浏览代码

修复bug

Pq 3 年之前
父节点
当前提交
548657d18a

+ 2 - 0
student/src/main/java/com/cooleshow/student/constants/CourseConstants.java

@@ -13,6 +13,8 @@ public class CourseConstants {
     public static final int COURSE_HOMEWORK_SET = 1;//课程已布置课后作业
     public static final int COURSE_HOMEWORK_NO_SET = 0;//课程未布置课后作业
 
+    public static final int COURSE_HOMEWORK_NO_EXPIRED = 0;//课后作业未过期
+
     public static final int COURSE_HOMEWORK_STU_SUBMIT = 1;//学员已提交课后作业
     public static final int COURSE_HOMEWORK_STU_NO_SUBMIT = 0;//学员未提交课后作业
 

+ 1 - 1
student/src/main/java/com/cooleshow/student/ui/course/PianoRoomCourseDetailActivity.java

@@ -177,7 +177,7 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
         }
         if (bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT) {
             //学员已提交课后作业
-            if (bean.homeworkExpire == CourseConstants.COURSE_HOMEWORK_NO_SET) {
+            if (bean.homeworkExpire == CourseConstants.COURSE_HOMEWORK_NO_EXPIRED) {
                 viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.GONE);
                 viewBinding.llHomeworkVideoContent.removeAllViews();
                 addVideoThumbnailView(bean.studentAttachments);

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

@@ -187,7 +187,7 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         }
         if (bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT) {
             //学员已提交课后作业
-            if (bean.homeworkExpire == CourseConstants.COURSE_HOMEWORK_NO_SET) {
+            if (bean.homeworkExpire == CourseConstants.COURSE_HOMEWORK_NO_EXPIRED) {
                 viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.GONE);
                 viewBinding.llHomeworkVideoContent.removeAllViews();
                 addVideoThumbnailView(bean.studentAttachments);

+ 11 - 2
student/src/main/java/com/cooleshow/student/ui/work/HomeWorkDetailActivity.java

@@ -265,9 +265,18 @@ public class HomeWorkDetailActivity extends BaseMVPActivity<ActivityHomeworkDeta
         }
         homeworkVideoData.clear();
         if (bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT) {
-            //学员已提交课后作业
-            addVideoThumbnailView(bean.studentAttachments);
             viewBinding.csTeacherReply.setVisibility(View.VISIBLE);
+            if (bean.homeworkExpire == CourseConstants.COURSE_HOMEWORK_NO_EXPIRED) {
+                //未过期
+                //学员已提交课后作业
+                addVideoThumbnailView(bean.studentAttachments);
+                viewBinding.viewHomeworkVideoContentBg.setVisibility(View.GONE);
+            } else {
+                //作业视频已过期
+                viewBinding.viewHomeworkVideoContentBg.setVisibility(View.VISIBLE);
+                viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.VISIBLE);
+                viewBinding.tvHomeworkVideoEmptyText.setText("作业已过期无法提交和查看!");
+            }
         } else {
             //学员未提交课后作业
             homeworkVideoData.add(PracticeVideoWorkBean.defaultInstance());