修改部分样式问题

TUIKit/TUIConversation/tuiconversation/src/main/res/layout/conversation_list_item_layout.xml

@@ -36,8 +36,8 @@
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:layout_alignParentRight="true"
-            android:layout_marginStart="-10dp"
-            android:layout_marginTop="-8dp"
+            android:layout_marginTop="-6dp"
+            android:layout_marginEnd="10dp"
             android:gravity="center"
             android:includeFontPadding="false"
             android:textColor="#FFFFFF"

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

@@ -24,7 +24,7 @@ public class VIPCourseAdapter extends BaseQuickAdapter<VIPCourseGroupListBean.Ro
     @Override
     protected void convert(@NonNull BaseViewHolder holder, VIPCourseGroupListBean.RowsBean bean) {
         ImageView iv_avatar = holder.getView(R.id.iv_avatar);
-        GlideUtils.INSTANCE.loadImage(getContext(), bean.getStudentAvatar(), iv_avatar, R.drawable.icon_teacher_default_head);
+        GlideUtils.INSTANCE.loadImage(getContext(), bean.getTeacherAvatar(), iv_avatar, R.drawable.icon_teacher_default_head);
 
         holder.setText(R.id.tv_title, bean.getCourseGroupName());
         holder.setText(R.id.tv_name, bean.getTeacherName());

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

@@ -25,12 +25,11 @@ public class VIPCourseGroupDetailBean {
     private String courseNum;
     private String coursePlan;
     private String status;
-    private String studentAvatar;
-    private String studentName;
+    private String teacherAvatar;
+    private String teacherName;
     private String studentNum;
     private String subjectId;
     private String subjectName;
-    private String teacherName;
 
     public String getTeacherName() {
         return teacherName;
@@ -88,20 +87,12 @@ public class VIPCourseGroupDetailBean {
         this.status = status;
     }
 
-    public String getStudentAvatar() {
-        return studentAvatar;
-    }
-
-    public void setStudentAvatar(String studentAvatar) {
-        this.studentAvatar = studentAvatar;
-    }
-
-    public String getStudentName() {
-        return studentName;
+    public String getTeacherAvatar() {
+        return teacherAvatar;
     }
 
-    public void setStudentName(String studentName) {
-        this.studentName = studentName;
+    public void setTeacherAvatar(String teacherAvatar) {
+        this.teacherAvatar = teacherAvatar;
     }
 
     public String getStudentNum() {

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

@@ -270,7 +270,7 @@ public class VIPOrInterestCourseGroupDetailActivity extends BaseMVPActivity<AcVi
             return;
         }
         this.mDetailBean = bean;
-        GlideUtils.INSTANCE.loadImage(this, bean.getStudentAvatar(), viewBinding.ivAvatar, R.drawable.icon_teacher_default_head);
+        GlideUtils.INSTANCE.loadImage(this, bean.getTeacherAvatar(), viewBinding.ivAvatar, R.drawable.icon_teacher_default_head);
 
         viewBinding.tvCourseGroupTitle.setText(bean.getCourseGroupName());
         viewBinding.tvName.setText(bean.getTeacherName());

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

@@ -124,9 +124,9 @@
                             android:gravity="center"
                             android:includeFontPadding="false"
                             android:paddingStart="4dp"
-                            android:paddingTop="2dp"
+                            android:paddingTop="1dp"
                             android:paddingEnd="4dp"
-                            android:paddingBottom="2dp"
+                            android:paddingBottom="1dp"
                             android:textColor="@color/color_ff8c00"
                             android:textSize="@dimen/sp_10"
                             app:layout_constraintBottom_toBottomOf="@+id/tv_name"

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

@@ -128,11 +128,11 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:paddingStart="4dp"
-        android:paddingTop="2dp"
+        android:paddingTop="1dp"
         android:paddingEnd="4dp"
-        android:paddingBottom="2dp"
+        android:paddingBottom="1dp"
         android:textColor="@color/color_ff8c00"
-        android:textSize="@dimen/sp_11"
+        android:textSize="@dimen/sp_10"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"
         app:layout_constraintLeft_toRightOf="@+id/tv_name"
         app:layout_constraintRight_toLeftOf="@+id/iv_arrow"

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

@@ -77,9 +77,9 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:paddingStart="4dp"
-        android:paddingTop="2dp"
+        android:paddingTop="1dp"
         android:paddingEnd="4dp"
-        android:paddingBottom="2dp"
+        android:paddingBottom="1dp"
         android:textColor="@color/color_ff8c00"
         android:textSize="@dimen/sp_10"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"

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

@@ -129,11 +129,11 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:paddingStart="4dp"
-        android:paddingTop="2dp"
+        android:paddingTop="1dp"
         android:paddingEnd="4dp"
-        android:paddingBottom="2dp"
+        android:paddingBottom="1dp"
         android:textColor="@color/color_ff8c00"
-        android:textSize="@dimen/sp_11"
+        android:textSize="@dimen/sp_10"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"
         app:layout_constraintLeft_toRightOf="@+id/tv_name"
         app:layout_constraintRight_toLeftOf="@+id/iv_arrow"

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

@@ -75,9 +75,9 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:paddingStart="4dp"
-        android:paddingTop="2dp"
+        android:paddingTop="1dp"
         android:paddingEnd="4dp"
-        android:paddingBottom="2dp"
+        android:paddingBottom="1dp"
         android:textColor="@color/color_ff8c00"
         android:textSize="@dimen/sp_10"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"

tclive/src/main/java/com/daya/tclive/ui/TCStudentLiveRoomActivity.java

@@ -581,6 +581,7 @@ public class TCStudentLiveRoomActivity extends BaseMVPActivity<AcTtLiveroomLayou
         viewBinding.flVideoContainer.setOnClickListener(this);
         viewBinding.ivVoiceSwitch.setOnClickListener(this);
         viewBinding.viewLiveStatus.tvRetry.setOnClickListener(this);
+        viewBinding.tvVipCourse.setOnClickListener(this);
         viewBinding.tvAppointmentCourse.setOnClickListener(this);
         viewBinding.tvLiveCourse.setOnClickListener(this);
         viewBinding.tvVideoCourse.setOnClickListener(this);
@@ -698,7 +699,7 @@ public class TCStudentLiveRoomActivity extends BaseMVPActivity<AcTtLiveroomLayou
             return;
         }
 
-        if (id == R.id.tv_appointment_course || id == R.id.tv_live_course
+        if (id == R.id.tv_vip_course || id == R.id.tv_appointment_course || id == R.id.tv_live_course
                 || id == R.id.tv_video_course || id == R.id.tv_music_sheet) {
             //约课 直播课 视频课 曲谱
             startTeacherHomePage(id);

teacher/src/main/java/com/cooleshow/teacher/adapter/VIPCourseGroupDetailAdapter.java

@@ -38,13 +38,14 @@ public class VIPCourseGroupDetailAdapter extends BaseQuickAdapter<VIPCourseGroup
         if (courseStudentVos != null && courseStudentVos.size() > 0) {
             VIPCourseGroupDetailListBean.CourseStudentVosBean courseStudentVosBean = courseStudentVos.get(0);
             GlideUtils.INSTANCE.loadImage(getContext(), courseStudentVosBean.getAvatar(), iv_avatar, R.drawable.icon_teacher_default_head);
+            holder.setText(R.id.tv_name, courseStudentVosBean.getUserName());
         }
 
         holder.setText(R.id.tv_title, data.getCourseGroupName());
 
         ImageView iv_attendance_status = holder.getView(R.id.iv_attendance_status);
 
-        holder.setText(R.id.tv_name, data.getUserName());
+
 
         holder.setText(R.id.tv_course_name, data.getSubjectName());
 

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

@@ -124,9 +124,9 @@
                             android:gravity="center"
                             android:includeFontPadding="false"
                             android:paddingStart="4dp"
-                            android:paddingTop="2dp"
+                            android:paddingTop="1dp"
                             android:paddingEnd="4dp"
-                            android:paddingBottom="2dp"
+                            android:paddingBottom="1dp"
                             android:textColor="@color/color_ff8c00"
                             android:textSize="@dimen/sp_10"
                             app:layout_constraintBottom_toBottomOf="@+id/tv_name"

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

@@ -128,11 +128,11 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:paddingStart="4dp"
-        android:paddingTop="2dp"
+        android:paddingTop="1dp"
         android:paddingEnd="4dp"
-        android:paddingBottom="2dp"
+        android:paddingBottom="1dp"
         android:textColor="@color/color_ff8c00"
-        android:textSize="@dimen/sp_11"
+        android:textSize="@dimen/sp_10"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"
         app:layout_constraintLeft_toRightOf="@+id/tv_name"
         app:layout_constraintRight_toLeftOf="@+id/iv_arrow"

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

@@ -76,9 +76,9 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:paddingStart="4dp"
-        android:paddingTop="2dp"
+        android:paddingTop="1dp"
         android:paddingEnd="4dp"
-        android:paddingBottom="2dp"
+        android:paddingBottom="1dp"
         android:textColor="@color/color_ff8c00"
         android:textSize="@dimen/sp_10"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"

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

@@ -51,11 +51,11 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:paddingStart="4dp"
-        android:paddingTop="2dp"
+        android:paddingTop="1dp"
         android:paddingEnd="4dp"
-        android:paddingBottom="2dp"
+        android:paddingBottom="1dp"
         android:textColor="@color/color_ff8c00"
-        android:textSize="@dimen/sp_11"
+        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"

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

@@ -128,11 +128,11 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:paddingStart="4dp"
-        android:paddingTop="2dp"
+        android:paddingTop="1dp"
         android:paddingEnd="4dp"
-        android:paddingBottom="2dp"
+        android:paddingBottom="1dp"
         android:textColor="@color/color_ff8c00"
-        android:textSize="@dimen/sp_11"
+        android:textSize="@dimen/sp_10"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"
         app:layout_constraintLeft_toRightOf="@+id/tv_name"
         app:layout_constraintRight_toLeftOf="@+id/iv_arrow"

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

@@ -75,9 +75,9 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:paddingStart="4dp"
-        android:paddingTop="2dp"
+        android:paddingTop="1dp"
         android:paddingEnd="4dp"
-        android:paddingBottom="2dp"
+        android:paddingBottom="1dp"
         android:textColor="@color/color_ff8c00"
         android:textSize="@dimen/sp_10"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"