修改部分问题

BaseLibrary/src/main/java/com/cooleshow/base/utils/TimeUtils.java

@@ -997,7 +997,7 @@ public final class TimeUtils {
         try {
             Date parse = getDefaultFormat().parse(time);
             return parse;
-        } catch (ParseException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return getNowDate();

BaseLibrary/src/main/java/com/cooleshow/base/utils/UiUtils.java

@@ -316,7 +316,7 @@ public class UiUtils {
     }
 
     public static String getLiveCoursePriceText(String lessonPrice, int lessonCount) {
-        String price = "￥" + lessonPrice;
+        String price =lessonPrice;
         try {
             double v = Double.parseDouble(lessonPrice);
             if (v == 0) {

student/src/main/java/com/cooleshow/student/adapter/LiveCourseListAdapter.java

@@ -10,6 +10,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.module.BaseLoadMoreModule;
 import com.chad.library.adapter.base.module.LoadMoreModule;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+import com.cooleshow.base.constanst.CourseGroupStatusType;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.StringUtils;
 import com.cooleshow.base.utils.TimeUtils;
@@ -43,7 +44,7 @@ public class LiveCourseListAdapter extends BaseQuickAdapter<LiveCourseListBean.R
         //subjectName
         holder.setText(R.id.tv_course_name, data.subjectName);
         //购买人数
-        holder.setText(R.id.tv_buy_num, data.payCount + "人");
+        holder.setText(R.id.tv_buy_num, data.payCount + "人学习");
         //头像
         ImageView iv_bg = holder.getView(R.id.iv_bg);
         GlideUtils.INSTANCE.loadImage(getContext(), data.cover, iv_bg, com.cooleshow.base.R.drawable.bg_video_placeholder);
@@ -59,19 +60,19 @@ public class LiveCourseListAdapter extends BaseQuickAdapter<LiveCourseListBean.R
         TextView tvCourseStatusBt = holder.getView(R.id.tv_course_status);
         if (TextUtils.equals(CourseConstants.COURSE_STATUS_NOT_START, data.status)) {
             //未开始
-            holder.setText(R.id.tv_course_status, "未开始");
+            holder.setText(R.id.tv_course_status, CourseGroupStatusType.NOT_START.getValue());
             tvCourseStatusBt.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_ff802c));
         }
 
         if (TextUtils.equals(CourseConstants.COURSE_STATUS_ING, data.status)) {
             //进行中
-            holder.setText(R.id.tv_course_status, "进行中");
+            holder.setText(R.id.tv_course_status, CourseGroupStatusType.ING.getValue());
             tvCourseStatusBt.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));
         }
 
         if (TextUtils.equals(CourseConstants.COURSE_STATUS_COMPLETE, data.status)) {
             //已结束
-            holder.setText(R.id.tv_course_status, "已结束");
+            holder.setText(R.id.tv_course_status, CourseGroupStatusType.COMPLETE.getValue());
             tvCourseStatusBt.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_999999));
         }
 

teacher/src/main/java/com/cooleshow/teacher/adapter/LiveCourseListAdapter.java

@@ -8,6 +8,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.module.BaseLoadMoreModule;
 import com.chad.library.adapter.base.module.LoadMoreModule;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+import com.cooleshow.base.constanst.CourseGroupStatusType;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.StringUtils;
 import com.cooleshow.base.utils.TimeUtils;
@@ -39,7 +40,7 @@ public class LiveCourseListAdapter extends BaseQuickAdapter<LiveCourseListBean.R
         //subjectName
         holder.setText(R.id.tv_course_name, data.subjectName);
         //购买人数
-        holder.setText(R.id.tv_buy_num, data.studentCount + "人");
+        holder.setText(R.id.tv_buy_num, data.studentCount + "人学习");
         //封面
         ImageView iv_cover = holder.getView(R.id.iv_bg);
         GlideUtils.INSTANCE.loadImage(getContext(), data.backgroundPic, iv_cover, com.cooleshow.base.R.drawable.bg_video_placeholder);
