修改筛选字段显示

BaseLibrary/src/main/java/com/cooleshow/base/constanst/CourseGroupStatusType.java

@@ -8,11 +8,9 @@ import com.cooleshow.base.interfaces.IFilterViewData;
  */
 public enum CourseGroupStatusType implements IPickerViewData, IFilterViewData {
     ALL("", "全部"),
-    NOT_START("NOT_START", "未开始"),
-    ING("ING", "进行中"),
-    COMPLETE("COMPLETE", "已结课"),
-    CANCEL("CANCEL", "已取消");
-
+    NOT_START("NOT_START", "未开课"),
+    ING("ING", "已开课"),
+    COMPLETE("COMPLETE", "已结课");
 
     private final String value;
     private final String id;

BaseLibrary/src/main/java/com/cooleshow/base/constanst/CourseStatusType.java

@@ -0,0 +1,46 @@
+package com.cooleshow.base.constanst;
+
+import com.contrarywind.interfaces.IPickerViewData;
+import com.cooleshow.base.interfaces.IFilterViewData;
+
+/**
+ * Author by pq, Date on 2022/12/23.
+ */
+public enum CourseStatusType implements IPickerViewData, IFilterViewData {
+    ALL("", "全部状态"),
+    COMPLETE("COMPLETE", "已结束"),
+    ING("ING", "进行中"),
+    NOT_START("NOT_START", "未开始");
+
+
+    private final String value;
+    private final String id;
+
+    public String getValue() {
+        return value;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    CourseStatusType(String id, String s) {
+        this.id = id;
+        this.value = s;
+    }
+
+    @Override
+    public String getPickerViewText() {
+        return getValue();
+    }
+
+    @Override
+    public String getDataId() {
+        return getId();
+    }
+
+    @Override
+    public String getShowName() {
+        return getValue();
+    }
+}

student/src/main/java/com/cooleshow/student/ui/course/PianoCourseGroupDetailActivity.java

@@ -20,6 +20,7 @@ import com.cooleshow.base.bean.CommonCourseConfigBean;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.constanst.CourseAttendanceStatusType;
 import com.cooleshow.base.constanst.CourseGroupStatusType;
+import com.cooleshow.base.constanst.CourseStatusType;
 import com.cooleshow.base.interfaces.IFilterViewData;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
@@ -68,7 +69,7 @@ public class PianoCourseGroupDetailActivity extends BaseMVPActivity<AcPianoCours
     private String courseType = Constants.VIP_COURSE_TAG;
     private String classMonth;
     private Date currentSelectDate;
-    private String courseStatus = CourseGroupStatusType.ALL.getId();
+    private String courseStatus = CourseStatusType.ALL.getId();
     private String currentAttendanceStatus;
     private PianoCourseGroupCourseListAdapter mAdapter;
     private CommonCourseConfigBean mConfigBean;
@@ -138,8 +139,8 @@ public class PianoCourseGroupDetailActivity extends BaseMVPActivity<AcPianoCours
     }
 
     private void initFilterData() {
-        CourseGroupStatusType[] values = CourseGroupStatusType.values();
-        List<CourseGroupStatusType> courseGroupStatusTypes = Arrays.asList(values);
+        CourseStatusType[] values = CourseStatusType.values();
+        List<CourseStatusType> courseGroupStatusTypes = Arrays.asList(values);
         statusList = new ArrayList<IFilterViewData>(courseGroupStatusTypes);
 
         CourseAttendanceStatusType[] attendanceStatuValues = CourseAttendanceStatusType.values();
@@ -184,7 +185,7 @@ public class PianoCourseGroupDetailActivity extends BaseMVPActivity<AcPianoCours
         currentSelectDate = date != null ? date : TimeUtils.getNowDate();
         String targetDateTimeStr = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy-MM"));
         classMonth = targetDateTimeStr;
-        courseStatus = !TextUtils.isEmpty(status) ? status : CourseGroupStatusType.ALL.getId();
+        courseStatus = !TextUtils.isEmpty(status) ? status : CourseStatusType.ALL.getId();
         currentAttendanceStatus = !TextUtils.isEmpty(attendanceStatus) ? attendanceStatus : CourseAttendanceStatusType.ALL.getId();
         if (viewBinding != null) {
             viewBinding.tvTime.setText(classMonth);
@@ -277,10 +278,6 @@ public class PianoCourseGroupDetailActivity extends BaseMVPActivity<AcPianoCours
             //已结课
             tv_status.setText(CourseGroupStatusType.COMPLETE.getValue());
             tv_status.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_999999));
-        } else if (TextUtils.equals(status, CourseGroupStatusType.CANCEL.getId())) {
-            //已取消
-            tv_status.setText(CourseGroupStatusType.CANCEL.getValue());
-            tv_status.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_999999));
         }
 
         String coursePlan = bean.getCoursePlan();

