优化老师端Vip课和趣纠课课程详情页面UI交互

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

@@ -94,7 +94,7 @@ public class VIPOrInterestCourseGroupDetailActivity extends BaseMVPActivity<AcVi
             courseType = courseTypeValue;
         }
         title = TextUtils.equals(courseType, Constants.VIP_COURSE_TAG) ? "VIP定制课详情" : "趣纠课详情";
-        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, title);
+        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "课程组详情");
         viewBinding.toolbarInclude.toolbar.setBackgroundColor(Color.TRANSPARENT);
         viewBinding.scCoursePlan.setOnTouchListener(new SolveEditTextScrollClash(viewBinding.scCoursePlan));
         viewBinding.scCoursePlan.setVerticalScrollBarEnabled(true);

teacher/src/main/java/com/cooleshow/teacher/bean/SparringCourseHomeworkBean.java

@@ -43,8 +43,16 @@ public class SparringCourseHomeworkBean {
     public int id;
     public String content;
     public String imUserId;
+    private boolean attendanceStatus;
 
-    /**  {
+    public boolean isAttendanceStatus() {
+        return attendanceStatus;
+    }
+
+    public void setAttendanceStatus(boolean attendanceStatus) {
+        this.attendanceStatus = attendanceStatus;
+    }
+/**  {
         "endTime": "2022-07-01 23:59:00",
             "startTime": "2022-07-01 00:00:00",
             "decorateTime": "2022-07-02 17:59:40",

teacher/src/main/java/com/cooleshow/teacher/constants/CourseConstants.java

@@ -1,5 +1,9 @@
 package com.cooleshow.teacher.constants;
 
+import android.text.TextUtils;
+
+import com.cooleshow.base.constanst.CourseStatusType;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -49,4 +53,70 @@ public class CourseConstants {
         }
         return 1.00;
     }
+
+
+    /**
+     * 老师评价
+     *
+     * @param courseStatus
+     * @return
+     */
+    public static String getTeacherEvaluateDefaultTip(String courseStatus) {
+        if (TextUtils.equals(courseStatus, CourseStatusType.COMPLETE.getId())) {
+            return "课程已结束，请对学员的表现进行评价哦";
+        }
+        return "课程结束之后才能评价学员哦";
+    }
+
+    /**
+     * 学员评价
+     *
+     * @param courseStatus
+     * @return
+     */
+    public static String getStudentEvaluateDefaultTip(String courseStatus) {
+        if (TextUtils.equals(courseStatus, CourseStatusType.COMPLETE.getId())) {
+            return "学员尚未对您进行评价";
+        }
+        return "课程结束之后学员才能对您进行评价哦";
+    }
+
+    /**
+     * 课后作业
+     *
+     * @param courseStatus
+     * @return
+     */
+    public static String getTeacherHomeworkDefaultTip(String courseStatus) {
+        if (TextUtils.equals(courseStatus, CourseStatusType.COMPLETE.getId())) {
+            return "课程已结束，请布置作业";
+        }
+        return "课程结束之后才能布置作业哦";
+    }
+
+    /**
+     * 课后作业
+     *
+     * @param courseStatus
+     * @return
+     */
+    public static String getHomeworkVideoDefaultTip(String courseStatus) {
+        if (TextUtils.equals(courseStatus, CourseStatusType.COMPLETE.getId())) {
+            return "学员尚未上传作业视频";
+        }
+        return "课程结束之后学员可上传作业视频";
+    }
+
+    /**
+     * 作业点评
+     *
+     * @param
+     * @return
+     */
+    public static String getHomeworkCommentDefaultTip(boolean isSubmit) {
+        if (isSubmit) {
+            return "您尚未点评作业";
+        }
+        return "暂无作业可点评";
+    }
 }

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

@@ -6,6 +6,8 @@ import android.widget.LinearLayout;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cooleshow.base.bean.CommonCourseConfigBean;
+import com.cooleshow.base.constanst.Constants;
+import com.cooleshow.base.constanst.CourseStatusType;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.GlideUtils;
@@ -83,7 +85,6 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         if (presenter != null) {
             presenter.getCourseConfig();
             presenter.getSparringCourseHomework(mCourseId, studentId);
-            presenter.getSparringCourseComment(mCourseId, mCourseGroupId, studentId);
         }
     }
 
@@ -106,10 +107,15 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         if (infoBean == null) {
             return;
         }
+        //获取课后评价
+        presenter.getSparringCourseComment(mCourseId, mCourseGroupId, studentId);
+
         //学生头像
         GlideUtils.INSTANCE.loadImage(this, infoBean.studentAvatar, viewBinding.ivAvatar, R.drawable.icon_teacher_default_head);
         //title
-        viewBinding.tvTitle.setText(UserHelper.getStudentName(infoBean.studentName, studentId));
+        viewBinding.tvTitle.setText(infoBean.courseGroupName);
+
+        viewBinding.tvName.setText(UserHelper.getStudentName(infoBean.studentName, studentId));
         //subjectName
         viewBinding.tvCourseName.setText(infoBean.subjectName);
         viewBinding.tvCourseTime.setText(UiUtils.getCourseTimeString(infoBean.startTime, infoBean.endTime));
@@ -121,6 +127,7 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
             viewBinding.tvCourseStatus.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_ff802c));
             viewBinding.tvEnterRoom.setVisibility(View.VISIBLE);
             viewBinding.bottomView.setVisibility(View.VISIBLE);
+            viewBinding.ivAttendanceStatus.setVisibility(View.GONE);
         }
         if (TextUtils.equals(CourseConstants.COURSE_STATUS_ING, status)) {
             //课程进行中
@@ -128,12 +135,15 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
             viewBinding.tvCourseStatus.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));
             viewBinding.tvEnterRoom.setVisibility(View.VISIBLE);
             viewBinding.bottomView.setVisibility(View.VISIBLE);
+            viewBinding.ivAttendanceStatus.setVisibility(View.GONE);
         }
         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);
+            viewBinding.ivAttendanceStatus.setVisibility(View.VISIBLE);
+            viewBinding.ivAttendanceStatus.setImageResource(infoBean.isAttendanceStatus() ? R.drawable.icon_course_attendance_arrive : R.drawable.icon_course_attendance_truancy);
             viewBinding.bottomView.setVisibility(View.GONE);
         }
         //课后作业
@@ -152,6 +162,7 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         if (bean == null) {
             return;
         }
+        boolean isSubmit = !TextUtils.isEmpty(bean.studentAttachments);
         if (!TextUtils.isEmpty(bean.teacherReplied)) {
             //老师已点评作业
             viewBinding.tvHomeworkCommentEmptyText.setVisibility(View.GONE);
@@ -159,8 +170,9 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
             viewBinding.tvHomeworkCommentContent.setVisibility(View.VISIBLE);
             viewBinding.tvHomeworkCommentContent.setText(bean.teacherReplied);
         } else {
+            viewBinding.tvHomeworkSetComment.setVisibility(isSubmit ? View.VISIBLE : View.GONE);
+            viewBinding.tvHomeworkCommentEmptyText.setText(CourseConstants.getHomeworkCommentDefaultTip(isSubmit));
             viewBinding.tvHomeworkCommentEmptyText.setVisibility(View.VISIBLE);
-            viewBinding.tvHomeworkSetComment.setVisibility(View.VISIBLE);
             viewBinding.tvHomeworkCommentContent.setVisibility(View.GONE);
         }
     }
@@ -188,7 +200,8 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
             }
         } else {
             //学员未提交课后作业
-            viewBinding.tvHomeworkVideoEmptyText.setText("学员尚未上传作业视频");
+            String homeworkVideoDefaultTip = CourseConstants.getHomeworkVideoDefaultTip(bean.courseStatus);
+            viewBinding.tvHomeworkVideoEmptyText.setText(homeworkVideoDefaultTip);
             viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.VISIBLE);
         }
     }
