Browse Source

修改文案提示

Pq 3 months ago
parent
commit
cdf1afbe66

+ 8 - 6
student/src/main/java/com/cooleshow/student/ui/course/GroupCourseDetailActivity.java

@@ -205,12 +205,14 @@ public class GroupCourseDetailActivity extends BaseMVPActivity<ActivityGroupCour
             return;
         }
         teacherIsReply = !TextUtils.isEmpty(bean.teacherReplied);
+        boolean isSubmit = bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT;
         if (teacherIsReply) {
             //老师已点评作业
             viewBinding.tvHomeworkCommentEmptyText.setVisibility(View.GONE);
             viewBinding.tvHomeworkCommentContent.setVisibility(View.VISIBLE);
             viewBinding.tvHomeworkCommentContent.setText(bean.teacherReplied);
         } else {
+            viewBinding.tvHomeworkCommentEmptyText.setText(CourseConstants.getHomeworkCommentDefaultTip(isSubmit));
             viewBinding.tvHomeworkCommentEmptyText.setVisibility(View.VISIBLE);
             viewBinding.tvHomeworkCommentContent.setVisibility(View.GONE);
         }
@@ -225,12 +227,12 @@ public class GroupCourseDetailActivity extends BaseMVPActivity<ActivityGroupCour
         if (bean == null) {
             return;
         }
-        if (!TextUtils.equals(CourseConstants.COURSE_STATUS_COMPLETE, bean.courseStatus)) {
-            viewBinding.viewHomeworkVideoContentBg.setVisibility(View.VISIBLE);
-            viewBinding.tvHomeworkVideoEmptyText.setText("课程结束后才可提交作业");
-            viewBinding.tvEditHomework.setVisibility(View.GONE);
-            return;
-        }
+//        if (!TextUtils.equals(CourseConstants.COURSE_STATUS_COMPLETE, bean.courseStatus)) {
+//            viewBinding.viewHomeworkVideoContentBg.setVisibility(View.VISIBLE);
+//            viewBinding.tvHomeworkVideoEmptyText.setText("课程结束后才可提交作业");
+//            viewBinding.tvEditHomework.setVisibility(View.GONE);
+//            return;
+//        }
         homeworkVideoData.clear();
         if (bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT) {
             //学员已提交课后作业

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

@@ -208,12 +208,14 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
             return;
         }
         teacherIsReply = !TextUtils.isEmpty(bean.teacherReplied);
+        boolean isSubmit = bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT;
         if (teacherIsReply) {
             //老师已点评作业
             viewBinding.tvHomeworkCommentEmptyText.setVisibility(View.GONE);
             viewBinding.tvHomeworkCommentContent.setVisibility(View.VISIBLE);
             viewBinding.tvHomeworkCommentContent.setText(bean.teacherReplied);
         } else {
+            viewBinding.tvHomeworkCommentEmptyText.setText(CourseConstants.getHomeworkCommentDefaultTip(isSubmit));
             viewBinding.tvHomeworkCommentEmptyText.setVisibility(View.VISIBLE);
             viewBinding.tvHomeworkCommentContent.setVisibility(View.GONE);
         }
@@ -228,12 +230,12 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
         if (bean == null) {
             return;
         }
-        if (!TextUtils.equals(CourseConstants.COURSE_STATUS_COMPLETE, bean.courseStatus)) {
-            viewBinding.viewHomeworkVideoContentBg.setVisibility(View.VISIBLE);
-            viewBinding.tvHomeworkVideoEmptyText.setText("课程结束后才可提交作业");
-            viewBinding.tvEditHomework.setVisibility(View.GONE);
-            return;
-        }
+//        if (!TextUtils.equals(CourseConstants.COURSE_STATUS_COMPLETE, bean.courseStatus)) {
+//            viewBinding.viewHomeworkVideoContentBg.setVisibility(View.VISIBLE);
+//            viewBinding.tvHomeworkVideoEmptyText.setText("课程结束后才可提交作业");
+//            viewBinding.tvEditHomework.setVisibility(View.GONE);
+//            return;
+//        }
         homeworkVideoData.clear();
         if (bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT) {
             //学员已提交课后作业

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

@@ -234,12 +234,12 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         if (bean == null) {
             return;
         }
-        if (!TextUtils.equals(CourseConstants.COURSE_STATUS_COMPLETE, bean.courseStatus)) {
-            viewBinding.viewHomeworkVideoContentBg.setVisibility(View.VISIBLE);
-            viewBinding.tvHomeworkVideoEmptyText.setText("课程结束后才可提交作业");
-            viewBinding.tvEditHomework.setVisibility(View.GONE);
-            return;
-        }
+//        if (!TextUtils.equals(CourseConstants.COURSE_STATUS_COMPLETE, bean.courseStatus)) {
+//            viewBinding.viewHomeworkVideoContentBg.setVisibility(View.VISIBLE);
+//            viewBinding.tvHomeworkVideoEmptyText.setText("课程结束后才可提交作业");
+//            viewBinding.tvEditHomework.setVisibility(View.GONE);
+//            return;
+//        }
         homeworkVideoData.clear();
         if (bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT) {
             //学员已提交课后作业

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

@@ -330,12 +330,14 @@ public class HomeWorkDetailActivity extends BaseMVPActivity<ActivityHomeworkDeta
             viewBinding.tvHomeworkCommentContent.setText(bean.teacherReplied);
         } else {
             boolean isSet = bean.decorateHomework == CourseConstants.COURSE_HOMEWORK_SET;
+            boolean isSubmit = bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT;
             viewBinding.tvCommit.setVisibility(View.GONE);
             viewBinding.tvCommit.setClickable(isSet);
             viewBinding.tvCommit.setEnabled(isSet);
             //没布置作业 不显示提交作业 但是没布置作业怎么进到作业详情呢 奇怪的逻辑
             viewBinding.tvEditHomework.setVisibility(isSet ? View.VISIBLE : View.GONE);
             viewBinding.tvHomeworkCommentEmptyText.setVisibility(View.VISIBLE);
+            viewBinding.tvHomeworkCommentEmptyText.setText(CourseConstants.getHomeworkCommentDefaultTip(isSubmit));
             viewBinding.tvHomeworkSetComment.setVisibility(View.GONE);
             viewBinding.tvHomeworkCommentContent.setVisibility(View.GONE);
         }

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/widgets/CourseSetCommentDialog.java

@@ -133,7 +133,7 @@ public class CourseSetCommentDialog extends Dialog implements View.OnClickListen
         if (method == TYPE_SET_HOMEWORK_COMMENT) {
             //老师提交作业评价
             mViewBinding.tvTitle.setText("作业点评");
-            mViewBinding.etContent.setHint("请输入您对本次课程学员的作业点评");
+            mViewBinding.etContent.setHint("请输入您对本次作业点评");
         }
     }
 

+ 1 - 1
teacher/src/main/res/values/strings.xml

@@ -12,7 +12,7 @@
     <string name="course_ing_str">进行中</string>
     <string name="course_is_completed">已结束</string>
     <string name="set_homework_str">布置作业</string>
-    <string name="comment_str">点评</string>
+    <string name="comment_str">点评作业</string>
     <string name="submit_action_str">提交</string>
     <string name="submit_comment_str">提交评价</string>
     <string name="submit_comment_success">评价成功</string>