优化代码,统一引用至课程类型枚举值

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

@@ -13,6 +13,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.CourseType;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.student.R;
@@ -49,7 +50,7 @@ public class HomeworkAdapter extends BaseQuickAdapter<HomeworkListBean.RowsBean,
 
         TextView tv_name = helper.getView(R.id.tv_name);
         tv_name.setText(item.teacherName);
-        if (TextUtils.equals(item.type, CourseConstants.PIANO_ROOM_COURSE)) {
+        if (TextUtils.equals(item.type, CourseType.PIANO_ROOM_CLASS.getId())) {
             //琴房课
             im_header.setImageResource(R.drawable.icon_piano_room_course);
         } else {

student/src/main/java/com/cooleshow/student/ui/main/NewHomeFragmentV2.java

@@ -81,10 +81,6 @@ import androidx.recyclerview.widget.LinearSnapHelper;
 import androidx.viewpager.widget.ViewPager;
 import androidx.viewpager2.widget.ViewPager2;
 
-import static com.cooleshow.student.constants.CourseConstants.LIVE_COURSE;
-import static com.cooleshow.student.constants.CourseConstants.OTHER_COURSE;
-import static com.cooleshow.student.constants.CourseConstants.PIANO_ROOM_COURSE;
-import static com.cooleshow.student.constants.CourseConstants.VIP_COURSE;
 
 /**
  * Author by pq, Date on 2022/8/29.

student/src/main/java/com/cooleshow/student/ui/work/HomeWorkDetailActivity.java

@@ -13,6 +13,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.listener.OnItemChildClickListener;
 import com.chad.library.adapter.base.listener.OnItemClickListener;
+import com.cooleshow.base.constanst.CourseType;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.video.VideoPlayActivity;
@@ -159,7 +160,7 @@ public class HomeWorkDetailActivity extends BaseMVPActivity<ActivityHomeworkDeta
         //时间
         viewBinding.tvTime.setText(UiUtils.getCourseTimeString(infoBean.startTime, infoBean.endTime));
         //学生头像
-        if (TextUtils.equals(infoBean.courseType, CourseConstants.PIANO_ROOM_COURSE)) {
+        if (TextUtils.equals(infoBean.courseType, CourseType.PIANO_ROOM_CLASS.getId())) {
             viewBinding.ivAvatar.setImageResource(R.drawable.icon_piano_room_course);
             viewBinding.tvTitle.setText(infoBean.courseGroupName);
         } else {

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

@@ -13,6 +13,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.CourseType;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.base.utils.UiUtils;
@@ -50,7 +51,7 @@ public class HomeworkAdapter extends BaseQuickAdapter<HomeworkListBean.RowsBean,
         helper.setText(R.id.tv_title, item.courseGroupName);
         TextView tv_name = helper.getView(R.id.tv_name);
         tv_name.setText(item.studentName);
-        if (TextUtils.equals(item.type, CourseConstants.PIANO_ROOM_COURSE)) {
+        if (TextUtils.equals(item.type, CourseType.PIANO_ROOM_CLASS.getId())) {
             im_header.setImageResource(R.drawable.icon_piano_room_course);
         } else {
             GlideUtils.INSTANCE.loadImage(getContext(), item.studentAvatar, im_header, R.drawable.icon_teacher_default_head);

teacher/src/main/java/com/cooleshow/teacher/helper/CourseHelper.java

@@ -3,6 +3,7 @@ package com.cooleshow.teacher.helper;
 import android.text.TextUtils;
 
 import com.cooleshow.base.constanst.Constants;
+import com.cooleshow.base.constanst.CourseType;
 import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.teacher.bean.CourseTableDataBean;
 import com.cooleshow.teacher.constants.CourseConstants;
@@ -15,19 +16,19 @@ public class CourseHelper {
         if (configBean == null) {
             return false;
         }
-        if (TextUtils.equals(courseType, CourseConstants.VIP_COURSE)) {
+        if (TextUtils.equals(courseType, CourseType.VIP.getId())) {
             return isLessThanTargetTime(configBean.getVipStartTime(), startTime);
         }
-        if (TextUtils.equals(courseType, CourseConstants.OTHER_COURSE)) {
+        if (TextUtils.equals(courseType, CourseType.PRACTICE.getId())) {
             return isLessThanTargetTime(configBean.getPracticeStartTime(), startTime);
         }
-        if (TextUtils.equals(courseType, CourseConstants.LIVE_COURSE)) {
+        if (TextUtils.equals(courseType, CourseType.LIVE.getId())) {
             return isLessThanTargetTime(configBean.getLiveStartTime(), startTime);
         }
-        if (TextUtils.equals(courseType, CourseConstants.PIANO_ROOM_COURSE)) {
+        if (TextUtils.equals(courseType, CourseType.PIANO_ROOM_CLASS.getId())) {
             return isLessThanTargetTime(configBean.getPianoStartTime(), startTime);
         }
-        if (TextUtils.equals(courseType, CourseConstants.COURSE_GROUP_ID)) {
+        if (TextUtils.equals(courseType, CourseType.GROUP.getId())) {
             return isLessThanTargetTime(configBean.getGroupStartTime(), startTime);
         }
         return false;

teacher/src/main/java/com/cooleshow/teacher/ui/work/AssignHomeworkActivity.java

@@ -5,6 +5,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.cooleshow.base.constanst.CourseType;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.GlideUtils;
@@ -104,7 +105,7 @@ public class AssignHomeworkActivity extends BaseMVPActivity<ActivityAssignHomewo
         viewBinding.tvTitle.setText(bean.courseGroupName);
         viewBinding.tvName.setText(bean.studentName);
         //subjectName
-        if (TextUtils.equals(bean.courseType, CourseConstants.PIANO_ROOM_COURSE)) {
+        if (TextUtils.equals(bean.courseType, CourseType.PIANO_ROOM_CLASS.getId())) {
             //琴房课
             viewBinding.ivAvatar.setImageResource(R.drawable.icon_piano_room_course);
         } else {

teacher/src/main/java/com/cooleshow/teacher/ui/work/HomeWorkFragment.java

@@ -17,6 +17,7 @@ import com.bigkoo.pickerview.view.TimePickerView;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.listener.OnItemChildClickListener;
 import com.cooleshow.base.constanst.Constants;
+import com.cooleshow.base.constanst.CourseType;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
 import com.cooleshow.base.utils.LOG;
@@ -116,7 +117,7 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
         mAdapter.setOnItemClickListener((adapter, view, position) -> {
             List<HomeworkListBean.RowsBean> data = (List<HomeworkListBean.RowsBean>) adapter.getData();
             HomeworkListBean.RowsBean rowsBean = data.get(position);
-            if (rowsBean != null && TextUtils.equals(CourseConstants.PIANO_ROOM_COURSE, rowsBean.type)) {
+            if (rowsBean != null && TextUtils.equals(CourseType.PIANO_ROOM_CLASS.getId(), rowsBean.type)) {
                 //琴房课
                 ARouter.getInstance().build(RouterPath.CourseCenter.PIANO_ROOM_COURSE_DETAIL)
                         .withString("course_id", rowsBean.courseId)
@@ -141,8 +142,8 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
                     return;
                 }
                 HomeworkListBean.RowsBean rowsBean = mAdapter.getData().get(position);
-                if (TextUtils.equals(rowsBean.type, CourseConstants.OTHER_COURSE)
-                        || TextUtils.equals(rowsBean.type, CourseConstants.VIP_COURSE)) {
+                if (TextUtils.equals(rowsBean.type, CourseType.PRACTICE.getId())
+                        || TextUtils.equals(rowsBean.type, CourseType.VIP.getId())) {
                     //VIP课或者趣纠课
                     ChatHelper.getInstance().goChat(rowsBean.imUserId, rowsBean.studentName);
                 } else {