@@ -225,6 +238,7 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         if (bean == null) {
             return;
         }
+        boolean courseIsEnd = TextUtils.equals(CourseStatusType.COMPLETE.getId(), bean.courseStatus);
         if (bean.decorateHomework == CourseConstants.COURSE_HOMEWORK_SET) {
             //已布置课后作业
             viewBinding.tvHomeworkEmptyText.setVisibility(View.GONE);
@@ -233,9 +247,10 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
             viewBinding.tvSetHomework.setVisibility(View.GONE);
         } else {
             //未布置课后作业
+            viewBinding.tvSetHomework.setVisibility(courseIsEnd ? View.VISIBLE : View.GONE);
             viewBinding.tvHomeworkEmptyText.setVisibility(View.VISIBLE);
+            viewBinding.tvHomeworkEmptyText.setText(CourseConstants.getTeacherHomeworkDefaultTip(bean.courseStatus));
             viewBinding.tvHomeworkContent.setVisibility(View.GONE);
-            viewBinding.tvSetHomework.setVisibility(View.VISIBLE);
         }
     }
 
@@ -245,6 +260,7 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         if (isFinishing() || isDestroyed()) {
             return;
         }
+        boolean courseIsEnd = TextUtils.equals(mInfoBean.courseStatus, CourseStatusType.COMPLETE.getId());
         if (commentBean != null && !TextUtils.isEmpty(commentBean.teacherReplied)) {
             //老师已评价 tv_set_teacher_comment
             viewBinding.tvSetTeacherComment.setVisibility(View.GONE);
@@ -253,7 +269,9 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
             viewBinding.tvTeacherAppraisalContent.setText(commentBean.teacherReplied);
         } else {
             //老师未评价
-            viewBinding.tvSetTeacherComment.setVisibility(View.VISIBLE);
+            //课程结束才显示评价按钮
+            viewBinding.tvSetTeacherComment.setVisibility(courseIsEnd ? View.VISIBLE : View.GONE);
+            viewBinding.tvTeacherAppraisalEmptyText.setText(CourseConstants.getTeacherEvaluateDefaultTip(mInfoBean.courseStatus));
             viewBinding.tvTeacherAppraisalEmptyText.setVisibility(View.VISIBLE);
             viewBinding.tvTeacherAppraisalContent.setVisibility(View.GONE);
         }
@@ -270,6 +288,7 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         } else {
             //学员未评价
             viewBinding.ratingBarForStudent.setVisibility(View.GONE);
+            viewBinding.tvStuCommentEmptyText.setText(CourseConstants.getStudentEvaluateDefaultTip(mInfoBean.courseStatus));
             viewBinding.tvStuCommentEmptyText.setVisibility(View.VISIBLE);
             viewBinding.tvStuCommentContent.setVisibility(View.GONE);
         }
@@ -413,6 +432,7 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         //获取课程详情作业信息失败
     }
 
+
     @Override
     public void onDestroy() {
         super.onDestroy();

teacher/src/main/java/com/cooleshow/teacher/ui/course/VIPOrInterestCourseGroupDetailActivity.java

@@ -99,7 +99,7 @@ public class VIPOrInterestCourseGroupDetailActivity extends BaseMVPActivity<AcVi
             courseType = courseTypeValue;
         }
         title = TextUtils.equals(courseType, Constants.VIP_COURSE_TAG) ? "VIP定制课详情" : "趣纠课详情";
-        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, title);
+        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "课程组详情");
         viewBinding.toolbarInclude.toolbar.setBackgroundColor(Color.TRANSPARENT);
         viewBinding.scCoursePlan.setOnTouchListener(new SolveEditTextScrollClash(viewBinding.scCoursePlan));
         viewBinding.scCoursePlan.setVerticalScrollBarEnabled(true);

teacher/src/main/java/com/cooleshow/teacher/widgets/CourseSetCommentDialog.java

@@ -6,7 +6,10 @@ import android.content.DialogInterface;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import android.text.Editable;
 import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -17,6 +20,8 @@ import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.databinding.DialogSetCourseCommentLayoutBinding;
 
+import java.util.Locale;
+
 import androidx.annotation.NonNull;
 
 /**
@@ -31,9 +36,25 @@ public class CourseSetCommentDialog extends Dialog implements View.OnClickListen
     private int showType = TYPE_SET_TEACHER_COMMENT;
 
     private DialogSetCourseCommentLayoutBinding mViewBinding;
+    private TextWatcher mTextWatcher = new TextWatcher() {
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+        }
+
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+        }
+
+        @Override
+        public void afterTextChanged(Editable s) {
+            updateTextNum();
+        }
+    };
 
     public CourseSetCommentDialog(@NonNull Context context) {
-        super(context, com.cooleshow.base.R.style.DialogStyle);
+        super(context, R.style.MyBottomDialogStyle);
     }
 
     @Override
@@ -41,10 +62,15 @@ public class CourseSetCommentDialog extends Dialog implements View.OnClickListen
         super.onCreate(savedInstanceState);
         mViewBinding = DialogSetCourseCommentLayoutBinding.inflate(getLayoutInflater());
         setContentView(mViewBinding.getRoot());
-        getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT);
+        initParams();
+        initListener();
+    }
+
+    private void initListener() {
         mViewBinding.ivClose.setOnClickListener(this);
         mViewBinding.tvSubmit.setOnClickListener(this);
-        mViewBinding.flContent.setOnClickListener(this);
+        mViewBinding.csRoot.setOnClickListener(this);
+        mViewBinding.etContent.addTextChangedListener(mTextWatcher);
         setOnDismissListener(dialog -> {
             if (mViewBinding != null) {
                 if (mViewBinding.etContent != null) {
@@ -55,8 +81,37 @@ public class CourseSetCommentDialog extends Dialog implements View.OnClickListen
         });
     }
 
+    private void initParams() {
+        Window window = getWindow();
+        //设置dialog在屏幕底部
+        window.setGravity(Gravity.BOTTOM);
+        //设置dialog弹出时的动画效果，从屏幕底部向上弹出
+        window.setWindowAnimations(com.cooleshow.base.R.style.BottomAnimation);
+        window.getDecorView().setPadding(0, 0, 0, 0);
+        //获得window窗口的属性
+        WindowManager.LayoutParams lp = window.getAttributes();
+        //设置窗口宽度为充满全屏
+        lp.width = WindowManager.LayoutParams.MATCH_PARENT;
+        //设置窗口高度为包裹内容
+        lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        lp.horizontalMargin = 0;
+        lp.verticalMargin = 0;
+        //将设置好的属性set回去
+        window.setAttributes(lp);
+    }
+
+
+    private void updateTextNum() {
+        String text = mViewBinding.etContent.getText().toString().trim();
+        int cLength = text.length();
+        mViewBinding.tvTextNum.setText(String.format(Locale.getDefault(), "%d/200", cLength));
+    }
+
 
     public void unbind() {
+        if (mViewBinding != null && mTextWatcher != null) {
+            mViewBinding.etContent.removeTextChangedListener(mTextWatcher);
+        }
         if (mViewBinding != null) {
             mViewBinding = null;
         }
@@ -89,7 +144,7 @@ public class CourseSetCommentDialog extends Dialog implements View.OnClickListen
             return;
         }
 
-        if (v.getId() == R.id.fl_content) {
+        if (v.getId() == R.id.cs_root) {
             KeyboardUtils.showSoftInput(mViewBinding.etContent);
             return;
         }
@@ -117,4 +172,5 @@ public class CourseSetCommentDialog extends Dialog implements View.OnClickListen
     public interface OnSubmitClickListener {
         void onSubmit(String content, int type);
     }
+
 }

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

@@ -9,7 +9,6 @@
         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" />
@@ -39,7 +38,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@drawable/bg_white_10dp"
-                android:paddingBottom="20dp">
+                android:paddingBottom="12dp">
 
                 <ImageView
                     android:id="@+id/iv_time_icon"
@@ -84,12 +83,12 @@
                     android:background="@color/color_f2f2f2"
                     app:layout_constraintTop_toBottomOf="@+id/iv_time_icon" />
 
-                <com.cooleshow.base.widgets.QMUIRadiusImageView
+                <de.hdodenhof.circleimageview.CircleImageView
                     android:id="@+id/iv_avatar"
-                    android:layout_width="54dp"
-                    android:layout_height="54dp"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
                     android:layout_marginStart="11dp"
-                    android:layout_marginTop="17dp"
+                    android:layout_marginTop="12dp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/view_line"
@@ -97,41 +96,81 @@
 
                 <TextView
                     android:id="@+id/tv_title"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
                     android:ellipsize="end"
                     android:includeFontPadding="false"
-                    android:maxLines="2"
+                    android:maxLines="1"
                     android:textColor="@color/color_1a1a1a"
-                    android:textSize="@dimen/sp_16"
+                    android:textSize="@dimen/sp_15"
                     android:textStyle="bold"
-                    app:layout_constraintBottom_toTopOf="@+id/tv_course_name"
+                    app:layout_constraintHorizontal_bias="0"
+                    app:layout_constraintWidth_default="wrap"
+                    app:layout_constraintHorizontal_chainStyle="packed"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_name"
                     app:layout_constraintLeft_toRightOf="@+id/iv_avatar"
-                    app:layout_constraintRight_toLeftOf="@+id/iv_go_chat"
+                    app:layout_constraintRight_toLeftOf="@+id/iv_attendance_status"
                     app:layout_constraintTop_toTopOf="@+id/iv_avatar"
                     app:layout_constraintVertical_chainStyle="packed"
-                    tools:text="张豆豆张豆豆张豆张张" />
+                    tools:text="张豆豆张张张" />
 
                 <ImageView
+                    tools:visibility="visible"
+                    android:visibility="gone"
+                    android:layout_marginStart="5dp"
+                    android:id="@+id/iv_attendance_status"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintLeft_toRightOf="@+id/tv_title"
+                    app:layout_constraintBottom_toBottomOf="@+id/tv_title"
+                    app:layout_constraintTop_toTopOf="@+id/tv_title"
+                    android:src="@drawable/icon_course_attendance_truancy"
+                    android:layout_width="wrap_content"
+                    android:layout_marginEnd="12dp"
+                    android:adjustViewBounds="true"
+                    android:layout_height="17.1dp"/>
+
+                <ImageView
+                    android:visibility="gone"
                     android:paddingStart="5dp"
                     android:id="@+id/iv_go_chat"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="5dp"
                     android:src="@drawable/icon_chat_small"
+                    app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintBottom_toBottomOf="@+id/tv_title"
                     app:layout_constraintLeft_toRightOf="@+id/tv_title"
                     app:layout_constraintTop_toTopOf="@+id/tv_title" />
 
+
+                <TextView
+                    tools:text="小张小张小张小张小张小张小张小张小张小张小张小张小张小张"
+                    android:includeFontPadding="false"
+                    android:id="@+id/tv_name"
+                    android:layout_marginTop="8dp"
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    app:layout_constraintRight_toLeftOf="@+id/tv_course_name"
+                    app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
+                    app:layout_constraintLeft_toLeftOf="@+id/tv_title"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_title"
+                    android:textColor="@color/color_999999"
+                    android:textSize="@dimen/sp_13"
+                    android:layout_width="0dp"
+                    app:layout_constraintHorizontal_chainStyle="packed"
+                    app:layout_constraintHorizontal_bias="0"
+                    app:layout_constraintWidth_default="wrap"
+                    android:layout_height="wrap_content"/>
+
                 <TextView
                     android:id="@+id/tv_course_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
                     android:background="@drawable/shape_couse_type_text_bg"
                     android:gravity="center"
+                    android:layout_marginEnd="12dp"
+                    android:layout_marginStart="4dp"
                     android:includeFontPadding="false"
                     android:paddingStart="4dp"
                     android:paddingTop="1.5dp"
@@ -139,9 +178,10 @@
                     android:paddingBottom="1.5dp"
                     android:textColor="@color/color_ff8c00"
                     android:textSize="@dimen/sp_10"
-                    app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
-                    app:layout_constraintLeft_toLeftOf="@+id/tv_title"
-                    app:layout_constraintTop_toBottomOf="@+id/tv_title"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintBottom_toBottomOf="@+id/tv_name"
+                    app:layout_constraintTop_toTopOf="@+id/tv_name"
+                    app:layout_constraintLeft_toRightOf="@+id/tv_name"
                     tools:text="单簧管" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
@@ -169,7 +209,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:includeFontPadding="false"
-                    android:paddingStart="5dp"
+                    android:paddingStart="6dp"
                     android:text="老师评价"
                     android:textColor="@color/color_1a1a1a"
                     android:textSize="@dimen/sp_13"
@@ -206,12 +246,14 @@
                     app:layout_constraintTop_toBottomOf="@+id/view_title_line">
 
                     <TextView
+                        android:layout_marginEnd="20dp"
+                        android:layout_marginStart="20dp"
                         android:id="@+id/tv_teacher_appraisal_empty_text"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:drawableLeft="@drawable/icon_teacher_appraisal_empty"
-                        android:drawablePadding="8dp"
+                        android:drawablePadding="10dp"
                         android:gravity="center_vertical"
                         android:text="课程结束之后记得对学员的\n表现进行评价哦！"
                         android:textColor="@color/color_999999"
@@ -288,11 +330,13 @@
 
                     <TextView
                         android:id="@+id/tv_stu_comment_empty_text"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
+                        android:layout_marginEnd="20dp"
+                        android:layout_marginStart="20dp"
+                        android:drawablePadding="10dp"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:drawableLeft="@drawable/icon_stu_comment_empty"
-                        android:drawablePadding="8dp"
                         android:gravity="center_vertical"
                         android:text="学员尚未对您进行评价"
                         android:textColor="@color/color_999999"
@@ -370,11 +414,13 @@
 
                     <TextView
                         android:id="@+id/tv_homework_empty_text"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
+                        android:layout_marginEnd="20dp"
+                        android:layout_marginStart="20dp"
+                        android:drawablePadding="10dp"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:drawableLeft="@drawable/icon_homework_empty"
-                        android:drawablePadding="8dp"
                         android:gravity="center_vertical"
                         android:text="课程结束之后记得布置作业哦！"
                         android:textColor="@color/color_999999"
@@ -436,11 +482,13 @@
 
                     <TextView
                         android:id="@+id/tv_homework_video_empty_text"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
+                        android:layout_marginEnd="20dp"
+                        android:layout_marginStart="20dp"
+                        android:drawablePadding="10dp"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:drawableLeft="@drawable/icon_homework_video_empty"
-                        android:drawablePadding="8dp"
                         android:gravity="center_vertical"
                         android:text="学员尚未上传作业视频"
                         android:textColor="@color/color_999999"
@@ -518,11 +566,13 @@
 
                     <TextView
                         android:id="@+id/tv_homework_comment_empty_text"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
+                        android:layout_marginEnd="20dp"
+                        android:layout_marginStart="20dp"
+                        android:drawablePadding="10dp"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:drawableLeft="@drawable/icon_homework_comment"
-                        android:drawablePadding="8dp"
                         android:gravity="center_vertical"
                         android:text="您尚未点评作业"
                         android:textColor="@color/color_999999"

teacher/src/main/res/layout/dialog_set_course_comment_layout.xml

@@ -1,95 +1,92 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:id="@+id/cs_root"
+    android:background="@drawable/shape_f8f9fc_top_12dp"
+    android:paddingBottom="30dp">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginEnd="32dp"
-        android:background="@drawable/bg_white_10dp">
+        android:layout_marginTop="18dp"
+        android:includeFontPadding="false"
+        android:text="评价学员"
+        android:textColor="@color/color_333333"
+        android:textSize="@dimen/sp_18"
+        android:textStyle="bold"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageView
-            android:id="@+id/iv_close"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="13dp"
-            android:src="@drawable/icon_close_dialog"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+    <ImageView
+        android:id="@+id/iv_close"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="12dp"
+        android:src="@drawable/icon_close_dialog_32_32"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_title"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/tv_title" />
 
-        <View
-            android:id="@+id/view_title_tag"
-            android:layout_width="4dp"
-            android:layout_height="17dp"
-            android:layout_marginStart="19dp"
-            android:layout_marginTop="27dp"
-            android:background="@drawable/shape_course_title_tag_bg"
+    <FrameLayout
+        android:id="@+id/fl_input"
+        android:layout_width="match_parent"
+        android:layout_height="164dp"
+        android:layout_marginStart="14dp"
+        android:layout_marginTop="18dp"
+        android:layout_marginEnd="14dp"
+        android:background="@drawable/shape_white_8dp"
+        android:minHeight="164dp"
+        android:paddingStart="10dp"
+        android:paddingTop="12dp"
+        android:paddingEnd="10dp"
+        android:paddingBottom="18dp"
+        app:layout_constraintTop_toBottomOf="@+id/tv_title">
+
+        <EditText
+            android:id="@+id/et_content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginBottom="20dp"
+            android:background="@color/transparent"
+            android:gravity="left"
+            android:hint="请填写您的课程规划"
+            android:maxLength="200"
+            android:textCursorDrawable="@drawable/shape_2dc7aa_1dp"
+            android:textColor="@color/black_333"
+            android:textColorHint="@color/color_aaaaaa"
+            android:textSize="@dimen/sp_15"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:id="@+id/tv_title"
+            android:id="@+id/tv_text_num"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="4dp"
+            android:layout_gravity="bottom|right"
             android:includeFontPadding="false"
-            android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp_18"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="@+id/view_title_tag"
-            app:layout_constraintLeft_toRightOf="@+id/view_title_tag"
-            app:layout_constraintTop_toTopOf="@+id/view_title_tag"
-            tools:text="评价学员" />
+            android:text="0/200"
+            android:textColor="@color/color_aaaaaa"
+            android:textSize="@dimen/sp_14" />
+    </FrameLayout>
 
-        <FrameLayout
-            android:id="@+id/fl_content"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="18dp"
-            android:layout_marginTop="22dp"
-            android:layout_marginEnd="18dp"
-            android:background="@drawable/shape_bg_f7f8f9_4dp"
-            android:minHeight="112dp"
-            android:padding="11dp"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/view_title_tag">
-
-            <androidx.appcompat.widget.AppCompatEditText
-                android:id="@+id/et_content"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@null"
-                android:hint="请输入您对本次课程学员表现的评价"
-                android:maxHeight="200dp"
-                android:textColor="@color/color_333333"
-                android:textColorHint="@color/color_999999"
-                android:textSize="@dimen/sp_14" />
-
-        </FrameLayout>
-
-        <TextView
-            android:id="@+id/tv_submit"
-            android:layout_width="0dp"
-            android:layout_height="44dp"
-            android:layout_marginStart="26dp"
-            android:layout_marginTop="15dp"
-            android:layout_marginEnd="26dp"
-            android:layout_marginBottom="15dp"
-            android:background="@drawable/shape_login_bt_bg"
-            android:gravity="center"
-            android:includeFontPadding="false"
-            android:text="@string/submit_action_str"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_16"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/fl_content" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</FrameLayout>
+    <TextView
+        android:id="@+id/tv_submit"
+        android:layout_width="0dp"
+        android:layout_height="44dp"
+        android:layout_marginStart="28dp"
+        android:layout_marginTop="30dp"
+        android:layout_marginEnd="28dp"
+        android:background="@drawable/shape_2dc7aa_39dp"
+        android:gravity="center"
+        android:text="@string/submit_action_str"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_18"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/fl_input" />
+</androidx.constraintlayout.widget.ConstraintLayout>