Browse Source

修复bug

Pq 2 years ago
parent
commit
1c1d750493

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

@@ -177,10 +177,17 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
         }
         }
         if (bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT) {
         if (bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT) {
             //学员已提交课后作业
             //学员已提交课后作业
-            viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.GONE);
-            viewBinding.llHomeworkVideoContent.removeAllViews();
-            addVideoThumbnailView(bean.studentAttachments);
-            if (teacherIsReply) {
+            if (bean.homeworkExpire == CourseConstants.COURSE_HOMEWORK_NO_SET) {
+                viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.GONE);
+                viewBinding.llHomeworkVideoContent.removeAllViews();
+                addVideoThumbnailView(bean.studentAttachments);
+            } else {
+                viewBinding.llHomeworkVideoContent.setVisibility(View.GONE);
+                viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.VISIBLE);
+                viewBinding.tvHomeworkVideoEmptyText.setText("作业已过期无法提交和查看!");
+            }
+
+            if (teacherIsReply || bean.homeworkExpire == CourseConstants.COURSE_HOMEWORK_SET) {
                 viewBinding.tvEditHomework.setVisibility(View.GONE);
                 viewBinding.tvEditHomework.setVisibility(View.GONE);
             } else {
             } else {
                 viewBinding.tvEditHomework.setVisibility(View.VISIBLE);
                 viewBinding.tvEditHomework.setVisibility(View.VISIBLE);

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

@@ -113,7 +113,7 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         }
         }
         this.mInfoBean = infoBean;
         this.mInfoBean = infoBean;
         //时间
         //时间
-        viewBinding.tvCourseTime.setText(UiUtils.getCourseTimeString(infoBean.startTime,infoBean.endTime));
+        viewBinding.tvCourseTime.setText(UiUtils.getCourseTimeString(infoBean.startTime, infoBean.endTime));
         //学生头像
         //学生头像
         GlideUtils.INSTANCE.loadImage(this, infoBean.teacherAvatar, viewBinding.ivAvatar, R.drawable.icon_teacher_default_head);
         GlideUtils.INSTANCE.loadImage(this, infoBean.teacherAvatar, viewBinding.ivAvatar, R.drawable.icon_teacher_default_head);
         //title
         //title
@@ -187,10 +187,16 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         }
         }
         if (bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT) {
         if (bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT) {
             //学员已提交课后作业
             //学员已提交课后作业
-            viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.GONE);
-            viewBinding.llHomeworkVideoContent.removeAllViews();
-            addVideoThumbnailView(bean.studentAttachments);
-            if (teacherIsReply) {
+            if (bean.homeworkExpire == CourseConstants.COURSE_HOMEWORK_NO_SET) {
+                viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.GONE);
+                viewBinding.llHomeworkVideoContent.removeAllViews();
+                addVideoThumbnailView(bean.studentAttachments);
+            } else {
+                viewBinding.llHomeworkVideoContent.setVisibility(View.GONE);
+                viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.VISIBLE);
+                viewBinding.tvHomeworkVideoEmptyText.setText("作业已过期无法提交和查看!");
+            }
+            if (teacherIsReply || bean.homeworkExpire == CourseConstants.COURSE_HOMEWORK_SET) {
                 //老师已回复的话不可再编辑作业
                 //老师已回复的话不可再编辑作业
                 viewBinding.tvEditHomework.setVisibility(View.GONE);
                 viewBinding.tvEditHomework.setVisibility(View.GONE);
             } else {
             } else {

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/bean/SparringCourseHomeworkBean.java

@@ -14,7 +14,7 @@ public class SparringCourseHomeworkBean {
     public String endTime;
     public String endTime;
     public String startTime;
     public String startTime;
     public String decorateTime;
     public String decorateTime;
-    public int homeworkExpire;
+    public int homeworkExpire;//0未过期 1已过期
     public int decorateHomework;
     public int decorateHomework;
     public String studentAttachments;
     public String studentAttachments;
     public Object submitTime;
     public Object submitTime;

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

@@ -23,7 +23,7 @@ public class CourseConstants {
     public static final int COURSE_HOMEWORK_STU_NO_SUBMIT = 0;//学员未提交课后作业
     public static final int COURSE_HOMEWORK_STU_NO_SUBMIT = 0;//学员未提交课后作业
 
 
     public static final int COURSE_HOMEWORK_OVERDUE = 1;//作业过期
     public static final int COURSE_HOMEWORK_OVERDUE = 1;//作业过期
-    public static final int COURSE_HOMEWORK_NOT_OVERDUE = 0;//作业过期
+    public static final int COURSE_HOMEWORK_NOT_OVERDUE = 0;//作业过期
 
 
 
 
     public static final String LIVE_COURSE = "LIVE";//直播课PRACTICE
     public static final String LIVE_COURSE = "LIVE";//直播课PRACTICE

+ 10 - 3
teacher/src/main/java/com/cooleshow/teacher/ui/course/SparringCourseDetailActivity.java

@@ -173,11 +173,18 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         //tv_homework_video_empty_text
         //tv_homework_video_empty_text
         if (bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT) {
         if (bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT) {
             //学员已提交课后作业
             //学员已提交课后作业
-            viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.GONE);
-            viewBinding.llHomeworkVideoContent.removeAllViews();
-            addVideoThumbnailView(bean.studentAttachments);
+            if (bean.homeworkExpire == CourseConstants.COURSE_HOMEWORK_NOT_OVERDUE) {
+                viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.GONE);
+                viewBinding.llHomeworkVideoContent.removeAllViews();
+                addVideoThumbnailView(bean.studentAttachments);
+            } else {
+                viewBinding.llHomeworkVideoContent.setVisibility(View.GONE);
+                viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.VISIBLE);
+                viewBinding.tvHomeworkVideoEmptyText.setText("作业已过期无法查看!");
+            }
         } else {
         } else {
             //学员未提交课后作业
             //学员未提交课后作业
+            viewBinding.tvHomeworkVideoEmptyText.setText("学员尚未上传作业视频");
             viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.VISIBLE);
             viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.VISIBLE);
         }
         }
     }
     }

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/work/AssignHomeworkActivity.java

@@ -157,7 +157,7 @@ public class AssignHomeworkActivity extends BaseMVPActivity<ActivityAssignHomewo
             }
             }
             viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.VISIBLE);
             viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.VISIBLE);
             if (bean.homeworkExpire == CourseConstants.COURSE_HOMEWORK_OVERDUE) {
             if (bean.homeworkExpire == CourseConstants.COURSE_HOMEWORK_OVERDUE) {
-                viewBinding.tvHomeworkVideoEmptyText.setText("作业已过期无法查看");
+                viewBinding.tvHomeworkVideoEmptyText.setText("作业已过期无法查看");
             } else {
             } else {
                 viewBinding.tvHomeworkVideoEmptyText.setText("学员尚未上传作业视频");
                 viewBinding.tvHomeworkVideoEmptyText.setText("学员尚未上传作业视频");
             }
             }