Skip to content

Y
YDL-Component-Medical
Commit 5ea6e251 by 严久程
Options

课程模块

parent 229096eb
Showing with 2869 additions and 3364 deletions
m-course/build.gradle
......@@ -38,6 +38,10 @@ android {
ydl {}
xlzx {}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
sourceSets {
main {
......@@ -62,6 +66,7 @@ dependencies {
implementation modularPublication('com.ydl:m-user-api')
api project(":ydl-webview")
api project(":ydl-platform")
api project(":ydl-media")
} else {
//发布时使用
compileOnly rootProject.ext.dependencies["ydl-m-user-api"]
......
m-course/src/main/java/com/yidianling/course/CourseConstants.kt
package com.yidianling.course
import com.yidianling.ydlcommon.http.YdlRetrofitUtils
import com.yidianling.ydlcommon.router.YdlCommonOut
class CourseConstants {
companion object {
var EXPERT_HOME = YdlCommonOut.API_HOST_H5 + "experts/"
const val ALL_COURSE = YdlCommonOut.API_HOST + "course/list"
const val COURSE_PAGE_SIZE = 20
......
m-course/src/main/java/com/yidianling/course/CourseListAdapter.java
......@@ -4,8 +4,8 @@ import android.content.Context;
import android.view.View;
import android.view.ViewGroup;
import com.ydl.ydlcommon.adapter.CommonAdapter;
import com.yidianling.course.coursePlay.moudle.Course;
import com.yidianling.ydlcommon.adapter.CommonAdapter;
/**
* Created by zqk on 6/22/17.
......
m-course/src/main/java/com/yidianling/course/CourseListFragment.java
package com.yidianling.course;
import android.graphics.Color;
import android.annotation.SuppressLint;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.TextView;
import com.google.gson.Gson;
import com.ydl.webview.H5Params;
import com.ydl.webview.NewH5Activity;
import com.ydl.ydlcommon.base.BaseFragment;
import com.ydl.ydlcommon.bean.ShareData;
import com.ydl.ydlcommon.data.http.RxUtils;
import com.ydl.ydlcommon.utils.BuryPointUtils;
import com.ydl.ydlcommon.utils.NetworkParamsUtils;
import com.ydl.ydlcommon.utils.UMEventUtils;
import com.yidianling.common.tools.LogUtil;
import com.yidianling.course.courseNew.LoadMoreView;
import com.yidianling.course.courseNew.courseList.BaseLazyFragment;
import com.yidianling.course.coursePlay.common.net.RetrofitUtils;
import com.yidianling.course.coursePlay.http.CourseListDataManager;
import com.yidianling.course.coursePlay.moudle.Course;
import com.yidianling.course.coursePlay.moudle.CourseListDataBean;
import com.yidianling.course.router.CourseIn;
import com.yidianling.ydlcommon.data.ShareData;
import com.yidianling.ydlcommon.h5.H5Params;
import com.yidianling.ydlcommon.h5.NewH5Activity;
import com.yidianling.ydlcommon.http.RxUtils;
import com.yidianling.ydlcommon.http.YdlRetrofitUtils;
import com.yidianling.ydlcommon.tool.BuryPointUtils;
import com.yidianling.ydlcommon.utils.UMEventUtils;
import com.yidianling.ydlcommon.utils.YDLCacheUtils;
import java.net.ConnectException;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeoutException;
import butterknife.BindView;
import butterknife.OnClick;
import butterknife.OnItemClick;
import in.srain.cube.views.loadmore.LoadMoreContainer;
import in.srain.cube.views.loadmore.LoadMoreHandler;
import in.srain.cube.views.loadmore.LoadMoreListViewContainer;
......@@ -49,30 +33,25 @@ import in.srain.cube.views.ptr.header.MaterialHeader;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
import java.net.ConnectException;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeoutException;
/**
* A simple {@link Fragment} subclass.
* 咨询师课程列表页
*/
public class CourseListFragment extends BaseLazyFragment implements PtrHandler, LoadMoreHandler {
public class CourseListFragment extends BaseFragment implements PtrHandler, LoadMoreHandler {
@BindView(R2.id.lv_content)
ListView lvContent;
@BindView(R2.id.load_more_list_view_container)
LoadMoreListViewContainer loadMoreListViewContainer;
@BindView(R2.id.store_house_ptr_frame)
PtrFrameLayout storeHousePtrFrame;
@BindView(R2.id.tv_course_list_empty_prompt)
TextView emptyTv;
@BindView(R2.id.iv_course_list_empty_view)
ImageView ivEmptyView;
@BindView(R2.id.ll_pay_type)
LinearLayout llPayType;
@BindView(R2.id.tv_pay_type_free)
TextView payTypeFree;
@BindView(R2.id.tv_paied_type)
TextView paiedCourse;
private int page = 0;
private boolean hasMore = true;
......@@ -119,53 +98,33 @@ public class CourseListFragment extends BaseLazyFragment implements PtrHandler,
}
}
@Override
public void afterViewCreated(View view, Bundle savedInstanceState) {
isPrepared = true; //View创建完成
LogUtil.i("afterViewCreated id: " + tagId);
if (!isUseLazyMode) {
isVisible = true;
}
lazyLoad();
}
@Override
public int getLayoutId() {
public int layoutResId() {
return R.layout.fragment_course_list;
}
@Override
public void lazyLoad() {
if (!isPrepared || !isVisible) {
return;
}
LogUtil.i("lazy load tagid: " + tagId);
if (childType == TYPE_PAY) { //付费
llPayType.setVisibility(View.VISIBLE);
payTypeFree.setSelected(false);
payTypeFree.setTextColor(Color.parseColor("#909599"));
paiedCourse.setSelected(true);
paiedCourse.setTextColor(Color.parseColor("#ffffff"));
} else if (childType == TYPE_FREE) { //免费
llPayType.setVisibility(View.VISIBLE);
payTypeFree.setSelected(true);
payTypeFree.setTextColor(Color.parseColor("#ffffff"));
paiedCourse.setSelected(false);
paiedCourse.setTextColor(Color.parseColor("#909599"));
}
init();
isPrepared = false;
public void initDataAndEvent() {
lvContent = rootView.findViewById(R.id.lv_content);
loadMoreListViewContainer = rootView.findViewById(R.id.load_more_list_view_container);
storeHousePtrFrame = rootView.findViewById(R.id.store_house_ptr_frame);
emptyTv = rootView.findViewById(R.id.tv_course_list_empty_prompt);
ivEmptyView = rootView.findViewById(R.id.iv_course_list_empty_view);
lvContent.setOnItemClickListener((parent, view, position, id) -> itemClick(view, position));
}
@Override
public void onResume() {
super.onResume();
public void initDataAndEventLazy() {
init();
}
private void init() {
// header
final MaterialHeader header = new MaterialHeader(getActivity());
int[] colors = getResources().getIntArray(R.array.ydl_colors);
int[] colors = getResources().getIntArray(R.array.course_colors);
header.setColorSchemeColors(colors);
header.setLayoutParams(new PtrFrameLayout.LayoutParams(-1, -2));
int padding = (int) getActivity().getResources().getDimension(R.dimen.default_dis_size);
......@@ -184,27 +143,9 @@ public class CourseListFragment extends BaseLazyFragment implements PtrHandler,
loadMoreListViewContainer.setLoadMoreHandler(this);
adapter = new CourseListAdapter(getActivity());
lvContent.setAdapter(adapter);
localData();
getData(false);
}
/**
* 加载本地缓存数据
*/
private void localData() {
}
/**
* 更新缓存
* @param dataBean
*/
private void updateCache(CourseListDataBean dataBean){
String json = new Gson().toJson(dataBean);
if (!TextUtils.isEmpty(json)){
YDLCacheUtils.Companion.saveCourseListData(json);
}
}
private void getData(boolean loadMore) {
switch (tagId) {
case 1:
......@@ -229,19 +170,20 @@ public class CourseListFragment extends BaseLazyFragment implements PtrHandler,
getCourses(loadMore);
}
@SuppressLint("CheckResult")
private void getCourses(final boolean loadMore) {
StringBuffer sb = new StringBuffer();
if (tagId >= 10) {
sb.append("&page=").append(page).append("&listType=").append(tagId);
if (childType != -1){
if (childType != -1) {
sb.append("&isFree=").append(childType);
}
} else {
sb.append("&page=").append(page)
.append("&listType=").append(tagId+1);
.append("&listType=").append(tagId + 1);
}
String urlParams = YdlRetrofitUtils.getCommonParam() + sb.toString();
CourseListDataManager.INSTANCE.getHttp().getCourseList(urlParams).compose(RxUtils.resultJavaData()).subscribeOn(Schedulers.io())
String urlParams = NetworkParamsUtils.getCommonParam() + sb.toString();
RetrofitUtils.getCourseList(urlParams).compose(RxUtils.resultJavaData()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(resp -> {
lvContent.setVisibility(View.VISIBLE);
......@@ -261,7 +203,6 @@ public class CourseListFragment extends BaseLazyFragment implements PtrHandler,
if (!loadMore) {
if (courses != null) {
//更新缓存
updateCache(resp);
adapter.setDataList(courses);
adapter.notifyDataSetChanged();
}
......@@ -277,9 +218,6 @@ public class CourseListFragment extends BaseLazyFragment implements PtrHandler,
}, throwable -> {
if (throwable instanceof TimeoutException || throwable instanceof ConnectException || throwable instanceof UnknownHostException) {
if (adapter.mDataList == null || adapter.mDataList.size() <= 0) {
if (parentView == null) {
return;
}
emptyTv.setVisibility(View.VISIBLE);
ivEmptyView.setVisibility(View.VISIBLE);
lvContent.setVisibility(View.GONE);
......@@ -296,9 +234,6 @@ public class CourseListFragment extends BaseLazyFragment implements PtrHandler,
}
private void isShowEmptyView() {
if (getParentView() == null) {
return;
}
if (adapter.mDataList == null || adapter.mDataList.size() <= 0) {
emptyTv.setVisibility(View.VISIBLE);
ivEmptyView.setVisibility(View.VISIBLE);
......@@ -330,42 +265,17 @@ public class CourseListFragment extends BaseLazyFragment implements PtrHandler,
getData(false);
}
@OnClick({R2.id.tv_pay_type_free, R2.id.tv_paied_type})
void doClick(View view) {
if (view.getId() == R.id.tv_paied_type) {
if (paiedCourse.isSelected()) {
return;
}
childType = TYPE_PAY; //付费
payTypeFree.setSelected(false);
payTypeFree.setTextColor(Color.parseColor("#909599"));
paiedCourse.setSelected(true);
paiedCourse.setTextColor(Color.parseColor("#ffffff"));
getCourses(false);
} else if (view.getId() == R.id.tv_pay_type_free) {
if (payTypeFree.isSelected()) {
return;
}
childType = TYPE_FREE; //免费
payTypeFree.setSelected(true);
payTypeFree.setTextColor(Color.parseColor("#ffffff"));
paiedCourse.setSelected(false);
paiedCourse.setTextColor(Color.parseColor("#909599"));
getCourses(false);
}
}
@Override
public void onLoadMore(LoadMoreContainer loadMoreContainer) {
getData(true);
}
@OnItemClick(R2.id.lv_content)
void onItemClick(View v, int position) {
private void itemClick(View v, int position) {
Course course = adapter.getDataList().get(position);
if (course != null) {
H5Params h5Params = new H5Params(CourseConstants.Companion.getCOURSE_DETAIL_H5() + course.id, getActivity().getString(R.string.course_detail));
H5Params h5Params = new H5Params(CourseConstants.Companion.getCOURSE_DETAIL_H5() + course.id, "课程详情");
if (null != course.share && !TextUtils.isEmpty(course.share.getShare_url())) {
ShareData shareData = new ShareData(course.share.getShare_url(), course.share.getTitle(), course.share.getCover(), course.share.getDesc());
h5Params.setShareData(shareData);
......@@ -382,10 +292,4 @@ public class CourseListFragment extends BaseLazyFragment implements PtrHandler,
}
}
@Override
public void onDestroyView() {
super.onDestroyView();
LogUtil.i("destroy view id: " + tagId);
parentView = null;
}
}
m-course/src/main/java/com/yidianling/course/CourseListItemView.java
......@@ -12,7 +12,6 @@ import com.ydl.ydl_router.manager.YDLRouterManager;
import com.yidianling.course.coursePlay.CourseCommentActivity;
import com.yidianling.course.coursePlay.moudle.Course;
import com.yidianling.course.widget.CourseItemNewView;
import com.yidianling.ydlcommon.utils.UMEventUtils;
import butterknife.BindView;
import butterknife.ButterKnife;
......
m-course/src/main/java/com/yidianling/course/CourseNewListAdapter.java
......@@ -4,9 +4,9 @@ import android.content.Context;
import android.view.View;
import android.view.ViewGroup;
import com.ydl.ydlcommon.adapter.CommonAdapter;
import com.yidianling.course.coursePlay.moudle.Course;
import com.yidianling.course.widget.CourseItemNewView;
import com.yidianling.ydlcommon.adapter.CommonAdapter;
public class CourseNewListAdapter extends CommonAdapter<Course> {
......
m-course/src/main/java/com/yidianling/course/CoursePosterActivity.kt
......@@ -11,8 +11,11 @@ import android.view.View
import android.view.ViewGroup
import android.view.WindowManager
import com.alibaba.android.arouter.facade.annotation.Route
import com.ydl.ydlcommon.actions.share.ShareUtils
import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.utils.ImageUtil
import com.ydl.ydlcommon.utils.StatusBarUtils
import com.ydl.ydlcommon.view.dialog.YDLShareDialog
import com.yidianling.common.tools.ToastUtil
import com.yidianling.course.bean.PostersShareBean
import com.yidianling.course.coursePlay.common.net.RetrofitUtils
......@@ -20,6 +23,7 @@ import com.yidianling.course.widget.CoursePosterTemplate
import com.yidianling.course.widget.CustomPagerTransformer
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.activity_course_poster.*
/**
......
m-course/src/main/java/com/yidianling/course/FlutterCourseHomeFragment.kt
......@@ -7,6 +7,14 @@ import android.text.TextUtils
import com.alibaba.android.arouter.launcher.ARouter
import com.google.gson.Gson
import com.ydl.ydl_router.manager.YDLRouterManager
import com.ydl.ydlcommon.data.http.BaseResponse
import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.data.http.ThrowableConsumer
import com.ydl.ydlcommon.router.YdlCommonRouterManager
import com.ydl.ydlcommon.utils.YDLCacheUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.actionutil.BIConstants
import com.ydl.ydlcommon.utils.remind.ToastHelper
import com.yidianling.common.tools.ToastUtil
import com.yidianling.course.bean.CourseCouponBean
import com.yidianling.course.coursePlay.common.net.RetrofitUtils
......@@ -14,14 +22,6 @@ import com.yidianling.course.flutterPlugin.CourseSendPlugin
import com.yidianling.course.widget.CourseCouponDialog
import com.yidianling.router.RouterManager
import com.yidianling.ydlcommon.flutter.base.BaseFlutterFragment
import com.yidianling.ydlcommon.http.BaseResponse
import com.yidianling.ydlcommon.http.RxUtils
import com.yidianling.ydlcommon.http.ThrowableConsumer
import com.yidianling.ydlcommon.remind.ToastHelper
import com.yidianling.ydlcommon.router.YdlCommonRouterManager
import com.yidianling.ydlcommon.utils.YDLCacheUtils
import com.yidianling.ydlcommon.utils.actionutil.ActionCountUtils
import com.yidianling.ydlcommon.utils.actionutil.BIConstants
import io.flutter.view.FlutterView
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.functions.Consumer
......
m-course/src/main/java/com/yidianling/course/MyCourseListFragment.java deleted 100644 → 0
package com.yidianling.course;
import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.TextView;
import com.yidianling.common.tools.LogUtil;
import com.yidianling.common.tools.ToastUtil;
import com.yidianling.course.courseNew.LoadMoreView;
import com.yidianling.course.courseNew.courseList.BaseLazyFragment;
import com.yidianling.course.coursePlay.common.net.Command;
import com.yidianling.course.coursePlay.common.net.RetrofitUtils;
import com.yidianling.course.coursePlay.moudle.Course;
import com.yidianling.course.router.CourseIn;
import com.yidianling.ydlcommon.data.ShareData;
import com.yidianling.ydlcommon.h5.H5Params;
import com.yidianling.ydlcommon.h5.NewH5Activity;
import com.yidianling.ydlcommon.tool.BuryPointUtils;
import com.yidianling.ydlcommon.utils.UMEventUtils;
import java.net.ConnectException;
import java.net.UnknownHostException;
import java.util.List;
import java.util.concurrent.TimeoutException;
import butterknife.BindView;
import butterknife.OnClick;
import butterknife.OnItemClick;
import in.srain.cube.views.loadmore.LoadMoreContainer;
import in.srain.cube.views.loadmore.LoadMoreHandler;
import in.srain.cube.views.loadmore.LoadMoreListViewContainer;
import in.srain.cube.views.ptr.PtrDefaultHandler;
import in.srain.cube.views.ptr.PtrFrameLayout;
import in.srain.cube.views.ptr.PtrHandler;
import in.srain.cube.views.ptr.header.MaterialHeader;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
/**
* A simple {@link Fragment} subclass.
* 咨询师课程列表页
*/
public class MyCourseListFragment extends BaseLazyFragment implements PtrHandler, LoadMoreHandler {
@BindView(R2.id.lv_content)
ListView lvContent;
@BindView(R2.id.load_more_list_view_container)
LoadMoreListViewContainer loadMoreListViewContainer;
@BindView(R2.id.store_house_ptr_frame)
PtrFrameLayout storeHousePtrFrame;
@BindView(R2.id.tv_course_list_empty_prompt)
TextView emptyTv;
@BindView(R2.id.iv_course_list_empty_view)
ImageView ivEmptyView;
@BindView(R2.id.ll_pay_type)
LinearLayout llPayType;
@BindView(R2.id.tv_pay_type_free)
TextView payTypeFree;
@BindView(R2.id.tv_paied_type)
TextView paiedCourse;
private int page = 0;
private boolean hasMore = true;
private int tagId;
private CourseListAdapter adapter;
private int childType = -1;
private boolean isPrepared;
public MyCourseListFragment() {
// Required empty public constructor
}
public static MyCourseListFragment newInstance(int tagId) {
Bundle args = new Bundle();
args.putInt("tagId", tagId);
MyCourseListFragment fragment = new MyCourseListFragment();
fragment.setArguments(args);
return fragment;
}
public static MyCourseListFragment newInstance(int tagId, int childType) {
Bundle args = new Bundle();
args.putInt("tagId", tagId);
args.putInt("childType", childType);
MyCourseListFragment fragment = new MyCourseListFragment();
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
tagId = getArguments().getInt("tagId");
childType = getArguments().getInt("childType");
}
}
@Override
public void afterViewCreated(View view, Bundle savedInstanceState) {
isPrepared = true; //View创建完成
LogUtil.i("afterViewCreated id: " + tagId);
if (!isUseLazyMode) {
isVisible = true;
}
lazyLoad();
}
@Override
public int getLayoutId() {
return R.layout.fragment_course_list;
}
@Override
public void lazyLoad() {
if (!isPrepared || !isVisible) {
return;
}
LogUtil.i("lazy load tagid: " + tagId);
if (childType == 2) { //付费
llPayType.setVisibility(View.VISIBLE);
payTypeFree.setSelected(false);
payTypeFree.setTextColor(Color.parseColor("#909599"));
paiedCourse.setSelected(true);
paiedCourse.setTextColor(Color.parseColor("#ffffff"));
} else if (childType == 1) { //免费
llPayType.setVisibility(View.VISIBLE);
payTypeFree.setSelected(true);
payTypeFree.setTextColor(Color.parseColor("#ffffff"));
paiedCourse.setSelected(false);
paiedCourse.setTextColor(Color.parseColor("#909599"));
}
init();
isPrepared = false;
}
private void init() {
// header
final MaterialHeader header = new MaterialHeader(getActivity());
int[] colors = getResources().getIntArray(R.array.ydl_colors);
header.setColorSchemeColors(colors);
header.setLayoutParams(new PtrFrameLayout.LayoutParams(-1, -2));
int padding = (int) getActivity().getResources().getDimension(R.dimen.default_dis_size);
header.setPadding(0, padding, 0, padding);
header.setPtrFrameLayout(storeHousePtrFrame);
storeHousePtrFrame.setHeaderView(header);
storeHousePtrFrame.setPtrHandler(this);
storeHousePtrFrame.addPtrUIHandler(header);
// 使用默认样式
// loadMoreListViewContainer.useDefaultHeader();
LoadMoreView footerView = new LoadMoreView(getContext());
loadMoreListViewContainer.setLoadMoreView(footerView);
loadMoreListViewContainer.setLoadMoreUIHandler(footerView);
footerView.onLoading(loadMoreListViewContainer);
loadMoreListViewContainer.setLoadMoreHandler(this);
adapter = new CourseListAdapter(getActivity());
lvContent.setAdapter(adapter);
getData(false);
}
private void getData(boolean loadMore) {
switch (tagId) {
case 1:
case 2:
if (!CourseIn.INSTANCE.isLogin()) {
return;
}
break;
default:
break;
}
if (loadMore && !hasMore) {
loadMoreListViewContainer.loadMoreFinish(false, false);
return;
}
if (loadMore) {
page++;
} else {
page = 1;
hasMore = true;
}
getCourses(loadMore);
}
private void getCourses(final boolean loadMore) {
Command.GetCourse command;
if (tagId >= 10) {
command = new Command.GetCourse(page, tagId, childType);
} else {
command = new Command.GetCourse(page, tagId + 1);
}
//todo heti 待修改
RetrofitUtils.getCourseList(command)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(resp -> {
if (resp.code != 0) {
ToastUtil.toastShort(resp.msg);
hasMore = false;
isShowEmptyView();
return;
}
lvContent.setVisibility(View.VISIBLE);
emptyTv.setVisibility(View.GONE);
ivEmptyView.setVisibility(View.GONE);
if (getActivity() instanceof CourseActivity)
((CourseActivity) getActivity()).disPro();
if (loadMoreListViewContainer != null) {
loadMoreListViewContainer.loadMoreFinish(false, true);
}
try {
List<Course> courses = resp.data;
if (courses == null || courses.size() < CourseConstants.COURSE_PAGE_SIZE) {
hasMore = false;
}
if (!loadMore) {
if (courses != null) {
adapter.setDataList(courses);
adapter.notifyDataSetChanged();
}
} else if (courses != null) {
adapter.addDataList(courses);
}
isShowEmptyView();
} catch (Exception e) {
LogUtil.e(e.toString());
}
}, throwable -> {
// hasMore=false;
if (throwable instanceof TimeoutException || throwable instanceof ConnectException || throwable instanceof UnknownHostException) {
if (adapter.mDataList == null || adapter.mDataList.size() <= 0) {
if (parentView == null) {
return;
}
emptyTv.setVisibility(View.VISIBLE);
ivEmptyView.setVisibility(View.VISIBLE);
lvContent.setVisibility(View.GONE);
emptyTv.setText("网络不给力哦，下拉刷新重试");
ivEmptyView.setImageResource(R.drawable.no_net);
} else {
RetrofitUtils.handleError(getActivity(), throwable);
}
} else {
RetrofitUtils.handleError(getActivity(), throwable);
isShowEmptyView();
}
});
}
private void isShowEmptyView() {
if (getParentView() == null) {
return;
}
if (adapter.mDataList == null || adapter.mDataList.size() <= 0) {
emptyTv.setVisibility(View.VISIBLE);
ivEmptyView.setVisibility(View.VISIBLE);
lvContent.setVisibility(View.GONE);
ivEmptyView.setImageResource(R.drawable.blank);
emptyTv.setText("还没有相应的课程哦~");
} else {
lvContent.setVisibility(View.VISIBLE);
emptyTv.setVisibility(View.GONE);
ivEmptyView.setVisibility(View.GONE);
}
}
@Override
public boolean checkCanDoRefresh(PtrFrameLayout frame, View content, View header) {
return PtrDefaultHandler.checkContentCanBePulledDown(frame, lvContent, header);
}
@Override
public void onRefreshBegin(PtrFrameLayout frame) {
frame.postDelayed(new Runnable() {
@Override
public void run() {
if (storeHousePtrFrame != null) {
storeHousePtrFrame.refreshComplete();
}
}
}, 1800);
getData(false);
}
@OnClick({R2.id.tv_pay_type_free, R2.id.tv_paied_type})
void doClick(View view) {
if (view.getId() == R.id.tv_paied_type) {
if (paiedCourse.isSelected()) {
return;
}
childType = 2; //付费
payTypeFree.setSelected(false);
payTypeFree.setTextColor(Color.parseColor("#909599"));
paiedCourse.setSelected(true);
paiedCourse.setTextColor(Color.parseColor("#ffffff"));
getCourses(false);
} else if (view.getId() == R.id.tv_pay_type_free) {
if (payTypeFree.isSelected()) {
return;
}
childType = 1; //付费
payTypeFree.setSelected(true);
payTypeFree.setTextColor(Color.parseColor("#ffffff"));
paiedCourse.setSelected(false);
paiedCourse.setTextColor(Color.parseColor("#909599"));
getCourses(false);
}
}
@Override
public void onLoadMore(LoadMoreContainer loadMoreContainer) {
getData(true);
}
@OnItemClick(R2.id.lv_content)
void onItemClick(View v, int position) {
Course course = adapter.getDataList().get(position);
if (course != null) {
H5Params h5Params = new H5Params(CourseConstants.Companion.getCOURSE_DETAIL_H5() + course.id, getActivity().getString(R.string.course_detail));
if (!TextUtils.isEmpty(course.share.getShare_url())) {
ShareData shareData = new ShareData(course.share.getShare_url(), course.share.getTitle(), course.share.getCover(), course.share.getDesc());
h5Params.setShareData(shareData);
}
UMEventUtils.umEvent("列表页分类点击", "分类id", course.id + "");
UMEventUtils.umEvent("列表页分类点击", "分类名称", course.title);
NewH5Activity.start(getActivity(), h5Params);
BuryPointUtils.getInstance().createMap()
.put("curriculum_name", course.title == null ? "" : course.title)
.put("curriculum_ID", course.id)
.burryPoint("Curriculum_click");
}
}
@Override
public void onDestroyView() {
super.onDestroyView();
LogUtil.i("destroy view id: " + tagId);
parentView = null;
}
}
m-course/src/main/java/com/yidianling/course/bean/CouponHintParam.kt 0 → 100644
package com.yidianling.course.bean
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
* @描述:
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2018/12/27
*/
// noThing为无关参数
data class CouponHintParam(val noThing : Int)
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/bean/CouponHintResponseBean.kt 0 → 100644
package com.yidianling.course.bean
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
* @描述:
* @Copyright Copyright (c) 2019
* @Company 壹点灵
* @date 2019/01/02
*/
class CouponHintResponseBean(val msg:String, val url:String)
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/bean/CourseExtraBean.kt 0 → 100644
package com.yidianling.course.bean
import com.ydl.ydlcommon.bean.ShareData
/**
* @author jiucheng
* @描述:
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2019/7/11
*/
data class CourseExtraBean(
/**
* 课程价格
*/
var applyFee: String,
/**
* 课程类型 1.音频课程 2.线下 3.app群直播 4.app音视频直播 5.站外课程 6.系列课程 7.视频课程 8.app视频直播 ,
*/
var courseType: Int,
/**
* 是否包含音视频 1：只有音频 2：只有视屏 3：音视频都有
*/
var mediaTypes: Int,
/**
* 咨询师头像
*/
var doctorHead: String,
/**
* 咨询师名字
*/
var doctorName: String,
/**
* 课程id
*/
var id: String,
/**
* 是否购买
*/
var isBuy: Boolean,
/**
* 课程原价
*/
var originalApplyFee: String,
/**
* 课程图
*/
var pic: String,
/**
* 子课程数量
*/
var serialsNumber: Int,
/**
* 分享数据
*/
var shareData: ShareData,
/**
* 课程标题
*/
var title: String,
/**
* 用户评论次数：等于大于1表示评论过
*/
var userCommentNum: Int
)
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/bean/CourseMediaBean.kt 0 → 100644
package com.yidianling.course.bean
/**
* @author jiucheng
* @描述:
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2019/7/11
*/
data class CourseMediaBean(
/**
* 课程id ,
*/
var courseId: String,
/**
* 课程主讲人名字
*/
var doctorName: String,
/**
* 资料类型 1.音频 2.视频 ,
*/
var mediaType: Int,
/**
* 课程标题 ,
*/
var title: String,
/**
* 课程url ,
*/
var url: String,
/**
* 当前是否在播放
*/
var isPlaying: Boolean = false,
/**
* 是否是试听
*/
var isDemo: Boolean = false
)
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/bean/CourseMediaDetailBean.kt 0 → 100644
package com.yidianling.course.bean
/**
* @author jiucheng
* @描述:
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2019/7/11
*/
data class CourseMediaDetailBean(
/**
* 课程概括
*/
val courseExtra: CourseExtraBean,
/**
* 试听
*/
val voiceSample: CourseMediaGroupBean,
/**
* 系列音/视频
*/
val voiceWhole: CourseMediaGroupBean
)
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/bean/CourseMediaGroupBean.kt 0 → 100644
package com.yidianling.course.bean
/**
* @author jiucheng
* @描述:
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2019/7/11
*/
data class CourseMediaGroupBean(
/**
* 是否购买
*/
var isBuy: Boolean,
/**
* //是否是系列课
*/
var isSeries: Boolean,
/**
* 音频列表
*/
var courseMedia: List<CourseMediaBean>
)
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/coursePlay/http/CourseListParams.kt → m-course/src/main/java/com/yidianling/course/bean/RedListParam.kt
package com.yidianling.course.coursePlay.http
package com.yidianling.course.bean
/**
* @author yuanWai
* @描述:
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2018/12/12
* @date 2018/11/27
*/
data class CourseListParams(val params : String)
\ No newline at end of file
data class RedListParam(val serviceType : Int)
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/courseNew/BannerBean.java deleted 100644 → 0
package com.yidianling.course.courseNew;
/**
* Created by Jim on 2018/7/13 0013.
*/
public class BannerBean {
public String title;
public String image;
public String linkUrl;
}
m-course/src/main/java/com/yidianling/course/courseNew/CategoryItemView.kt deleted 100644 → 0
package com.yidianling.course.courseNew
import android.content.Context
import android.view.LayoutInflater
import android.widget.FrameLayout
import android.widget.LinearLayout
import com.ydl.ydl_image.module.GlideApp
import com.yidianling.course.R
import kotlinx.android.synthetic.main.item_view_category.view.*
/**
* @author : Zhangwenchao
* @e-mail : zhangwch@yidianling.com
* @time : 2018/7/14
*/
class CategoryItemView(context: Context?) : FrameLayout(context) {
init {
LayoutInflater.from(context).inflate(R.layout.item_view_category, this, true)
}
fun setText(text: CharSequence?) {
tv_title.text = text
}
fun setImage(url: String?) {
url?.let { GlideApp.with(this).load(it).into(iv_icon) }
}
}
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/courseNew/CourseHeadPagerAdapter.java deleted 100644 → 0
package com.yidianling.course.courseNew;
import android.content.Context;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import com.ydl.ydl_image.module.GlideApp;
import com.yidianling.common.tools.RxImageTool;
import com.yidianling.course.R;
import com.yidianling.ydlcommon.utils.ScreenUtil;
import com.yidianling.ydlcommon.utils.UMEventUtils;
import com.yidianling.ydlcommon.utils.actionutil.ActionCountUtils;
import com.yidianling.ydlcommon.utils.actionutil.BIConstants;
import java.util.List;
/**
* Created by softrice on 2015/11/13.
*/
public class CourseHeadPagerAdapter extends PagerAdapter {
/**
* 装ImageView数组
*/
private List<BannerBean> banners;
private ImageView[] mImageViews;
private Context mContext;
private int dp194, screenWidth;
public CourseHeadPagerAdapter(List<BannerBean> banners, Context context) {
this.banners = banners;
mContext = context;
dp194 = RxImageTool.dip2px(194f);
screenWidth = ScreenUtil.screenWidth;
initDatas();
}
public void setData(List<BannerBean> banners) {
this.banners = banners;
initDatas();
}
@Override
public int getCount() {
if (banners == null || banners.size() <= 0) {
return 1;
} else {
return banners.size();
}
}
private void initDatas() {
if (banners == null || banners.size() <= 0) {
mImageViews = new ImageView[1];
mImageViews[0] = new ImageView(mContext);
mImageViews[0].setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, dp194));
mImageViews[0].setScaleType(ImageView.ScaleType.CENTER_CROP);
GlideApp.with(mContext)
.load(R.drawable.default_banner)
.override(screenWidth, dp194)
.into(mImageViews[0]);
} else {
mImageViews = new ImageView[banners.size()];
for (int i = 0; i < mImageViews.length; i++) {
mImageViews[i] = new ImageView(mContext);
mImageViews[i].setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, dp194));
mImageViews[i].setScaleType(ImageView.ScaleType.CENTER_CROP);
GlideApp.with(mContext)
.load(banners.get(i).image)
.override(screenWidth, dp194)
.into(mImageViews[i]);
}
}
}
@Override
public boolean isViewFromObject(View view, Object object) {
return view == object;
}
@Override
public void destroyItem(ViewGroup container, int position, Object object) {
((ViewPager) container).removeView(mImageViews[position
% mImageViews.length]);
}
@Override
public Object instantiateItem(ViewGroup container, int position) {
try {
((ViewPager) container).addView(mImageViews[position
% mImageViews.length], 0);
} catch (Exception e) {
// handler something
}
mImageViews[position % mImageViews.length].setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
UMEventUtils.umEvent("banner点击", "banner链接", banners.get(position).linkUrl);
ActionCountUtils.Companion.count(BIConstants.CourseHomeEvent.POSITION_COURSE_HOME_BANNER_CLICK, position + "");
LinkUrlRouterProtocol.jump(container.getContext(), banners.get(position).linkUrl);
}
});
return mImageViews[position % mImageViews.length];
}
}
m-course/src/main/java/com/yidianling/course/courseNew/CourseTopicActivity.kt
package com.yidianling.course.courseNew
import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
import android.support.v4.widget.SwipeRefreshLayout
......@@ -12,16 +13,16 @@ import android.widget.LinearLayout
import android.widget.TextView
import com.alibaba.android.arouter.facade.annotation.Route
import com.ydl.ydl_image.module.GlideApp
import com.ydl.ydlcommon.actions.share.ShareUtils
import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.utils.UMEventUtils
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.RxNetTool
import com.yidianling.course.R
import com.yidianling.course.coursePlay.common.net.RetrofitUtils
import com.yidianling.course.coursePlay.moudle.Course
import com.yidianling.course.model.TopicCourseBean
import com.yidianling.ydlcommon.base.BaseActivity
import com.yidianling.ydlcommon.http.RxUtils
import com.yidianling.ydlcommon.share.ShareUtils
import com.yidianling.ydlcommon.utils.UMEventUtils
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.activity_course_topic.*
......@@ -64,11 +65,10 @@ class CourseTopicActivity : BaseActivity(), View.OnClickListener, SwipeRefreshLa
specialId = intent.getStringExtra("special_id").toInt()
}
LogUtil.i("special id: $specialId")
swl.setColorSchemeResources(R.color.google_green)
swl.setColorSchemeResources(R.color.main_theme)
swl.setOnRefreshListener(this)
tv_left_menu.setOnClickListener {
UMEventUtils.umEvent("专题详情", "分享", "分享")
//分享
share()
}
......@@ -94,7 +94,7 @@ class CourseTopicActivity : BaseActivity(), View.OnClickListener, SwipeRefreshLa
}
fun initFooterView() {
footerView = LayoutInflater.from(this).inflate(R.layout.item_text, course_topic_rcv, false)
footerView = LayoutInflater.from(this).inflate(R.layout.item_course_topic_text, course_topic_rcv, false)
adapter?.addFooterView(footerView)
}
......@@ -104,6 +104,7 @@ class CourseTopicActivity : BaseActivity(), View.OnClickListener, SwipeRefreshLa
}
}
@SuppressLint("CheckResult")
private fun loadData() {
if (!RxNetTool.isConnected(CourseTopicActivity@ this)) {
swl.isRefreshing = false
......
m-course/src/main/java/com/yidianling/course/courseNew/CourseTopicAdapter.kt
......@@ -5,13 +5,13 @@ import android.support.v4.util.SparseArrayCompat
import android.support.v7.widget.RecyclerView
import android.view.View
import android.view.ViewGroup
import com.ydl.webview.H5Params
import com.ydl.webview.NewH5Activity
import com.ydl.ydlcommon.utils.UMEventUtils
import com.ydl.ydlcommon.view.BaseViewHolder
import com.yidianling.course.CourseConstants
import com.yidianling.course.coursePlay.moudle.Course
import com.yidianling.course.widget.CourseItemNewView
import com.yidianling.ydlcommon.h5.H5Params
import com.yidianling.ydlcommon.h5.NewH5Activity
import com.yidianling.ydlcommon.utils.UMEventUtils
import com.yidianling.ydlcommon.view.BaseViewHolder
/**
* Created by Jim on 2018/7/12 0012.
......
m-course/src/main/java/com/yidianling/course/courseNew/LinkUrlRouterProtocol.java
......@@ -5,8 +5,8 @@ import android.text.TextUtils;
import com.ydl.ydl_router.manager.YDLRouterManager;
import com.ydl.ydl_router.manager.YDLRouterParams;
import com.ydl.ydlcommon.router.IYDLRouterConstant;
import com.yidianling.common.tools.LogUtil;
import com.yidianling.ydlcommon.router.IYDLRouterConstant;
/**
* Created by Jim on 2018/7/17 0017.
......
m-course/src/main/java/com/yidianling/course/courseNew/PriceUtil.java deleted 100644 → 0
package com.yidianling.course.courseNew;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.style.AbsoluteSizeSpan;
import android.widget.TextView;
import com.yidianling.course.R;
import com.yidianling.ydlcommon.app.YdlCommonApp;
/**
* Created by Jim on 2018/7/17 0017.
*/
public class PriceUtil {
public static void formatPrice(String price, TextView textView) {
if (TextUtils.isEmpty(price) || "0.00".equals(price) || "null".equals(price)) {
textView.setTextSize(12);
textView.setTextColor(YdlCommonApp.INSTANCE.getApp().getResources().getColor(R.color.google_green));
String money = "0.00";
SpannableString sStr = new SpannableString("¥" + money);
int index = money.indexOf(".") + 1;
if (index != -1) {
sStr.setSpan(new AbsoluteSizeSpan(18, true), 1, index, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
}
textView.setText(sStr);
} else {
textView.setTextSize(12);
textView.setTextColor(YdlCommonApp.INSTANCE.getApp().getResources().getColor(R.color.cube_holo_orange_dark));
SpannableString sStr = new SpannableString("¥" + price);
int index = price.indexOf(".") + 1;
if (index != -1 && index > 1) {
sStr.setSpan(new AbsoluteSizeSpan(18, true), 1, index, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
}
textView.setText(sStr);
}
}
}
m-course/src/main/java/com/yidianling/course/courseNew/courseList/BaseLazyFragment.java deleted 100644 → 0
package com.yidianling.course.courseNew.courseList;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import butterknife.ButterKnife;
import butterknife.Unbinder;
public abstract class BaseLazyFragment extends Fragment {
protected boolean isVisible;
protected boolean isUseLazyMode=true;
private Unbinder mUnBinder;
protected View parentView;
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
parentView = inflater.inflate(getLayoutId(), container, false);
return parentView;
}
@Override
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
mUnBinder = ButterKnife.bind(this, view);
afterViewCreated(view,savedInstanceState);
}
public abstract void afterViewCreated(View view,Bundle savedInstanceState);
public abstract int getLayoutId();
@Override
public void setUserVisibleHint(boolean isVisibleToUser) {
super.setUserVisibleHint(isVisibleToUser);
if (!isUseLazyMode){
return;
}
if (getUserVisibleHint()) {
isVisible = true;
onVisible();
} else {
isVisible = false;
onInvisible();
}
}
public BaseLazyFragment setIsUseLazyMode(boolean isUseLazyMode){
this.isUseLazyMode=isUseLazyMode;
return this;
}
protected void onInvisible() {
}
protected void onVisible() {
lazyLoad();
};
public abstract void lazyLoad();
@Override
public void onDestroyView() {
super.onDestroyView();
mUnBinder.unbind();
}
public View getParentView(){
return parentView;
}
}
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/courseNew/courseList/CouresListPresenter.java deleted 100644 → 0
package com.yidianling.course.courseNew.courseList;
/**
* Created by Jim on 2018/7/16 0016.
*/
public class CouresListPresenter {
}
m-course/src/main/java/com/yidianling/course/courseNew/courseList/CourseListContainerActivity.kt
......@@ -6,6 +6,7 @@ import `in`.srain.cube.views.ptr.PtrDefaultHandler
import `in`.srain.cube.views.ptr.PtrFrameLayout
import `in`.srain.cube.views.ptr.PtrHandler
import `in`.srain.cube.views.ptr.header.MaterialHeader
import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
import android.graphics.Typeface
......@@ -16,7 +17,17 @@ import android.widget.AdapterView
import android.widget.LinearLayout
import android.widget.TextView
import com.alibaba.android.arouter.facade.annotation.Route
import com.ydl.base_module.ui.searchbarview.SearchBarView
import com.ydl.webview.H5Params
import com.ydl.webview.NewH5Activity
import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.bean.ShareData
import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.ui.LogoLoadingView
import com.ydl.ydlcommon.utils.NetworkParamsUtils
import com.ydl.ydlcommon.utils.UMEventUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.actionutil.BIConstants
import com.ydl.ydlcommon.utils.remind.ToastHelper
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.RxImageTool
import com.yidianling.course.CourseConstants
......@@ -27,25 +38,15 @@ import com.yidianling.course.courseNew.courseList.widget.CourseFilterPopupWindow
import com.yidianling.course.courseNew.courseList.widget.CourseGoodPopupWindow
import com.yidianling.course.courseNew.courseList.widget.CourseSortPopupWindow
import com.yidianling.course.coursePlay.common.net.RetrofitUtils
import com.yidianling.course.coursePlay.http.CourseListDataManager
import com.yidianling.course.coursePlay.moudle.Course
import com.yidianling.course.model.CourseCategoryBean
import com.yidianling.course.router.CourseIn
import com.yidianling.ydlcommon.base.BaseActivity
import com.yidianling.ydlcommon.data.ShareData
import com.yidianling.ydlcommon.h5.H5Params
import com.yidianling.ydlcommon.h5.NewH5Activity
import com.yidianling.ydlcommon.http.RxUtils
import com.yidianling.ydlcommon.http.YdlRetrofitUtils
import com.yidianling.ydlcommon.remind.ToastHelper
import com.yidianling.ydlcommon.ui.LogoLoadingView
import com.yidianling.ydlcommon.utils.UMEventUtils
import com.yidianling.ydlcommon.utils.actionutil.ActionCountUtils
import com.yidianling.ydlcommon.utils.actionutil.BIConstants
import com.yidianling.course.widget.SearchBarView
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.activity_courses.*
import kotlinx.android.synthetic.main.item_hot_search_view.view.*
import kotlinx.android.synthetic.main.layout_title_bar.*
import org.json.JSONException
import org.json.JSONObject
......@@ -134,7 +135,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
private fun init() {
// header
val header = MaterialHeader(this)
val colors = resources.getIntArray(R.array.ydl_colors)
val colors = resources.getIntArray(R.array.course_colors)
header.setColorSchemeColors(colors)
header.layoutParams = PtrFrameLayout.LayoutParams(-1, -2)
val padding = resources.getDimension(R.dimen.default_dis_size).toInt()
......@@ -155,9 +156,10 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
val course = adapter!!.dataList[position]
if (course != null) {
val h5Params = H5Params(CourseConstants.COURSE_DETAIL_H5 + course.id, this@CourseListContainerActivity.getString(R.string.course_detail))
val h5Params = H5Params(CourseConstants.COURSE_DETAIL_H5 + course.id, "课程详情")
if (null != course.share && !TextUtils.isEmpty(course.share.share_url)) {
val shareData = ShareData(course.share.share_url, course.share.title, course.share.cover, course.share.desc)
val shareData =
ShareData(course.share.share_url, course.share.title, course.share.cover, course.share.desc)
h5Params.shareData = shareData
}
......@@ -173,165 +175,213 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
/**
* 获取课程分类数据
*/
@SuppressLint("CheckResult")
private fun loadData() {
RetrofitUtils.getCourseListCategory()
.subscribeOn(Schedulers.io())
.compose(RxUtils.resultJavaData())
.observeOn(AndroidSchedulers.mainThread())
.subscribe({ resp ->
if (resp?.childSample != null && resp.childSample.size > 0) {
allCategoryBean = resp
repeat(resp.childSample.size) {
if (resp.childSample[it].id == 2) {
allCourseList.addAll(resp.childSample[it].childSample)
return@repeat
}
.subscribeOn(Schedulers.io())
.compose(RxUtils.resultJavaData())
.observeOn(AndroidSchedulers.mainThread())
.subscribe({ resp ->
if (resp?.childSample != null && resp.childSample.size > 0) {
allCategoryBean = resp
repeat(resp.childSample.size) {
if (resp.childSample[it].id == 2) {
allCourseList.addAll(resp.childSample[it].childSample)
return@repeat
}
if (currentType != -1) {
for (bean in allCourseList) {
if (bean.type == currentType.toString()) {
selectedCourseList.add(bean)
break
}
}
if (currentType != -1) {
for (bean in allCourseList) {
if (bean.type == currentType.toString()) {
selectedCourseList.add(bean)
break
}
}
if (selectedCourseList.size > 0) {
classify_layout.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
classify_layout.setTextColor(ContextCompat.getColor(this@CourseListContainerActivity, R.color.color_1DA1F2))
} else {
classify_layout.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
classify_layout.setTextColor(ContextCompat.getColor(this@CourseListContainerActivity, R.color.color_242424))
}
}
if (selectedCourseList.size > 0) {
classify_layout.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
classify_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.color_1DA1F2
)
)
} else {
classify_layout.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
classify_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.color_242424
)
)
}
repeat(resp.childSample.size) {
if (resp.childSample[it].id == 4) {
addHotSearchView(resp.childSample[it].childSample)
return@repeat
}
repeat(resp.childSample.size) {
if (resp.childSample[it].id == 4) {
addHotSearchView(resp.childSample[it].childSample)
return@repeat
}
}
}
}, { t: Throwable? ->
})
//
// RetrofitUtils.getCourseListCategory(BaseCommand())
// .subscribeOn(Schedulers.io())
// .compose(RxUtils.resultData())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe({ resp ->
// if (resp != null && resp.size >= 0) {
// allCourseList.addAll(resp)
// //如果上个页面有传递选中的课程分类，在这里需要添加的选中的list中，弹窗显示时才会有选中信息
// if (currentType != -1) {
// for (bean in allCourseList) {
// if (bean.type == currentType) {
// selectedCourseList.add(bean)
// break
// }
// }
// }
// if (selectedCourseList.size > 0) {
// classify_layout.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
// classify_layout.setTextColor(ContextCompat.getColor(this@CourseListContainerActivity, R.color.color_1DA1F2))
// } else {
// classify_layout.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
// classify_layout.setTextColor(ContextCompat.getColor(this@CourseListContainerActivity, R.color.color_242424))
// }
//
// addHotSearchView()
// }
// }, { t: Throwable? ->
// })
}, { t: Throwable? ->
})
}
private fun initCouponHintView() {
courseListContainerActivityCouponHintView.initData(View.VISIBLE)
courseListContainerActivityCouponHintView.setCouponList()
hint_view.initData(View.VISIBLE)
hint_view.setCouponList()
}
private fun setClick() {
//综合排序弹窗
sort_layout.setOnClickListener {
var popupWindow = CourseSortPopupWindow(this, selectedSort, object : CourseSortPopupWindow.OnSortItemSelectedListener {
override fun onSortItemSelected(sortItem: String) {
selectedSort = sortItem
getData(false)
ActionCountUtils.count(BIConstants.CourseListEvent.POSITION_COURSE_LIST_SORT_CLICK, selectedSort)
}
})
var popupWindow =
CourseSortPopupWindow(this, selectedSort, object : CourseSortPopupWindow.OnSortItemSelectedListener {
override fun onSortItemSelected(sortItem: String) {
selectedSort = sortItem
getData(false)
ActionCountUtils.count(
BIConstants.CourseListEvent.POSITION_COURSE_LIST_SORT_CLICK,
selectedSort
)
}
})
popupWindow.setOnDismissListener {
sort_layout.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_arrow_drop_down_grey_500_18dp, 0)
sort_layout.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
R.drawable.course_ic_arrow_drop_down_grey_500_18dp,
0
)
}
sort_layout.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_arrow_drop_down_green_18dp, 0)
sort_layout.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
R.drawable.course_ic_arrow_drop_down_green_18dp,
0
)
popupWindow.showAsDropDown(view_line)
}
//分类排序弹窗--现在是只支持单选
classify_layout.setOnClickListener {
var popupWindow = CourseGoodPopupWindow(this, allCourseList, selectedCourseList, object : CourseGoodPopupWindow.OnGoodSelectedListener {
override fun onGoodSelected(selectedGoodsList: ArrayList<CourseCategoryBean>) {//现在是只支持单选:selectedGoodsList里面最多只有一个数据
selectedCourseList.clear()
selectedCourseList.addAll(selectedGoodsList)
if (selectedCourseList.size > 0) {
}
if (selectedGoodsList.size == 0) {
//重置所有选择条件:这时候默认选择全部类型
currentType = 10
}
getData(false)
var popupWindow = CourseGoodPopupWindow(
this,
allCourseList,
selectedCourseList,
object : CourseGoodPopupWindow.OnGoodSelectedListener {
override fun onGoodSelected(selectedGoodsList: ArrayList<CourseCategoryBean>) {//现在是只支持单选:selectedGoodsList里面最多只有一个数据
selectedCourseList.clear()
selectedCourseList.addAll(selectedGoodsList)
if (selectedCourseList.size > 0) {
}
if (selectedGoodsList.size == 0) {
//重置所有选择条件:这时候默认选择全部类型
currentType = 10
}
getData(false)
var name = if (selectedGoodsList.size == 0) "全部类型" else selectedGoodsList[0].name
ActionCountUtils.count(BIConstants.CourseListEvent.POSITION_COURSE_LIST_CLASSIFICATION_CLICK, name)
}
})
var name = if (selectedGoodsList.size == 0) "全部类型" else selectedGoodsList[0].name
ActionCountUtils.count(
BIConstants.CourseListEvent.POSITION_COURSE_LIST_CLASSIFICATION_CLICK,
name
)
}
})
popupWindow.setOnDismissListener {
if (selectedCourseList.size > 0) {
classify_layout.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
classify_layout.setTextColor(ContextCompat.getColor(this@CourseListContainerActivity, R.color.color_1DA1F2))
classify_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.color_1DA1F2
)
)
} else {
classify_layout.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
classify_layout.setTextColor(ContextCompat.getColor(this@CourseListContainerActivity, R.color.color_242424))
classify_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.color_242424
)
)
}
classify_layout.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_arrow_drop_down_grey_500_18dp, 0)
classify_layout.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
R.drawable.course_ic_arrow_drop_down_grey_500_18dp,
0
)
}
classify_layout.setTextColor(ContextCompat.getColor(this@CourseListContainerActivity, R.color.color_1DA1F2))
classify_layout.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_arrow_drop_down_green_18dp, 0)
classify_layout.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
R.drawable.course_ic_arrow_drop_down_green_18dp,
0
)
popupWindow.showAsDropDown(view_line)
}
//筛选
filter_layout.setOnClickListener {
var popupWindow = CourseFilterPopupWindow(this@CourseListContainerActivity, isFree, isInvite, isPromotion, object : CourseFilterPopupWindow.OnFilterSelectedListener {
override fun onFilterSelected(isFree: Int, isInvite: Int, isPromotion: Int) {
this@CourseListContainerActivity.isFree = isFree
this@CourseListContainerActivity.isInvite = isInvite
this@CourseListContainerActivity.isPromotion = isPromotion
getData(false)
var sign = if (isFree == 1) "免费" else "付费"
if (isInvite == 1) {
sign += "返利"
}
if (isPromotion == 1) {
sign += "促销"
var popupWindow = CourseFilterPopupWindow(
this@CourseListContainerActivity,
isFree,
isInvite,
isPromotion,
object : CourseFilterPopupWindow.OnFilterSelectedListener {
override fun onFilterSelected(isFree: Int, isInvite: Int, isPromotion: Int) {
this@CourseListContainerActivity.isFree = isFree
this@CourseListContainerActivity.isInvite = isInvite
this@CourseListContainerActivity.isPromotion = isPromotion
getData(false)
var sign = if (isFree == 1) "免费" else "付费"
if (isInvite == 1) {
sign += "返利"
}
if (isPromotion == 1) {
sign += "促销"
}
ActionCountUtils.count(BIConstants.CourseListEvent.POSITION_COURSE_LIST_FILTER_CLICK, sign)
}
ActionCountUtils.count(BIConstants.CourseListEvent.POSITION_COURSE_LIST_FILTER_CLICK, sign)
}
})
})
popupWindow.setOnDismissListener {
if (this@CourseListContainerActivity.isFree != 0 || this@CourseListContainerActivity.isInvite != 0 || this@CourseListContainerActivity.isPromotion != 0) {
filter_layout.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
filter_layout.setTextColor(ContextCompat.getColor(this@CourseListContainerActivity, R.color.color_1DA1F2))
filter_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.color_1DA1F2
)
)
} else {
filter_layout.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
filter_layout.setTextColor(ContextCompat.getColor(this@CourseListContainerActivity, R.color.color_242424))
filter_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.color_242424
)
)
}
filter_layout.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_arrow_drop_down_grey_500_18dp, 0)
filter_layout.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
R.drawable.course_ic_arrow_drop_down_grey_500_18dp,
0
)
}
filter_layout.setTextColor(ContextCompat.getColor(this@CourseListContainerActivity, R.color.color_1DA1F2))
filter_layout.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_arrow_drop_down_green_18dp, 0)
filter_layout.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
R.drawable.course_ic_arrow_drop_down_green_18dp,
0
)
popupWindow.showAsDropDown(view_line)
}
......@@ -380,6 +430,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
}
@SuppressLint("CheckResult")
private fun getCourses(loadMore: Boolean) {
val sb = StringBuffer()
if (selectedCourseList.size > 0) {
......@@ -391,10 +442,10 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
sb.append("&listType=").append(currentType + 1)
}
sb.append("&page=").append(page)
.append("&isFree=").append(isFree)
.append("&reorder=").append(selectedSort)
.append("&isInvite=").append(isInvite)
.append("&isPromotion=").append(isPromotion)
.append("&isFree=").append(isFree)
.append("&reorder=").append(selectedSort)
.append("&isInvite=").append(isInvite)
.append("&isPromotion=").append(isPromotion)
if (keyList.size > 0) {
repeat(keyList.size) {
......@@ -402,7 +453,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
}
}
val urlParams = YdlRetrofitUtils.getCommonParam() + sb.toString()
val urlParams = NetworkParamsUtils.getCommonParam() + sb.toString()
//不是上拉加载更多，是第一次加载或者下拉刷新，且当前页面还没有数据
if (!loadMore && adapter?.count!! <= 0) {
......@@ -410,61 +461,60 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
v_loading.visibility = View.VISIBLE
v_loading.setViewType(LogoLoadingView.TYPE_LOADING, null)
}
CourseListDataManager.getHttp().getCourseList(urlParams).compose(RxUtils.resultJavaData()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe({ resp ->
if (resp.list.isNotEmpty()) {
if (load_more_list_view_container != null) {
load_more_list_view_container.loadMoreFinish(false, true)
}
try {
val courses = ArrayList<Course>()
courses.addAll(resp.list)
if (courses.size < CourseConstants.COURSE_PAGE_SIZE) {
hasMore = false
}
if (!loadMore) {
adapter!!.dataList = courses
adapter!!.notifyDataSetChanged()
lv_content.setSelection(0)
} else {
adapter!!.addDataList(courses)
adapter!!.notifyDataSetChanged()
}
RetrofitUtils.getCourseList(urlParams).compose(RxUtils.resultJavaData()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe({ resp ->
if (resp.list.isNotEmpty()) {
} catch (e: Exception) {
LogUtil.e(e.toString())
if (load_more_list_view_container != null) {
load_more_list_view_container.loadMoreFinish(false, true)
}
try {
val courses = ArrayList<Course>()
courses.addAll(resp.list)
if (courses.size < CourseConstants.COURSE_PAGE_SIZE) {
hasMore = false
}
if (!loadMore) {
adapter!!.dataList = courses
adapter!!.notifyDataSetChanged()
lv_content.setSelection(0)
} else {
adapter!!.addDataList(courses)
adapter!!.notifyDataSetChanged()
}
lv_content.visibility = View.VISIBLE
tv_course_list_empty_prompt.visibility = View.GONE
iv_course_list_empty_view.visibility = View.GONE
v_loading.visibility = View.GONE
} else {
lv_content.visibility = View.GONE
tv_course_list_empty_prompt.visibility = View.VISIBLE
iv_course_list_empty_view.visibility = View.VISIBLE
iv_course_list_empty_view.setImageResource(R.drawable.blank)
tv_course_list_empty_prompt.text = "还没有相应的课程哦~"
v_loading.visibility = View.GONE
} catch (e: Exception) {
LogUtil.e(e.toString())
}
}, { throwable ->
v_loading.visibility = View.GONE
if (adapter!!.mDataList == null || adapter!!.mDataList.size <= 0) {
lv_content.visibility = View.GONE
tv_course_list_empty_prompt.visibility = View.GONE
iv_course_list_empty_view.visibility = View.GONE
v_loading.visibility = View.VISIBLE
v_loading.setViewType(LogoLoadingView.TYPE_NET_LOSS, "哎呦，网络开小差了")
} else {
ToastHelper.show("网络不给力")
RetrofitUtils.handleError(this@CourseListContainerActivity, throwable)
}
})
lv_content.visibility = View.VISIBLE
tv_course_list_empty_prompt.visibility = View.GONE
iv_course_list_empty_view.visibility = View.GONE
v_loading.visibility = View.GONE
} else {
lv_content.visibility = View.GONE
tv_course_list_empty_prompt.visibility = View.VISIBLE
iv_course_list_empty_view.visibility = View.VISIBLE
iv_course_list_empty_view.setImageResource(R.drawable.blank)
tv_course_list_empty_prompt.text = "还没有相应的课程哦~"
v_loading.visibility = View.GONE
}
}, { throwable ->
v_loading.visibility = View.GONE
if (adapter!!.mDataList == null || adapter!!.mDataList.size <= 0) {
lv_content.visibility = View.GONE
tv_course_list_empty_prompt.visibility = View.GONE
iv_course_list_empty_view.visibility = View.GONE
v_loading.visibility = View.VISIBLE
v_loading.setViewType(LogoLoadingView.TYPE_NET_LOSS, "哎呦，网络开小差了")
} else {
ToastHelper.show("网络不给力")
RetrofitUtils.handleError(this@CourseListContainerActivity, throwable)
}
})
}
......@@ -530,12 +580,27 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
if (selectedCourseList.size > 0) {
classify_layout.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
classify_layout.setTextColor(ContextCompat.getColor(this@CourseListContainerActivity, R.color.color_1DA1F2))
classify_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.color_1DA1F2
)
)
} else {
classify_layout.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
classify_layout.setTextColor(ContextCompat.getColor(this@CourseListContainerActivity, R.color.color_242424))
classify_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.color_242424
)
)
}
classify_layout.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_arrow_drop_down_grey_500_18dp, 0)
classify_layout.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
R.drawable.course_ic_arrow_drop_down_grey_500_18dp,
0
)
}
3 -> {//筛选
if (isAdd) {
......@@ -562,10 +627,20 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
if (this@CourseListContainerActivity.isFree != 0 || this@CourseListContainerActivity.isInvite != 0 || this@CourseListContainerActivity.isPromotion != 0) {
filter_layout.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
filter_layout.setTextColor(ContextCompat.getColor(this@CourseListContainerActivity, R.color.color_1DA1F2))
filter_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.color_1DA1F2
)
)
} else {
filter_layout.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
filter_layout.setTextColor(ContextCompat.getColor(this@CourseListContainerActivity, R.color.color_242424))
filter_layout.setTextColor(
ContextCompat.getColor(
this@CourseListContainerActivity,
R.color.color_242424
)
)
}
}
else -> {//热门筛选
......
m-course/src/main/java/com/yidianling/course/courseNew/courseList/CourseListPresenter.java deleted 100644 → 0
package com.yidianling.course.courseNew.courseList;//package com.yidianling.course.courseNew.courseList;
//
//import com.yidianling.common.tools.LogUtil;
//import com.yidianling.course.coursePlay.common.net.Command;
//import com.yidianling.course.coursePlay.common.net.RetrofitUtils;
//import com.yidianling.course.coursePlay.moudle.Course;
//import com.yidianling.ydlcommon.http.RxUtils;
//
//import java.util.List;
//
//import io.reactivex.android.schedulers.AndroidSchedulers;
//import io.reactivex.functions.Consumer;
//import io.reactivex.schedulers.Schedulers;
//
///**
// * Created by Jim on 2018/7/16 0016.
// */
//
//public class CourseListPresenter {
//
// private ICourseListView mView;
//
// public CourseListPresenter(ICourseListView view){
// mView=view;
// }
//
// public void fetchData(Command.GetCourse cmd) {
// RetrofitUtils.getCourseList(cmd)
// .subscribeOn(Schedulers.io())
// .compose(RxUtils.resultData())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(resp-> {
//
// },throwable -> {
// mView.showLoadErrorView();
// LogUtil.e("load error: "+throwable.toString());
// });
// }
//
//}
m-course/src/main/java/com/yidianling/course/courseNew/courseList/ICourseListView.java deleted 100644 → 0
package com.yidianling.course.courseNew.courseList;
/**
* Created by Jim on 2018/7/16 0016.
*/
public interface ICourseListView {
void hideRefreshView();
void showLoadErrorView();
}
m-course/src/main/java/com/yidianling/course/courseNew/courseList/widget/CourseGoodPopupWindow.kt
package com.yidianling.course.courseNew.courseList.widget
import android.content.Context
import android.graphics.Typeface
import android.graphics.drawable.BitmapDrawable
import android.support.v7.widget.GridLayoutManager
import android.support.v7.widget.LinearLayoutManager
import android.view.LayoutInflater
import android.view.ViewGroup
import android.widget.PopupWindow
import com.ydl.ydlcommon.view.SpaceItemDecorator
import com.yidianling.common.tools.RxImageTool
import com.yidianling.course.R
import com.yidianling.course.courseNew.courseList.widget.adapter.CourseGoodAdapter
import com.yidianling.course.model.CourseCategoryBean
import com.yidianling.ydlcommon.view.SpaceItemDecorator
import kotlinx.android.synthetic.main.course_good_popup_window.view.*
......
m-course/src/main/java/com/yidianling/course/courseNew/courseList/widget/adapter/CourseGoodAdapter.kt
......@@ -13,7 +13,7 @@ import kotlinx.android.synthetic.main.item_course_good_item.view.*
/**
* @author yuanwai
* @描述:课程列表页--筛选模块--擅长方式popwindow适配器
* @描述:课程列表页--筛选模块--分类 popwindow适配器
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2018/9/22
......
m-course/src/main/java/com/yidianling/course/courseNew/home/CourseHomeFragment.kt deleted 100644 → 0
package com.yidianling.course.courseNew.home
import android.support.v4.widget.SwipeRefreshLayout
import android.support.v7.widget.LinearLayoutManager
import android.text.TextUtils
import android.view.View
import com.alibaba.android.arouter.launcher.ARouter
import com.ydl.base_module.ui.searchbarview.SearchBarView
import com.ydl.ydl_image.module.GlideApp
import com.ydl.ydl_router.manager.YDLRouterManager
import com.yidianling.course.R
import com.yidianling.course.bean.CourseCouponBean
import com.yidianling.course.bean.CourseHomeBodyBean
import com.yidianling.course.courseNew.BannerBean
import com.yidianling.course.courseNew.mine.MyCourseActivity
import com.yidianling.course.courseNew.sections.*
import com.yidianling.course.coursePlay.common.net.RetrofitUtils
import com.yidianling.course.model.CatogoryBean
import com.yidianling.course.model.NormalCourseBean
import com.yidianling.course.model.QulityCourseBean
import com.yidianling.course.router.CourseIn
import com.yidianling.course.widget.CourseCouponDialog
import com.yidianling.ydlcommon.adapter.section.SectionAdapter
import com.yidianling.ydlcommon.base.BaseFragment
import com.yidianling.ydlcommon.event.SelectTabCallPhoneEvent
import com.yidianling.ydlcommon.http.BaseResponse
import com.yidianling.ydlcommon.player.YDLMusicHelper
import com.yidianling.ydlcommon.remind.ToastHelper
import com.yidianling.ydlcommon.ui.LogoLoadingView
import com.yidianling.ydlcommon.utils.UMEventUtils
import com.yidianling.ydlcommon.utils.actionutil.ActionCountUtils
import com.yidianling.ydlcommon.utils.actionutil.BIConstants
import de.greenrobot.event.EventBus
import kotlinx.android.synthetic.main.fragment_course_home.*
/**
* Created by Jim on 2018/6/21 0021.
* 课程首页Fragment
*/
class CourseHomeFragment : BaseFragment(), ICourseHomeView, SwipeRefreshLayout.OnRefreshListener {
private var presenter: CourseHomePresenter = CourseHomePresenter(this)
private var adapter = SectionAdapter()
private var dialog: CourseCouponDialog? = null
companion object {
private const val BANNER = 1
private const val CATEGORY = 2
private const val QULITY_COURSE = 3
private const val CLASSIFIED_COURSE = 4
private const val TOPIC = 5
private const val LIST_END = 7
}
override fun layoutResId(): Int {
return R.layout.fragment_course_home
}
override fun initDataAndEvent() {
}
override fun initDataAndEventLazy() {
initViews()
initNetLossView()
//加载本地缓存数据
presenter.localData(context)
presenter.fetchData()
initCouponHintView()
}
override fun isAddStatusView(): Boolean {
return true
}
override fun setUserVisibleHint(isVisibleToUser: Boolean) {
super.setUserVisibleHint(isVisibleToUser)
if (isVisibleToUser) {
presenter.prepareCoupon()
ActionCountUtils.count(BIConstants.CourseHomeEvent.POSITION_COURSE_HOME_PAGE_VISIT)
}
}
private fun initCouponHintView() {
couponHintView.initData(View.VISIBLE)
couponHintView.setCouponList()
}
private fun initViews() {
iv_back.setOnClickListener {
EventBus.getDefault().post(SelectTabCallPhoneEvent(0))
}
swl?.setOnRefreshListener(this)
swl?.setColorSchemeResources(R.color.google_green)
rcv?.layoutManager = LinearLayoutManager(activity)
rcv?.adapter = adapter
activity_course_search_bar.initBarType(SearchBarView.JUMP_TO_SEARCH_COURSE, null)
GlideApp.with(activity).load(R.drawable.music).into(img_music)
img_music.setOnClickListener {
if (YDLMusicHelper.isCoursePlaying()) {
//课程播放页
YDLMusicHelper.startCoursePlayActivity(activity, 1)
} else {
img_music.visibility = View.GONE
}
}
tv_left_menu.setOnClickListener {
ActionCountUtils.count(BIConstants.CourseHomeEvent.POSITION_COURSE_HOME_MY_COUSE_CLICK)
UMEventUtils.umEvent("我的课程点击", "我的课程", "我的课程")
if (CourseIn.isLogin()) {
MyCourseActivity.start(activity)
} else {
startActivity(CourseIn.loginWayIntent(activity))
}
}
}
private fun initNetLossView() {
v_loading.visibility = View.VISIBLE
v_loading.setViewType(LogoLoadingView.TYPE_LOADING, null)
v_loading.setListener(object : LogoLoadingView.LogoLoadingListener {
override fun onDataResetClick() {
v_loading.setViewType(LogoLoadingView.TYPE_LOADING, null)
presenter.fetchData()
}
override fun onBackClick() {
EventBus.getDefault().post(SelectTabCallPhoneEvent(0))
}
})
}
override fun showBody(resultBeans: List<ResultBean>) {
if (resultBeans.isEmpty()) {
return
}
v_loading.visibility = View.GONE
rcv?.visibility = View.VISIBLE
adapter.clearData()
for (resultBean in resultBeans) {
when (resultBean.type) {
BANNER -> {
val bannerMap = resultBean.body
val banners = ArrayList<BannerBean>()
for (map in bannerMap) {
val banner = BannerBean()
banner.image = map.image
banner.title = map.title
banner.linkUrl = map.linkUrl
banners.add(banner)
}
adapter.addSection(BannerSection(banners))
}
CATEGORY -> {
val categoryMap = resultBean.body
val categorys = ArrayList<CatogoryBean>()
for (map in categoryMap) {
val category = CatogoryBean()
category.image = map.image
category.title = map.title
category.linkUrl = map.linkUrl
categorys.add(category)
}
adapter.addSection(CategorySection(categorys))
}
QULITY_COURSE -> {
val totalCourse = ArrayList<ArrayList<CourseHomeBodyBean>>()
val coursesLeft = ArrayList<CourseHomeBodyBean>()
val coursesRight = ArrayList<CourseHomeBodyBean>()
for (result in resultBean.body) {
if (TextUtils.equals(result.type, "1")) {
coursesLeft.add(result)
}
if (TextUtils.equals(result.type, "2")) {
coursesRight.add(result)
}
}
totalCourse.add(coursesLeft)
totalCourse.add(coursesRight)
val course = QulityCourseBean().apply {
this.diviLine = resultBean.diviLine
this.head = resultBean.head
this.footer = resultBean.footer
this.body = totalCourse
}
adapter.addSection(QulityCourseSection(activity, course, adapter))
}
CLASSIFIED_COURSE -> {
val classifiedMap = resultBean.body
val normal = NormalCourseBean().apply {
this.head = resultBean.head
this.footer = resultBean.footer
this.diviLine = resultBean.diviLine
this.body = classifiedMap
}
adapter.addSection(ClassifiedCourseSection(activity, normal))
}
TOPIC -> {
val topicMap = resultBean.body
val normal = NormalCourseBean().apply {
this.head = resultBean.head
this.footer = resultBean.footer
this.diviLine = resultBean.diviLine
this.body = topicMap
}
adapter.addSection(TopicsCoursesSection(context, normal))
}
LIST_END -> {
val head = resultBean.head
adapter.addSection(ListEndSection(head.title))
}
}
}
adapter.notifyDataSetChanged()
}
/**
* 可领取的优惠券列表
*/
override fun couponDataResponse(data: List<CourseCouponBean>) {
if (dialog == null) {
dialog = CourseCouponDialog(activity, data, object : CourseCouponDialog.OnClickEnsureListener {
override fun clickUse(toLink: String) {
YDLRouterManager.router(toLink)
dialog!!.dismiss()
}
override fun clickEnsure(status: Int) {
if (status == CourseCouponDialog.STATUS_RECEIVER) {
presenter.receiveCoupon(data)
} else {
dialog!!.dismiss()
//查看我的卡券
ARouter.getInstance().build("/mine/redpacket")
.withString("is_from_main", "1")
.navigation()
}
}
})
}
dialog!!.show()
}
/**
* 优惠券领取成功
*/
override fun receiveCouponResponse(data: BaseResponse<List<String>>) {
if (data.code == 200) {
dialog?.updateStatus(CourseCouponDialog.STATUS_GET, data.data)
} else {
ToastHelper.show(data.msg)
}
}
override fun showLoadErrorView(throwable: Throwable?) {
RetrofitUtils.handleError(activity, throwable)
}
override fun hideRefreshView() {
swl?.isRefreshing = false
}
override fun showRefreshView() {
swl?.isRefreshing = true
v_loading.visibility = View.VISIBLE
v_loading.setViewType(LogoLoadingView.TYPE_LOADING, null)
}
override fun onRefresh() {
swl?.isRefreshing = true
presenter.fetchData()
}
override fun onDestroy() {
super.onDestroy()
presenter?.onDestroy()
}
}
m-course/src/main/java/com/yidianling/course/courseNew/home/CourseHomePresenter.kt deleted 100644 → 0
package com.yidianling.course.courseNew.home
import android.annotation.SuppressLint
import android.content.Context
import android.os.Handler
import android.text.TextUtils
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.ToastUtil
import com.yidianling.course.bean.CourseCouponBean
import com.yidianling.course.coursePlay.common.net.RetrofitUtils
import com.yidianling.router.RouterManager
import com.yidianling.ydlcommon.http.RxUtils
import com.yidianling.ydlcommon.http.ThrowableConsumer
import com.yidianling.ydlcommon.router.YdlCommonRouterManager
import com.yidianling.ydlcommon.utils.AssetsUtils
import com.yidianling.ydlcommon.utils.YDLAsyncUtils
import com.yidianling.ydlcommon.utils.YDLCacheUtils
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.functions.Consumer
import io.reactivex.schedulers.Schedulers
import java.text.SimpleDateFormat
import java.util.*
/**
* Created by Jim on 2018/7/11 0011.
*/
class CourseHomePresenter(var view: ICourseHomeView) {
private var hasRequestCoupon = false
private val compositeSubscription = CompositeDisposable()
/**
* 加载本地缓存
*/
fun localData(context: Context) {
YDLAsyncUtils.asyncAsResult(object : YDLAsyncUtils.AsyncObjecyerResult {
override fun doAsyncAction(): Any {
var cacheData = YDLCacheUtils.getCourseHomeData()
if (cacheData?.isEmpty()!!) {
cacheData = String(AssetsUtils.getAssertsFile(context, "course_home.json")!!)
}
return cacheData
}
override fun asyncResult(`object`: Any?) {
if (`object` is String) {
val gson = Gson()
if (!TextUtils.isEmpty(`object`)) {
val list = gson.fromJson<List<ResultBean>>(`object`, object : TypeToken<List<ResultBean>>() {}.type)
view.showBody(list)
}
}
}
})
}
/**
* 更新本地缓存
*/
private fun updateCache(list: List<ResultBean>) {
YDLAsyncUtils.async(object : YDLAsyncUtils.AsyncObjecyer {
override fun doAsyncAction() {
val gson = Gson()
val json = gson.toJson(list)
YDLCacheUtils.saveCourseHomeData(json)
}
})
}
fun fetchData() {
compositeSubscription.add(RetrofitUtils.getCoursesHomePage()
.subscribeOn(Schedulers.io())
.compose(RxUtils.resultJavaData())
.observeOn(AndroidSchedulers.mainThread())
.subscribe({ response ->
view.hideRefreshView()
view.showBody(response)
//更新本地缓存数据
updateCache(response)
}, { t: Throwable? ->
view.hideRefreshView()
view.showLoadErrorView(t)
LogUtil.e("CoursesHomePage data fetch error: " + t.toString())
}))
}
/**
* 获取优惠券信息
*/
fun prepareCoupon() {
//判断是否登录 以及本次app启动后是否已经请求过
if (RouterManager.getUserRouter()?.isLogin() == true && !hasRequestCoupon) {
Handler().postDelayed({
//优惠券逻辑
if (compareCouponTime()) {
getCouponData()
}
}, 2000)
}
}
/**
* 获取可以领取的课程优惠券
*
* @param uid uid
* @param services 适用服务 1预约咨询 2电话倾诉 3课程（用户课程 专家课程） 5测评
* @param receiveType 领取条件方式 1前台领取 2链接领取
* @param applyEnds 适用终端 1PC官网 2wap站点 3用户app 4好杮app 5专家app
* @return
*/
@SuppressLint("SimpleDateFormat")
private fun getCouponData() {
val (userId) = YdlCommonRouterManager.getYdlCommonRoute().getUserInfo() ?: return
val disposable = RetrofitUtils.getCourseCoupons(userId, "3", "1", "3")
.compose(RxUtils.netCheck())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(Consumer {
hasRequestCoupon = true
val simpleFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss")//如2016-08-10
val time = System.currentTimeMillis()
val date = Date()
date.time = time
val nowTime = simpleFormat.format(date)
if (it?.data != null && !it.data.isEmpty()) {
YDLCacheUtils.saveCouponTime(userId, nowTime)
view.couponDataResponse(it.data)
}
}, object : ThrowableConsumer() {
override fun accept(msg: String) {
}
})
compositeSubscription.add(disposable)
}
/**
* 领取优惠券
*/
fun receiveCoupon(list: List<CourseCouponBean>) {
val (userId) = YdlCommonRouterManager.getYdlCommonRoute().getUserInfo() ?: return
val couponIds = ArrayList<String>()
for (bean in list) {
couponIds.add(bean.id)
}
val bean = CouponReceiveBean()
bean.couponIds = couponIds
bean.uid = userId
val couponIdsStr = Gson().toJson(bean)
view.showRefreshView()
val disposable = RetrofitUtils.receiveCoupon(couponIdsStr)
.compose(RxUtils.netCheck())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(Consumer {
view.hideRefreshView()
view.receiveCouponResponse(it)
}, object : ThrowableConsumer() {
override fun accept(msg: String) {
ToastUtil.toastShort(msg)
view.hideRefreshView()
}
})
compositeSubscription.add(disposable)
}
/**
* 对比上次获取优惠券时间，若时间差超过一天，则再次请求，否则不获请求
*/
@SuppressLint("SimpleDateFormat")
private fun compareCouponTime(): Boolean {
val uid = YdlCommonRouterManager.getYdlCommonRoute().getUserInfo()?.userId
val simpleFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss")//如2016-08-10
val last = YDLCacheUtils.getCouponTime(uid)
return if (TextUtils.isEmpty(last)) {
//还没有获取过优惠券，直接请求数据
true
} else {
val time = System.currentTimeMillis()
val date = Date()
date.time = time
val nowTime = simpleFormat.format(date)
!TextUtils.equals(last.substring(0, 10), nowTime.substring(0, 10))
}
}
fun onDestroy() {
compositeSubscription.dispose()
}
inner class CouponReceiveBean {
var couponIds: List<String>? = null
var uid: String? = null
}
}
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/courseNew/home/ICourseHomeView.kt deleted 100644 → 0
package com.yidianling.course.courseNew.home
import com.hannesdorfmann.mosby3.mvp.MvpView
import com.yidianling.course.bean.CourseCouponBean
import com.yidianling.ydlcommon.http.BaseResponse
/**
* Created by Jim on 2018/7/11 0011.
*/
interface ICourseHomeView : MvpView {
fun showBody(resultBeans: List<ResultBean>)
fun hideRefreshView()
fun showRefreshView()
fun showLoadErrorView(throwable: Throwable?)
fun couponDataResponse(data: List<CourseCouponBean>)
fun receiveCouponResponse(data: BaseResponse<List<String>>)
}
m-course/src/main/java/com/yidianling/course/courseNew/home/ResultBean.java deleted 100644 → 0
package com.yidianling.course.courseNew.home;
import com.google.gson.annotations.SerializedName;
import com.yidianling.course.bean.CourseHomeBodyBean;
import java.util.List;
/**
* Created by Jim on 2018/7/13 0013.
*/
public class ResultBean {
public Head head;
public List<CourseHomeBodyBean> body;
public Footer footer;
public int type;
public boolean diviLine;
public static class Head {
public String title;
public String subTitle;
public String subLinkUrl;
public String tab1Name;
public String tab2Name;
}
public static class Footer {
public String title;
@SerializedName(value = "linkUrl",alternate = "LinkUrl")
public String linkUrl;
}
}
m-course/src/main/java/com/yidianling/course/courseNew/mine/MyCourseActivity.java
......@@ -14,13 +14,13 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.ydl.base_module.ui.searchbarview.SearchBarView;
import com.ydl.ydlcommon.base.BaseActivity;
import com.ydl.ydlcommon.utils.DisplayUtils;
import com.ydl.ydlcommon.utils.UMEventUtils;
import com.yidianling.course.CourseListFragment;
import com.yidianling.course.R;
import com.yidianling.ydlcommon.base.BaseActivity;
import com.yidianling.ydlcommon.ui.confideredpacket.ConfideRedPacketView;
import com.yidianling.ydlcommon.utils.DisplayUtils;
import com.yidianling.ydlcommon.utils.UMEventUtils;
import com.yidianling.course.widget.CourseRedPacketView;
import com.yidianling.course.widget.SearchBarView;
import java.lang.reflect.Field;
......@@ -84,9 +84,9 @@ public class MyCourseActivity extends BaseActivity {
}
private void initConfideRedPacketView() {
ConfideRedPacketView confideRedPacketView = findViewById(R.id.confideRedPacketView);
confideRedPacketView.initData(View.VISIBLE);
confideRedPacketView.setConfide();
CourseRedPacketView courseRedPacketView = findViewById(R.id.courseRedPacketView);
courseRedPacketView.initData(View.VISIBLE);
courseRedPacketView.setConfide();
}
......
m-course/src/main/java/com/yidianling/course/courseNew/sections/BannerSection.java deleted 100644 → 0
package com.yidianling.course.courseNew.sections;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.yidianling.common.tools.LogUtil;
import com.yidianling.course.R;
import com.yidianling.course.courseNew.BannerBean;
import com.yidianling.course.courseNew.CourseHeadPagerAdapter;
import com.yidianling.ydlcommon.adapter.section.Section;
import com.yidianling.ydlcommon.view.LoopViewPager;
import java.util.List;
/**
* Created by Jim on 2018/6/22 0022.
* 轮播图模版
*/
public class BannerSection extends Section {
private List<BannerBean> mBanners;
private final int IDENTIFY_TYPE = BANNER_SECTION;
public BannerSection(List<BannerBean> banners) {
super(R.layout.item_course_banner);
this.mBanners=banners;
}
@Override
public void bindViewHolder(RecyclerView.ViewHolder holder, int position) {
if (holder instanceof BannerViewHolder){
((BannerViewHolder) holder).notifyData(mBanners);
}
}
@Override
public int getTotalDataNum() {
return 1;
}
@Override
public int getItemViewType(int position) {
return combineType(IDENTIFY_TYPE, TYPE_BODY);
}
@Override
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view= LayoutInflater.from(parent.getContext()).inflate(itemResourceId,parent,false);
return new BannerViewHolder(view,mBanners);
}
@Override
public boolean isBelongTo(int viewType) {
return String.valueOf(viewType).startsWith(String.valueOf(IDENTIFY_TYPE));
}
@Override
public boolean isHeadType(int position) {
return false;
}
@Override
public boolean isFooterType(int position) {
return false;
}
@Override
public int getSectionId() {
return 0;
}
static class BannerViewHolder extends RecyclerView.ViewHolder {
private LoopViewPager mHeadViewPager;
private CourseHeadPagerAdapter mAdapter;
public BannerViewHolder(View itemView,List<BannerBean> banners) {
super(itemView);
mHeadViewPager=itemView.findViewById(R.id.vp_head_bar);
mAdapter=new CourseHeadPagerAdapter(banners,itemView.getContext());
mHeadViewPager.setAdapter(mAdapter);
}
public void notifyData(List<BannerBean> banners){
mAdapter=new CourseHeadPagerAdapter(banners,itemView.getContext());
mHeadViewPager.setAdapter(mAdapter);
}
}
}
m-course/src/main/java/com/yidianling/course/courseNew/sections/CategorySection.java deleted 100644 → 0
package com.yidianling.course.courseNew.sections;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import com.yidianling.common.tools.RxDeviceTool;
import com.yidianling.course.R;
import com.yidianling.course.courseNew.CategoryItemView;
import com.yidianling.course.courseNew.LinkUrlRouterProtocol;
import com.yidianling.course.model.CatogoryBean;
import com.yidianling.ydlcommon.adapter.section.Section;
import com.yidianling.ydlcommon.utils.UMEventUtils;
import com.yidianling.ydlcommon.utils.actionutil.ActionCountUtils;
import com.yidianling.ydlcommon.utils.actionutil.BIConstants;
import java.util.List;
import cn.lankton.flowlayout.FlowLayout;
/**
* Created by Jim on 2018/6/25 0025.
*/
public class CategorySection extends Section {
private final int IDENTIFY_TYPE = CATEGORY_SECTION;
public List<CatogoryBean> datas;
public CategorySection(List<CatogoryBean> datas) {
super(R.layout.item_category2);
this.datas = datas;
}
@Override
public void bindViewHolder(RecyclerView.ViewHolder holder, int position) {
if (holder instanceof CategoryViewHolder) {
}
}
@Override
public int getTotalDataNum() {
return 1;
}
@Override
public int getItemViewType(int position) {
return combineType(IDENTIFY_TYPE, TYPE_BODY);
}
@Override
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext()).inflate(itemResourceId, parent, false);
return new CategoryViewHolder(view, datas);
}
@Override
public boolean isBelongTo(int viewType) {
return String.valueOf(viewType).startsWith(String.valueOf(IDENTIFY_TYPE));
}
@Override
public boolean isHeadType(int position) {
return false;
}
@Override
public boolean isFooterType(int position) {
return false;
}
@Override
public int getSectionId() {
return 0;
}
static class CategoryViewHolder extends RecyclerView.ViewHolder {
public CategoryViewHolder(View itemView, List<CatogoryBean> datas) {
super(itemView);
int width = RxDeviceTool.getScreenWidth(itemView.getContext());
FlowLayout flowLayout = itemView.findViewById(R.id.flow_layout);
int itemWidth = width / 4;
for (int i = 0; i < datas.size(); i++) {
CatogoryBean category = datas.get(i);
CategoryItemView ciView = new CategoryItemView(itemView.getContext());
ViewGroup.MarginLayoutParams params = new ViewGroup.MarginLayoutParams(itemWidth, WindowManager.LayoutParams.WRAP_CONTENT);
ciView.setLayoutParams(params);
ciView.setText(category.title);
ciView.setImage(category.image);
ciView.setOnClickListener(view -> {
UMEventUtils.umEvent("课程分类点击", "分类id", category.linkUrl);
UMEventUtils.umEvent("课程分类点击", "分类名称", category.title);
ActionCountUtils.Companion.count(BIConstants.CourseHomeEvent.POSITION_COURSE_HOME_CLASSIFICATION_CLICK, category.title);
if (!TextUtils.isEmpty(category.linkUrl)) {
LinkUrlRouterProtocol.jump(itemView.getContext(), category.linkUrl);
}
});
flowLayout.addView(ciView);
}
}
}
}
m-course/src/main/java/com/yidianling/course/courseNew/sections/ClassifiedCourseSection.java deleted 100644 → 0
package com.yidianling.course.courseNew.sections;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.yidianling.course.R;
import com.yidianling.course.bean.CourseHomeBodyBean;
import com.yidianling.course.courseNew.LinkUrlRouterProtocol;
import com.yidianling.course.courseNew.viewholder.FooterMoreViewHolder;
import com.yidianling.course.courseNew.viewholder.SingleTitleHeaderViewHolder;
import com.yidianling.course.coursePlay.moudle.Course;
import com.yidianling.course.model.NormalCourseBean;
import com.yidianling.course.widget.CourseItemNewView;
import com.yidianling.ydlcommon.adapter.section.Section;
import com.yidianling.ydlcommon.utils.UMEventUtils;
import com.yidianling.ydlcommon.utils.actionutil.ActionCountUtils;
import com.yidianling.ydlcommon.utils.actionutil.BIConstants;
/**
* Created by Jim on 2018/6/25 0025.
* 分类课程模版
*/
public class ClassifiedCourseSection extends Section {
private final int IDENTIFY_TYPE = CLASSIFY_COURSE_SECTION;
private NormalCourseBean data;
private int totalNum;
private Context context;
public ClassifiedCourseSection(Context context, NormalCourseBean bean) {
super(R.layout.item_classified_title, R.layout.item_more, R.layout.item_course_list);
this.context = context;
this.data = bean;
initTotlaNum();
}
@Override
public void bindViewHolder(RecyclerView.ViewHolder holder, int position) {
if (holder instanceof FooterMoreViewHolder) {
((FooterMoreViewHolder) holder).titleView.setText(data.footer.title);
((FooterMoreViewHolder) holder).linearLayout.setOnClickListener(view -> {
UMEventUtils.umEvent(data.head.title, "更多课程", "更多课程");
LinkUrlRouterProtocol.jump(context, data.footer.linkUrl);
if (!TextUtils.isEmpty(data.head.title)) {
if (data.head.title.contains("线下")) {
ActionCountUtils.Companion.count(BIConstants.CourseHomeEvent.POSITION_COURSE_HOME_OFFLINE_CERTIFICATION_TRAINING_MORE_CLICK);
} else {
ActionCountUtils.Companion.count(BIConstants.CourseHomeEvent.POSITION_COURSE_HOME_CONSULTANT_COURSE_MORE_CLICK);
}
}
});
} else if (holder instanceof SingleTitleHeaderViewHolder) {
((SingleTitleHeaderViewHolder) holder).titleView.setText(data.head.title);
} else if (holder instanceof CourseItemViewHolder) {
CourseItemViewHolder realHolder = (CourseItemViewHolder) holder;
// if ((data.head != null && position == 1) || (data.head == null && position == 0)) {
// realHolder.hideDividerLine();
// } else {
// realHolder.tv_line_bottom.setVisibility(View.VISIBLE);
// }
CourseHomeBodyBean course = data.body.get(position - 1);
Course courseBean = switchData(course);
realHolder.courseItemNewView.setData(courseBean);
holder.itemView.setOnClickListener(view -> {
UMEventUtils.umEvent(data.head.title, data.head.title + "链接", course.linkUrl);
LinkUrlRouterProtocol.jump(context, courseBean.linkUrl);
if (!TextUtils.isEmpty(data.head.title)) {
if (data.head.title.contains("线下")) {
ActionCountUtils.Companion.count(BIConstants.CourseHomeEvent.POSITION_COURSE_HOME_OFFLINE_CERTIFICATION_TRAINING_XXX_CLICK + courseBean.id + "_click");
}
}
});
}
}
private Course switchData(CourseHomeBodyBean bean) {
Course course = new Course();
course.id = bean.id;
course.title = bean.title;
course.hostListPic = bean.hostListPic;
course.courseHostInfo = bean.courseHostInfo;
course.hostInfo = bean.hostInfo;
course.pic = bean.pic;
course.image = bean.image;
course.subCourseNum = bean.subCourseNum;
course.doctorName = bean.doctorName;
course.joinNum = bean.joinNum;
course.isInvite = bean.isInvite;
course.applyFee = bean.applyFee;
course.recommend = bean.recommend;
course.newCourse = bean.newCourse;
course.demoType = bean.demoType;
course.originalApplyFee = bean.originalApplyFee;
course.courseType = bean.courseType;
course.isBuy = bean.isBuy;
course.demoFile = bean.demoFile;
course.promotionApplyFee = bean.promotionApplyFee;
course.isPromotion = bean.isPromotion;
course.linkUrl = bean.linkUrl;
return course;
}
private void initTotlaNum() {
totalNum = 0;
if (data.head != null) {
totalNum++;
}
if (data.footer != null) {
totalNum++;
}
if (data.body != null) {
totalNum += data.body.size();
}
}
@Override
public int getTotalDataNum() {
return totalNum;
}
@Override
public int getItemViewType(int position) {
if (isHeadType(position)) {
return combineType(IDENTIFY_TYPE, TYPE_HEADER);
} else if (isFooterType(position)) {
return combineType(IDENTIFY_TYPE, TYPE_FOOTER);
} else {
return combineType(IDENTIFY_TYPE, TYPE_BODY);
}
}
@Override
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = null;
if (viewType == combineType(IDENTIFY_TYPE, TYPE_HEADER)) {
view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_classified_title, parent, false);
return new SingleTitleHeaderViewHolder(view);
} else if (viewType == combineType(IDENTIFY_TYPE, TYPE_FOOTER)) {
view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_more, parent, false);
return new FooterMoreViewHolder(view);
} else {
view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_course_list, parent, false);
return new CourseItemViewHolder(view);
}
}
@Override
public boolean isBelongTo(int viewType) {
return String.valueOf(viewType).startsWith(String.valueOf(IDENTIFY_TYPE));
}
@Override
public boolean isHeadType(int position) {
return data.head != null && position == 0;
}
@Override
public boolean isFooterType(int position) {
return data.footer != null && position == totalNum - 1;
}
@Override
public int getSectionId() {
return IDENTIFY_TYPE;
}
static class CourseItemViewHolder extends RecyclerView.ViewHolder {
public CourseItemNewView courseItemNewView;
public View tv_line_bottom;
public CourseItemViewHolder(View itemView) {
super(itemView);
courseItemNewView = itemView.findViewById(R.id.view_content);
tv_line_bottom = itemView.findViewById(R.id.tv_line_bottom);
}
public void hideDividerLine() {
tv_line_bottom.setVisibility(View.INVISIBLE);
}
}
}
m-course/src/main/java/com/yidianling/course/courseNew/sections/ListEndSection.java deleted 100644 → 0
package com.yidianling.course.courseNew.sections;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.yidianling.course.R;
import com.yidianling.ydlcommon.adapter.section.Section;
import com.yidianling.ydlcommon.view.BaseViewHolder;
/**
* Created by Jim on 2018/6/27 0027.
*/
public class ListEndSection extends Section {
private final int IDENTIFY_TYPE=LIST_END_SECTION;
public ListEndSection() {
super(R.layout.item_list_end);
}
private String title;
public ListEndSection(String title) {
super(R.layout.item_list_end);
this.title = title;
}
@Override
public void bindViewHolder(RecyclerView.ViewHolder holder, int position) {
}
@Override
public int getTotalDataNum() {
return 1;
}
@Override
public int getItemViewType(int position) {
return combineType(IDENTIFY_TYPE,TYPE_BODY);
}
@Override
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view= LayoutInflater.from(parent.getContext()).inflate(itemResourceId,parent,false);
BaseViewHolder viewHolder = new BaseViewHolder(view);
viewHolder.setText(R.id.tv_title, title);
return viewHolder;
}
@Override
public boolean isBelongTo(int viewType) {
return String.valueOf(viewType).startsWith(String.valueOf(IDENTIFY_TYPE));
}
@Override
public boolean isHeadType(int position) {
return false;
}
@Override
public boolean isFooterType(int position) {
return false;
}
@Override
public int getSectionId() {
return 0;
}
}
m-course/src/main/java/com/yidianling/course/courseNew/sections/QulityCourseSection.java deleted 100644 → 0
package com.yidianling.course.courseNew.sections;
import android.content.Context;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import com.yidianling.course.R;
import com.yidianling.course.bean.CourseHomeBodyBean;
import com.yidianling.course.courseNew.LinkUrlRouterProtocol;
import com.yidianling.course.courseNew.viewholder.FooterMoreViewHolder;
import com.yidianling.course.coursePlay.moudle.Course;
import com.yidianling.course.model.QulityCourseBean;
import com.yidianling.ydlcommon.adapter.section.Section;
import com.yidianling.ydlcommon.utils.UMEventUtils;
import com.yidianling.ydlcommon.utils.actionutil.ActionCountUtils;
import com.yidianling.ydlcommon.utils.actionutil.BIConstants;
/**
* Created by Jim on 2018/6/25 0025.
*/
public class QulityCourseSection extends Section {
private final int IDENTIFY_TYPE = QULITY_COURSE_SECTION;
private QulityCourseBean data;
private int totalNum = 0;
private static final int FREE = 0;
private static final int PAY = 1;
public static int type = PAY;
public void setType(int type) {
this.type = type;
initTotlaNum();
adapter.notifyDataSetChanged();
}
private RecyclerView.Adapter adapter;
private Context context;
public QulityCourseSection(Context context, QulityCourseBean data, RecyclerView.Adapter adapter) {
super(R.layout.item_head_quality_course, R.layout.item_more, R.layout.item_course_list);
this.context = context;
this.adapter = adapter;
this.data = data;
type = PAY;
initTotlaNum();
}
private void initTotlaNum() {
}
@Override
public void bindViewHolder(RecyclerView.ViewHolder holder, int position) {
if (holder instanceof FooterMoreViewHolder) {
((FooterMoreViewHolder) holder).titleView.setText(data.footer.title);
((FooterMoreViewHolder) holder).linearLayout.setOnClickListener(v -> {
UMEventUtils.umEvent("更多课程", "更多课程", "更多课程");
LinkUrlRouterProtocol.jump(context, data.footer.linkUrl + "?childId=" + (type + 1));
ActionCountUtils.Companion.count(BIConstants.CourseHomeEvent.POSITION_COURSE_HOME_EXCELLENT_COURSES_MORE_CLICK);
});
} else if (holder instanceof QulityCourseHeaderVH) {
((QulityCourseHeaderVH) holder).tv_title.setText(data.head.title);
((QulityCourseHeaderVH) holder).tv_tab1.setText(data.head.tab1Name);
((QulityCourseHeaderVH) holder).tv_tab2.setText(data.head.tab2Name);
if (type == PAY) {
((QulityCourseHeaderVH) holder).tv_tab2.setTextColor(ContextCompat.getColor(holder.itemView.getContext(), R.color.green_34cd65));
((QulityCourseHeaderVH) holder).iv_tab2.setVisibility(View.VISIBLE);
((QulityCourseHeaderVH) holder).tv_tab1.setTextColor(ContextCompat.getColor(holder.itemView.getContext(), R.color.grey_909599));
((QulityCourseHeaderVH) holder).iv_tab1.setVisibility(View.INVISIBLE);
} else {
((QulityCourseHeaderVH) holder).tv_tab1.setTextColor(ContextCompat.getColor(holder.itemView.getContext(), R.color.green_34cd65));
((QulityCourseHeaderVH) holder).iv_tab1.setVisibility(View.VISIBLE);
((QulityCourseHeaderVH) holder).tv_tab2.setTextColor(ContextCompat.getColor(holder.itemView.getContext(), R.color.grey_909599));
((QulityCourseHeaderVH) holder).iv_tab2.setVisibility(View.INVISIBLE);
}
} else if (holder instanceof ClassifiedCourseSection.CourseItemViewHolder) {
ClassifiedCourseSection.CourseItemViewHolder realHolder = (ClassifiedCourseSection.CourseItemViewHolder) holder;
// if ((data.head != null && position == 1) || (data.head == null && position == 0)) {
// realHolder.hideDividerLine();
// } else {
// realHolder.tv_line_bottom.setVisibility(View.VISIBLE);
// }
CourseHomeBodyBean course = data.body.get(type).get(position - 1);
Course courseBean = switchData(course);
realHolder.courseItemNewView.setData(courseBean);
holder.itemView.setOnClickListener(view -> {
UMEventUtils.umEvent("精品课程", "精品课程链接", courseBean.linkUrl);
LinkUrlRouterProtocol.jump(context, courseBean.linkUrl);
if (type == PAY) {
ActionCountUtils.Companion.count(BIConstants.CourseHomeEvent.POSITION_COURSE_HOME_EXCELLENT_COURSES_PAY_XXX_CLICK + courseBean.id + "_click");
} else {
ActionCountUtils.Companion.count(BIConstants.CourseHomeEvent.POSITION_COURSE_HOME_EXCELLENT_COURSES_FREE_XXX_CLICK + courseBean.id + "_click");
}
});
}
}
/**
* 这里是个坑
*
* @param bean
* @return
*/
private Course switchData(CourseHomeBodyBean bean) {
Course course = new Course();
course.id = bean.id;
course.title = bean.title;
course.hostListPic = bean.hostListPic;
course.courseHostInfo = bean.courseHostInfo;
course.pic = bean.pic;
course.image = bean.image;
course.hostInfo = bean.hostInfo;
course.subCourseNum = bean.subCourseNum;
course.doctorName = bean.doctorName;
course.joinNum = bean.joinNum;
course.isInvite = bean.isInvite;
course.applyFee = bean.applyFee;
course.recommend = bean.recommend;
course.newCourse = bean.newCourse;
course.demoType = bean.demoType;
course.originalApplyFee = bean.originalApplyFee;
course.isBuy = bean.isBuy;
course.demoFile = bean.demoFile;
course.promotionApplyFee = bean.promotionApplyFee;
course.courseType = bean.courseType;
course.isPromotion = bean.isPromotion;
course.linkUrl = bean.linkUrl;
return course;
}
@Override
public int getTotalDataNum() {
totalNum = 0;
if (data.head != null) {
totalNum++;
}
if (data.footer != null) {
totalNum++;
}
if (data.body != null) {
totalNum += data.body.get(type).size();
}
return totalNum;
}
@Override
public int getItemViewType(int position) {
if (isHeadType(position)) {
return combineType(IDENTIFY_TYPE, TYPE_HEADER);
} else if (isFooterType(position)) {
return combineType(IDENTIFY_TYPE, TYPE_FOOTER);
} else {
return combineType(IDENTIFY_TYPE, TYPE_BODY);
}
}
@Override
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
if (viewType == combineType(IDENTIFY_TYPE, TYPE_HEADER)) {
View view = LayoutInflater.from(parent.getContext()).inflate(headerResourceId, parent, false);
return new QulityCourseHeaderVH(this, view);
} else if (viewType == combineType(IDENTIFY_TYPE, TYPE_FOOTER)) {
View view = LayoutInflater.from(parent.getContext()).inflate(footerResourceId, parent, false);
return new FooterMoreViewHolder(view);
} else {
View view = LayoutInflater.from(parent.getContext()).inflate(itemResourceId, parent, false);
return new ClassifiedCourseSection.CourseItemViewHolder(view);
}
}
@Override
public boolean isBelongTo(int viewType) {
return String.valueOf(viewType).startsWith(String.valueOf(IDENTIFY_TYPE));
}
@Override
public boolean isHeadType(int position) {
return data.head != null && position == 0;
}
@Override
public boolean isFooterType(int position) {
return data.footer != null && position == totalNum - 1;
}
@Override
public int getSectionId() {
return IDENTIFY_TYPE;
}
static class QulityCourseHeaderVH extends RecyclerView.ViewHolder {
public TextView tv_title, tv_tab1, tv_tab2;
public ImageView iv_tab1, iv_tab2;
public QulityCourseHeaderVH(QulityCourseSection section, View itemView) {
super(itemView);
tv_title = itemView.findViewById(R.id.tv_title);
tv_tab1 = itemView.findViewById(R.id.tv_tab1);
iv_tab1 = itemView.findViewById(R.id.iv_tab1);
tv_tab2 = itemView.findViewById(R.id.tv_tab2);
iv_tab2 = itemView.findViewById(R.id.iv_tab2);
itemView.findViewById(R.id.ll_tab1).setOnClickListener(v -> {
UMEventUtils.umEvent("精品课程", "免费课程", "免费课程");
tv_tab1.setTextColor(ContextCompat.getColor(itemView.getContext(), R.color.green_34cd65));
iv_tab1.setVisibility(View.VISIBLE);
tv_tab2.setTextColor(ContextCompat.getColor(itemView.getContext(), R.color.grey_909599));
iv_tab2.setVisibility(View.INVISIBLE);
section.setType(FREE);
});
itemView.findViewById(R.id.ll_tab2).setOnClickListener(v -> {
UMEventUtils.umEvent("精品课程", "付费课程", "付费课程");
tv_tab2.setTextColor(ContextCompat.getColor(itemView.getContext(), R.color.green_34cd65));
iv_tab2.setVisibility(View.VISIBLE);
tv_tab1.setTextColor(ContextCompat.getColor(itemView.getContext(), R.color.grey_909599));
iv_tab1.setVisibility(View.INVISIBLE);
section.setType(PAY);
});
}
}
}
m-course/src/main/java/com/yidianling/course/courseNew/sections/TopicsCoursesSection.java deleted 100644 → 0
package com.yidianling.course.courseNew.sections;
import android.content.Context;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.yidianling.course.R;
import com.yidianling.course.bean.CourseHomeBodyBean;
import com.yidianling.course.courseNew.LinkUrlRouterProtocol;
import com.yidianling.course.courseNew.viewholder.SingleTitleHeaderViewHolder;
import com.yidianling.course.link.CourseLinkUrl;
import com.yidianling.course.model.NormalCourseBean;
import com.yidianling.ydlcommon.adapter.section.Section;
import com.yidianling.ydlcommon.utils.UMEventUtils;
import com.yidianling.ydlcommon.utils.actionutil.ActionCountUtils;
import com.yidianling.ydlcommon.utils.actionutil.BIConstants;
import com.yidianling.ydlcommon.view.BaseViewHolder;
import java.util.List;
/**
* Created by Jim on 2018/6/27 0027.
*/
public class TopicsCoursesSection extends Section {
private final int IDENTIFY_TYPE = TOPICS_COURSES_SECTION;
private Context mContext;
private NormalCourseBean data;
public TopicsCoursesSection(Context mContext, NormalCourseBean data) {
super(R.layout.item_classified_title, 0, R.layout.item_topics_courses);
this.mContext = mContext;
this.data = data;
}
@Override
public void bindViewHolder(RecyclerView.ViewHolder holder, int position) {
if (holder instanceof SingleTitleHeaderViewHolder) {
if (data.head != null) {
if (!TextUtils.isEmpty(data.head.title)) {
((SingleTitleHeaderViewHolder) holder).titleView.setText(data.head.title);
}
if (!TextUtils.isEmpty(data.head.subTitle)) {
((SingleTitleHeaderViewHolder) holder).subTitleView.setVisibility(View.VISIBLE);
((SingleTitleHeaderViewHolder) holder).subTitleView.setText(data.head.subTitle);
((SingleTitleHeaderViewHolder) holder).subTitleView.setOnClickListener(v -> {
UMEventUtils.umEvent("专题课程", "更多点击", "更多点击");
if (null != mContext) {
CourseLinkUrl.Companion.jump(mContext, data.head.subLinkUrl);
}
ActionCountUtils.Companion.count(BIConstants.CourseHomeEvent.POSITION_COURSE_HOME_THEMATIC_COURSES_MORE_CLICK);
});
} else {
((SingleTitleHeaderViewHolder) holder).subTitleView.setVisibility(View.GONE);
}
}
} else if (holder instanceof TopicsCoursesVH) {
((TopicsCoursesVH) holder).notifyData(data.body);
}
}
@Override
public int getTotalDataNum() {
return 2;
}
@Override
public int getItemViewType(int position) {
if (isHeadType(position)) {
return combineType(IDENTIFY_TYPE, TYPE_HEADER);
}
return combineType(IDENTIFY_TYPE, TYPE_BODY);
}
@Override
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = null;
if (viewType == combineType(IDENTIFY_TYPE, TYPE_HEADER)) {
view = LayoutInflater.from(parent.getContext()).inflate(headerResourceId, parent, false);
return new SingleTitleHeaderViewHolder(view);
}
view = LayoutInflater.from(parent.getContext()).inflate(itemResourceId, parent, false);
return new TopicsCoursesVH(view, data.body);
}
@Override
public boolean isBelongTo(int viewType) {
return String.valueOf(viewType).startsWith(String.valueOf(IDENTIFY_TYPE));
}
@Override
public boolean isHeadType(int position) {
return data.head != null && position == 0;
}
@Override
public boolean isFooterType(int position) {
return false;
}
@Override
public int getSectionId() {
return 0;
}
static class TopicsCoursesVH extends RecyclerView.ViewHolder {
private RecyclerView mRecyclerView;
private Adapter mAdapter;
public TopicsCoursesVH(View itemView, List<CourseHomeBodyBean> data) {
super(itemView);
mRecyclerView = itemView.findViewById(R.id.rcv_topics_courses);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(itemView.getContext());
linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
mRecyclerView.setLayoutManager(linearLayoutManager);
mAdapter = new Adapter(data, itemView.getContext());
mRecyclerView.setAdapter(mAdapter);
}
public void notifyData(List<CourseHomeBodyBean> data) {
mAdapter.data = data;
mAdapter.notifyDataSetChanged();
}
}
static class Adapter extends RecyclerView.Adapter<BaseViewHolder> {
private List<CourseHomeBodyBean> data;
private Context mContext;
public Adapter(List<CourseHomeBodyBean> data, Context context) {
this.data = data;
mContext = context;
}
public void setData(List<CourseHomeBodyBean> data) {
this.data = data;
}
@Override
public BaseViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_imag, parent, false);
return new BaseViewHolder(view);
}
@Override
public void onBindViewHolder(BaseViewHolder holder, int position) {
holder.setImageWithUrl(R.id.img, data.get(position).image);
holder.setOnClickListener(R.id.img, view -> {
UMEventUtils.umEvent("专题课程", "专题链接", data.get(position).linkUrl);
LinkUrlRouterProtocol.jump(mContext, data.get(position).linkUrl);
ActionCountUtils.Companion.count(BIConstants.CourseHomeEvent.POSITION_COURSE_HOME_THEMATIC_COURSES_XXX_CLICK + data.get(position).id + "_click");
});
}
@Override
public int getItemCount() {
return data.size();
}
}
}
m-course/src/main/java/com/yidianling/course/courseNew/viewholder/FooterMoreViewHolder.java deleted 100644 → 0
package com.yidianling.course.courseNew.viewholder;
import android.content.Context;
import android.content.Intent;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.yidianling.common.tools.LogUtil;
import com.yidianling.course.R;
import com.yidianling.course.courseNew.courseList.CourseListContainerActivity;
//更多课程
public class FooterMoreViewHolder extends RecyclerView.ViewHolder {
public TextView titleView;
public LinearLayout linearLayout;
public FooterMoreViewHolder(View itemView) {
super(itemView);
titleView = itemView.findViewById(R.id.tv_title);
linearLayout = itemView.findViewById(R.id.ll_more);
}
}
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/courseNew/viewholder/SingleTitleHeaderViewHolder.java deleted 100644 → 0
package com.yidianling.course.courseNew.viewholder;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.yidianling.course.R;
public class SingleTitleHeaderViewHolder extends RecyclerView.ViewHolder {
public TextView titleView;
public TextView subTitleView;
public SingleTitleHeaderViewHolder(View itemView) {
super(itemView);
titleView = itemView.findViewById(R.id.single_title);
subTitleView = itemView.findViewById(R.id.tv_more);
}
public SingleTitleHeaderViewHolder(Context context, ViewGroup parent) {
super(LayoutInflater.from(context).inflate(R.layout.item_classified_title, parent, false));
titleView = itemView.findViewById(R.id.single_title);
subTitleView = itemView.findViewById(R.id.tv_more);
}
}
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/coursePlay/CourseCommentActivity.kt
package com.yidianling.course.coursePlay
import android.annotation.SuppressLint
import android.app.Activity
import android.content.Intent
import android.text.Editable
import android.text.TextUtils
import android.text.TextWatcher
import com.alibaba.android.arouter.facade.annotation.Route
import com.ydl.webview.H5Params
import com.ydl.webview.NewH5Activity
import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.utils.log.LogHelper
import com.yidianling.common.tools.ToastUtil
import com.yidianling.course.CourseConstants
import com.yidianling.course.R
import com.yidianling.course.coursePlay.common.net.Command
import com.yidianling.course.coursePlay.common.net.RetrofitUtils
import com.yidianling.ydlcommon.base.BaseActivity
import com.yidianling.ydlcommon.h5.H5Params
import com.yidianling.ydlcommon.h5.NewH5Activity
import com.yidianling.ydlcommon.log.LogHelper
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.activity_course_commeny.*
......@@ -65,7 +66,7 @@ class CourseCommentActivity : BaseActivity() {
override fun afterTextChanged(s: Editable?) {
if (TextUtils.isEmpty(s)) {
tv_input_length.text = "0"
tv_input_length.setTextColor(resources.getColor(R.color.color_b3b3b3))
tv_input_length.setTextColor(resources.getColor(R.color.color_B3B3B3))
} else {
tv_input_length.text = s!!.length.toString()
tv_input_length.setTextColor(resources.getColor(R.color.color_242424))
......@@ -81,6 +82,7 @@ class CourseCommentActivity : BaseActivity() {
}
//提交评论
@SuppressLint("CheckResult")
private fun commitReply(content: String) {
showProgressDialog(null)
val cmd = Command.CourseCommitReply(courseId!!.toInt(), content)
......
m-course/src/main/java/com/yidianling/course/coursePlay/CourseHeadView.kt
......@@ -4,13 +4,13 @@ import android.annotation.SuppressLint
import android.text.TextUtils
import android.view.View
import android.widget.LinearLayout
import com.ydl.webview.H5Params
import com.ydl.webview.NewH5Activity
import com.ydl.ydl_image.module.GlideApp
import com.yidianling.common.tools.ToastUtil
import com.yidianling.course.CourseConstants
import com.yidianling.course.R
import com.yidianling.ydlcommon.bean.CourseExtraBean
import com.yidianling.ydlcommon.h5.H5Params
import com.yidianling.ydlcommon.h5.NewH5Activity
import com.yidianling.course.bean.CourseExtraBean
import kotlinx.android.synthetic.main.item_course_play_head.view.*
/**
......@@ -50,7 +50,7 @@ class CourseHeadView : LinearLayout {
@SuppressLint("SetTextI18n")
fun setData(bean: CourseExtraBean) {
courseId = bean.id
GlideApp.with(context).load(bean.doctorHead).error(R.drawable.head_place_hold_pic).into(img_head)
GlideApp.with(context).load(bean.doctorHead).error(R.drawable.course_head_place_hold_pic).into(img_head)
if (TextUtils.isEmpty(bean.doctorName)) {
ll_info.visibility= View.GONE
}else{
......
m-course/src/main/java/com/yidianling/course/coursePlay/CoursePlayActivity.kt
......@@ -17,35 +17,32 @@ import android.widget.LinearLayout
import android.widget.TextView
import com.alibaba.android.arouter.facade.annotation.Route
import com.bumptech.glide.Glide
import com.dou361.ijkplayer.widget.PlayStateParams
import com.dou361.ijkplayer.widget.PlayerView
import com.google.android.exoplayer2.ui.PlayerView
import com.ydl.media.audio.AudioPlayer
import com.ydl.media.audio.utils.PlayProgressUtil
import com.ydl.media.view.PlayTypeEnum
import com.ydl.media.view.PlayerFloatHelper
import com.ydl.ydl_image.module.GlideApp
import com.ydl.ydl_pay.CommonPayDialog
import com.ydl.ydl_router.manager.YDLRouterManager
import com.ydl.ydlcommon.adapter.CommonRecyclerAdapter
import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.bean.ShareData
import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.ydl.ydlcommon.router.YdlCommonRouterManager
import com.ydl.ydlcommon.utils.ScreenUtil
import com.ydl.ydlcommon.utils.StatusBarUtils
import com.ydl.ydlcommon.utils.UMEventUtils
import com.ydl.ydlcommon.utils.Utils
import com.ydl.ydlcommon.view.BaseViewHolder
import com.ydl.ydlcommon.view.dialog.CommonDialog
import com.ydl.ydlcommon.view.dialog.YDLShareDialog
import com.yidianling.common.tools.RxImageTool
import com.yidianling.common.tools.RxNetTool
import com.yidianling.common.tools.ToastUtil
import com.yidianling.course.R
import com.yidianling.course.bean.CourseMediaBean
import com.yidianling.course.bean.CourseMediaDetailBean
import com.yidianling.course.coursePlay.presenter.CoursePlayPresenter
import com.yidianling.ydlcommon.BuildConfig
import com.yidianling.ydlcommon.adapter.CommonRecyclerAdapter
import com.yidianling.ydlcommon.base.BaseActivity
import com.yidianling.ydlcommon.bean.CourseMediaBean
import com.yidianling.ydlcommon.bean.CourseMediaDetailBean
import com.yidianling.ydlcommon.data.ShareData
import com.yidianling.ydlcommon.data.YdlDataManager
import com.yidianling.ydlcommon.dialog.CommonDialog
import com.yidianling.ydlcommon.dialog.YDLShareDialog
import com.yidianling.ydlcommon.player.YDLMusicHelper
import com.yidianling.ydlcommon.player.util.UtilH
import com.yidianling.ydlcommon.router.IYDLRouterConstant
import com.yidianling.ydlcommon.router.YdlCommonRouterManager
import com.yidianling.ydlcommon.tool.StatusBarUtils
import com.yidianling.ydlcommon.utils.PlayerFloatHelper
import com.yidianling.ydlcommon.utils.ScreenUtil
import com.yidianling.ydlcommon.utils.UMEventUtils
import com.yidianling.ydlcommon.utils.Utils
import com.yidianling.ydlcommon.view.BaseViewHolder
import kotlinx.android.synthetic.main.activity_course_play.*
import org.json.JSONException
import org.json.JSONObject
......@@ -148,103 +145,106 @@ class CoursePlayActivity : BaseActivity() {
recy_list?.isNestedScrollingEnabled = false
recy_list?.layoutManager = LinearLayoutManager(this, OrientationHelper.VERTICAL, false)
adapter = CommonRecyclerAdapter<CourseMediaBean>(recy_list, R.layout.dialog_course_playlist_item)
.setBindDataCallback(object : CommonRecyclerAdapter.BindDataCallback<CourseMediaBean> {
override fun bindDatabindData(holder: BaseViewHolder, bean: CourseMediaBean, position: Int) {
var gifView: ImageView = holder.getView(R.id.gifView)
var playView: ImageView = holder.getView(R.id.ic_play_view)
var bodyView: LinearLayout = holder.getView(R.id.lin_body)
if (index == position) {
gifView.visibility = View.VISIBLE
playView.visibility = View.GONE
bodyView.setBackgroundColor(this@CoursePlayActivity.resources.getColor(R.color.color_F8FCFF))
if (isShowAnim) {
Glide.with(this@CoursePlayActivity).asGif().load(R.drawable.music).into(gifView)
} else {
Glide.with(this@CoursePlayActivity).asBitmap().load(R.drawable.music).into(gifView)
}
holder.setTextColor(R.id.text_title, this@CoursePlayActivity.resources.getColor(R.color.google_green))
adapter = CommonRecyclerAdapter<CourseMediaBean>(recy_list, R.layout.item_course_playlist_item)
.setBindDataCallback(object : CommonRecyclerAdapter.BindDataCallback<CourseMediaBean> {
override fun bindDatabindData(holder: BaseViewHolder, bean: CourseMediaBean, position: Int) {
var gifView: ImageView = holder.getView(R.id.gifView)
var playView: ImageView = holder.getView(R.id.ic_play_view)
var bodyView: LinearLayout = holder.getView(R.id.lin_body)
if (index == position) {
gifView.visibility = View.VISIBLE
playView.visibility = View.GONE
bodyView.setBackgroundColor(this@CoursePlayActivity.resources.getColor(R.color.color_F8FCFF))
if (isShowAnim) {
Glide.with(this@CoursePlayActivity).asGif().load(R.drawable.course_music).into(gifView)
} else {
gifView.visibility = View.GONE
playView.visibility = View.VISIBLE
bodyView.setBackgroundColor(this@CoursePlayActivity.resources.getColor(R.color.white))
if (courPlayBean?.courseExtra?.isBuy!!) {
GlideApp.with(this@CoursePlayActivity).load(R.drawable.ico_kcml_play).into(playView)
Glide.with(this@CoursePlayActivity).asBitmap().load(R.drawable.course_music).into(gifView)
}
holder.setTextColor(
R.id.text_title,
this@CoursePlayActivity.resources.getColor(R.color.main_theme)
)
} else {
gifView.visibility = View.GONE
playView.visibility = View.VISIBLE
bodyView.setBackgroundColor(this@CoursePlayActivity.resources.getColor(R.color.white))
if (courPlayBean?.courseExtra?.isBuy!!) {
GlideApp.with(this@CoursePlayActivity).load(R.drawable.course_ico_kcml_play).into(playView)
} else {
if (bean.isDemo) {
GlideApp.with(this@CoursePlayActivity).load(R.drawable.course_ico_kcml_play)
.into(playView)
} else {
if (bean.isDemo) {
GlideApp.with(this@CoursePlayActivity).load(R.drawable.ico_kcml_play).into(playView)
} else {
GlideApp.with(this@CoursePlayActivity).load(R.drawable.ico_kcml_lock).into(playView)
}
GlideApp.with(this@CoursePlayActivity).load(R.drawable.course_ico_kcml_lock)
.into(playView)
}
holder.setTextColor(R.id.text_title, this@CoursePlayActivity.resources.getColor(R.color.black_deep))
}
holder.setTextColor(
R.id.text_title,
this@CoursePlayActivity.resources.getColor(R.color.color_FF000000)
)
}
var test: TextView = holder.getView(R.id.text_test)
//试听标签
if (bean.isDemo) {
test.visibility = View.VISIBLE
} else {
test.visibility = View.GONE
var test: TextView = holder.getView(R.id.text_test)
//试听标签
if (bean.isDemo) {
test.visibility = View.VISIBLE
} else {
test.visibility = View.GONE
}
holder.setText(R.id.text_title, bean.title)
holder.setOnClickListener(R.id.lin_body) {
if (position < 0) {
return@setOnClickListener
}
holder.setText(R.id.text_title, bean.title)
if (index == position) {
} else {
if (!bean.isDemo && !courPlayBean!!.courseExtra.isBuy) {
CommonDialog(this@CoursePlayActivity)
.setMessage("\n购买课程，获取完整课程内容\n")
.setLeftOnclick("放弃") {
holder.setOnClickListener(R.id.lin_body) {
if (position < 0) {
}
.setRightClick("购买") {
//跳转支付页
addCourseOrder()
}
.setCancelAble(false)
.show()
return@setOnClickListener
}
PlayProgressUtil.saveProgress(this@CoursePlayActivity, playList[index].url, 0)
if (index == position) {
// if (play_type == 0) {//音频
// if (!YDLMusicHelper.isCoursePlaying()) {
// //暂停状态 开始播放
// YDLMusicHelper.start()
// }
// if (play_type == 1) {//视屏
// //暂停状态 开始播放
// videoView?.startPlay()
// }
// }
} else {
if (!bean.isDemo && !courPlayBean!!.courseExtra.isBuy) {
CommonDialog(this@CoursePlayActivity)
.setMessage("\n购买课程，获取完整课程内容\n")
.setLeftOnclick("放弃") {
}
.setRightClick("购买") {
//跳转支付页
addCourseOrder()
}
.setCancelAble(false)
.show()
return@setOnClickListener
}
UtilH.saveProgress(this@CoursePlayActivity, playList[index].url, 0)
if (play_type == 1) {
//暂停状态 开始播放
(play_view as CoursePlayItemViewVideo)?.play(position)
}
if (play_type == 0) {
if (RxNetTool.isWifi(this@CoursePlayActivity)) {
if (play_type == 1) {
//暂停状态 开始播放
(play_view as CoursePlayItemViewVideo)?.play(position)
}
if (play_type == 0) {
if (RxNetTool.isWifi(this@CoursePlayActivity)) {
(play_view as CoursePlayItemViewAudio).playView!!.play(position)
} else {
if ((play_view as CoursePlayItemViewAudio).hasEnsureNetStatus) {
(play_view as CoursePlayItemViewAudio).playView!!.play(position)
} else {
if ((play_view as CoursePlayItemViewAudio).hasEnsureNetStatus) {
(play_view as CoursePlayItemViewAudio).playView!!.play(position)
} else {
(play_view as CoursePlayItemViewAudio).setData(position, playList, courPlayBean!!.courseExtra, from)
}
(play_view as CoursePlayItemViewAudio).setData(
position,
playList,
courPlayBean!!.courseExtra,
from
)
}
}
index = position
adapter?.notifyDataSetChanged()
}
index = position
adapter?.notifyDataSetChanged()
}
}
})
}
})
headview = CourseHeadView(this)
//添加头部和底部view
adapter!!.addHeadView(headview)
......@@ -273,7 +273,7 @@ class CoursePlayActivity : BaseActivity() {
if (null == intent) {
return
}
if (intent.hasExtra(ROUTER_PARAMS)){
if (intent.hasExtra(ROUTER_PARAMS)) {
//路由传递的入参
val json = intent.getStringExtra(ROUTER_PARAMS)
try {
......@@ -304,9 +304,17 @@ class CoursePlayActivity : BaseActivity() {
}
try {
if (YDLMusicHelper.isCoursePlaying() && TextUtils.isEmpty(receiverPlayUrl)) {
receiverPlayUrl = YDLMusicHelper.getCurrentData()?.url
if (PlayerFloatHelper.playingType == PlayTypeEnum.PLAY_TYPE_COURSE
&& AudioPlayer.get().isPlaying
&& TextUtils.isEmpty(receiverPlayUrl)
) {
receiverPlayUrl = AudioPlayer.get().playMusic?.path
}
// if (YDLMusicHelper.isCoursePlaying() && TextUtils.isEmpty(receiverPlayUrl)) {
// receiverPlayUrl = YDLMusicHelper.getCurrentData()?.url
// }
} catch (e: Exception) {
}
......@@ -324,7 +332,8 @@ class CoursePlayActivity : BaseActivity() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
window.statusBarColor = Color.TRANSPARENT
window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
window.decorView.systemUiVisibility =
View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
} else {
window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
......@@ -356,7 +365,13 @@ class CoursePlayActivity : BaseActivity() {
setPlayList(bean)
if (!TextUtils.isEmpty(receiverPlayUrl)) {
for ((index, element) in playList.withIndex()) {
if (TextUtils.equals(receiverPlayUrl, element.url) || TextUtils.equals(receiverPlayUrl!!.replace("http", "https"), element.url)) {
if (TextUtils.equals(receiverPlayUrl, element.url) || TextUtils.equals(
receiverPlayUrl!!.replace(
"http",
"https"
), element.url
)
) {
this@CoursePlayActivity.index = index
}
}
......@@ -370,12 +385,16 @@ class CoursePlayActivity : BaseActivity() {
try {
if (play_type == 1) {
//视频播放销毁音频服务
YDLMusicHelper.stop()
AudioPlayer.get().stopPlayer()
}
if (YDLMusicHelper.isConfidePlaying() || YDLMusicHelper.isFMPlaying()) {
YDLMusicHelper.stop()
if (PlayerFloatHelper.playingType == PlayTypeEnum.PLAY_TYPE_CONFIDE || PlayerFloatHelper.playingType == PlayTypeEnum.PLAY_TYPE_FM) {
if (AudioPlayer.get().isPlaying) {
AudioPlayer.get().stopPlayer()
}
}
} catch (e: Exception) {
e.printStackTrace()
}
......@@ -477,21 +496,21 @@ class CoursePlayActivity : BaseActivity() {
}
val build = CommonPayDialog.Build(mContext)
.setCourseId(course_id.toString())
.setToken(userInfo.token)
.setUid(userInfo.userId)
.setFfrom(YdlDataManager.getRam().getChannelName())
.setListener(object : CommonPayDialog.OnPayResultListener {
override fun onSuccesed() {
//刷新界面
initData()
}
.setCourseId(course_id.toString())
.setToken(userInfo.token)
.setUid(userInfo.userId)
.setFfrom(YdlDataManager.getRam().getChannelName())
.setListener(object : CommonPayDialog.OnPayResultListener {
override fun onSuccesed() {
//刷新界面
initData()
}
override fun onFailed() {
override fun onFailed() {
}
})
.setIsTestEnvironment(BuildConfig.DEBUG)
}
})
.setIsTestEnvironment(BuildConfig.DEBUG)
build.build().show()
}
......@@ -521,7 +540,8 @@ class CoursePlayActivity : BaseActivity() {
private fun toTrend(share: ShareData) {
var url = if (TextUtils.isEmpty(share.url)) share.share_url else share.url
YdlCommonRouterManager.getYdlCommonRoute().publishArticleToTrend(this@CoursePlayActivity, url!!, share.cover!!, share.title!!)
YdlCommonRouterManager.getYdlCommonRoute()
.publishArticleToTrend(this@CoursePlayActivity, url!!, share.cover!!, share.title!!)
}
override fun onPause() {
......
m-course/src/main/java/com/yidianling/course/coursePlay/CoursePlayItemViewAudio.kt
......@@ -6,6 +6,8 @@ import android.view.ViewGroup
import android.widget.RelativeLayout
import com.yidianling.common.tools.RxDeviceTool
import com.yidianling.common.tools.RxNetTool
import com.yidianling.course.bean.CourseExtraBean
import com.yidianling.course.bean.CourseMediaBean
import com.yidianling.ydlcommon.bean.CourseExtraBean
import com.yidianling.ydlcommon.bean.CourseMediaBean
import com.yidianling.ydlcommon.dialog.CommonDialog
......
m-course/src/main/java/com/yidianling/course/coursePlay/CoursePlayItemViewVideo.kt
......@@ -9,12 +9,10 @@ import android.widget.RelativeLayout
import com.dou361.ijkplayer.widget.PlayStateParams
import com.dou361.ijkplayer.widget.PlayerView
import com.ydl.ydl_image.module.GlideApp
import com.ydl.ydlcommon.view.dialog.CommonDialog
import com.yidianling.course.R
import com.yidianling.ydlcommon.bean.CourseExtraBean
import com.yidianling.ydlcommon.bean.CourseMediaBean
import com.yidianling.ydlcommon.dialog.CommonDialog
import com.yidianling.ydlcommon.player.YDLMusicHelper
import com.yidianling.ydlcommon.player.util.UtilH
import com.yidianling.course.bean.CourseExtraBean
import com.yidianling.course.bean.CourseMediaBean
import tv.danmaku.ijk.media.player.IMediaPlayer
import java.text.SimpleDateFormat
import java.util.*
......
m-course/src/main/java/com/yidianling/course/coursePlay/CourseReplyListActivity.kt deleted 100644 → 0
package com.yidianling.course.coursePlay
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
import com.cxzapp.yidianling.common.view.FootViewLoadMore
import com.ydl.ydl_image.module.GlideApp
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.ToastUtil
import com.yidianling.course.R
import com.yidianling.course.coursePlay.common.net.Command
import com.yidianling.course.coursePlay.common.net.RetrofitUtils
import com.yidianling.course.coursePlay.moudle.CoursePlayBean
import com.yidianling.ydlcommon.adapter.CommonRecyclerAdapter
import com.yidianling.ydlcommon.base.BaseActivity
import com.yidianling.ydlcommon.view.BaseViewHolder
import com.yidianling.ydlcommon.view.CircleImageView
import com.yidianling.ydlcommon.view.TitleBar
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
/**
* 课程课后笔记列表
*
*/
class CourseReplyListActivity : BaseActivity() {
override fun layoutResId(): Int {
return R.layout.activity_course_reply_list
}
override fun initDataAndEvent() {
course_id = intent.getIntExtra("course_id", 0)
initView()
getListData(false)
}
var title_bar: TitleBar? = null
var recycler_list: RecyclerView? = null
var footView: FootViewLoadMore? = null
var adapter: CommonRecyclerAdapter<CoursePlayBean.Comments>? = null
var page = 1 //分页
//课程id
var course_id = 0
fun initView() {
title_bar = findViewById<TitleBar>(R.id.title_bar)
recycler_list = findViewById<RecyclerView>(R.id.recycler_list)
recycler_list?.layoutManager = LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false)
adapter = CommonRecyclerAdapter<CoursePlayBean.Comments>(recycler_list, R.layout.item_course_play_recylist)
.setBindDataCallback(object : CommonRecyclerAdapter.BindDataCallback<CoursePlayBean.Comments> {
override fun bindDatabindData(holder: BaseViewHolder, t: CoursePlayBean.Comments, position: Int) {
//绑定数据
var img: CircleImageView = holder.getView(R.id.img_head)
GlideApp.with(applicationContext).load(t.head).into(img)
holder.setText(R.id.text_name, t.name)
holder.setText(R.id.text_time, t.create_time)
holder.setText(R.id.text_des, t.content)
}
})
.setOnLoadMoreListener(object : CommonRecyclerAdapter.OnLoadMoreLIstener {
override fun onLoadMore() {
getListData(true)
LogUtil.e("---------------------------------------")
}
})
footView = FootViewLoadMore(mContext)
adapter?.addFootView(footView)
recycler_list?.adapter = adapter
}
//获取列表数据
fun getListData(isLoadMore: Boolean) {
if (isLoadMore) {
page++
} else {
page = 1
}
if (isLoadMore) {
footView?.onLoading()
} else {
showProgressDialog(null)
}
val cmd = Command.CourseReplyList(course_id, page)
RetrofitUtils.courseReplyList(cmd)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe({ resp ->
if (!isLoadMore) {
dismissProgressDialog()
}
if (resp.code == 0) {
//跟新view显示
updateView(isLoadMore, resp.data as List<CoursePlayBean.Comments>)
} else {
footView?.onError()
ToastUtil.toastShort(resp.msg)
}
}, {
throwable->
footView?.onError()
if (!isLoadMore) {
dismissProgressDialog()
}
RetrofitUtils.handleError(mContext, throwable)
})
}
//跟新视图
fun updateView(isLoadMore: Boolean, list: List<CoursePlayBean.Comments>) {
if (list == null) return
if (list.size == 0) {
footView?.onFinish()
return
}
if (isLoadMore) {
adapter?.addDatas(list)
} else {
adapter?.update(list)
}
}
}
m-course/src/main/java/com/yidianling/course/coursePlay/PlayViewInterface.kt
package com.yidianling.course.coursePlay
import com.yidianling.ydlcommon.bean.CourseExtraBean
import com.yidianling.ydlcommon.bean.CourseMediaBean
import com.yidianling.course.bean.CourseExtraBean
import com.yidianling.course.bean.CourseMediaBean
import java.util.*
......
m-course/src/main/java/com/yidianling/course/coursePlay/common/net/Command.java
package com.yidianling.course.coursePlay.common.net;
import com.yidianling.course.CourseConstants;
import com.yidianling.ydlcommon.http.BaseCommand;
import com.yidianling.ydlcommon.router.YdlCommonOut;
import com.ydl.ydlcommon.data.http.BaseCommand;
import com.ydl.ydlcommon.router.YdlCommonOut;
/**
* Created by Jim on 2018/2/26 0026.
......@@ -81,14 +80,10 @@ public class Command {
this.type = type;
}
public GetCourse(int page, int type,int child_type) {
public GetCourse(int page, int type, int child_type) {
this.page = page;
this.type = type;
this.child_type=child_type;
}
public String getUrl() {
return CourseConstants.ALL_COURSE;
this.child_type = child_type;
}
}
......
m-course/src/main/java/com/yidianling/course/coursePlay/common/net/NetApiStore.java
package com.yidianling.course.coursePlay.common.net;
import com.ydl.ydlcommon.data.http.BaseAPIResponse;
import com.ydl.ydlcommon.data.http.BaseResponse;
import com.yidianling.course.bean.CouponHintResponseBean;
import com.yidianling.course.bean.CourseCouponBean;
import com.yidianling.course.bean.CourseMediaDetailBean;
import com.yidianling.course.bean.PostersShareBean;
import com.yidianling.course.courseNew.home.ResultBean;
import com.yidianling.course.coursePlay.moudle.Course;
import com.yidianling.course.coursePlay.moudle.CourseAddOrderBean;
import com.yidianling.course.coursePlay.moudle.CourseListDataBean;
import com.yidianling.course.coursePlay.moudle.CoursePlayBean;
import com.yidianling.course.model.CourseCategoryBean;
import com.yidianling.course.model.TopicCourseBean;
import com.yidianling.ydlcommon.http.BaseAPIResponse;
import com.yidianling.ydlcommon.http.BaseResponse;
import java.util.List;
import java.util.Map;
......@@ -42,12 +43,6 @@ public interface NetApiStore {
@POST("course/list")
Observable<BaseResponse<List<Course>>> getPhpCourseList(@FieldMap Map<String, String> params);
// //获取课程播放页 初始化数据
// @FormUrlEncoded
// @POST("course/play")
// Observable<BaseResponse<CoursePlayBean>> getCoursePlayData(@FieldMap Map<String, String> params);
//课程课后笔记列表
@FormUrlEncoded
@POST("course/comments")
......@@ -68,11 +63,6 @@ public interface NetApiStore {
@POST("course/add-order")
Observable<BaseResponse<CourseAddOrderBean>> addCourseOrder(@FieldMap Map<String, String> params);
//首页课程
@GET("auth/course/home")
Observable<BaseAPIResponse<List<ResultBean>>> getCourseHomePageDatas();
//获取课程海报分享数据
@GET("auth/course/posters/share")
Observable<BaseResponse<PostersShareBean>> getPosterData(@Query("id") String courseId);
......@@ -87,10 +77,6 @@ public interface NetApiStore {
@GET("auth/course/search/newsample")
Observable<BaseAPIResponse<CourseCategoryBean>> getCourseListCategory();
// //首页分类
// @FormUrlEncoded
// @POST("course/course-special")
// Observable<BaseResponse<TopicCourseBean>> getCourseTopic(@FieldMap Map<String, String> params);
//课程专题列表接口
......@@ -116,4 +102,18 @@ public interface NetApiStore {
//领取优惠券
@POST("marketing/coupon/new/receives")
Observable<BaseResponse<List<String>>> receiveCoupon(@Body RequestBody body);
@GET("auth/coupon/courseCoupon/warn")
Observable<BaseAPIResponse<CouponHintResponseBean>> getCouponHint();
//倾诉红包接口
@retrofit2.http.Headers("Content-Type:application/json")
@GET
Observable<BaseAPIResponse<String>> getCouponMax(@Url String url);
//获取课程播放页 java 接口
@GET("auth/course/get/all/audio-video")
Observable<BaseResponse<CourseMediaDetailBean>> getCoursePlayData(@Query("courseId") String courseId);
}
m-course/src/main/java/com/yidianling/course/coursePlay/common/net/RetrofitUtils.java
package com.yidianling.course.coursePlay.common.net;
import android.content.Context;
import com.yidianling.course.bean.CourseCouponBean;
import com.yidianling.course.bean.PostersShareBean;
import com.yidianling.course.courseNew.home.ResultBean;
import com.ydl.ydlcommon.data.http.BaseAPIResponse;
import com.ydl.ydlcommon.data.http.BaseResponse;
import com.ydl.ydlcommon.data.http.FormatText;
import com.ydl.ydlcommon.utils.NetworkParamsUtils;
import com.ydl.ydlcommon.utils.remind.HttpErrorUtils;
import com.ydl.ydlnet.YDLHttpUtils;
import com.yidianling.course.bean.*;
import com.yidianling.course.coursePlay.moudle.Course;
import com.yidianling.course.coursePlay.moudle.CourseAddOrderBean;
import com.yidianling.course.coursePlay.moudle.CourseListDataBean;
import com.yidianling.course.coursePlay.moudle.CoursePlayBean;
import com.yidianling.course.model.CourseCategoryBean;
import com.yidianling.course.model.TopicCourseBean;
import com.yidianling.ydlcommon.http.BaseAPIResponse;
import com.yidianling.ydlcommon.http.BaseCommand;
import com.yidianling.ydlcommon.http.BaseResponse;
import com.yidianling.ydlcommon.http.FormatText;
import com.yidianling.ydlcommon.http.YdlRetrofitUtils;
import java.util.List;
import io.reactivex.Observable;
import okhttp3.MediaType;
import okhttp3.RequestBody;
import retrofit2.Retrofit;
import static com.yidianling.ydlcommon.http.YdlRetrofitUtils.getMaps;
import static com.yidianling.ydlcommon.http.YdlRetrofitUtils.getPostList;
import java.util.List;
/**
* Created by Jim on 2018/2/26 0026.
......@@ -33,62 +26,48 @@ import static com.yidianling.ydlcommon.http.YdlRetrofitUtils.getPostList;
public class RetrofitUtils {
public static void handleError(Context context, Throwable e) {
YdlRetrofitUtils.handleError(context, e);
}
public static Retrofit getRxRetrofit() {
return YdlRetrofitUtils.getRxRetrofit();
HttpErrorUtils.Companion.handleError(context, e);
}
//课程提交回复
public static Observable<BaseResponse<Object>> commitCourseReply(Command.CourseCommitReply cmd) {
List<FormatText> list = getPostList(cmd);
return YdlRetrofitUtils.getRxRetrofit().newBuilder().baseUrl(YdlRetrofitUtils.SERVER_API_JAVA_URL).build().create(NetApiStore.class).commitCourseReply(getMaps(list));
List<FormatText> list = NetworkParamsUtils.getPostList(cmd);
// return YdlRetrofitUtils.getRxRetrofit().newBuilder().baseUrl(YdlRetrofitUtils.SERVER_API_JAVA_URL).build().create(NetApiStore.class).commitCourseReply(getMaps(list));
return YDLHttpUtils.Companion.obtainApi(NetApiStore.class).commitCourseReply(NetworkParamsUtils.getMaps(list));
}
//获取课程海报分享数据
public static Observable<BaseResponse<PostersShareBean>> getPosterData(String courseId) {
return YdlRetrofitUtils.getRxRetrofit().newBuilder().baseUrl(YdlRetrofitUtils.SERVER_API_JAVA_URL).build().create(NetApiStore.class).getPosterData(courseId);
}
//课程播放页--点赞
public static Observable<BaseResponse<Object>> coursePlayZan(Command.CoursePlayZan cmd) {
List<FormatText> list = getPostList(cmd);
return getRxRetrofit().create(NetApiStore.class).coursePlayZan(getMaps(list));
return YDLHttpUtils.Companion.obtainApi(NetApiStore.class).getPosterData(courseId);
// return YdlRetrofitUtils.getRxRetrofit().newBuilder().baseUrl(YdlRetrofitUtils.SERVER_API_JAVA_URL).build().create(NetApiStore.class).getPosterData(courseId);
}
//课程课后笔记列表
public static Observable<BaseResponse<List<CoursePlayBean.Comments>>> courseReplyList(Command.CourseReplyList cmd) {
List<FormatText> list = getPostList(cmd);
return getRxRetrofit().create(NetApiStore.class).courseReplyList(getMaps(list));
}
public static Observable<BaseAPIResponse<List<ResultBean>>> getCoursesHomePage() {
return getRxRetrofit().newBuilder().baseUrl(YdlRetrofitUtils.SERVER_API_JAVA_URL).build().create(NetApiStore.class).getCourseHomePageDatas();
List<FormatText> list = NetworkParamsUtils.getPostList(cmd);
return YDLHttpUtils.Companion.obtainApi(NetApiStore.class).courseReplyList(NetworkParamsUtils.getMaps(list));
// return getRxRetrofit().create(NetApiStore.class).courseReplyList(getMaps(list));
}
//获取课程列表(php接口)
public static Observable<BaseResponse<List<Course>>> getCourseList(Command.GetCourse cmd) {
List<FormatText> list = getPostList(cmd);
return getRxRetrofit().create(NetApiStore.class).getPhpCourseList(getMaps(list));
}
List<FormatText> list = NetworkParamsUtils.getPostList(cmd);
//获取课程列表分类
public static Observable<BaseResponse<List<CourseCategoryBean>>> getCourseListCategory(BaseCommand cmd) {
List<FormatText> list = getPostList(cmd);
return getRxRetrofit().create(NetApiStore.class).getCourseCats(getMaps(list));
return YDLHttpUtils.Companion.obtainApi(NetApiStore.class).getPhpCourseList(NetworkParamsUtils.getMaps(list));
// return getRxRetrofit().create(NetApiStore.class).getPhpCourseList(getMaps(list));
}
//获取课程列表分类
public static Observable<BaseAPIResponse<CourseCategoryBean>> getCourseListCategory() {
return getRxRetrofit().newBuilder().baseUrl(YdlRetrofitUtils.SERVER_API_JAVA_URL).build().create(NetApiStore.class).getCourseListCategory();
return YDLHttpUtils.Companion.obtainApi(NetApiStore.class).getCourseListCategory();
// return getRxRetrofit().newBuilder().baseUrl(YdlRetrofitUtils.SERVER_API_JAVA_URL).build().create(NetApiStore.class).getCourseListCategory();
}
//获取课程专题
public static Observable<BaseAPIResponse<TopicCourseBean>> getCourseTopic(String id) {
return getRxRetrofit().newBuilder().baseUrl(YdlRetrofitUtils.SERVER_API_JAVA_URL).build().create(NetApiStore.class).getCourseSpecial(id);
return YDLHttpUtils.Companion.obtainApi(NetApiStore.class).getCourseSpecial(id);
// return getRxRetrofit().newBuilder().baseUrl(YdlRetrofitUtils.SERVER_API_JAVA_URL).build().create(NetApiStore.class).getCourseSpecial(id);
}
......@@ -102,14 +81,39 @@ public class RetrofitUtils {
* @return
*/
public static Observable<BaseResponse<List<CourseCouponBean>>> getCourseCoupons(String uid, String services, String receiveType, String applyEnds) {
return YdlRetrofitUtils.getRxRetrofit().newBuilder().baseUrl(YdlRetrofitUtils.SERVER_COUPON_URL)
.build().create(NetApiStore.class).getCourseCoupons(uid, services, receiveType, applyEnds);
return YDLHttpUtils.Companion.obtainApi(NetApiStore.class).getCourseCoupons(uid, services, receiveType, applyEnds);
// return YdlRetrofitUtils.getRxRetrofit().newBuilder().baseUrl(YdlRetrofitUtils.SERVER_COUPON_URL)
// .build().create(NetApiStore.class).getCourseCoupons(uid, services, receiveType, applyEnds);
}
//领取优惠券
public static Observable<BaseResponse<List<String>>> receiveCoupon(String couponIds) {
RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), couponIds);
return YdlRetrofitUtils.getRxRetrofit().newBuilder().baseUrl(YdlRetrofitUtils.SERVER_COUPON_URL).build().create(NetApiStore.class).receiveCoupon(body);
return YDLHttpUtils.Companion.obtainApi(NetApiStore.class).receiveCoupon(body);
}
public static Observable<BaseAPIResponse<CouponHintResponseBean>> getCouponHint(CouponHintParam param) {
return YDLHttpUtils.Companion.obtainApi(NetApiStore.class).getCouponHint();
}
public static Observable<BaseAPIResponse<String>> getCouponMax(RedListParam param) {
StringBuffer sb = new StringBuffer();
sb.append("serviceType").append("=").append(param.getServiceType()).append("&");
String confideParam = sb.toString() + NetworkParamsUtils.getCommonParam();
return YDLHttpUtils.Companion.obtainApi(NetApiStore.class).getCouponMax(confideParam);
}
public static Observable<BaseAPIResponse<CourseListDataBean>> getCourseList(String url) {
return YDLHttpUtils.Companion.obtainApi(NetApiStore.class).getCourseList(YdlRetrofitUtils.SERVER_API_JAVA_URL + "auth/course/getList?"+url);
}
/**
* 获取课程播放页 java 接口
*
*/
public static Observable<BaseResponse<CourseMediaDetailBean>> getCoursePlayData(String courseId) {
return YDLHttpUtils.Companion.obtainApi(NetApiStore.class).getCoursePlayData(courseId);
}
}
m-course/src/main/java/com/yidianling/course/coursePlay/dialog/CoursePlayListBean.kt deleted 100644 → 0
package com.yidianling.course.coursePlay.dialog
/**
* 课程播放列表dialog 实体类
* Created by harvie on 2017/6/29 0029.
*/
class CoursePlayListBean{
var isPlay = false //当前是否在播放
var title = "" //课程标题
var playUrl = "" //播放地址
var isTestPlay = false //是否试听音频
var playTime = "00:00" //音频时长
}
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/coursePlay/dialog/CoursePlayListDialog.kt deleted 100644 → 0
package com.yidianling.course.coursePlay.dialog
import android.app.Activity
import android.app.Dialog
import android.content.Context
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
import android.view.Gravity
import android.view.View
import android.view.Window
import android.widget.ImageView
import android.widget.TextView
import com.ydl.ydl_image.module.GlideApp
import com.yidianling.course.R
import com.yidianling.ydlcommon.adapter.CommonRecyclerAdapter
import com.yidianling.ydlcommon.view.BaseViewHolder
/**
* 课程播放列表dialog
* Created by harvie on 2017/6/29 0029.
*/
class CoursePlayListDialog : Dialog {
var mContext: Context? = null
var recyList: RecyclerView? = null
var textClose: TextView? = null
var index = 0 //当前播放下标
var itemListener: ItemClickListener? = null
var adapter: CommonRecyclerAdapter<CoursePlayListBean>? = null
constructor(context: Context?) : super(context, R.style.commonDialog) {
mContext = context
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
requestWindowFeature(Window.FEATURE_NO_TITLE)
setContentView(R.layout.dialog_course_playlist)
val m = window.windowManager
val d = m.defaultDisplay
val p = window.attributes
p.width = d.width //设置dialog的宽度为当前手机屏幕的宽度
p.height = (d.height * 5 / 10)
window.attributes = p
window.setGravity(Gravity.BOTTOM)
initView()
}
//跟新当前播放下标
fun updateIndex(inde: Int) {
index = inde
adapter?.notifyDataSetChanged()
}
fun initView() {
recyList = findViewById<RecyclerView>(R.id.recy_list)
textClose = findViewById<TextView>(R.id.text_close)
textClose?.setOnClickListener {
dismiss()
}
recyList?.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
adapter = CommonRecyclerAdapter<CoursePlayListBean>(recyList, R.layout.dialog_course_playlist_item)
.setBindDataCallback(object : CommonRecyclerAdapter.BindDataCallback<CoursePlayListBean> {
override fun bindDatabindData(holder: BaseViewHolder, t: CoursePlayListBean, position: Int) {
var gifView: ImageView = holder.getView(R.id.gifView)
if (index == position) {
GlideApp.with(context).load(R.drawable.music).into(gifView)
gifView.visibility = View.VISIBLE
holder.setTextColor(R.id.text_title, context.resources.getColor(R.color.google_green))
} else {
gifView.visibility = View.GONE
holder.setTextColor(R.id.text_title, context.resources.getColor(R.color.black_deep))
}
var test: TextView = holder.getView(R.id.text_test)
if (t.isTestPlay) {
test.visibility = View.VISIBLE
} else {
test.visibility = View.GONE
}
holder.setText(R.id.text_title, t.title)
holder.setText(R.id.text_time, "" + t.playTime)
holder.setOnClickListener(R.id.lin_body) {
//item点击事件
var boo = itemListener?.itemClick(position) ?: false
if (boo) {
index = position
adapter?.notifyDataSetChanged()
}
}
}
})
recyList?.adapter = adapter
}
fun scrollToPosition(i: Int) {
recyList?.scrollToPosition(i)
}
//设置item点击事件
fun setItemClickListener(itemListener: ItemClickListener): CoursePlayListDialog {
this.itemListener = itemListener
return this
}
//设置列表数据
fun setList(playIndex: Int, list: List<CoursePlayListBean>?) {
this.index = playIndex
if (list != null) {
for (i in list.indices) {
list[i].isPlay = i == playIndex
}
adapter?.update(list)
}
}
//跟新列表状态
fun updateAdapter() {
adapter?.notifyDataSetChanged()
}
//列表点击事件
interface ItemClickListener {
fun itemClick(indec: Int): Boolean
}
override fun show() {
if (null == mContext) {
return
}
if (mContext is Activity) {
if ((mContext as Activity).isFinishing) {
return
}
}
super.show()
}
}
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/coursePlay/http/CourseListDataManager.kt deleted 100644 → 0
package com.yidianling.course.coursePlay.http
/**
* @author yuanwai
* @描述:课程列表页接口实现模型
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2018/12/11
*/
object CourseListDataManager{
fun getHttp(): ICourseListHttp = CourseListHttpImpl.getInstance()
}
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/coursePlay/http/CourseListHttpImpl.kt deleted 100644 → 0
package com.yidianling.course.coursePlay.http
import com.yidianling.course.coursePlay.common.net.NetApiStore
import com.yidianling.course.coursePlay.moudle.CourseListDataBean
import com.yidianling.ydlcommon.http.BaseAPIResponse
import com.yidianling.ydlcommon.http.RxUtils
import com.yidianling.ydlcommon.http.YdlRetrofitUtils
import io.reactivex.Observable
/**
* @author yuanWai
* @描述:课程列表页接口实现类
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2018/12/12
*/
class CourseListHttpImpl : ICourseListHttp{
companion object {
fun getInstance(): CourseListHttpImpl {
return Holder.INSTANCE
}
}
object Holder {
val INSTANCE = CourseListHttpImpl()
}
private val netApiStore: NetApiStore by lazy {
YdlRetrofitUtils.getRxRetrofit().newBuilder().baseUrl(YdlRetrofitUtils.SERVER_API_JAVA_URL).build().create(NetApiStore::class.java)
}
override fun getCourseList(params: String): Observable<BaseAPIResponse<CourseListDataBean>> {
return RxUtils.mapObservable(CourseListParams(""))
.flatMap {netApiStore.getCourseList(YdlRetrofitUtils.SERVER_API_JAVA_URL + "auth/course/getList?" + params)
}
}
}
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/coursePlay/http/ICourseListHttp.kt deleted 100644 → 0
package com.yidianling.course.coursePlay.http
import com.yidianling.course.coursePlay.moudle.CourseListDataBean
import com.yidianling.ydlcommon.http.BaseAPIResponse
import io.reactivex.Observable
/**
* @author yuanwai
* @描述:课程列表页请求接口
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2018/12/11
*/
interface ICourseListHttp{
/**
* 专家搜索页请求
*/
fun getCourseList(params : String): Observable<BaseAPIResponse<CourseListDataBean>>
}
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/coursePlay/moudle/Course.java
package com.yidianling.course.coursePlay.moudle;
import com.ydl.ydlcommon.bean.ShareData;
import com.yidianling.course.bean.CourseHostInfoBean;
import com.yidianling.ydlcommon.data.ShareData;
//课程列表
//课程
......
m-course/src/main/java/com/yidianling/course/coursePlay/moudle/CourseListDataBean.kt
package com.yidianling.course.coursePlay.moudle
import com.yidianling.ydlcommon.bean.YDLBaseDataBean
import com.ydl.ydlcommon.bean.YDLBaseDataBean
/**
* @author yuanWai
......@@ -9,4 +9,4 @@ import com.yidianling.ydlcommon.bean.YDLBaseDataBean
* @Company 壹点灵
* @date 2018/12/12
*/
data class CourseListDataBean(val list : List<Course>) : YDLBaseDataBean()
\ No newline at end of file
data class CourseListDataBean(val list: List<Course>) : YDLBaseDataBean()
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/coursePlay/moudle/CoursePlayBean.kt
package com.yidianling.course.coursePlay.moudle
import com.yidianling.ydlcommon.data.ShareData
import com.ydl.ydlcommon.bean.ShareData
import java.util.*
/**
......
m-course/src/main/java/com/yidianling/course/coursePlay/presenter/CoursePlayPresenter.kt
package com.yidianling.course.coursePlay.presenter
import android.annotation.SuppressLint
import com.yidianling.common.tools.ToastUtil
import com.yidianling.ydlcommon.bean.CourseMediaDetailBean
import com.yidianling.course.bean.CourseMediaDetailBean
import com.yidianling.course.coursePlay.CoursePlayActivity
import com.yidianling.course.coursePlay.common.net.RetrofitUtils
import com.yidianling.ydlcommon.http.api.ApiRequestUtil
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
......@@ -13,9 +13,10 @@ import io.reactivex.schedulers.Schedulers
* Created by harvie on 2017/6/28 0028.
*/
class CoursePlayPresenter(val view: CoursePlayActivity) {
@SuppressLint("CheckResult")
fun getInitData(course_id: Int) {
view.showLoadingDialog()
ApiRequestUtil.getCoursePlayData(course_id.toString())
RetrofitUtils.getCoursePlayData(course_id.toString())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe({ resp ->
......
m-course/src/main/java/com/yidianling/course/course_special_list/presenter/CourseSpecialListPresenterImpl.kt
......@@ -2,6 +2,7 @@ package com.yidianling.course.course_special_list.presenter
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import com.ydl.ydlcommon.data.http.ThrowableConsumer
import com.yidianling.common.tools.RxNetTool
import com.yidianling.course.course_special_list.bean.CourseSpecialItemBean
import com.yidianling.course.course_special_list.contract.ICourseSpecialListContract
......@@ -20,12 +21,18 @@ import io.reactivex.schedulers.Schedulers
* @Company 壹点灵
* @date 2018/9/18
*/
class CourseSpecialListPresenterImpl (view: ICourseSpecialListContract.View) :
RxPresenter<ICourseSpecialListContract.View, ICourseSpecialListContract.Model>(view), ICourseSpecialListContract.Presenter{
class CourseSpecialListPresenterImpl (var view: ICourseSpecialListContract.View) :
ICourseSpecialListContract.Presenter{
override fun attachView(view: ICourseSpecialListContract.View) {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
override fun detachView() {
TODO("not implemented") //To change body of crea ted functions use File | Settings | File Templates.
}
override fun createModel(): ICourseSpecialListContract.Model {
return CourseSpecialListModelImpl()
override fun destroy() {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
/**
......@@ -90,6 +97,5 @@ class CourseSpecialListPresenterImpl (view: ICourseSpecialListContract.View) :
}
}
})
addDisposable(disposable)
}
}
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/flutterPlugin/CoursePlugin.kt
import android.content.Intent
import android.net.Uri
import android.text.TextUtils
import com.ydl.webview.H5Params
import com.ydl.webview.NewH5Activity
import com.ydl.ydl_router.manager.YDLRouterManager
import com.ydl.ydlcommon.base.BaseApp
import com.ydl.ydlcommon.router.YdlCommonRouterManager
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.RxDeviceTool
import com.yidianling.course.BuildConfig
......@@ -10,14 +14,7 @@ import com.yidianling.course.courseNew.mine.MyCourseActivity
import com.yidianling.course.course_special_list.activity.CourseSpecialListActivity
import com.yidianling.course.flutterPlugin.CourseSendPlugin
import com.yidianling.course.router.CourseIn
import com.yidianling.ydlcommon.app.YdlCommonApp
import com.yidianling.ydlcommon.flutter.base.BaseFlutterFragment
import com.yidianling.ydlcommon.h5.H5Params
import com.yidianling.ydlcommon.h5.NewH5Activity
import com.yidianling.ydlcommon.player.YDLMusicHelper
import com.yidianling.ydlcommon.router.YdlCommonRouterManager
import com.yidianling.ydlcommon.utils.PlayerFloatHelper
import com.yidianling.ydlcommon.view.PlayerFloatView
import io.flutter.plugin.common.MethodCall
import io.flutter.plugin.common.MethodChannel
import io.flutter.view.FlutterView
......@@ -57,8 +54,8 @@ class CoursePlugin : MethodChannel.MethodCallHandler {
mMap["accessToken"] = YdlCommonRouterManager.getYdlCommonRoute().getAccessToken()
?: ""
mMap["isFromApp"] = "1"
mMap["version"] = RxDeviceTool.getAppVersionName(YdlCommonApp.getApp())
mMap["osBuild"] = RxDeviceTool.getBuildMANUFACTURER() + "," + RxDeviceTool.getBuildBrandModel() + "," + RxDeviceTool.getOsBuileVersion() + "," + RxDeviceTool.getAppVersionName(YdlCommonApp.getApp())
mMap["version"] = RxDeviceTool.getAppVersionName(BaseApp.getApp())
mMap["osBuild"] = RxDeviceTool.getBuildMANUFACTURER() + "," + RxDeviceTool.getBuildBrandModel() + "," + RxDeviceTool.getOsBuileVersion() + "," + RxDeviceTool.getAppVersionName(BaseApp.getApp())
result.success(mMap)
}
JUMPURL -> {
......
m-course/src/main/java/com/yidianling/course/model/Banner.java deleted 100644 → 0
package com.yidianling.course.model;
/**
* Created by Jim on 2018/6/22 0022.
*/
public class Banner {
public String imagUrl;
}
m-course/src/main/java/com/yidianling/course/model/CatogoryBean.java deleted 100644 → 0
package com.yidianling.course.model;
/**
* Created by Jim on 2018/7/14 0014.
*/
public class CatogoryBean {
public String title;
public String image;
public String linkUrl;
}
m-course/src/main/java/com/yidianling/course/model/ClassifiedCoursesBean.java deleted 100644 → 0
package com.yidianling.course.model;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import org.json.JSONException;
import org.json.JSONObject;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
/**
* Created by Jim on 2018/7/14 0014.
*/
public class ClassifiedCoursesBean {
public Head head;
public Body body;
public Footer footer;
public static class Head {
/**
* title : 精品课程
* tab1Name : 免费课程
* tab2Name : 付费课程
*/
public String title;
public String tab1Name;
public String tab2Name;
}
public static class Body {
public List<TabListBean> oneTabList;
public List<TabListBean> twoTabList;
public static class TabListBean {
/**
* id : 6
* image : https://img.ydlcdn.com/file/2015/11/zawz18il050dybbm.jpg
* title : 阳光心灵分享会第一期：谈谈心中的那缕烦忧
* expert :
* price : 30.00
* popularity : 67
* linkUrl : https://testh2.yidianling.com/course/6
*/
public String id;
public String image;
public String title;
public String expert;
public String price;
public String popularity;
public String linkUrl;
}
}
public static class Footer {
public String title;
public String linkUrl;
}
}
m-course/src/main/java/com/yidianling/course/model/CourseBean.java deleted 100644 → 0
package com.yidianling.course.model;
import com.google.gson.annotations.SerializedName;
public class CourseBean {
public String id;
public String image;
public String title;
public String leftBottom;
public String rightBottom;
public String linkUrl;
/**
* 是否显示返利标签
* 0不显示 1显示
*/
public int isInvite;
/**
* 促销标签：
* 1活动中 2结束or没开始 3倒计时
* <p>
* 1和3都显示促销标签
* <p>
* if(is_promotion == 1) 时 列表金额取 promotion_apply_fee字段
*/
@SerializedName("isPromotion")
//这么java接口和php接口字段名不同，兼容两个接口
public String is_promotion;
@SerializedName("promotionApplyFee")
public String promotion_apply_fee;
}
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/model/LocalButtonShownBean.java deleted 100644 → 0
package com.yidianling.course.model;
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
* @描述: 用于存放私聊，倾诉，咨询三个按钮
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2018/12/26
*/
public class LocalButtonShownBean {
public int type; //0隐藏1显示
public String name; //按钮描述
public LocalButtonShownBean(int type, String name) {
this.type = type;
this.name = name;
}
}
m-course/src/main/java/com/yidianling/course/model/NormalCourseBean.java deleted 100644 → 0
package com.yidianling.course.model;
import com.yidianling.course.bean.CourseHomeBodyBean;
import com.yidianling.course.courseNew.home.ResultBean;
import java.util.List;
/**
* @author : Zhangwenchao
* @e-mail : zhangwch@yidianling.com
* @time : 2018/7/14
*/
public class NormalCourseBean {
public ResultBean.Head head;
public List<CourseHomeBodyBean> body;
public ResultBean.Footer footer;
public int type;
public boolean diviLine;
}
m-course/src/main/java/com/yidianling/course/model/QulityCourseBean.java deleted 100644 → 0
package com.yidianling.course.model;
import com.yidianling.course.bean.CourseHomeBodyBean;
import com.yidianling.course.courseNew.home.ResultBean;
import java.util.ArrayList;
import java.util.List;
/**
* @author : Zhangwenchao
* @e-mail : zhangwch@yidianling.com
* @time : 2018/7/14
*/
public class QulityCourseBean {
public ResultBean.Head head;
public List<ArrayList<CourseHomeBodyBean>> body;
public ResultBean.Footer footer;
public int type;
public boolean diviLine;
}
m-course/src/main/java/com/yidianling/course/model/TopicCourseBean.kt
package com.yidianling.course.model
import com.ydl.ydlcommon.bean.ShareData
import com.yidianling.course.coursePlay.moudle.Course
import com.yidianling.ydlcommon.data.ShareData
/**
* Created by Jim on 2018/7/16 0016.
......
m-course/src/main/java/com/yidianling/course/widget/CouponHintView.kt 0 → 100644
package com.yidianling.course.widget
import android.annotation.SuppressLint
import android.content.Context
import android.text.TextUtils
import android.util.AttributeSet
import android.util.Log
import android.view.View
import android.widget.RelativeLayout
import com.ydl.ydl_router.manager.YDLRouterManager
import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.data.http.ThrowableConsumer
import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.yidianling.course.R
import com.yidianling.course.bean.CouponHintParam
import com.yidianling.course.bean.CouponHintResponseBean
import com.yidianling.course.coursePlay.common.net.RetrofitUtils
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.functions.Consumer
import kotlinx.android.synthetic.main.coupon_hint_view.view.*
/**
* @author <a href="https://www.jianshu.com/u/c1e5310dd724">xujian</a>
* @描述:我的课程优惠码View
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2018/12/27
*/
class CouponHintView : RelativeLayout{
private var jumpType : Int = JUMP_TO_COUPON_LIST
private var mCouponHintCallBack : CouponHintCallBack? = null
//是否显示
private var couponHintVisible : Int = View.VISIBLE
private var couponUrl:String? = null
companion object {
/**
* 跳转类型
* 0.跳转红包
*/
const val JUMP_TO_COUPON_LIST = 0
}
constructor(context:Context):super(context){
initView()
}
constructor(context: Context,attributeSet: AttributeSet):super(context,attributeSet){
initView()
}
/**
* 界面初始化
*/
private fun initView(){
View.inflate(context, R.layout.coupon_hint_view,this)
setOnClickListener {
when(jumpType){
JUMP_TO_COUPON_LIST ->{//我的红包
if (TextUtils.isEmpty(couponUrl)) {
YDLRouterManager.router(IYDLRouterConstant.ROUTER_MINE_REDPACKET)
}else {
YDLRouterManager.router(couponUrl)
}
}
}
visibility = View.GONE
}
imgClose.setOnClickListener {
visibility = View.GONE
}
}
/**
* 请求红包列表数据
*/
@SuppressLint("CheckResult")
fun initData(visible : Int){
this.couponHintVisible = visible
RetrofitUtils.getCouponHint(CouponHintParam(0)).compose(RxUtils.resultJavaData())
.map { it }
.filter { it != null }
.observeOn(AndroidSchedulers.mainThread())
.subscribe(Consumer {
if (null != it) {
setData(it)
couponUrl = it.url
}
}, object: ThrowableConsumer() {
override fun accept(msg: String) {
visibility = View.GONE
}
})
}
//设置跳转到我的红包
fun setCouponList(){
jumpType = JUMP_TO_COUPON_LIST
}
/**
* 数据赋值
*/
private fun setData(couponData : CouponHintResponseBean){
if (TextUtils.isEmpty(couponData.msg)){
visibility = View.GONE
return
}
//因为数据请求是异步的 会出现 MainActivity设置了隐藏 但是到了这里 依然显示的现象
visibility = couponHintVisible
val sb = StringBuffer()
sb.append(couponData.msg)
tvMsg.text = sb.toString()
}
fun setCloseHide(){
imgClose.visibility = View.GONE
}
fun setRedPacketCallBack(mRedPacketCallBack : CouponHintCallBack){
this.mCouponHintCallBack = mRedPacketCallBack
}
interface CouponHintCallBack{
fun jumpInfo() //暂未设置跳转
}
}
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/widget/CourseItemNewView.kt
......@@ -13,14 +13,6 @@ import com.yidianling.common.tools.RxImageTool
import com.yidianling.course.CourseConstants
import com.yidianling.course.R
import com.yidianling.course.coursePlay.moudle.Course
import com.yidianling.ydlcommon.h5.H5Params
import com.yidianling.ydlcommon.h5.NewH5Activity
import com.yidianling.ydlcommon.player.YDLMusicHelper
import com.yidianling.ydlcommon.utils.PlayerFloatHelper
import com.yidianling.ydlcommon.utils.actionutil.ActionCountUtils
import com.yidianling.ydlcommon.utils.actionutil.BIConstants
import com.yidianling.ydlcommon.view.PlayerFloatView
import kotlinx.android.synthetic.main.item_course_new_list_view.view.*
/**
* @author jiucheng
......
m-course/src/main/java/com/yidianling/course/widget/CourseRedPacketView.kt 0 → 100644
package com.yidianling.course.widget
import android.annotation.SuppressLint
import android.content.Context
import android.text.TextUtils
import android.util.AttributeSet
import android.view.View
import android.widget.RelativeLayout
import com.ydl.ydl_router.manager.YDLRouterManager
import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.data.http.ThrowableConsumer
import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.yidianling.course.R
import com.yidianling.course.bean.RedListParam
import com.yidianling.course.coursePlay.common.net.RetrofitUtils
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.functions.Consumer
import kotlinx.android.synthetic.main.course_redpacket_view.view.*
/**
* @author yuanWai
* @描述:红包提示View
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2018/11/27
*/
class CourseRedPacketView : RelativeLayout {
private var jumpType: Int = JUMP_NOT
private var mRedPacketCallBack: RedPacketCallBack? = null
private var onDataRequestFinishedListener: OnDataRequestFinishedListener? = null
//是否显示
private var redPacketVisible: Int = View.VISIBLE
companion object {
/**
* 跳转类型
* 0.不跳转 1.跳转倾诉频道 2.跳转专家详情
*/
const val JUMP_NOT = 0
const val JUMP_CONFIDE_HOME = 1
const val JUMP_EXPERT_INFO = 2
}
constructor(context: Context) : super(context) {
initView()
}
constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) {
initView()
}
/**
* 界面初始化
*/
private fun initView() {
View.inflate(context, R.layout.course_redpacket_view, this)
setOnClickListener {
when (jumpType) {
JUMP_NOT -> {//不跳转
}
JUMP_CONFIDE_HOME -> {//跳转倾诉频道页
// ARouter.getInstance().build("/confide/home").navigation()
YDLRouterManager.router(IYDLRouterConstant.ROUTER_CONFIDE_HOME)
}
JUMP_EXPERT_INFO -> {//跳转专家详情页
if (null != mRedPacketCallBack) {
mRedPacketCallBack!!.jumpExpertInfo()
}
}
}
visibility = View.GONE
}
imgClose.setOnClickListener {
visibility = View.GONE
}
}
/**
* 请求红包列表数据
*/
@SuppressLint("CheckResult")
fun initData(visible: Int) {
this.redPacketVisible = visible
RetrofitUtils.getCouponMax(RedListParam(3)).compose(RxUtils.resultJavaData())
.map { it }
.filter { it != null }
.observeOn(AndroidSchedulers.mainThread())
.subscribe(Consumer {
setData(it)
}, object : ThrowableConsumer() {
override fun accept(msg: String) {
visibility = View.GONE
}
})
}
//设置不跳转
fun setNot() {
jumpType = JUMP_NOT
}
//设置跳转倾诉列表首页
fun setConfide() {
jumpType = JUMP_CONFIDE_HOME
}
//设置跳转专家详情页
fun setExpertInfo() {
jumpType = JUMP_EXPERT_INFO
}
/**
* 数据赋值
*/
private fun setData(couponMax: String) {
if (TextUtils.isEmpty(couponMax)) {
visibility = View.GONE
return
}
var max = couponMax.toFloat().toInt()
visibility = if (max > 0) {
View.VISIBLE
} else {
View.GONE
}
//因为数据请求是异步的 会出现 MainActivity设置了隐藏 但是到了这里 依然显示的现象
visibility = redPacketVisible
if (max <= 0) {
visibility = View.GONE
}
val sb = StringBuffer()
sb.append("您有")
.append(max)
.append("元的倾诉红包，倾诉享")
tvMsg.text = sb.toString()
if (onDataRequestFinishedListener != null) {
onDataRequestFinishedListener!!.onDataRequestFinishedListener(max)
}
}
fun setCloseHide() {
imgClose.visibility = View.GONE
}
fun setRedPacketCallBack(mRedPacketCallBack: RedPacketCallBack) {
this.mRedPacketCallBack = mRedPacketCallBack
}
interface RedPacketCallBack {
fun jumpExpertInfo()
}
fun setOnDataRequestFinishedListener(onDataRequestFinishedListener: OnDataRequestFinishedListener) {
this.onDataRequestFinishedListener = onDataRequestFinishedListener
}
/**
* 数据请求完成回调
*/
interface OnDataRequestFinishedListener {
fun onDataRequestFinishedListener(max: Int)
}
}
\ No newline at end of file
m-course/src/main/res/drawable/background_course_comment_push.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true">
<shape>
<corners android:radius="16dp"/>
<solid android:color="@color/color_FFDB26"/>
</shape>
</item>
</selector>
\ No newline at end of file
m-course/src/main/res/drawable/background_course_demo.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="4dp"/>
<solid android:color="@color/color_FFDB26" />
<stroke android:width="1dp" android:color="@color/color_FFDB26"/>
</shape>
\ No newline at end of file
m-course/src/main/res/drawable/course_background_course_play_bottom.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true">
<shape>
<gradient
android:angle="90"
android:endColor="#00000000"
android:startColor="#0A000000"
/>
</shape>
</item>
</selector>
\ No newline at end of file
m-course/src/main/res/drawable/course_background_course_play_buy_button.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true">
<shape>
<corners android:radius="4dp" />
<solid android:color="@color/main_theme" />
</shape>
</item>
</selector>
\ No newline at end of file
m-course/src/main/res/drawable/course_background_course_poster_button.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true">
<shape>
<corners android:radius="4dp" />
<solid android:color="@color/color_30FFFFFF"/>
</shape>
</item>
<item android:state_checked="false">
<shape>
<corners android:radius="4dp" />
<stroke android:width="0.5dp" android:color="@color/white" />
</shape>
</item>
</selector>
\ No newline at end of file
m-course/src/main/res/drawable/course_bg_radius_f3_10.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="4dp"/>
<solid android:color="#f5f5f5" />
<stroke android:width="1dp" android:color="#f5f5f5"/>
</shape>
\ No newline at end of file
m-course/src/main/res/drawable/course_bg_radius_green_6.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="5dp" />
<solid android:color="@color/main_theme" />
<stroke
android:width="1dp"
android:color="@color/main_theme" />
</shape>
\ No newline at end of file
m-course/src/main/res/drawable/course_comment_item_btn_background.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="14dp" />
<solid android:color="@color/color_FFDB26" />
</shape>
\ No newline at end of file
m-course/src/main/res/drawable/course_filter_confirm_btn_bg.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="6dp" />
<solid android:color="@color/main_theme" />
<stroke
android:width="0.5px"
android:color="@color/main_theme" />
</shape>
\ No newline at end of file
m-course/src/main/res/drawable/course_filter_reset_btn_bg.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="6dp" />
<solid android:color="@color/color_F7F7F7" />
<stroke
android:width="0.5px"
android:color="@color/main_theme" />
</shape>
\ No newline at end of file
m-course/src/main/res/drawable/course_filter_select_nor.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="4dp" />
<solid android:color="@color/color_F7F7F7" />
</shape>
\ No newline at end of file
m-course/src/main/res/drawable/course_filter_select_sel.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="4dp" />
<stroke android:color="@color/color_1DA1F2" android:width="1px" />
<solid android:color="@color/color_151DA1F2" />
</shape>
\ No newline at end of file
m-course/src/main/res/drawable/tv_course_item_btn_background.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners
android:radius="14dp"/>
<solid android:color="@color/color_F5F5F5"/>
</shape>
\ No newline at end of file
m-course/src/main/res/layout/activity_course_commeny.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
tools:ignore="MissingDefaultResource">
<ImageView
android:id="@+id/iv_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="19dp"
android:src="@drawable/toolbar_back"
app:layout_constraintBottom_toBottomOf="@+id/tv_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_title" />
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="45dp"
android:gravity="center"
android:text="写评论"
android:textColor="@color/color_242424"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/tv_left_menu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:background="@drawable/background_course_comment_push"
android:paddingLeft="16dp"
android:paddingTop="5dp"
android:paddingRight="16dp"
android:paddingBottom="5dp"
android:text="发布"
android:textColor="@color/color_242424"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="@+id/tv_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_title" />
<View
android:id="@+id/view_line"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/color_F4F4F4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_title" />
<EditText
android:id="@+id/et_comment"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginLeft="18dp"
android:layout_marginTop="18dp"
android:layout_marginRight="15dp"
android:background="@null"
android:gravity="start"
android:hint="评价返28元课程兑换券"
android:maxLength="500"
android:paddingBottom="45dp"
android:textColor="@color/color_242424"
android:textColorHint="@color/color_B3B3B3"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/view_line" />
<TextView
android:id="@+id/tv_input_length"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="@color/color_B3B3B3"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="@+id/tv_input_limt"
app:layout_constraintEnd_toStartOf="@+id/tv_input_limt" />
<TextView
android:id="@+id/tv_input_limt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:layout_marginBottom="20dp"
android:text="/500"
android:textColor="@color/color_B3B3B3"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
m-course/src/main/res/layout/activity_course_play.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
<android.support.v4.widget.NestedScrollView
android:id="@+id/nestedScrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/rl_write_bottom"
android:layout_below="@+id/frame_play"
android:overScrollMode="never">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<android.support.v7.widget.RecyclerView
android:id="@+id/recy_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="55dp"
android:background="@color/white"
android:overScrollMode="never"
android:scrollbars="none">
</android.support.v7.widget.RecyclerView>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
<FrameLayout
android:id="@+id/frame_play"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/transparent" />
<RelativeLayout
android:id="@+id/title_bar_layout"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp">
<ImageView
android:id="@+id/iv_back"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_centerVertical="true"
android:padding="3dp"
android:src="@drawable/course_ico_course_h5_back" />
<TextView
android:id="@+id/tv_title_full"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:layout_toRightOf="@+id/iv_back"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/white"
android:textSize="17sp"
android:visibility="gone" />
<ImageView
android:id="@+id/iv_share"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:padding="3dp"
android:src="@drawable/course_ico_course_h5_share" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_write_bottom"
android:layout_width="match_parent"
android:layout_height="62dp"
android:layout_alignParentBottom="true"
android:background="@color/white"
tools:visibility="visible">
<TextView
android:id="@+id/tv_write_comment"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_below="@+id/view_line"
android:layout_marginLeft="15dp"
android:layout_marginTop="6dp"
android:layout_marginRight="15dp"
android:layout_marginBottom="6dp"
android:background="@drawable/course_bg_radius_f3_10"
android:drawableLeft="@drawable/course_ico_comment_write"
android:drawablePadding="5dp"
android:gravity="center_vertical"
android:hint="评价返28元课程兑换券"
android:paddingLeft="10dp"
android:textColor="@color/white"
android:textColorHint="#999999"
android:textSize="14sp"
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/text_price"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_below="@+id/view_line"
android:layout_marginLeft="15dp"
android:layout_marginTop="6dp"
android:layout_marginRight="15dp"
android:layout_marginBottom="6dp"
android:background="@drawable/course_background_course_play_buy_button"
android:gravity="center"
android:textColor="@color/white"
android:textSize="17sp"
android:visibility="gone"
tools:text="立即抢购" />
<View
android:id="@+id/view_line"
android:layout_width="match_parent"
android:layout_height="7dp"
android:background="@drawable/course_background_course_play_bottom" />
</RelativeLayout>
</RelativeLayout>
m-course/src/main/res/layout/activity_course_poster.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_99000000"
tools:ignore="MissingDefaultResource">
<ImageView
android:id="@+id/iv_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="15dp"
android:src="@drawable/toolbar_back"
app:layout_constraintBottom_toBottomOf="@+id/tv_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_title" />
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="45dp"
android:gravity="center"
android:text="生成海报"
android:textColor="@color/white"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<RelativeLayout
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
app:layout_constraintBottom_toTopOf="@+id/radio_group"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_title"
tools:background="@color/main_theme">
<android.support.v4.view.ViewPager
android:id="@+id/viewpager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:clipChildren="false"
android:clipToPadding="false"
android:paddingLeft="53dp"
android:paddingRight="53dp"
tools:background="@color/red" />
</RelativeLayout>
<RadioGroup
android:id="@+id/radio_group"
android:layout_width="wrap_content"
android:layout_height="38dp"
android:layout_marginBottom="10dp"
android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@+id/view"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<android.support.v7.widget.AppCompatRadioButton
android:id="@+id/rb_one"
android:layout_width="100dp"
android:layout_height="match_parent"
android:background="@drawable/course_background_course_poster_button"
android:button="@null"
android:checked="true"
android:gravity="center"
android:text="模版一"
android:textColor="@color/white" />
<android.support.v7.widget.AppCompatRadioButton
android:id="@+id/rb_two"
android:layout_width="100dp"
android:layout_height="match_parent"
android:layout_marginLeft="15dp"
android:background="@drawable/course_background_course_poster_button"
android:button="@null"
android:gravity="center"
android:text="模版二"
android:textColor="@color/white" />
</RadioGroup>
<View
android:id="@+id/view"
android:layout_width="match_parent"
android:layout_height="56dp"
android:background="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/tv_share"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="15dp"
android:layout_marginTop="6dp"
android:layout_marginEnd="15dp"
android:layout_marginBottom="6dp"
android:background="@drawable/course_bg_radius_green_6"
android:gravity="center"
android:text="分享"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="@+id/view"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/view" />
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
m-course/src/main/res/layout/activity_course_topic.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<include
android:id="@+id/v_no_network"
layout="@layout/view_no_network"
android:visibility="gone" />
<include layout="@layout/layout_title_bar" />
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/swl"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="45dp">
<android.support.v7.widget.RecyclerView
android:id="@+id/course_topic_rcv"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</android.support.v4.widget.SwipeRefreshLayout>
</FrameLayout>
\ No newline at end of file
m-course/src/main/res/layout/activity_courses.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:fitsSystemWindows="true"
android:orientation="vertical"
>
<include layout="@layout/layout_title_bar"/>
<com.yidianling.course.widget.SearchBarView
android:id="@+id/search_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<View
android:id="@+id/divider_line"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#f0f0f0"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="45dp"
android:orientation="horizontal">
<com.ydl.ydlcommon.view.DrawableRightTextView
android:id="@+id/sort_layout"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawableRight="@drawable/course_ic_arrow_drop_down_grey_500_18dp"
android:gravity="center"
android:text="综合排序"
android:textColor="@color/main_theme"
android:textSize="14sp"
android:textStyle="bold"/>
<com.ydl.ydlcommon.view.DrawableRightTextView
android:id="@+id/classify_layout"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawableRight="@drawable/course_ic_arrow_drop_down_grey_500_18dp"
android:gravity="center"
android:text="分类"
android:textColor="@color/color_242424"
android:textSize="14sp"/>
<com.ydl.ydlcommon.view.DrawableRightTextView
android:id="@+id/filter_layout"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawableRight="@drawable/course_ic_arrow_drop_down_grey_500_18dp"
android:gravity="center"
android:text="筛选"
android:textColor="@color/color_242424"
android:textSize="14sp"/>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_hot_search"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:paddingBottom="10dp"/>
<View
android:id="@+id/view_line"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#f0f0f0"/>
<com.yidianling.course.widget.CouponHintView
android:id="@+id/hint_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"/>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<in.srain.cube.views.ptr.PtrFrameLayout
android:id="@+id/store_house_ptr_frame"
android:layout_width="match_parent"
android:layout_height="match_parent">
<in.srain.cube.views.loadmore.LoadMoreListViewContainer
android:id="@+id/load_more_list_view_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<ListView
android:id="@+id/lv_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@color/color_EDEDED"
android:dividerHeight="0dp"/>
<ImageView
android:id="@+id/iv_course_list_empty_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="50dp"
android:src="@drawable/course_blank"
android:visibility="gone"/>
<TextView
android:id="@+id/tv_course_list_empty_prompt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="14dp"
android:text="暂无相应记录"
android:textColor="#b2b2b2"
android:visibility="gone"/>
<com.ydl.ydlcommon.ui.LogoLoadingView
android:id="@+id/v_loading"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"/>
</in.srain.cube.views.loadmore.LoadMoreListViewContainer>
</in.srain.cube.views.ptr.PtrFrameLayout>
<View
android:id="@+id/img_backgroud"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:alpha="0.4"
android:background="@android:color/black"
android:visibility="gone"/>
</FrameLayout>
</LinearLayout>
m-course/src/main/res/layout/activity_my_course.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<include layout="@layout/layout_title_bar"/>
<com.yidianling.course.widget.CourseRedPacketView
android:id="@+id/courseRedPacketView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"/>
<com.ydl.base_module.ui.searchbarview.SearchBarView
android:id="@+id/search_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<android.support.design.widget.TabLayout
android:id="@+id/my_courses_tabs"
android:layout_width="match_parent"
android:layout_height="40dp"
android:background="@color/white"
app:tabGravity="fill"
app:tabIndicatorColor="@color/google_green"
app:tabMode="fixed"
app:tabSelectedTextColor="@color/google_green"
app:tabTextColor="#333"/>
<android.support.v4.view.ViewPager
android:id="@+id/my_course_vp"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
</LinearLayout>
\ No newline at end of file
m-course/src/main/res/layout/coupon_hint_view.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="32dp"
android:orientation="horizontal"
android:background="#ffedcb">
<ImageView
android:id="@+id/imgTiXing"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_marginStart="15dp"
android:layout_marginTop="9dp"
android:src="@drawable/course_confideredpacket_tixing"/>
<TextView
android:id="@+id/tvMsg"
android:layout_toRightOf="@+id/imgTiXing"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_marginStart="4dp"
android:textColor="#ff821d"
android:textSize="12sp"
tools:text="您有个课程优惠码未使用"/>
<!--取消按钮暂时隐藏-->
<ImageView
android:id="@+id/imgClose"
android:layout_width="29dp"
android:layout_height="29dp"
android:layout_marginTop="9dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_10"
android:padding="5dp"
android:src="@drawable/course_confideredpacket_close"
tools:ignore="OnClick" />
</RelativeLayout>
\ No newline at end of file
m-course/src/main/res/layout/course_filter_popup_window.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:ignore="MissingDefaultResource">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginTop="22dp"
android:textColor="@color/color_242424"
android:textSize="16sp"
android:textStyle="bold"
android:text="付费类型" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:background="@color/white"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_no_free"
android:layout_width="0px"
android:layout_height="36dp"
android:layout_marginLeft="15dp"
android:layout_weight="1"
android:background="@drawable/course_filter_select_nor"
android:gravity="center"
android:orientation="vertical"
android:text="付费"
android:textColor="@color/color_242424"
android:textSize="14dp" />
<TextView
android:id="@+id/tv_free"
android:layout_width="0px"
android:layout_height="36dp"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:background="@drawable/course_filter_select_nor"
android:gravity="center"
android:orientation="vertical"
android:text="免费"
android:textColor="@color/color_242424"
android:textSize="14dp" />
<TextView
android:layout_width="0px"
android:layout_height="36dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="15dp"
android:layout_weight="1"
tools:text="站位用 只为了效果 啦啦啦" />
</LinearLayout>
<View
style="@style/viewline"
android:layout_marginLeft="15dp"
android:layout_marginTop="20dp"
android:layout_marginRight="15dp"
android:background="@color/color_F0F0F0" />
<TextView
android:id="@+id/tv_ageTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginTop="23dp"
android:textColor="@color/color_242424"
android:textSize="16sp"
android:textStyle="bold"
android:text="活动类型" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:background="@color/white"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_promotion"
android:layout_width="0px"
android:layout_height="36dp"
android:layout_marginLeft="15dp"
android:layout_weight="1"
android:background="@drawable/course_filter_select_nor"
android:gravity="center"
android:orientation="vertical"
android:text="限时促销"
android:textColor="@color/color_242424"
android:textSize="14dp" />
<TextView
android:id="@+id/tv_invite"
android:layout_width="0px"
android:layout_height="36dp"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:background="@drawable/course_filter_select_nor"
android:gravity="center"
android:orientation="vertical"
android:text="邀请返利"
android:textColor="@color/color_242424"
android:textSize="14dp" />
<TextView
android:layout_width="0px"
android:layout_height="36dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="15dp"
android:layout_weight="1"
tools:text="站位用 只为了效果 啦啦啦" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:layout_marginBottom="16dp"
android:background="@color/white"
android:orientation="horizontal"
android:paddingLeft="15dp"
android:paddingRight="15dp">
<Button
android:id="@+id/btn_reset"
android:layout_width="0px"
android:layout_height="44dp"
android:layout_weight="1"
android:background="@drawable/course_filter_reset_btn_bg"
android:text="重置"
android:textColor="@color/main_theme"
android:textSize="17dp"
android:textStyle="bold" />
<Button
android:id="@+id/btn_confirm"
android:layout_width="0px"
android:layout_height="44dp"
android:layout_marginLeft="11dp"
android:layout_weight="1"
android:background="@drawable/course_filter_confirm_btn_bg"
android:text="确定"
android:textColor="@color/white"
android:textSize="17dp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
<View
android:id="@+id/v_zhezhao"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#80000000" />
</LinearLayout>
\ No newline at end of file
m-course/src/main/res/layout/course_good_popup_window.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical">
<TextView
android:id="@+id/tv_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginTop="22dp"
android:text="课程类型"
android:textColor="@color/color_242424"
android:textSize="16dp"
android:textStyle="bold" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rvGood"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal">
<Button
android:id="@+id/btnReset"
android:layout_width="0px"
android:layout_height="37dp"
android:layout_marginLeft="15dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="24dp"
android:layout_weight="1"
android:background="@drawable/course_filter_reset_btn_bg"
android:text="重置"
android:textColor="@color/main_theme"
android:textSize="18dp" />
<Button
android:id="@+id/btnConfirm"
android:layout_width="0px"
android:layout_height="37dp"
android:layout_marginLeft="13dp"
android:layout_marginTop="8dp"
android:layout_marginRight="15dp"
android:layout_marginBottom="24dp"
android:layout_weight="1"
android:background="@drawable/course_filter_confirm_btn_bg"
android:gravity="center"
android:text="确定"
android:textColor="@color/white"
android:textSize="18dp" />
</LinearLayout>
<View
android:id="@+id/v_zhezhao"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#80000000" />
</LinearLayout>
\ No newline at end of file
m-course/src/main/res/layout/course_redpacket_view.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="32dp"
android:orientation="horizontal"
android:background="@color/color_FFEEE6">
<ImageView
android:id="@+id/imgTiXing"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_marginStart="15dp"
android:layout_marginTop="9dp"
android:src="@drawable/course_redpacket_tixing"/>
<TextView
android:id="@+id/tvMsg"
android:layout_toRightOf="@+id/imgTiXing"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_marginStart="4dp"
android:textColor="#ff821d"
android:textSize="12sp"
tools:text="您有一个30元的倾诉红包未使用，即时倾诉，享"/>
<TextView
android:layout_toRightOf="@+id/tvMsg"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:textSize="12sp"
android:textColor="#ff3b30"
android:text="立减优惠"/>
<ImageView
android:id="@+id/imgClose"
android:layout_width="29dp"
android:layout_height="29dp"
android:layout_marginTop="9dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginEnd="10dp"
android:padding="5dp"
android:src="@drawable/course_redpacket_close"
tools:ignore="OnClick"/>
</RelativeLayout>
\ No newline at end of file
m-course/src/main/res/layout/course_sort_popup_window.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:ignore="MissingDefaultResource">
<TextView
android:id="@+id/tv_ynthesize"
android:layout_width="match_parent"
android:layout_height="46dp"
android:background="@color/white"
android:gravity="center"
android:text="综合排序"
android:textColor="@color/color_242424"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_read"
android:layout_width="match_parent"
android:layout_height="46dp"
android:background="@color/white"
android:gravity="center"
android:text="人气从高到低"
android:textColor="@color/color_242424"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_price"
android:layout_width="match_parent"
android:layout_height="46dp"
android:background="@color/white"
android:gravity="center"
android:text="价格从低到高"
android:textColor="@color/color_242424"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_new"
android:layout_width="match_parent"
android:layout_height="46dp"
android:background="@color/white"
android:gravity="center"
android:text="上架时间从新到旧"
android:textColor="@color/color_242424"
android:textSize="15sp" />
<View
android:id="@+id/v_zhezhao"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#80000000" />
</LinearLayout>
m-course/src/main/res/layout/fragment_course_list.xml 0 → 100644
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<in.srain.cube.views.ptr.PtrFrameLayout
android:id="@+id/store_house_ptr_frame"
android:layout_width="match_parent"
android:layout_height="match_parent">
<in.srain.cube.views.loadmore.LoadMoreListViewContainer
android:id="@+id/load_more_list_view_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<ListView
android:id="@+id/lv_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@color/color_EDEDED"
android:dividerHeight="0dp" />
<ImageView
android:id="@+id/iv_course_list_empty_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/blank"
android:visibility="gone"
android:layout_gravity="center_horizontal"
android:layout_marginTop="50dp"/>
<TextView
android:id="@+id/tv_course_list_empty_prompt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="14dp"
android:text="暂无相应记录"
android:layout_gravity="center_horizontal"
android:visibility="gone"
android:textColor="#b2b2b2"/>
</in.srain.cube.views.loadmore.LoadMoreListViewContainer>
</in.srain.cube.views.ptr.PtrFrameLayout>
</LinearLayout>
m-course/src/main/res/layout/item_course_good_item.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/tvGoodName"
android:layout_width="match_parent"
android:layout_height="36dp"
android:layout_marginTop="10dp"
android:background="@drawable/course_filter_select_nor"
android:gravity="center"
android:orientation="vertical"
android:textColor="@color/color_242424"
android:textSize="14dp"
tools:text="恋爱婚姻" />
m-course/src/main/res/layout/item_course_list.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_item_course_list">
<com.yidianling.course.widget.CourseItemNewView
android:id="@+id/view_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:layout_height="50dp" />
<LinearLayout
android:id="@+id/iv_export_btn_layout"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginRight="15dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"
app:layout_constraintRight_toRightOf="@+id/view_content"
app:layout_constraintTop_toBottomOf="@+id/view_content"
tools:visibility="visible">
<TextView
android:id="@+id/tv_course_item_first"
android:layout_width="wrap_content"
android:layout_height="28dp"
android:layout_marginRight="8dp"
android:layout_weight="1"
android:background="@drawable/tv_course_item_btn_background"
android:gravity="center"
android:paddingLeft="11dp"
android:paddingRight="11dp"
android:text="和TA私聊"
android:textColor="@color/color_333333"
android:textSize="12sp"
android:visibility="invisible" />
<TextView
android:id="@+id/tv_course_item_comment"
android:layout_width="wrap_content"
android:layout_height="28dp"
android:layout_weight="1"
android:background="@drawable/course_comment_item_btn_background"
android:gravity="center"
android:paddingLeft="11dp"
android:paddingRight="11dp"
android:text="评价课程"
android:textColor="@color/color_242424"
android:textSize="12sp"
android:visibility="invisible" />
</LinearLayout>
<View
android:id="@+id/tv_line_bottom"
android:layout_width="0dp"
android:layout_height="1dp"
android:background="@color/color_F7F7F7"
android:visibility="invisible"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/iv_export_btn_layout" />
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
m-course/src/main/res/layout/item_course_play_head.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical">
<TextView
android:id="@+id/text_user_des"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="18dp"
android:layout_marginEnd="16dp"
android:textColor="@color/color_242424"
android:textSize="22sp"
app:layout_constraintEnd_toStartOf="@+id/line_view"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="丁sir说抑郁：像心挽回像心挽回像心挽回"/>
<View
android:id="@+id/line_view"
android:layout_width="1dp"
android:layout_height="0dp"
android:layout_marginTop="3dp"
android:layout_marginEnd="19dp"
android:layout_marginBottom="3dp"
android:background="@color/e"
app:layout_constraintBottom_toBottomOf="@+id/text_user_des"
app:layout_constraintEnd_toStartOf="@+id/tv_detail"
app:layout_constraintTop_toTopOf="@+id/text_user_des"/>
<TextView
android:id="@+id/tv_detail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:text="详情"
android:textColor="@color/color_242424"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="@+id/text_user_des"
app:layout_constraintEnd_toStartOf="@+id/iv_more"
app:layout_constraintTop_toTopOf="@+id/text_user_des"/>
<ImageView
android:id="@+id/iv_more"
android:layout_width="6dp"
android:layout_height="10dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginEnd="16dp"
android:src="@drawable/course_ic_course_more"
app:layout_constraintBottom_toBottomOf="@+id/text_user_des"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/text_user_des"/>
<LinearLayout
android:id="@+id/ll_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:layout_marginTop="8dp"
app:layout_constraintStart_toStartOf="@+id/text_user_des"
app:layout_constraintTop_toBottomOf="@+id/text_user_des">
<com.ydl.ydlcommon.view.CircleImageView
android:id="@+id/img_head"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/course_head_place_hold_pic"/>
<TextView
android:id="@+id/text_user_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:textColor="@color/color_242424"
android:textSize="12sp"
tools:text="王昭君"/>
</LinearLayout>
<View
android:id="@+id/view_hor_line"
android:layout_width="wrap_content"
android:layout_height="1dp"
android:layout_marginTop="18dp"
android:layout_marginEnd="15dp"
android:background="@color/color_F4F4F4"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/text_user_des"
app:layout_constraintTop_toBottomOf="@+id/ll_info"/>
<TextView
android:id="@+id/tv_media_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:textColor="@color/color_666666"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="@+id/text_user_des"
app:layout_constraintTop_toBottomOf="@+id/view_hor_line"
tools:text="15节系列课 | 音频"/>
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
m-course/src/main/res/layout/item_course_playlist_item.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical">
<LinearLayout
android:id="@+id/lin_body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_F8FCFF"
android:orientation="horizontal"
android:paddingLeft="15dp"
android:paddingRight="15dp">
<ImageView
android:id="@+id/gifView"
android:layout_width="20dp"
android:layout_height="12dp"
android:layout_marginTop="16dp"
android:src="@drawable/course_music" />
<ImageView
android:id="@+id/ic_play_view"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginTop="16dp"
android:src="@drawable/course_ico_kcml_play" />
<TextView
android:id="@+id/text_test"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="16dp"
android:background="@drawable/background_course_demo"
android:gravity="center"
android:paddingLeft="5dp"
android:paddingTop="2dp"
android:paddingRight="5dp"
android:paddingBottom="2dp"
android:text="试听"
android:textColor="@color/color_242424"
android:textSize="10sp" />
<TextView
android:id="@+id/text_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:ellipsize="end"
android:gravity="center_vertical"
android:paddingLeft="13dp"
android:textColor="@color/color_242424"
android:textSize="14sp"
tools:text="shishihihgoerrjgejgr" />
<View
android:layout_width="match_parent"
android:layout_height="1dp" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
m-course/src/main/res/layout/item_course_topic_image.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<ImageView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/iv_course_topic_head"
android:layout_width="match_parent"
android:layout_height="166dp"
android:scaleType="fitXY"/>
m-course/src/main/res/layout/item_course_topic_text.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="8dp"
android:background="#f2f5f7"/>
<LinearLayout
android:id="@+id/ll_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_marginTop="20dp"
android:orientation="horizontal">
<ImageView
android:layout_width="5dp"
android:layout_height="17dp"
android:background="@color/main_theme"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="10dp"
android:gravity="left|center_vertical"
android:textStyle="bold"
android:textSize="16sp"
android:text="活动说明"
android:textColor="#333">
</TextView>
</LinearLayout>
<TextView
android:id="@+id/tv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="left"
android:textSize="16sp"
android:layout_marginTop="15dp"
android:lineSpacingMultiplier="1.5"
android:layout_marginLeft="15dp"
android:layout_marginBottom="20dp"
tools:text="hellll"
android:textColor="#333">
</TextView>
</LinearLayout>
\ No newline at end of file
m-course/src/main/res/layout/item_hot_search_view.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/tv_hot_search"
android:layout_width="wrap_content"
android:layout_height="22dp"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:background="@drawable/background_course_hot_search"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:textColor="@color/color_course_filter_selector"
android:textSize="12dp"
tools:ignore="MissingDefaultResource"
tools:layout_width="80dp"
tools:text="今天有空" />
\ No newline at end of file
m-course/src/main/res/values/arrays.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<resources>
<integer-array name="course_colors">
<item>@color/main_theme</item>
</integer-array>
</resources>
\ No newline at end of file
m-course/src/main/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<!--透明度
100% — FF
99% — FC
98% — FA
97% — F7
96% — F5
95% — F2
94% — F0
93% — ED
92% — EB
91% — E8
90% — E6
89% — E3
88% — E0
87% — DE
86% — DB
85% — D9
84% — D6
83% — D4
82% — D1
81% — CF
80% — CC
79% — C9
78% — C7
77% — C4
76% — C2
75% — BF
74% — BD
73% — BA
72% — B8
71% — B5
70% — B3
69% — B0
68% — AD
67% — AB
66% — A8
65% — A6
64% — A3
63% — A1
62% — 9E
61% — 9C
60% — 99
59% — 96
58% — 94
57% — 91
56% — 8F
55% — 8C
54% — 8A
53% — 87
52% — 85
51% — 82
50% — 80
49% — 7D
48% — 7A
47% — 78
46% — 75
45% — 73
44% — 70
43% — 6E
42% — 6B
41% — 69
40% — 66
39% — 63
38% — 61
37% — 5E
36% — 5C
35% — 59
34% — 57
33% — 54
32% — 52
31% — 4F
30% — 4D
29% — 4A
28% — 47
27% — 45
26% — 42
25% — 40
24% — 3D
23% — 3B
22% — 38
21% — 36
20% — 33
19% — 30
18% — 2E
17% — 2B
16% — 29
15% — 26
14% — 24
13% — 21
12% — 1F
11% — 1C
10% — 1A
9% — 17
8% — 14
7% — 12
6% — 0F
5% — 0D
4% — 0A
3% — 08
2% — 05
1% — 03
0% — 00-->
<color name="color_F7F7F7" tools:ignore="MissingDefaultResource">#F7F7F7</color>
<color name="color_999999">#999999</color>
<color name="color_242424">#242424</color>
<color name="color_333333">#333333</color>
<color name="color_f0f0f0">#f0f0f0</color>
<color name="color_666666">#f666666</color>
<color name="color_EBEBEB">#EBEBEB</color>
<color name="color_EBEBEB" tools:ignore="MissingDefaultResource">#EBEBEB</color>
<color name="color_1DA1F2">#1DA1F2</color>
<color name="color_151DA1F2">#261DA1F2</color>
<color name="color_E0E0E0">#E0E0E0</color>
<color name="color_F0F0F0">#F0F0F0</color>
<color name="color_EDEDED">#EDEDED</color>
<color name="color_F5F5F5">#F5F5F5</color>
<color name="color_34CD65">#34CD65</color>
<color name="color_FFEEE6">#FFEEE6</color>
<color name="color_FFDB26">#FFDB26</color>
<color name="color_F4F4F4">#F4F4F4</color>
<color name="color_B3B3B3">#B3B3B3</color>
<color name="color_F8FCFF">#F8FCFF</color>
<color name="color_FF000000">#FF000000</color>
<color name="color_99000000">#99000000</color>
<color name="color_30FFFFFF">#4DFFFFFF</color>
<color name="color_66000000">#66000000</color>
</resources>
\ No newline at end of file
m-course/src/main/res/values/dimens.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="default_dis_size">8dp</dimen>
</resources>
\ No newline at end of file
m-course/src/main/res/values/styles.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- 项目中的分割线 -->
<style name="viewline">
<item name="android:background">@color/color_E0E0E0</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">0.5dp</item>
</style>
</resources>
\ No newline at end of file
m-course/src/xlzx/res/color/color_course_filter_selector.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/color_34CD65" android:state_selected="true" android:state_enabled="true"/>
<item android:color="@color/color_666666" android:state_enabled="true"/>
</selector>
\ No newline at end of file
m-course/src/xlzx/res/drawable/background_course_hot_search.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingDefaultResource">
<item android:state_enabled="true" android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="#EEFFF3" />
<corners android:radius="11dp" />
<stroke android:width="0.5dp" android:color="@color/color_34CD65" />
</shape>
</item>
<item android:state_enabled="true">
<shape>
<corners android:radius="11dp" />
<solid android:color="@color/color_F5F5F5" />
</shape>
</item>
</selector>
\ No newline at end of file
m-course/src/ydl/res/color/color_course_filter_selector.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/main_theme" android:state_selected="true" android:state_enabled="true"/>
<item android:color="@color/color_666666" android:state_enabled="true"/>
</selector>
\ No newline at end of file
m-course/src/ydl/res/drawable/background_course_hot_search.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingDefaultResource">
<item android:state_enabled="true" android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="#E8F6FF"/>
<corners android:radius="11dp"/>
<stroke android:width="0.5dp" android:color="@color/color_1DA1F2"/>
</shape>
</item>
<item android:state_enabled="true">
<shape>
<corners android:radius="11dp"/>
<solid android:color="@color/color_F5F5F5"/>
</shape>
</item>
</selector>
\ No newline at end of file
settings.gradle
include ':app',":router", ':ydl-net', ':ydl-utils', ':ydl-platform', ':ydl-webview', ':ydl-media',":m-user", ':m-consultant', ':m-muse'
\ No newline at end of file
include ':app',":router", ":m-course", ':ydl-net', ':ydl-utils', ':ydl-platform', ':ydl-webview', ':ydl-media',":m-user", ':m-consultant', ':m-muse'
\ No newline at end of file
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/ImageUtil.java
......@@ -2,6 +2,7 @@ package com.ydl.ydlcommon.utils;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Environment;
import android.util.Base64;
......@@ -61,4 +62,48 @@ public class ImageUtil {
// 最后通知图库更新
context.sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.fromFile(file)));
}
public static boolean savePicture(Context context, Bitmap bitmap) {
if (bitmap == null) {
return false;
}
// 去掉base64中的前缀
// String base64Str = base64DataStr.substring(base64DataStr.indexOf(",")+1, base64DataStr.length());
File appDir = new File(Environment.getExternalStorageDirectory(), "Camera");// 图片保存的文件夹的名称
if (!appDir.exists()) {
appDir.mkdir();
}
String imgName = System.currentTimeMillis() + ".png";
File fileTest = new File(appDir, imgName);
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
bitmap.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream);
byte[] data = byteArrayOutputStream.toByteArray();
for (int i = 0; i < data.length; i++) {
if (data[i] < 0) {
data[i] += 256;//调整异常数据
}
}
OutputStream os = null;
try {
os = new FileOutputStream(fileTest);
os.write(data);
os.flush();
os.close();
// 通知系统刷新图库
updateAlbum(context, fileTest);
ToastUtil.toastShort("图片已保存至相册");
return true;
} catch (FileNotFoundException e) {
e.printStackTrace();
ToastUtil.toastShort("保存失败");
return false;
} catch (IOException e) {
e.printStackTrace();
ToastUtil.toastShort("保存失败");
return false;
}
}
}
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/NetworkParamsUtils.java
package com.ydl.ydlcommon.utils;
import com.ydl.ydlcommon.base.BaseApp;
import com.ydl.ydlcommon.data.PlatformDataManager;
import com.ydl.ydlcommon.data.http.BaseCommand;
import com.ydl.ydlcommon.data.http.FormatText;
import com.ydl.ydlcommon.router.YdlCommonRouterManager;
import com.ydl.ydlcommon.router.YdlUserInfo;
import com.yidianling.common.tools.RxAppTool;
import com.yidianling.common.tools.RxDeviceTool;
import okhttp3.MediaType;
import okhttp3.RequestBody;
import java.io.File;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import okhttp3.MediaType;
import okhttp3.RequestBody;
import java.util.*;
/**
* Created by haorui on 2019-09-19.
......@@ -54,7 +55,6 @@ public class NetworkParamsUtils {
}
//获取网络请求表
public static Map<String, String> getMaps(BaseCommand cmd) {
Map<String, String> map = new HashMap<>();
......@@ -130,4 +130,20 @@ public class NetworkParamsUtils {
return map;
}
public static String getCommonParam() {
StringBuffer sb = new StringBuffer();
YdlUserInfo userInfo = YdlCommonRouterManager.INSTANCE.getYdlCommonRoute().getUserInfo();
sb.append("ffrom").append("=").append(PlatformDataManager.INSTANCE.getRam().getChannelName())
.append("&").append("isFromApp").append("=").append("1")
.append("&").append("osBuild").append("=").append(RxDeviceTool.getBuildBrandModel()).append(",")
.append(RxDeviceTool.getSDKVersionName()).append(",").append(RxAppTool.getAppVersionName(BaseApp.Companion.getApp()))
.append("&").append("ts").append("=").append(System.currentTimeMillis() / 1000)
.append("&").append("version").append("=").append(RxAppTool.getAppVersionName(BaseApp.Companion.getApp()));
if (null != userInfo) {
sb.append("&").append("uid").append("=").append(userInfo.getUserId())
.append("&").append("accessToken").append("=").append(userInfo.getToken());
}
return sb.toString();
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment