修复部分问题

student/src/main/java/com/cooleshow/student/adapter/HomeTeacherStyleAdapter.java

@@ -30,7 +30,7 @@ public class HomeTeacherStyleAdapter extends BaseQuickAdapter<HomeStyleBean.Rows
         ImageView im_teacher_header = helper.getView(R.id.im_teacher_header);
         TextView tv_teacher_name = helper.getView(R.id.tv_teacher_name);
         TextView tv_watch_count = helper.getView(R.id.tv_watch_count);
-        GlideUtils.INSTANCE.loadImage(getContext(), item.videoUrl, im_pic);
+        GlideUtils.INSTANCE.loadVideoThumbnail(getContext(), item.videoUrl, im_pic);
         tv_title.setText(item.describe);
         GlideUtils.INSTANCE.loadImage(getContext(), item.avatar, im_teacher_header);
         tv_teacher_name.setText(item.username);

student/src/main/java/com/cooleshow/student/contract/SparringCourseDetailContract.java

@@ -19,16 +19,18 @@ public interface SparringCourseDetailContract {
         void getSparringCourseCommentError();
 
         void submitSparringCourseTeacherCommentSuccess();
+
         void submitSparringCourseHomeworkSuccess();
+
         void submitSparringCourseHomeworkCommentSuccess();
     }
 
     interface Presenter {
         void getSparringCourseHomework(String courseId);
 
-        void getSparringCourseComment(String courseScheduleId, String courseGroupId, String studentId);
+        void getSparringCourseComment(String courseScheduleId, String courseGroupId);
 
-        void submitSparringCourseComment(String commentContent, String courseScheduleId, String courseGroupId, String studentId);
+        void submitSparringCourseComment(String commentContent, String courseScheduleId, String courseGroupId);
 
         void submitSparringCourseHomework(String commentContent, String courseScheduleId);
 

student/src/main/java/com/cooleshow/student/presenter/course/SparringCourseDetailPresenter.java

@@ -41,7 +41,7 @@ public class SparringCourseDetailPresenter extends BasePresenter<SparringCourseD
     }
 
     @Override
-    public void getSparringCourseComment(String courseScheduleId, String courseGroupId, String studentId) {
+    public void getSparringCourseComment(String courseScheduleId, String courseGroupId) {
         if (getView() != null) {
             getView().showLoading();
         }
@@ -49,7 +49,6 @@ public class SparringCourseDetailPresenter extends BasePresenter<SparringCourseD
         try {
             jsonObject.putOpt("courseScheduleId", courseScheduleId);
             jsonObject.putOpt("courseGroupId", courseGroupId);
-            jsonObject.putOpt("studentId", studentId);
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -81,7 +80,7 @@ public class SparringCourseDetailPresenter extends BasePresenter<SparringCourseD
      * @param studentId
      */
     @Override
-    public void submitSparringCourseComment(String commentContent, String courseScheduleId, String courseGroupId, String studentId) {
+    public void submitSparringCourseComment(String commentContent, String courseScheduleId, String courseGroupId) {
         if (getView() != null) {
             getView().showLoading();
         }
@@ -90,7 +89,6 @@ public class SparringCourseDetailPresenter extends BasePresenter<SparringCourseD
             jsonObject.putOpt("courseScheduleId", courseScheduleId);
             jsonObject.putOpt("teacherReplied", commentContent);
             jsonObject.putOpt("courseGroupId", courseGroupId);
-            jsonObject.putOpt("studentId", studentId);
         } catch (JSONException e) {
             e.printStackTrace();
         }

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

@@ -193,7 +193,6 @@ public class MinePracticeCourseFragment extends BaseMVPFragment<FragmentPractice
                             .build(RouterPath.CourseCenter.SPARRING_COURSE_DETAIL)
                             .withString(SparringCourseDetailActivity.COURSE_ID, rowsBean.courseId)
                             .withString(SparringCourseDetailActivity.COURSE_GROUP_ID, rowsBean.courseGoupId)
-                            .withString(SparringCourseDetailActivity.STUDENT_ID, rowsBean.userId)
                             .navigation();
                 }
             }

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

@@ -49,7 +49,7 @@ import java.util.List;
  * @author Ryan
  * 类说明：陪练课详情
  */
-@Route(path = RouterPath.CourseCenter.SPARRING_COURSE_DETAIL)
+
 public class PracticeCourseDetailActivity extends BaseMVPActivity<ActivityPracticeCourseDetailLayoutBinding, PracticeCourseDetailPresenter> implements PracticeCourseDetailContract.PracticeCourseDetailView, View.OnClickListener {
     private final int CHOOSE_VIDEO = 1002;
     public static final String COURSE_ID = "course_id";

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

@@ -7,6 +7,9 @@ import android.widget.LinearLayout;
 import androidx.annotation.NonNull;
 import io.rong.imkit.utils.helper.OpenChatHelper;
 
+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;
@@ -20,20 +23,20 @@ import com.cooleshow.student.databinding.ActivitySparringCourseDetailLayoutBindi
 import com.cooleshow.student.presenter.course.SparringCourseDetailPresenter;
 import com.cooleshow.student.widgets.CourseSetCommentDialog;
 import com.cooleshow.base.widgets.VideoThumbnailView;
+import com.daya.live_teaching.utils.helper.CourseEnterHelper;
 
 /**
  * Author by pq, Date on 2022/4/27.
  */
-
+@Route(path = RouterPath.CourseCenter.SPARRING_COURSE_DETAIL)
 public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparringCourseDetailLayoutBinding, SparringCourseDetailPresenter> implements SparringCourseDetailContract.SparringCourseDetailView, View.OnClickListener {
     public static final String COURSE_ID = "course_id";
     public static final String COURSE_GROUP_ID = "course_group_id";
-    public static final String STUDENT_ID = "studentId";
     private String mCourseId;
     private String mCourseGroupId;
-    private String studentId;
     private CourseSetCommentDialog mSetCommentDialog;
     private SparringCourseHomeworkBean mInfoBean;
+    private boolean teacherIsReply = false;//老师是否点评
 
     @NonNull
     @Override
@@ -46,16 +49,16 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "课程详情");
         mCourseId = getIntent().getStringExtra(COURSE_ID);
         mCourseGroupId = getIntent().getStringExtra(COURSE_GROUP_ID);
-        studentId = getIntent().getStringExtra(STUDENT_ID);
         if (TextUtils.isEmpty(mCourseId)
-                || TextUtils.isEmpty(mCourseGroupId)
-                || TextUtils.isEmpty(studentId)) {
+                || TextUtils.isEmpty(mCourseGroupId)) {
             finish();
             return;
         }
         viewBinding.tvSetHomework.setOnClickListener(this);
         viewBinding.tvHomeworkSetComment.setOnClickListener(this);
         viewBinding.tvSetTeacherComment.setOnClickListener(this);
+        viewBinding.tvEditHomework.setOnClickListener(this);
+        viewBinding.tvEnterRoom.setOnClickListener(this);
     }
 
     @Override
@@ -67,7 +70,7 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
     private void refresh() {
         if (presenter != null) {
             presenter.getSparringCourseHomework(mCourseId);
-            presenter.getSparringCourseComment(mCourseId, mCourseGroupId, studentId);
+            presenter.getSparringCourseComment(mCourseId, mCourseGroupId);
         }
     }
 
@@ -104,42 +107,43 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
             //课程未开始
             viewBinding.tvCourseStatus.setText(getString(R.string.course_not_start_str));
             viewBinding.tvCourseStatus.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_ff802c));
+            viewBinding.tvEnterRoom.setVisibility(View.GONE);
         }
         if (TextUtils.equals(CourseConstants.COURSE_STATUS_ING, status)) {
             //课程进行中
             viewBinding.tvCourseStatus.setText(R.string.course_ing_str);
             viewBinding.tvCourseStatus.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));
+            viewBinding.tvEnterRoom.setVisibility(View.VISIBLE);
         }
         if (TextUtils.equals(CourseConstants.COURSE_STATUS_COMPLETE, status)) {
             //课程已结束
             viewBinding.tvCourseStatus.setText(R.string.course_is_completed);
             viewBinding.tvCourseStatus.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_999999));
+            viewBinding.tvEnterRoom.setVisibility(View.GONE);
         }
         //课后作业
         handleHomeworkData(infoBean);
-        //作业视频
-        handleHomeworkStudentSubmit(infoBean);
         //作业点评
         handleHomeworkComment(infoBean);
+        //作业视频
+        handleHomeworkStudentSubmit(infoBean);
     }
 
     /**
      * 作业点评
      */
     private void handleHomeworkComment(SparringCourseHomeworkBean bean) {
-        //tv_homework_comment_content
         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.VISIBLE);
             viewBinding.tvHomeworkCommentContent.setVisibility(View.GONE);
         }
     }
@@ -153,15 +157,27 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         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("您尚未上传作业视频");
         }
     }
 
@@ -202,12 +218,10 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
             viewBinding.tvHomeworkEmptyText.setVisibility(View.GONE);
             viewBinding.tvHomeworkContent.setVisibility(View.VISIBLE);
             viewBinding.tvHomeworkContent.setText(bean.content);