@@ -55,19 +56,19 @@ public class LiveCourseListAdapter extends BaseQuickAdapter<LiveCourseListBean.R
 
         if (TextUtils.equals(CourseConstants.COURSE_STATUS_NOT_START, data.status)) {
             //未开始
-            holder.setText(R.id.tv_course_status, "未开始");
+            holder.setText(R.id.tv_course_status, CourseGroupStatusType.NOT_START.getValue());
             tvCourseStatusBt.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_ff802c));
         }
 
         if (TextUtils.equals(CourseConstants.COURSE_STATUS_ING, data.status)) {
             //进行中
-            holder.setText(R.id.tv_course_status, "进行中");
+            holder.setText(R.id.tv_course_status, CourseGroupStatusType.ING.getValue());
             tvCourseStatusBt.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));
         }
 
         if (TextUtils.equals(CourseConstants.COURSE_STATUS_COMPLETE, data.status)) {
             //已结束
-            holder.setText(R.id.tv_course_status, "已结束");
+            holder.setText(R.id.tv_course_status, CourseGroupStatusType.COMPLETE.getValue());
             tvCourseStatusBt.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_999999));
         }
 

teacher/src/main/java/com/cooleshow/teacher/ui/course/MineLiveCourseActivity.java

@@ -19,8 +19,11 @@ import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.MineLiveCoursePagerAdapter;
+import com.cooleshow.teacher.bean.MineLiveCourseListBean;
+import com.cooleshow.teacher.contract.MineLiveCourseContract;
 import com.cooleshow.teacher.databinding.ActivityMineLiveCourseBinding;
 import com.cooleshow.teacher.presenter.course.MineLiveCoursePresenter;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.google.android.material.tabs.TabLayout;
 
@@ -36,9 +39,9 @@ import java.util.List;
  * 类说明：
  */
 @Route(path = RouterPath.CourseCenter.TEACHER_MINE_LIVE_COURSE)
-public class MineLiveCourseActivity extends BaseMVPActivity<ActivityMineLiveCourseBinding, MineLiveCoursePresenter> implements View.OnClickListener {
-    private List<String> titles = new ArrayList<String>(Arrays.asList("进行中", "未上架", "销售中", "已完成", "已取消","已下架"));
-    private List<String> types = new ArrayList<String>(Arrays.asList(TYPE_ING, TYPE_NOT_SALE, TYPE_APPLY, TYPE_COMPLETE, TYPE_CANCEL,TYPE_OUT_SALE));
+public class MineLiveCourseActivity extends BaseMVPActivity<ActivityMineLiveCourseBinding, MineLiveCoursePresenter> implements View.OnClickListener, MineLiveCourseContract.MineLiveCourseView {
+    private List<String> titles = new ArrayList<String>(Arrays.asList("进行中", "未上架", "销售中", "已完成", "已取消", "已下架"));
+    private List<String> types = new ArrayList<String>(Arrays.asList(TYPE_ING, TYPE_NOT_SALE, TYPE_APPLY, TYPE_COMPLETE, TYPE_CANCEL, TYPE_OUT_SALE));
     private List<Fragment> fragments = new ArrayList<>();
     private TabLayout tabLayout;
     private ViewPager viewPager;
@@ -67,7 +70,7 @@ public class MineLiveCourseActivity extends BaseMVPActivity<ActivityMineLiveCour
 
     @Override
     protected void initView() {
-        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "我的直播课");
+        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "直播课");
         viewBinding.toolbarInclude.tvRightText.setTextColor(getResources().getColor(com.cooleshow.base.R.color.common_black));
         viewBinding.toolbarInclude.tvRightText.setVisibility(View.VISIBLE);
         viewBinding.toolbarInclude.tvRightText.setText("创建课程");
@@ -95,7 +98,7 @@ public class MineLiveCourseActivity extends BaseMVPActivity<ActivityMineLiveCour
         fragments.clear();
         for (int i = 0; i < titles.size(); i++) {
             tabLayout.addTab(tabLayout.newTab().setText(titles.get(i)));
-            Fragment adFragment = MineLiveCourseFragment.newInstance(types.get(i));
+            MineLiveCourseFragment adFragment = MineLiveCourseFragment.newInstance(types.get(i));
             fragments.add(adFragment);
         }
         viewPager.setAdapter(new MineLiveCoursePagerAdapter(getSupportFragmentManager(), fragments, titles));
@@ -103,14 +106,46 @@ public class MineLiveCourseActivity extends BaseMVPActivity<ActivityMineLiveCour
         tabLayout.setupWithViewPager(viewPager);
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        presenter.getTeacherUserInfo();
+    }
 
     @Override
     protected ActivityMineLiveCourseBinding getLayoutView() {
         return ActivityMineLiveCourseBinding.inflate(getLayoutInflater());
     }
 
+
     @Override
     protected MineLiveCoursePresenter createPresenter() {
         return new MineLiveCoursePresenter();
     }
