修改部分样式问题

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

@@ -188,11 +188,12 @@ public class PianoCourseGroupDetailActivity extends BaseMVPActivity<AcPianoCours
     private void reBuildFilter(Date date, String status, String attendanceStatus) {
         currentSelectDate = date != null ? date : TimeUtils.getNowDate();
         String targetDateTimeStr = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy-MM"));
+        String targetDateTimeText = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy年MM月"));
         classMonth = targetDateTimeStr;
         courseStatus = !TextUtils.isEmpty(status) ? status : CourseStatusType.ALL.getId();
         currentAttendanceStatus = !TextUtils.isEmpty(attendanceStatus) ? attendanceStatus : CourseAttendanceStatusType.ALL.getId();
         if (viewBinding != null) {
-            viewBinding.tvTime.setText(classMonth);
+            viewBinding.tvTime.setText(targetDateTimeText);
         }
         refreshCourseList(true);
     }

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

@@ -186,12 +186,13 @@ public class VIPOrInterestCourseGroupDetailActivity extends BaseMVPActivity<AcVi
 
     private void reBuildFilter(Date date, String status, String attendanceStatus) {
         currentSelectDate = date != null ? date : TimeUtils.getNowDate();
-        String targetDateTimeStr = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy年MM月"));
+        String targetDateTimeStr = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy-MM"));
+        String targetDateTimeText = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy年MM月"));
         classMonth = targetDateTimeStr;
         courseStatus = !TextUtils.isEmpty(status) ? status : CourseStatusType.ALL.getId();
         currentAttendanceStatus = !TextUtils.isEmpty(attendanceStatus) ? attendanceStatus : CourseAttendanceStatusType.ALL.getId();
         if (viewBinding != null) {
-            viewBinding.tvTime.setText(classMonth);
+            viewBinding.tvTime.setText(targetDateTimeText);
         }
         refreshCourseList(true);
     }

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

@@ -287,9 +287,9 @@
                     android:gravity="center"
                     android:includeFontPadding="false"
                     android:maxLines="1"
-                    android:paddingStart="10dp"
+                    android:paddingEnd="5dp"
+                    android:paddingStart="5dp"
                     android:paddingTop="12dp"
-                    android:paddingEnd="10dp"
                     android:paddingBottom="12dp"
                     android:textColor="@color/color_131415"
                     android:textSize="@dimen/sp_14"
@@ -310,9 +310,9 @@
                     android:gravity="center"
                     android:includeFontPadding="false"
                     android:maxLines="1"
-                    android:paddingStart="10dp"
+                    android:paddingEnd="5dp"
+                    android:paddingStart="5dp"
                     android:paddingTop="12dp"
-                    android:paddingEnd="10dp"
                     android:paddingBottom="12dp"
                     android:text="全部状态"
                     android:textColor="@color/color_131415"
@@ -334,9 +334,9 @@
                     android:gravity="center"
                     android:includeFontPadding="false"
                     android:maxLines="1"
-                    android:paddingStart="10dp"
+                    android:paddingEnd="5dp"
+                    android:paddingStart="5dp"
                     android:paddingTop="12dp"
-                    android:paddingEnd="10dp"
                     android:paddingBottom="12dp"
                     android:text="全部考勤"
                     android:textColor="@color/color_131415"

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

@@ -286,11 +286,11 @@
                     android:drawablePadding="6dp"
                     android:ellipsize="end"
                     android:gravity="center"
+                    android:paddingEnd="5dp"
+                    android:paddingStart="5dp"
                     android:includeFontPadding="false"
                     android:maxLines="1"
-                    android:paddingStart="10dp"
                     android:paddingTop="12dp"
-                    android:paddingEnd="10dp"
                     android:paddingBottom="12dp"
                     android:textColor="@color/color_131415"
                     android:textSize="@dimen/sp_14"
@@ -299,7 +299,7 @@
                     app:layout_constraintRight_toLeftOf="@+id/guide_line1"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintWidth_default="wrap"
-                    tools:text="2021年9月" />
+                    tools:text="2021年19月" />
 
                 <TextView
                     android:id="@+id/tv_course_status"
@@ -311,9 +311,9 @@
                     android:gravity="center"
                     android:includeFontPadding="false"
                     android:maxLines="1"
-                    android:paddingStart="10dp"
+                    android:paddingEnd="5dp"
+                    android:paddingStart="5dp"
                     android:paddingTop="12dp"
-                    android:paddingEnd="10dp"
                     android:paddingBottom="12dp"
                     android:text="全部状态"
                     android:textColor="@color/color_131415"
@@ -335,9 +335,9 @@
                     android:gravity="center"
                     android:includeFontPadding="false"
                     android:maxLines="1"
-                    android:paddingStart="10dp"
+                    android:paddingEnd="5dp"
+                    android:paddingStart="5dp"
                     android:paddingTop="12dp"
-                    android:paddingEnd="10dp"
                     android:paddingBottom="12dp"
                     android:text="全部考勤"
                     android:textColor="@color/color_131415"

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

@@ -51,7 +51,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
-        android:layout_marginEnd="5dp"
         android:ellipsize="end"
         android:includeFontPadding="false"
         android:maxLines="1"

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

@@ -50,7 +50,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
-        android:layout_marginEnd="5dp"
         android:ellipsize="end"
         android:includeFontPadding="false"
         android:maxLines="1"

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