-            viewBinding.tvSetHomework.setVisibility(View.GONE);
         } else {
             //未布置课后作业
             viewBinding.tvHomeworkEmptyText.setVisibility(View.VISIBLE);
             viewBinding.tvHomeworkContent.setVisibility(View.GONE);
-            viewBinding.tvSetHomework.setVisibility(View.VISIBLE);
         }
     }
 
@@ -271,10 +285,29 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         }
 
         if (v.getId() == R.id.iv_go_chat) {
+            //跳转聊天
             if (mInfoBean != null) {
                 OpenChatHelper.goChat(SparringCourseDetailActivity.this, mInfoBean.teacherId, mInfoBean.teacherName);
             }
         }
+
+        if (v.getId() == R.id.tv_enter_room) {
+            //进入教室
+            if (mInfoBean != null) {
+                CourseEnterHelper.start(this, mInfoBean.courseScheduleId, mInfoBean.subjectName);
+            }
+            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();
+        }
     }
 
     private void showSetCommentDialog(int typeSetTeacherComment) {
@@ -286,7 +319,7 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
                     //提交
                     if (type == CourseSetCommentDialog.TYPE_SET_TEACHER_COMMENT) {
                         //提交老师点评
-                        presenter.submitSparringCourseComment(content, mCourseId, mCourseGroupId, studentId);
+                        presenter.submitSparringCourseComment(content, mCourseId, mCourseGroupId);
                     }
                     if (type == CourseSetCommentDialog.TYPE_SET_HOMEWORK) {
                         //提交布置作业

student/src/main/java/com/cooleshow/student/ui/main/CourseTableFragment.kt

@@ -124,7 +124,6 @@ class CourseTableFragment :
                         SparringCourseDetailActivity.COURSE_GROUP_ID,
                         data.courseGoupId
                     )
-                    .withString(SparringCourseDetailActivity.STUDENT_ID, data.userId)
                     .navigation()
             } else if (TextUtils.equals(
                     CourseTableListAdapter.PIANO_ROOM_COURSE,

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

@@ -115,11 +115,11 @@
 
 
                 <ImageView
-                    android:paddingStart="5dp"
                     android:id="@+id/iv_go_chat"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="5dp"
+                    android:paddingStart="5dp"
                     android:src="@drawable/icon_chat_small"
                     app:layout_constraintBottom_toBottomOf="@+id/tv_title"
                     app:layout_constraintLeft_toRightOf="@+id/tv_title"
@@ -260,7 +260,6 @@
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_stu_comment" />
 
                 <RatingBar
-                    android:visibility="gone"
                     android:id="@+id/rating_bar_for_student"
                     style="@style/HomeRatingBar"
                     android:layout_width="wrap_content"
@@ -269,10 +268,11 @@
                     android:numStars="5"
                     android:rating="3"
                     android:stepSize="1"
-                    tools:visibility="visible"
+                    android:visibility="gone"
                     app:layout_constraintBottom_toBottomOf="@+id/tv_stu_comment_title"
                     app:layout_constraintLeft_toRightOf="@+id/tv_stu_comment_title"
-                    app:layout_constraintTop_toTopOf="@+id/tv_stu_comment_title" />
+                    app:layout_constraintTop_toTopOf="@+id/tv_stu_comment_title"
+                    tools:visibility="visible" />
 
                 <FrameLayout
                     android:id="@+id/view_stu_comment_content_bg"
@@ -351,7 +351,7 @@
                     android:text="@string/set_homework_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"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_homework" />
@@ -422,6 +422,24 @@
                     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:paddingEnd="11dp"
+                    android:paddingTop="5dp"
+                    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"
@@ -442,7 +460,7 @@
                         android:drawableLeft="@drawable/icon_homework_video_empty"
                         android:drawablePadding="8dp"
                         android:gravity="center_vertical"
-                        android:text="学员尚未上传作业视频"
+                        android:text="您尚未上传作业视频"
                         android:textColor="@color/color_999999"
                         android:textSize="@dimen/sp_13" />
 
@@ -499,7 +517,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" />
@@ -542,4 +560,20 @@
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 
+
+    <TextView
+        android:visibility="gone"
+        android:id="@+id/tv_enter_room"
+        android:layout_width="match_parent"
+        android:layout_height="44dp"
+        android:layout_marginStart="27dp"
+        android:layout_marginEnd="27dp"
+        android:layout_marginBottom="30dp"
+        android:background="@drawable/shape_2dc7aa_39dp"
+        android:gravity="center"
+        android:text="进入教室"
+        android:textColor="@color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>