+
+    @Override
+    public void queryPageCourseGroupSuccess(int page, MineLiveCourseListBean data) {
+
+    }
+
+    @Override
+    public void queryPageCourseGroupError(int page) {
+
+    }
+
+    @Override
+    public void getTeacherInfoSuccess(TeacherUserInfo data) {
+        if (!checkActivityExist()) {
+            return;
+        }
+        if (fragments != null) {
+            for (int i = 0; i < fragments.size(); i++) {
+                Fragment fragment = fragments.get(i);
+                if (fragment instanceof MineLiveCourseFragment) {
+                    MineLiveCourseFragment mineLiveCourseFragment = (MineLiveCourseFragment) fragment;
+                    mineLiveCourseFragment.getTeacherInfoSuccess(data);
+                }
+            }
+        }
+    }
 }

teacher/src/main/java/com/cooleshow/teacher/ui/course/MineLiveCourseFragment.java

@@ -146,7 +146,6 @@ public class MineLiveCourseFragment extends BaseMVPFragment<FragmentMineLiveCour
     @Override
     public void onResume() {
         super.onResume();
-        presenter.getTeacherUserInfo();
     }
 
     private boolean hasNext = true;

teacher/src/main/java/com/cooleshow/teacher/ui/course/MineVideoCourseActivity.java

@@ -17,9 +17,12 @@ import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.MineVideoCoursePagerAdapter;
+import com.cooleshow.teacher.bean.VideoCourseListBean;
 import com.cooleshow.teacher.constants.TeacherInfoConstants;
+import com.cooleshow.teacher.contract.MineVideoCourseContract;
 import com.cooleshow.teacher.databinding.ActivityMineVideoCourseBinding;
 import com.cooleshow.teacher.presenter.course.MineVideoCoursePresenter;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.google.android.material.tabs.TabLayout;
 
@@ -35,7 +38,7 @@ import java.util.List;
  * 类说明：
  */
 @Route(path = RouterPath.CourseCenter.TEACHER_MINE_VIDEO_COURSE)
-public class MineVideoCourseActivity extends BaseMVPActivity<ActivityMineVideoCourseBinding, MineVideoCoursePresenter> implements View.OnClickListener {
+public class MineVideoCourseActivity extends BaseMVPActivity<ActivityMineVideoCourseBinding, MineVideoCoursePresenter> implements View.OnClickListener, MineVideoCourseContract.MineVideoCourseView {
     private boolean teacherIsCert;
     private List<String> titles = new ArrayList<String>(Arrays.asList("已上架", "审核中", "审核失败", "已下架"));
     private List<String> auditStatusList = new ArrayList<String>(Arrays.asList(TYPE_PASS, TYPE_DOING, TYPE_UNPASS, TYPE_OUT_SALE));
@@ -100,6 +103,7 @@ public class MineVideoCourseActivity extends BaseMVPActivity<ActivityMineVideoCo
             fragments.add(adFragment);
         }
         viewPager.setAdapter(new MineVideoCoursePagerAdapter(getSupportFragmentManager(), fragments, titles));
+        viewPager.setOffscreenPageLimit(fragments.size());
         tabLayout.setupWithViewPager(viewPager);
     }
 
@@ -113,4 +117,36 @@ public class MineVideoCourseActivity extends BaseMVPActivity<ActivityMineVideoCo
     protected MineVideoCoursePresenter createPresenter() {
         return new MineVideoCoursePresenter();
     }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        presenter.getTeacherUserInfo();
+    }
+
+    @Override
+    public void queryVideoCourseGroupSuccess(int page, VideoCourseListBean data) {
+
+    }
+
+    @Override
+    public void queryVideoCourseGroupError(int page) {
+
+    }
+
+    @Override
+    public void getTeacherInfoSuccess(TeacherUserInfo data) {
+        if(!checkActivityExist()){
+            return;
+        }
+        if (fragments != null) {
+            for (int i = 0; i < fragments.size(); i++) {
+                Fragment fragment = fragments.get(i);
+                if(fragment instanceof MineVideoCourseFragment){
+                    MineVideoCourseFragment mineVideoCourseFragment = (MineVideoCourseFragment) fragment;
+                    mineVideoCourseFragment.getTeacherInfoSuccess(data);
+                }
+            }
+        }
+    }
 }

teacher/src/main/java/com/cooleshow/teacher/ui/course/MineVideoCourseFragment.java

@@ -189,7 +189,6 @@ public class MineVideoCourseFragment extends BaseMVPFragment<FragmentMineVideoCo
     @Override
     public void onResume() {
         super.onResume();
-        presenter.getTeacherUserInfo();
     }
 
     @Override