增加学生端琴房课进入作业详情的逻辑

student/src/main/java/com/cooleshow/student/ui/course/PianoRoomCourseDetailActivity.java

@@ -1,14 +1,17 @@
 package com.cooleshow.student.ui.course;
 
+import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.LinearLayout;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.SizeUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.student.R;
 import com.cooleshow.student.bean.PianoRoomCourseHomeworkBean;
 import com.cooleshow.student.constants.CourseConstants;
@@ -19,6 +22,7 @@ import com.cooleshow.base.widgets.VideoThumbnailView;
 import com.daya.live_teaching.utils.helper.CourseEnterHelper;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.rong.imkit.utils.helper.OpenChatHelper;
 
 /**
@@ -30,8 +34,15 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
     public static final String COURSE_ID = "course_id";
     private String mCourseId;
     private PianoRoomCourseHomeworkBean mInfoBean;
+    private boolean teacherIsReply =false;//老师是否已点评作业
 
 
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
+    }
+
     @NonNull
     @Override
     protected ActivityPianoRoomCourseDetailLayoutBinding getLayoutView() {
@@ -48,6 +59,7 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
         }
         viewBinding.ivGoChat.setOnClickListener(this);
         viewBinding.tvEnterRoom.setOnClickListener(this);
+        viewBinding.tvEditHomework.setOnClickListener(this);
     }
 
     @Override
@@ -133,15 +145,14 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
         if (bean == null) {
             return;
         }
-        if (!TextUtils.isEmpty(bean.teacherReplied)) {
+        teacherIsReply = !TextUtils.isEmpty(bean.teacherReplied);
+        if (teacherIsReply) {
             //老师已点评作业
             viewBinding.tvHomeworkCommentEmptyText.setVisibility(View.GONE);
-            viewBinding.tvHomeworkSetComment.setVisibility(View.GONE);
             viewBinding.tvHomeworkCommentContent.setVisibility(View.VISIBLE);
             viewBinding.tvHomeworkCommentContent.setText(bean.teacherReplied);
         } else {
             viewBinding.tvHomeworkCommentEmptyText.setVisibility(View.VISIBLE);
-            viewBinding.tvHomeworkSetComment.setVisibility(View.GONE);
             viewBinding.tvHomeworkCommentContent.setVisibility(View.GONE);
         }
     }
@@ -155,15 +166,27 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
         if (bean == null) {
             return;
         }
-        //tv_homework_video_empty_text
+        if (!TextUtils.equals(CourseConstants.COURSE_STATUS_COMPLETE, bean.courseStatus)) {
+            viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.VISIBLE);
+            viewBinding.tvHomeworkVideoEmptyText.setText("课程结束后才可提交作业");
+            viewBinding.tvEditHomework.setVisibility(View.GONE);
+            return;
+        }
         if (bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT) {
             //学员已提交课后作业
             viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.GONE);
             viewBinding.llHomeworkVideoContent.removeAllViews();
             addVideoThumbnailView(bean.studentAttachments);
+            if (teacherIsReply) {
+                viewBinding.tvEditHomework.setVisibility(View.GONE);
+            } else {
+                viewBinding.tvEditHomework.setVisibility(View.VISIBLE);
+            }
         } else {
             //学员未提交课后作业
+            viewBinding.tvEditHomework.setVisibility(View.VISIBLE);
             viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.VISIBLE);
+            viewBinding.tvHomeworkVideoEmptyText.setText("您尚未上传作业视频");
         }
     }
 
@@ -231,6 +254,16 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
             }
             return;
         }
+
+        if (v.getId() == R.id.tv_edit_homework) {
+            //跳转课后作业
+            if (TextUtils.isEmpty(mCourseId)) {
+                return;
+            }
+            ARouter.getInstance().build(RouterPath.WorkCenter.STUDENT_HOMEWORK_DETAIL)
+                    .withString("course_id", mCourseId)
+                    .navigation();
+        }
     }
 
 

student/src/main/java/com/cooleshow/student/ui/work/HomeWorkDetailActivity.java

@@ -176,11 +176,14 @@ public class HomeWorkDetailActivity extends BaseMVPActivity<ActivityHomeworkDeta
         //学生头像
         if (TextUtils.equals(infoBean.courseType, CourseConstants.OTHER_COURSE)) {
             GlideUtils.INSTANCE.loadImage(this, infoBean.teacherAvatar, viewBinding.ivAvatar, R.drawable.icon_teacher_default_head);
+            //title
+            viewBinding.tvTitle.setText(infoBean.teacherName);
         } else {
             viewBinding.ivAvatar.setImageResource(R.drawable.icon_piano_room_course);
+            //title
+            viewBinding.tvTitle.setText(infoBean.courseGroupName);
         }
-        //title
-        viewBinding.tvTitle.setText(infoBean.teacherName);
+
         //subjectName
         viewBinding.tvCourseName.setText(infoBean.subjectName);
 

student/src/main/res/layout/activity_piano_room_course_detail_layout.xml

@@ -5,18 +5,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
-        android:scaleType="fitXY"
-        android:src="@drawable/bg_sparring_course_header"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
 
     <include
         android:id="@+id/toolbar_include"
-        layout="@layout/common_toolbar_layout_white" />
+        layout="@layout/common_toolbar_layout" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -258,6 +250,25 @@
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_homework_video"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_homework_video" />
 
+                <TextView
+                    android:id="@+id/tv_edit_homework"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawableLeft="@drawable/icon_edit_appraisal"
+                    android:drawablePadding="3dp"
+                    android:includeFontPadding="false"
+                    android:paddingTop="5dp"
+                    android:paddingEnd="11dp"
+                    android:paddingBottom="5dp"
+                    android:text="编辑"
+                    android:textColor="@color/color_2dc7aa"
+                    android:textSize="@dimen/sp_14"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework_video"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="@+id/view_title_line_homework_video" />
+
+
                 <FrameLayout
                     android:id="@+id/view_homework_video_content_bg"
                     android:layout_width="match_parent"
@@ -335,7 +346,7 @@
                     android:text="@string/comment_str"
                     android:textColor="@color/color_2dc7aa"
                     android:textSize="@dimen/sp_14"
-                    android:visibility="invisible"
+                    android:visibility="gone"
                     app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework_comment"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_homework_comment" />