student/src/main/java/com/cooleshow/student/ui/course/VIPOrInterestCourseGroupDetailActivity.java

@@ -20,6 +20,7 @@ import com.cooleshow.base.bean.CommonCourseConfigBean;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.constanst.CourseAttendanceStatusType;
 import com.cooleshow.base.constanst.CourseGroupStatusType;
+import com.cooleshow.base.constanst.CourseStatusType;
 import com.cooleshow.base.interfaces.IFilterViewData;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
@@ -66,7 +67,7 @@ public class VIPOrInterestCourseGroupDetailActivity extends BaseMVPActivity<AcVi
     private String courseType = Constants.VIP_COURSE_TAG;
     private String classMonth;
     private Date currentSelectDate;
-    private String courseStatus = CourseGroupStatusType.ALL.getId();
+    private String courseStatus = CourseStatusType.ALL.getId();
     private String currentAttendanceStatus;
     private VIPCourseGroupDetailAdapter mAdapter;
     private CommonCourseConfigBean mConfigBean;
@@ -137,8 +138,8 @@ public class VIPOrInterestCourseGroupDetailActivity extends BaseMVPActivity<AcVi
     }
 
     private void initFilterData() {
-        CourseGroupStatusType[] values = CourseGroupStatusType.values();
-        List<CourseGroupStatusType> courseGroupStatusTypes = Arrays.asList(values);
+        CourseStatusType[] values = CourseStatusType.values();
+        List<CourseStatusType> courseGroupStatusTypes = Arrays.asList(values);
         statusList = new ArrayList<IFilterViewData>(courseGroupStatusTypes);
 
         CourseAttendanceStatusType[] attendanceStatuValues = CourseAttendanceStatusType.values();
@@ -186,7 +187,7 @@ public class VIPOrInterestCourseGroupDetailActivity extends BaseMVPActivity<AcVi
         currentSelectDate = date != null ? date : TimeUtils.getNowDate();
         String targetDateTimeStr = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy-MM"));
         classMonth = targetDateTimeStr;
-        courseStatus = !TextUtils.isEmpty(status) ? status : CourseGroupStatusType.ALL.getId();
+        courseStatus = !TextUtils.isEmpty(status) ? status : CourseStatusType.ALL.getId();
         currentAttendanceStatus = !TextUtils.isEmpty(attendanceStatus) ? attendanceStatus : CourseAttendanceStatusType.ALL.getId();
         if (viewBinding != null) {
             viewBinding.tvTime.setText(classMonth);
@@ -287,10 +288,6 @@ public class VIPOrInterestCourseGroupDetailActivity extends BaseMVPActivity<AcVi
             //已结课
             tv_status.setText(CourseGroupStatusType.COMPLETE.getValue());
             tv_status.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_999999));
-        } else if (TextUtils.equals(status, CourseGroupStatusType.CANCEL.getId())) {
-            //已取消
-            tv_status.setText(CourseGroupStatusType.CANCEL.getValue());
-            tv_status.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_999999));
         }
 
         String coursePlan = bean.getCoursePlan();

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

@@ -250,10 +250,6 @@ public class PianoCourseGroupDetailActivity extends BaseMVPActivity<AcPianoCours
             //已结课
             tv_status.setText(CourseGroupStatusType.COMPLETE.getValue());
             tv_status.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_999999));
-        } else if (TextUtils.equals(status, CourseGroupStatusType.CANCEL.getId())) {
-            //已取消
-            tv_status.setText(CourseGroupStatusType.CANCEL.getValue());
-            tv_status.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_999999));
         }
 
         String coursePlan = bean.getCoursePlan();

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

@@ -17,7 +17,7 @@ import com.chad.library.adapter.base.listener.OnItemClickListener;
 import com.cooleshow.base.bean.CommonCourseConfigBean;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.constanst.CourseAttendanceStatusType;
-import com.cooleshow.base.constanst.CourseGroupStatusType;
+import com.cooleshow.base.constanst.CourseStatusType;
 import com.cooleshow.base.interfaces.IFilterViewData;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.fragment.BaseFragment;
@@ -57,7 +57,7 @@ public class PianoCourseGroupDetailFragment extends BaseMVPFragment<FgPianoCours
     private String courseGroupId;
     private String classMonth;
     private Date currentSelectDate;
-    private String courseStatus = CourseGroupStatusType.ALL.getId();
+    private String courseStatus = CourseStatusType.ALL.getId();
     private String currentAttendanceStatus;
     private TimePickerView pvTime;
     private List<IFilterViewData> statusList;//状态筛选
