瀏覽代碼

修改部分样式问题

Pq 7 月之前
父節點
當前提交
6570145521

+ 4 - 1
teacher/src/main/java/com/cooleshow/teacher/adapter/GroupCourseGroupStudentListAdapter.java

@@ -35,7 +35,10 @@ public class GroupCourseGroupStudentListAdapter extends BaseQuickAdapter<PianoCo
 
     private void setBackGroupResources(View csRoot, BaseViewHolder holder) {
         int pos = holder.getLayoutPosition();
-        if(getData().size() ==1){
+        View view_line = holder.getView(R.id.view_line);
+        view_line.setVisibility(pos == getData().size() - 1 ? View.INVISIBLE : View.VISIBLE);
+
+        if (getData().size() == 1) {
             csRoot.setBackgroundResource(com.cooleshow.base.R.drawable.shape_10dp_white);
             return;
         }

+ 2 - 0
teacher/src/main/java/com/cooleshow/teacher/adapter/PianoCourseGroupStudentListAdapter.java

@@ -35,6 +35,8 @@ public class PianoCourseGroupStudentListAdapter extends BaseQuickAdapter<PianoCo
 
     private void setBackGroupResources(View csRoot, BaseViewHolder holder) {
         int pos = holder.getLayoutPosition();
+        View view_line = holder.getView(R.id.view_line);
+        view_line.setVisibility(pos == getData().size() - 1 ? View.INVISIBLE : View.VISIBLE);
         if(getData().size() ==1){
             csRoot.setBackgroundResource(com.cooleshow.base.R.drawable.shape_10dp_white);
             return;

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/constants/CourseConstants.java

@@ -65,7 +65,7 @@ public class CourseConstants {
      */
     public static String getTeacherEvaluateDefaultTip(String courseStatus) {
         if (TextUtils.equals(courseStatus, CourseStatusType.COMPLETE.getId())) {
-            return "课程已结束,请对学员的表现进行评价哦";
+            return Utils.getApp().getString(R.string.course_end_comment_stu_str);
         }
         return "课程结束之后才能评价学员哦";
     }

+ 0 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/comment/CourseCommentDetailActivity.java

@@ -147,13 +147,11 @@ public class CourseCommentDetailActivity extends BaseMVPActivity<ActivityCourseC
                 viewBinding.tvTeacherAppraisalEmptyText.setVisibility(View.GONE);
                 viewBinding.tvTeacherAppraisalContent.setVisibility(View.VISIBLE);
                 viewBinding.tvTeacherAppraisalContent.setText(commentBean.teacherReplied);
-                viewBinding.tvSubmit.setVisibility(View.GONE);
             } else {
                 //老师未评价
                 viewBinding.tvSetTeacherComment.setVisibility(View.VISIBLE);
                 viewBinding.tvTeacherAppraisalEmptyText.setVisibility(View.VISIBLE);
                 viewBinding.tvTeacherAppraisalContent.setVisibility(View.GONE);
-                viewBinding.tvSubmit.setVisibility(View.VISIBLE);
             }
         }
     }

+ 5 - 3
teacher/src/main/res/layout/activity_course_comment_detail_layout.xml

@@ -227,14 +227,16 @@
             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:text="@string/course_end_comment_stu_str"
                 android:textColor="@color/color_999999"
                 android:textSize="@dimen/sp_13" />
 

+ 8 - 2
teacher/src/main/res/layout/item_group_course_group_student_layout.xml

@@ -10,8 +10,7 @@
     android:background="@drawable/bg_white_10dp"
     android:paddingStart="12dp"
     android:paddingTop="12dp"
-    android:paddingEnd="12dp"
-    android:paddingBottom="12dp">
+    android:paddingEnd="12dp">
 
     <de.hdodenhof.circleimageview.CircleImageView
         android:id="@+id/iv_avatar"
@@ -71,5 +70,12 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <View
+        android:id="@+id/view_line"
+        android:layout_marginTop="12dp"
+        app:layout_constraintTop_toBottomOf="@+id/iv_avatar"
+        android:background="@color/color_f2f2f2"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

+ 8 - 3
teacher/src/main/res/layout/item_piano_course_group_student_layout.xml

@@ -10,8 +10,7 @@
     android:background="@drawable/bg_white_10dp"
     android:paddingStart="12dp"
     android:paddingTop="12dp"
-    android:paddingEnd="12dp"
-    android:paddingBottom="12dp">
+    android:paddingEnd="12dp">
 
     <de.hdodenhof.circleimageview.CircleImageView
         android:id="@+id/iv_avatar"
@@ -71,5 +70,11 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-
+    <View
+        android:id="@+id/view_line"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="12dp"
+        android:background="@color/color_f2f2f2"
+        app:layout_constraintTop_toBottomOf="@+id/iv_avatar" />
 </androidx.constraintlayout.widget.ConstraintLayout>

+ 2 - 2
teacher/src/main/res/layout/view_pc_detail_course_tab_layout.xml

@@ -5,8 +5,8 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
     <TextView
-        android:paddingStart="15dp"
-        android:paddingEnd="15dp"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
         tools:text="哈哈"
         android:gravity="center"
         android:layout_gravity="center"

+ 1 - 0
teacher/src/main/res/values/strings.xml

@@ -77,4 +77,5 @@
     <string name="will_start_tip_str">即将开始</string>
     <string name="please_set_homework_tip">课程已结束,请布置作业</string>
     <string name="student_not_upload_homework_tip">学员尚未上传作业视频</string>
+    <string name="course_end_comment_stu_str">课程已结束,请对学员的\n表现进行评价哦</string>
 </resources>