Browse Source

增加小组课收入类型和推送跳转

Pq 7 months ago
parent
commit
7d433d7173

+ 2 - 0
BaseLibrary/src/main/java/com/cooleshow/base/constanst/RouteConstants.java

@@ -20,4 +20,6 @@ public class RouteConstants {
     public static final String PAGE_TAG_FEEDBACK = "feedback";//意见反馈列表
     public static final String PAGE_TAG_COURSE_PLAN = "coursePlan";//课程规划->课程详情
     public static final String PAGE_TAG_HOMEPAGE = "homepage";//老师主页
+    public static final String PAGE_TAG_GROUP_COURSE_GROUP = "groupClass";//我的课程-小组课
+    public static final String PAGE_TAG_GROUP_COURSE_CANCEL = "groupCourseCancel";//我的小组课-已取消tab
 }

+ 21 - 3
BaseLibrary/src/main/java/com/cooleshow/base/utils/JumpUtils.java

@@ -49,7 +49,7 @@ public class JumpUtils {
                     }
 
                     if (TextUtils.equals(routeBean.pageTag, RouteConstants.PAGE_TAG_VIP_CLASS)) {
-                        //我的课表 -> 陪练
+                        //我的课表 -> VIP
                         ARouter.getInstance().build(RouterPath.CourseCenter.TEACHER_MINE_COURSE)
                                 .withInt(Constants.SELECT_POSITION, 0)
                                 .navigation();
@@ -67,7 +67,7 @@ public class JumpUtils {
                     if (TextUtils.equals(routeBean.pageTag, RouteConstants.PAGE_TAG_LIVE_CLASS)) {
                         //我的课表 -> 直播课
                         ARouter.getInstance().build(RouterPath.CourseCenter.TEACHER_MINE_COURSE)
-                                .withInt(Constants.SELECT_POSITION, 2)
+                                .withInt(Constants.SELECT_POSITION, 3)
                                 .navigation();
                         return true;
                     }
@@ -75,7 +75,7 @@ public class JumpUtils {
                     if (TextUtils.equals(routeBean.pageTag, RouteConstants.PAGE_TAG_VIDEO_CLASS)) {
                         //我的课表 -> 视频课
                         ARouter.getInstance().build(RouterPath.CourseCenter.TEACHER_MINE_COURSE)
-                                .withInt(Constants.SELECT_POSITION, 3)
+                                .withInt(Constants.SELECT_POSITION, 4)
                                 .navigation();
                         return true;
                     }
@@ -183,6 +183,24 @@ public class JumpUtils {
                         }
                         return true;
                     }
+
+                    if(TextUtils.equals(routeBean.pageTag,RouteConstants.PAGE_TAG_GROUP_COURSE_GROUP)){
+                        //我的课程->小组课
+                        ARouter.getInstance().build(RouterPath.CourseCenter.TEACHER_MINE_COURSE)
+                                .withInt(Constants.SELECT_POSITION, 2)
+                                .navigation();
+                        return true;
+                    }
+
+                    if(TextUtils.equals(routeBean.pageTag,RouteConstants.PAGE_TAG_GROUP_COURSE_CANCEL)){
+                        if(BaseApplication.Companion.isTeacherClient()){
+                            //我的小组课-已取消
+                            ARouter.getInstance().build(RouterPath.CourseCenter.TEACHER_MINE_GROUP_COURSE)
+                                    .withInt(Constants.SELECT_POSITION, 4)
+                                    .navigation();
+                            return true;
+                        }
+                    }
                 }
             } else {
                 //跳转H5页面

+ 3 - 0
teacher/src/main/java/com/cooleshow/teacher/adapter/MineIncomeAdapter.java

@@ -56,6 +56,9 @@ public class MineIncomeAdapter extends BaseQuickAdapter<UserAccountBean.RowsBean
         if (item.bizType.equals(IncomeType.VIP_COURSE.getId())) {
             im_state.setImageResource(R.drawable.icon_income_item_vip);
             tv_date.setText(UiUtils.getCourseTimeString(item.startTime, item.endTime));
+        }else if(TextUtils.equals(item.bizType,IncomeType.GROUP_COURSE.getId())){
+            im_state.setImageResource(com.cooleshow.base.R.drawable.icon_group_course_avatar);
+            tv_date.setText(UiUtils.getCourseTimeString(item.startTime, item.endTime));
         } else if (item.bizType.equals(IncomeType.PRACTICE.getId())) {
             im_state.setImageResource(R.drawable.icon_item_practice);
             tv_date.setText(UiUtils.getCourseTimeString(item.startTime, item.endTime));

+ 1 - 0
teacher/src/main/java/com/cooleshow/teacher/constants/IncomeType.java

@@ -8,6 +8,7 @@ import com.contrarywind.interfaces.IPickerViewData;
 public enum IncomeType implements IPickerViewData {
     ALL("", "全部收入"),
     VIP_COURSE("VIP_COURSE", "VIP定制课"),
+    GROUP_COURSE("GROUP", "小组课"),
     PRACTICE("PRACTICE", "趣纠课"),
     LIVE("LIVE", "直播课"),
     VIDEO("VIDEO", "视频课"),