@@ -98,8 +98,8 @@ public class PianoCourseGroupDetailFragment extends BaseMVPFragment<FgPianoCours
     }
 
     private void initFilterData() {
-        CourseGroupStatusType[] values = CourseGroupStatusType.values();
-        List<CourseGroupStatusType> courseGroupStatusTypes = Arrays.asList(values);
+        CourseStatusType[] values = CourseStatusType.values();
+        List<CourseStatusType> courseGroupStatusTypes = Arrays.asList(values);
         statusList = new ArrayList<IFilterViewData>(courseGroupStatusTypes);
 
         CourseAttendanceStatusType[] attendanceStatuValues = CourseAttendanceStatusType.values();
@@ -171,7 +171,7 @@ public class PianoCourseGroupDetailFragment extends BaseMVPFragment<FgPianoCours
         currentSelectDate = date != null ? date : TimeUtils.getNowDate();
         String targetDateTimeStr = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy-MM"));
         classMonth = targetDateTimeStr;
-        courseStatus = !TextUtils.isEmpty(status) ? status : CourseGroupStatusType.ALL.getId();
+        courseStatus = !TextUtils.isEmpty(status) ? status : CourseStatusType.ALL.getId();
         currentAttendanceStatus = !TextUtils.isEmpty(attendanceStatus) ? attendanceStatus : CourseAttendanceStatusType.ALL.getId();
         if (mViewBinding != null) {
             mViewBinding.tvTime.setText(classMonth);

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

@@ -22,6 +22,7 @@ import com.cooleshow.base.bean.CommonCourseConfigBean;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.constanst.CourseAttendanceStatusType;
 import com.cooleshow.base.constanst.CourseGroupStatusType;
+import com.cooleshow.base.constanst.CourseStatusType;
 import com.cooleshow.base.constanst.StyleConfig;
 import com.cooleshow.base.interfaces.IFilterViewData;
 import com.cooleshow.base.router.RouterPath;
@@ -71,7 +72,7 @@ public class VIPOrInterestCourseGroupDetailActivity extends BaseMVPActivity<AcVi
     private String courseType = Constants.VIP_COURSE_TAG;
     private String classMonth;
     private Date currentSelectDate;
-    private String courseStatus = CourseGroupStatusType.ALL.getId();
+    private String courseStatus = CourseStatusType.ALL.getId();
     private String currentAttendanceStatus;
     private VIPCourseGroupDetailAdapter mAdapter;
     private CommonCourseConfigBean mConfigBean;
@@ -142,8 +143,8 @@ public class VIPOrInterestCourseGroupDetailActivity extends BaseMVPActivity<AcVi
     }
 
     private void initFilterData() {
-        CourseGroupStatusType[] values = CourseGroupStatusType.values();
-        List<CourseGroupStatusType> courseGroupStatusTypes = Arrays.asList(values);
+        CourseStatusType[] values = CourseStatusType.values();
+        List<CourseStatusType> courseGroupStatusTypes = Arrays.asList(values);
         statusList = new ArrayList<IFilterViewData>(courseGroupStatusTypes);
 
         CourseAttendanceStatusType[] attendanceStatuValues = CourseAttendanceStatusType.values();
@@ -197,7 +198,7 @@ public class VIPOrInterestCourseGroupDetailActivity extends BaseMVPActivity<AcVi
         currentSelectDate = date != null ? date : TimeUtils.getNowDate();
         String targetDateTimeStr = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy-MM"));
         classMonth = targetDateTimeStr;
-        courseStatus = !TextUtils.isEmpty(status) ? status : CourseGroupStatusType.ALL.getId();
+        courseStatus = !TextUtils.isEmpty(status) ? status : CourseStatusType.ALL.getId();
         currentAttendanceStatus = !TextUtils.isEmpty(attendanceStatus) ? attendanceStatus : CourseAttendanceStatusType.ALL.getId();
         if (viewBinding != null) {
             viewBinding.tvTime.setText(classMonth);
@@ -298,10 +299,6 @@ public class VIPOrInterestCourseGroupDetailActivity extends BaseMVPActivity<AcVi
             //已结课
             tv_status.setText(CourseGroupStatusType.COMPLETE.getValue());
             tv_status.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_999999));
-        } else if (TextUtils.equals(status, CourseGroupStatusType.CANCEL.getId())) {
-            //已取消
-            tv_status.setText(CourseGroupStatusType.CANCEL.getValue());
-            tv_status.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_999999));
         }
 
         String coursePlan = bean.getCoursePlan();