Browse Source

优化VIP课课程详情进入教室逻辑判断

Pq 3 months ago
parent
commit
1917286cb3

+ 5 - 2
student/src/main/java/com/cooleshow/student/ui/course/SparringCourseDetailActivity.java

@@ -18,6 +18,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.listener.OnItemChildClickListener;
 import com.cooleshow.base.bean.CommonCourseConfigBean;
 import com.cooleshow.base.constanst.CourseStatusType;
+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;
@@ -387,9 +388,11 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
             //进入教室
             if (mInfoBean != null) {
                 if (mConfigBean != null) {
-                    boolean lessThanTargetTime = TimeUtils.isLessThanTargetTime(mConfigBean.getPracticeStartTime(), mInfoBean.startTime);
+                    boolean isVip = TextUtils.equals(mInfoBean.courseType, CourseType.VIP.getId());
+                    String time = isVip ? mConfigBean.getVipStartTime() : mConfigBean.getPracticeStartTime();
+                    boolean lessThanTargetTime = TimeUtils.isLessThanTargetTime(time, mInfoBean.startTime);
                     if (!lessThanTargetTime) {
-                        ToastUtil.getInstance().showShort("课程还未开始,请在上课前" + mConfigBean.getPracticeStartTime() + "分钟进入");
+                        ToastUtil.getInstance().showShort("课程还未开始,请在上课前" + time + "分钟进入");
                         return;
                     }
                     OpenClassRoomHelper.start(this, mInfoBean.courseScheduleId, mInfoBean.subjectName);

+ 5 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/course/SparringCourseDetailActivity.java

@@ -8,6 +8,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.bean.CommonCourseConfigBean;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.constanst.CourseStatusType;
+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;
@@ -337,9 +338,11 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
             //进入教室
             if (mInfoBean != null) {
                 if (mConfigBean != null) {
-                    boolean lessThanTargetTime = TimeUtils.isLessThanTargetTime(mConfigBean.getPracticeStartTime(), mInfoBean.startTime);
+                    boolean isVip = TextUtils.equals(mInfoBean.courseType, CourseType.VIP.getId());
+                    String time = isVip ? mConfigBean.getVipStartTime() : mConfigBean.getPracticeStartTime();
+                    boolean lessThanTargetTime = TimeUtils.isLessThanTargetTime(time, mInfoBean.startTime);
                     if (!lessThanTargetTime) {
-                        ToastUtil.getInstance().showShort("课程还未开始,请在上课前" + mConfigBean.getPracticeStartTime() + "分钟进入");
+                        ToastUtil.getInstance().showShort("课程还未开始,请在上课前" + time + "分钟进入");
                         return;
                     }
                     OpenClassRoomHelper.start(this, mInfoBean.courseScheduleId, mInfoBean.subjectName);