修复部分bug

student/src/main/java/com/cooleshow/student/bean/PianoRoomCourseHomeworkBean.java

@@ -52,6 +52,7 @@ public class PianoRoomCourseHomeworkBean {
     public int studentId;
     public String studentName;
     public String subjectName;
+    public String courseGroupName;
     public int submitHomework;
     public Object submitTime;
     public String teacherAvatar;

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

@@ -23,7 +23,7 @@ public class EvaluateTeacherPresenter extends BasePresenter<EvaluateTeacherContr
      * @param courseScheduleId
      * @param courseGroupId
      */
-    public void submitSparringCourseComment(String commentContent, String courseScheduleId, String courseGroupId) {
+    public void submitSparringCourseComment(String commentContent, String courseScheduleId, String courseGroupId,float score) {
         if (getView() != null) {
             getView().showLoading();
         }
@@ -32,6 +32,7 @@ public class EvaluateTeacherPresenter extends BasePresenter<EvaluateTeacherContr
             jsonObject.putOpt("courseScheduleId", courseScheduleId);
             jsonObject.putOpt("studentReplied", commentContent);
             jsonObject.putOpt("courseGroupId", courseGroupId);
+            jsonObject.putOpt("score", score);
         } catch (JSONException e) {
             e.printStackTrace();
         }

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

@@ -30,6 +30,7 @@ import androidx.annotation.Nullable;
 public class EvaluateTeacherActivity extends BaseMVPActivity<ActivityEvaluateTeacherBinding, EvaluateTeacherPresenter> implements EvaluateTeacherContract.EvaluateTeacherView, View.OnClickListener {
     private String mCourseId;
     private String mCourseGroupId;
+    private float ratingCount;
 
     @Override
     public void onClick(View view) {
@@ -40,7 +41,8 @@ public class EvaluateTeacherActivity extends BaseMVPActivity<ActivityEvaluateTea
                     ToastUtil.getInstance().showShort("请输入您对本次课程老师的评价");
                     break;
                 }
-                presenter.submitSparringCourseComment(inputContent,mCourseId,mCourseGroupId);
+
+                presenter.submitSparringCourseComment(inputContent,mCourseId,mCourseGroupId,ratingCount);
                 break;
         }
     }
@@ -67,7 +69,7 @@ public class EvaluateTeacherActivity extends BaseMVPActivity<ActivityEvaluateTea
         viewBinding.ratingBar.setOnRatingChangeListener(new RatingBar.OnRatingChangeListener() {
             @Override
             public void onRatingChange(float ratingCount) {
-
+                EvaluateTeacherActivity.this.ratingCount =ratingCount;
             }
         });
         viewBinding.etInput.addTextChangedListener(new TextWatcher() {

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

@@ -34,7 +34,7 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
     public static final String COURSE_ID = "course_id";
     private String mCourseId;
     private PianoRoomCourseHomeworkBean mInfoBean;
-    private boolean teacherIsReply =false;//老师是否已点评作业
+    private boolean teacherIsReply = false;//老师是否已点评作业
 
 
     @Override
@@ -101,10 +101,8 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
         this.mInfoBean = infoBean;
         //时间
         viewBinding.tvCourseTime.setText(infoBean.classDate);
-        //学生头像
-        GlideUtils.INSTANCE.loadImage(this, infoBean.studentAvatar, viewBinding.ivAvatar, R.drawable.icon_teacher_default_head);
         //title
-        viewBinding.tvTitle.setText(infoBean.teacherName);
+        viewBinding.tvTitle.setText(infoBean.courseGroupName);
         //subjectName
         viewBinding.tvCourseName.setText(infoBean.subjectName);
 

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

@@ -186,13 +186,19 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
             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);
+            if (bean.decorateHomework == CourseConstants.COURSE_HOMEWORK_SET) {
+                //有课后作业才显示编辑按钮
+                viewBinding.tvEditHomework.setVisibility(View.VISIBLE);
+            } else {
+                viewBinding.tvEditHomework.setVisibility(View.GONE);
+            }
             viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.VISIBLE);
             viewBinding.tvHomeworkVideoEmptyText.setText("您尚未上传作业视频");
         }
@@ -265,11 +271,17 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
 
         if (commentBean != null && !TextUtils.isEmpty(commentBean.studentReplied)) {
             //学生已评价 tv_stu_comment_content
+            //评分星级
+            viewBinding.ratingBarForStudent.setVisibility(View.VISIBLE);
+            viewBinding.ratingBarForStudent.setRating(commentBean.score);
+            viewBinding.tvEvaluate.setVisibility(View.GONE);
             viewBinding.tvStuCommentEmptyText.setVisibility(View.GONE);
             viewBinding.tvStuCommentContent.setVisibility(View.VISIBLE);
             viewBinding.tvStuCommentContent.setText(commentBean.studentReplied);
         } else {
             //学员未评价
+            viewBinding.tvEvaluate.setVisibility(View.VISIBLE);
+            viewBinding.ratingBarForStudent.setVisibility(View.GONE);
             viewBinding.tvStuCommentEmptyText.setVisibility(View.VISIBLE);
             viewBinding.tvStuCommentContent.setVisibility(View.GONE);
         }

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

@@ -80,6 +80,7 @@
                     android:id="@+id/iv_avatar"
                     android:layout_width="47dp"
                     android:layout_height="51dp"
+                    android:src="@drawable/icon_piano_room_course"
                     android:layout_marginStart="11dp"
                     android:layout_marginTop="17dp"
                     app:layout_constraintBottom_toBottomOf="parent"

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

@@ -234,6 +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"
+                    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" />
+
                 <TextView
                     android:id="@+id/tv_evaluate"
                     android:layout_width="wrap_content"
@@ -245,7 +259,7 @@
                     android:text="评价"
                     android:textColor="@color/color_2dc7aa"
                     android:textSize="@dimen/sp_14"
-                    android:visibility="visible"
+                    android:visibility="gone"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />