修改学生端陪练课课程详情页面部分逻辑

BaseLibrary/src/main/res/layout/common_toolbar_layout.xml

@@ -5,7 +5,7 @@
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/transparent"
+    android:background="@color/white"
     android:fitsSystemWindows="true"
     android:paddingTop="25dp"
     android:paddingBottom="@dimen/dp_9"

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

@@ -1,5 +1,6 @@
 package com.cooleshow.student.ui.course;
 
+import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -10,12 +11,15 @@ import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.RatingBar;
 import com.cooleshow.student.R;
 import com.cooleshow.student.contract.EvaluateTeacherContract;
 import com.cooleshow.student.databinding.ActivityEvaluateTeacherBinding;
 import com.cooleshow.student.presenter.course.EvaluateTeacherPresenter;
 
+import androidx.annotation.Nullable;
+
 /**
  * 创建日期：2022/5/31 11:20
  *
@@ -42,6 +46,12 @@ public class EvaluateTeacherActivity extends BaseMVPActivity<ActivityEvaluateTea
     }
 
     @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
+    }
+
+    @Override
     protected void initView() {
         initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "评价老师");
         mCourseId = getIntent().getStringExtra("course_id");

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

@@ -1,10 +1,12 @@
 package com.cooleshow.student.ui.course;
 
+import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.rong.imkit.utils.helper.OpenChatHelper;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
@@ -14,6 +16,8 @@ import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.SizeUtils;
 
+import com.cooleshow.base.utils.ToastUtil;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.student.R;
 import com.cooleshow.student.bean.SparringCourseCommentBean;
 import com.cooleshow.student.bean.SparringCourseHomeworkBean;
@@ -38,6 +42,12 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
     private SparringCourseHomeworkBean mInfoBean;
     private boolean teacherIsReply = false;//老师是否点评
 
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
+    }
+
     @NonNull
     @Override
     protected ActivitySparringCourseDetailLayoutBinding getLayoutView() {
@@ -56,15 +66,15 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         }
         viewBinding.tvSetHomework.setOnClickListener(this);
         viewBinding.tvHomeworkSetComment.setOnClickListener(this);
-        viewBinding.tvSetTeacherComment.setOnClickListener(this);
         viewBinding.tvEditHomework.setOnClickListener(this);
         viewBinding.tvEnterRoom.setOnClickListener(this);
+        viewBinding.tvEvaluate.setOnClickListener(this);
     }
 
     @Override
     public void initData() {
         super.initData();
-        refresh();
+
     }
 
     private void refresh() {
@@ -74,6 +84,13 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         }
     }
 
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        refresh();
+    }
+
     @Override
     protected SparringCourseDetailPresenter createPresenter() {
         return new SparringCourseDetailPresenter();
@@ -237,29 +254,22 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         }
         if (commentBean != null && !TextUtils.isEmpty(commentBean.teacherReplied)) {
             //老师已评价 tv_set_teacher_comment
-            viewBinding.tvSetTeacherComment.setVisibility(View.GONE);
             viewBinding.tvTeacherAppraisalEmptyText.setVisibility(View.GONE);
             viewBinding.tvTeacherAppraisalContent.setVisibility(View.VISIBLE);
             viewBinding.tvTeacherAppraisalContent.setText(commentBean.teacherReplied);
         } else {
             //老师未评价
-            viewBinding.tvSetTeacherComment.setVisibility(View.VISIBLE);
             viewBinding.tvTeacherAppraisalEmptyText.setVisibility(View.VISIBLE);
             viewBinding.tvTeacherAppraisalContent.setVisibility(View.GONE);
         }
 
         if (commentBean != null && !TextUtils.isEmpty(commentBean.studentReplied)) {
             //学生已评价 tv_stu_comment_content
-            //评分星级
-            viewBinding.ratingBarForStudent.setVisibility(View.VISIBLE);
-            viewBinding.ratingBarForStudent.setRating(commentBean.score);
-
             viewBinding.tvStuCommentEmptyText.setVisibility(View.GONE);
             viewBinding.tvStuCommentContent.setVisibility(View.VISIBLE);
             viewBinding.tvStuCommentContent.setText(commentBean.studentReplied);
         } else {
             //学员未评价
-            viewBinding.ratingBarForStudent.setVisibility(View.GONE);
             viewBinding.tvStuCommentEmptyText.setVisibility(View.VISIBLE);
             viewBinding.tvStuCommentContent.setVisibility(View.GONE);
         }
@@ -278,12 +288,6 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
             return;
         }
 
-        if (v.getId() == R.id.tv_set_teacher_comment) {
-            //提交老师评价
-            showSetCommentDialog(CourseSetCommentDialog.TYPE_SET_TEACHER_COMMENT);
-            return;
-        }
-
         if (v.getId() == R.id.iv_go_chat) {
             //跳转聊天
             if (mInfoBean != null) {
@@ -308,6 +312,23 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
                     .withString("course_id", mCourseId)
                     .navigation();
         }
+
+        if (v.getId() == R.id.tv_evaluate) {
+            //跳转评价老师
+            if (mInfoBean == null) {
+                return;
+            }
+            if (!TextUtils.equals(mInfoBean.courseStatus, CourseConstants.COURSE_STATUS_COMPLETE)) {
+                ToastUtil.getInstance().show(this, "课程结束之后才可以评价哦～");
+                return;
+            }
+            //评价老师
+            ARouter.getInstance()
+                    .build(RouterPath.CourseCenter.SPARRING_EVALUATE_TEACHER)
+                    .withString("course_id", mCourseId)
+                    .withString("course_group_id", mCourseGroupId)
+                    .navigation();
+        }
     }
 
     private void showSetCommentDialog(int typeSetTeacherComment) {

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

@@ -5,18 +5,9 @@
     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"
@@ -177,22 +168,6 @@
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line" />
 
-                <TextView
-                    android:id="@+id/tv_set_teacher_comment"
-                    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:text="@string/appraisal_str"
-                    android:textColor="@color/color_2dc7aa"
-                    android:textSize="@dimen/sp_14"
-                    android:visibility="invisible"
-                    app:layout_constraintBottom_toBottomOf="@+id/view_title_line"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toTopOf="@+id/view_title_line" />
-
                 <FrameLayout
                     android:id="@+id/view_content_bg"
                     android:layout_width="match_parent"
@@ -213,7 +188,7 @@
                         android:drawableLeft="@drawable/icon_teacher_appraisal_empty"
                         android:drawablePadding="8dp"
                         android:gravity="center_vertical"
-                        android:text="课程结束之后记得对学员的\n表现进行评价哦！"
+                        android:text="课程结束之后老师会对您的\n学习进行点评哦！"
                         android:textColor="@color/color_999999"
                         android:textSize="@dimen/sp_13" />
 
@@ -259,20 +234,20 @@
                     app:layout_constraintLeft_toRightOf="@+id/view_title_line_stu_comment"
                     app:layout_constraintTop_toTopOf="@+id/view_title_line_stu_comment" />
 
-                <RatingBar
-                    android:id="@+id/rating_bar_for_student"
-                    style="@style/HomeRatingBar"
+                <TextView
+                    android:id="@+id/tv_evaluate"
                     android:layout_width="wrap_content"
-                    android:layout_height="19dp"
-                    android:layout_marginStart="6dp"
-                    android:numStars="5"
-                    android:rating="3"
-                    android:stepSize="1"
-                    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"
-                    tools:visibility="visible" />
+                    android:layout_height="@dimen/dp_40"
+                    android:layout_marginRight="@dimen/dp_12"
+                    android:drawableLeft="@drawable/icon_course_detail_evaluate"
+                    android:drawablePadding="@dimen/dp_2"
+                    android:gravity="center"
+                    android:text="评价"
+                    android:textColor="@color/color_2dc7aa"
+                    android:textSize="@dimen/sp_14"
+                    android:visibility="visible"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <FrameLayout
                     android:id="@+id/view_stu_comment_content_bg"
@@ -294,7 +269,7 @@
                         android:drawableLeft="@drawable/icon_stu_comment_empty"
                         android:drawablePadding="8dp"
                         android:gravity="center_vertical"
-                        android:text="学员尚未对您进行评价"
+                        android:text="课程结束之后记得对老师的\n教学进行评价哦"
                         android:textColor="@color/color_999999"
                         android:textSize="@dimen/sp_13" />
 
@@ -376,7 +351,7 @@
                         android:drawableLeft="@drawable/icon_homework_empty"
                         android:drawablePadding="8dp"
                         android:gravity="center_vertical"
-                        android:text="课程结束之后记得布置作业哦！"
+                        android:text="课程结束后老师会布置作业哦！"
                         android:textColor="@color/color_999999"
                         android:textSize="@dimen/sp_13" />
 
@@ -429,8 +404,8 @@
                     android:drawableLeft="@drawable/icon_edit_appraisal"
                     android:drawablePadding="3dp"
                     android:includeFontPadding="false"
-                    android:paddingEnd="11dp"
                     android:paddingTop="5dp"
+                    android:paddingEnd="11dp"
                     android:paddingBottom="5dp"
                     android:text="编辑"
                     android:textColor="@color/color_2dc7aa"
@@ -542,7 +517,7 @@
                         android:drawableLeft="@drawable/icon_homework_comment"
                         android:drawablePadding="8dp"
                         android:gravity="center_vertical"
-                        android:text="您尚未点评作业"
+                        android:text="课程结束后上传作业视频会\n得到老师点评哦~"
                         android:textColor="@color/color_999999"
                         android:textSize="@dimen/sp_13" />
 
@@ -562,7 +537,6 @@
 
 
     <TextView
-        android:visibility="gone"
         android:id="@+id/tv_enter_room"
         android:layout_width="match_parent"
         android:layout_height="44dp"
@@ -573,6 +547,7 @@
         android:gravity="center"
         android:text="进入教室"
         android:textColor="@color/white"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent" />