@@ -170,11 +170,12 @@ public class PianoCourseGroupDetailFragment extends BaseMVPFragment<FgPianoCours
     private void reBuildFilter(Date date, String status, String attendanceStatus) {
         currentSelectDate = date != null ? date : TimeUtils.getNowDate();
         String targetDateTimeStr = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy-MM"));
+        String targetDateTimeText = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy年MM月"));
         classMonth = targetDateTimeStr;
         courseStatus = !TextUtils.isEmpty(status) ? status : CourseStatusType.ALL.getId();
         currentAttendanceStatus = !TextUtils.isEmpty(attendanceStatus) ? attendanceStatus : CourseAttendanceStatusType.ALL.getId();
         if (mViewBinding != null) {
-            mViewBinding.tvTime.setText(classMonth);
+            mViewBinding.tvTime.setText(targetDateTimeText);
         }
         refreshCourseList(false);
     }

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

@@ -198,12 +198,13 @@ public class VIPOrInterestCourseGroupDetailActivity extends BaseMVPActivity<AcVi
 
     private void reBuildFilter(Date date, String status, String attendanceStatus) {
         currentSelectDate = date != null ? date : TimeUtils.getNowDate();
-        String targetDateTimeStr = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy年MM月"));
+        String targetDateTimeStr = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy-MM"));
+        String targetDateTimeText = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy年MM月"));
         classMonth = targetDateTimeStr;
         courseStatus = !TextUtils.isEmpty(status) ? status : CourseStatusType.ALL.getId();
         currentAttendanceStatus = !TextUtils.isEmpty(attendanceStatus) ? attendanceStatus : CourseAttendanceStatusType.ALL.getId();
         if (viewBinding != null) {
-            viewBinding.tvTime.setText(classMonth);
+            viewBinding.tvTime.setText(targetDateTimeText);
         }
         refreshCourseList(true);
     }

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

@@ -332,9 +332,9 @@
                     android:gravity="center"
                     android:includeFontPadding="false"
                     android:maxLines="1"
-                    android:paddingStart="10dp"
+                    android:paddingEnd="5dp"
+                    android:paddingStart="5dp"
                     android:paddingTop="12dp"
-                    android:paddingEnd="10dp"
                     android:paddingBottom="12dp"
                     android:textColor="@color/color_131415"
                     android:textSize="@dimen/sp_14"
@@ -343,7 +343,7 @@
                     app:layout_constraintRight_toLeftOf="@+id/guide_line1"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintWidth_default="wrap"
-                    tools:text="2021年9月" />
+                    tools:text="2021年19月" />
 
                 <TextView
                     android:id="@+id/tv_course_status"
@@ -355,9 +355,9 @@
                     android:gravity="center"
                     android:includeFontPadding="false"
                     android:maxLines="1"
-                    android:paddingStart="10dp"
+                    android:paddingEnd="5dp"
+                    android:paddingStart="5dp"
                     android:paddingTop="12dp"
-                    android:paddingEnd="10dp"
                     android:paddingBottom="12dp"
                     android:text="全部状态"
                     android:textColor="@color/color_131415"
@@ -379,9 +379,9 @@
                     android:gravity="center"
                     android:includeFontPadding="false"
                     android:maxLines="1"
-                    android:paddingStart="10dp"
+                    android:paddingEnd="5dp"
+                    android:paddingStart="5dp"
                     android:paddingTop="12dp"
-                    android:paddingEnd="10dp"
                     android:paddingBottom="12dp"
                     android:text="全部考勤"
                     android:textColor="@color/color_131415"

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

@@ -32,9 +32,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/tv_tips"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginRight="10dp"
+        android:layout_marginLeft="9dp"
+        android:layout_marginTop="11dp"
+        android:layout_marginRight="9dp"
         android:layout_marginBottom="119dp"
         android:nestedScrollingEnabled="false"
         android:overScrollMode="never"

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

@@ -51,7 +51,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
-        android:layout_marginEnd="5dp"
         android:ellipsize="end"
         android:includeFontPadding="false"
         android:maxLines="1"

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

@@ -50,7 +50,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
-        android:layout_marginEnd="5dp"
         android:ellipsize="end"
         android:includeFontPadding="false"
         android:maxLines="1"

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

@@ -2,13 +2,14 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
+    android:layout_marginTop="5dp"
     android:layout_height="wrap_content">
 
 
     <View
         android:id="@+id/view_mark"
         android:layout_width="3dp"
-        android:layout_height="16dp"
+        android:layout_height="13dp"
         android:layout_marginLeft="5dp"
         android:background="@drawable/mark_2dc7aa_3radius"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -28,6 +29,7 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_item"
+        android:layout_marginTop="5dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintLeft_toLeftOf="parent"

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

@@ -3,24 +3,22 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginLeft="5dp"
+    android:layout_marginRight="5dp"
+    android:layout_marginTop="5dp"
+    android:layout_marginBottom="5dp"
     xmlns:tools="http://schemas.android.com/tools">
 
     <com.cooleshow.base.widgets.QMUIRadiusImageView
         android:id="@+id/iv_pic"
         android:layout_width="match_parent"
         android:layout_height="108dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginTop="5dp"
-        android:layout_marginRight="5dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:qmui_corner_radius="10dp" />
     <View
         android:layout_width="match_parent"
         android:layout_height="108dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginTop="5dp"
-        android:layout_marginRight="5dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         android:background="@drawable/bg_teachable_instrument"