修改学生端样式问题

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

@@ -55,7 +55,7 @@ public class TeachableInstrumentAdapter extends BaseQuickAdapter<TeachableInstru
             if (null != teachableInstrumentBean.subjects && teachableInstrumentBean.subjects.size() > 0) {
                 for (TeachableInstrumentBean subject : teachableInstrumentBean.subjects) {
                     if (subject.id==id){
-                        subject.isSelect=true;
+                        subject.isSelect=!subject.isSelect;
                     }else {
                         subject.isSelect=false;
                     }

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

@@ -45,20 +45,20 @@ public class TeachableInstrumentItemAdapter extends BaseQuickAdapter<TeachableIn
         iv_pic.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-               if (!item.isSelect){
-                   if (null!=itemSelectListener){
-                       itemSelectListener.select(item.id);
-                   }
-               }
+                if (null != itemSelectListener) {
+                    itemSelectListener.select(item.id);
+                }
             }
         });
     }
 
-    public  interface ItemSelectListener{
+    public interface ItemSelectListener {
         void select(long id);
     }
+
     private ItemSelectListener itemSelectListener;
-    public void setItemSelectListener(ItemSelectListener itemSelectListener){
-        this.itemSelectListener=itemSelectListener;
+
+    public void setItemSelectListener(ItemSelectListener itemSelectListener) {
+        this.itemSelectListener = itemSelectListener;
     }
 }

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

@@ -51,7 +51,7 @@
                 android:layout_width="@dimen/dp_6"
                 android:layout_height="@dimen/dp_11"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/icon_next_right"
+                android:background="@drawable/icon_arrow_right2"
                 app:layout_constraintBottom_toBottomOf="@+id/im_header"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/im_header" />
@@ -100,7 +100,7 @@
                 android:layout_width="@dimen/dp_6"
                 android:layout_height="@dimen/dp_11"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/icon_next_right"
+                android:background="@drawable/icon_arrow_right2"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -149,7 +149,7 @@
                 android:layout_width="@dimen/dp_6"
                 android:layout_height="@dimen/dp_11"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/icon_next_right"
+                android:background="@drawable/icon_arrow_right2"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -198,7 +198,7 @@
                 android:layout_width="@dimen/dp_6"
                 android:layout_height="@dimen/dp_11"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/icon_next_right"
+                android:background="@drawable/icon_arrow_right2"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -248,7 +248,7 @@
                 android:layout_width="@dimen/dp_6"
                 android:layout_height="@dimen/dp_11"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/icon_next_right"
+                android:background="@drawable/icon_arrow_right2"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -296,7 +296,7 @@
                 android:layout_width="@dimen/dp_6"
                 android:layout_height="@dimen/dp_11"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/icon_next_right"
+                android:background="@drawable/icon_arrow_right2"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -333,7 +333,7 @@
                 android:layout_width="@dimen/dp_6"
                 android:layout_height="@dimen/dp_11"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/icon_next_right"
+                android:background="@drawable/icon_arrow_right2"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -383,7 +383,7 @@
                 android:layout_width="@dimen/dp_6"
                 android:layout_height="@dimen/dp_11"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/icon_next_right"
+                android:background="@drawable/icon_arrow_right2"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />

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

@@ -46,7 +46,7 @@
                     android:layout_width="@dimen/dp_6"
                     android:layout_height="@dimen/dp_11"
                     android:layout_marginRight="15dp"
-                    android:background="@drawable/icon_next_right"
+                    android:background="@drawable/icon_arrow_right2"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -125,7 +125,7 @@
                     android:layout_width="@dimen/dp_6"
                     android:layout_height="@dimen/dp_11"
                     android:layout_marginRight="15dp"
-                    android:background="@drawable/icon_next_right"
+                    android:background="@drawable/icon_arrow_right2"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -163,7 +163,7 @@
                     android:layout_width="@dimen/dp_6"
                     android:layout_height="@dimen/dp_11"
                     android:layout_marginRight="15dp"
-                    android:background="@drawable/icon_next_right"
+                    android:background="@drawable/icon_arrow_right2"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -202,7 +202,7 @@
                     android:layout_width="@dimen/dp_6"
                     android:layout_height="@dimen/dp_11"
                     android:layout_marginRight="15dp"
-                    android:background="@drawable/icon_next_right"
+                    android:background="@drawable/icon_arrow_right2"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -240,7 +240,7 @@
                     android:layout_width="@dimen/dp_6"
                     android:layout_height="@dimen/dp_11"
                     android:layout_marginRight="15dp"
-                    android:background="@drawable/icon_next_right"
+                    android:background="@drawable/icon_arrow_right2"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -279,7 +279,7 @@
                     android:layout_width="@dimen/dp_6"
                     android:layout_height="@dimen/dp_11"
                     android:layout_marginRight="15dp"
-                    android:background="@drawable/icon_next_right"
+                    android:background="@drawable/icon_arrow_right2"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -316,7 +316,7 @@
                 android:layout_width="@dimen/dp_6"
                 android:layout_height="@dimen/dp_11"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/icon_next_right"
+                android:background="@drawable/icon_arrow_right2"
                 app:layout_constraintBottom_toBottomOf="@+id/tv_sign_out_account"
                 app:layout_constraintRight_toRightOf="@+id/tv_sign_out_account"
                 app:layout_constraintTop_toTopOf="@+id/tv_sign_out_account" />

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

@@ -44,10 +44,10 @@
             android:id="@+id/rv_instrument"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:layout_marginTop="11dp"
-            android:layout_marginRight="10dp"
-            android:layout_marginBottom="119dp"
+            android:layout_marginLeft="9dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="9dp"
+            android:layout_marginBottom="104dp"
             android:nestedScrollingEnabled="false"
             android:overScrollMode="never" />
 
@@ -60,7 +60,7 @@
         android:layout_alignParentBottom="true"
         android:layout_marginLeft="27dp"
         android:layout_marginRight="27dp"
-        android:layout_marginBottom="48dp"
+        android:layout_marginBottom="30dp"
         android:background="?attr/klx_main_bt_background"
         android:gravity="center"
         android:text="确认"

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

@@ -663,51 +663,27 @@
             <TextView
                 android:id="@+id/tv_network_detection"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_45"
+                android:layout_height="wrap_content"
+                style="@style/me_btn_style"
                 android:gravity="center_vertical"
-                android:paddingLeft="@dimen/dp_15"
                 android:text="网络检测"
-                android:textColor="@color/color_333333"
-                android:textSize="@dimen/sp_16"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/dp_22"
-                android:background="@drawable/icon_arrow_right2"
-                app:layout_constraintBottom_toBottomOf="@+id/tv_network_detection"
-                app:layout_constraintRight_toRightOf="@+id/tv_network_detection"
-                app:layout_constraintTop_toTopOf="@+id/tv_network_detection" />
-
             <TextView
                 android:id="@+id/tv_device_detection"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_45"
+                android:layout_height="wrap_content"
+                style="@style/me_btn_style"
                 android:gravity="center_vertical"
-                android:paddingLeft="@dimen/dp_15"
                 android:text="设备检测"
-                android:textColor="@color/color_333333"
-                android:textSize="@dimen/sp_16"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tv_network_detection" />
 
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/dp_22"
-                android:background="@drawable/icon_arrow_right2"
-                app:layout_constraintBottom_toBottomOf="@+id/tv_device_detection"
-                app:layout_constraintRight_toRightOf="@+id/tv_device_detection"
-                app:layout_constraintTop_toTopOf="@+id/tv_device_detection" />
-
-
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -723,96 +699,50 @@
             <TextView
                 android:id="@+id/tv_help"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_45"
+                android:layout_height="wrap_content"
+                style="@style/me_btn_style"
                 android:gravity="center_vertical"
-                android:paddingLeft="@dimen/dp_15"
                 android:text="帮助中心"
-                android:textColor="@color/color_333333"
-                android:textSize="@dimen/sp_16"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/dp_22"
-                android:background="@drawable/icon_arrow_right2"
-                app:layout_constraintBottom_toBottomOf="@+id/tv_help"
-                app:layout_constraintRight_toRightOf="@+id/tv_help"
-                app:layout_constraintTop_toTopOf="@+id/tv_help" />
-
-
             <TextView
                 android:id="@+id/tv_feedback"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_45"
+                android:layout_height="wrap_content"
+                style="@style/me_btn_style"
                 android:layout_marginBottom="10dp"
                 android:gravity="center_vertical"
-                android:paddingLeft="@dimen/dp_15"
                 android:text="意见反馈"
-                android:textColor="@color/color_333333"
-                android:textSize="@dimen/sp_16"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tv_help" />
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/dp_22"
-                android:background="@drawable/icon_arrow_right2"
-                app:layout_constraintBottom_toBottomOf="@+id/tv_feedback"
-                app:layout_constraintRight_toRightOf="@+id/tv_feedback"
-                app:layout_constraintTop_toTopOf="@+id/tv_feedback" />
 
             <TextView
                 android:id="@+id/tv_contact_us"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_45"
+                android:layout_height="wrap_content"
+                style="@style/me_btn_style"
                 android:gravity="center_vertical"
-                android:paddingLeft="@dimen/dp_15"
                 android:text="联系我们"
-                android:textColor="@color/color_333333"
-                android:textSize="@dimen/sp_16"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tv_feedback" />
 
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/dp_22"
-                android:background="@drawable/icon_arrow_right2"
-                app:layout_constraintBottom_toBottomOf="@+id/tv_contact_us"
-                app:layout_constraintRight_toRightOf="@+id/tv_contact_us"
-                app:layout_constraintTop_toTopOf="@+id/tv_contact_us" />
-
 
             <TextView
                 android:id="@+id/tv_customer"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_45"
+                android:layout_height="wrap_content"
+                style="@style/me_btn_style"
                 android:gravity="center_vertical"
-                android:paddingLeft="@dimen/dp_15"
                 android:text="在线客服"
-                android:textColor="@color/color_333333"
-                android:textSize="@dimen/sp_16"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tv_contact_us" />
 
 
-            <ImageView
-                android:id="@+id/iv_customer_arrow"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/dp_22"
-                android:background="@drawable/icon_arrow_right2"
-                app:layout_constraintBottom_toBottomOf="@+id/tv_customer"
-                app:layout_constraintRight_toRightOf="@+id/tv_customer"
-                app:layout_constraintTop_toTopOf="@+id/tv_customer" />
-
-
             <androidx.constraintlayout.widget.Group
                 android:id="@+id/group_customer"
                 android:layout_width="wrap_content"

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

@@ -2,20 +2,22 @@
 <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:paddingTop="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"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_title"
         android:background="@drawable/mark_2dc7aa_3radius"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="@+id/tv_title" />
 
     <TextView
+        android:paddingBottom="7dp"
+        android:paddingTop="7dp"
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -23,9 +25,8 @@
         android:text="xxxxx"
         android:textColor="@color/black_333"
         android:textSize="@dimen/sp_16"
-        app:layout_constraintBottom_toBottomOf="@+id/view_mark"
         app:layout_constraintLeft_toRightOf="@+id/view_mark"
-        app:layout_constraintTop_toTopOf="@+id/view_mark" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_item"

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

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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:layout_marginLeft="5dp"
+    android:layout_marginTop="5dp"
+    android:layout_marginRight="5dp"
+    android:layout_marginBottom="5dp">
 
     <com.cooleshow.base.widgets.QMUIRadiusImageView
         android:id="@+id/iv_pic"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintDimensionRatio="w,1:1"
-        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="0dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginTop="5dp"
-        android:layout_marginRight="5dp"
-        app:layout_constraintBottom_toBottomOf="@+id/iv_pic"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         android:background="@drawable/bg_teachable_instrument"
-        />
+        app:layout_constraintBottom_toBottomOf="@+id/iv_pic"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_pic"
+        app:layout_constraintRight_toRightOf="@+id/iv_pic"
+        app:layout_constraintTop_toTopOf="@+id/iv_pic" />
 
     <ImageView
         android:id="@+id/im_check"
@@ -40,13 +40,18 @@
 
     <TextView
         android:id="@+id/tv_name"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="7dp"
         android:layout_marginBottom="7dp"
+        android:ellipsize="middle"
+        android:paddingStart="7dp"
+        android:paddingEnd="7dp"
+        android:singleLine="true"
         android:text=""
         android:textColor="@color/white"
         android:textSize="@dimen/sp_16"
         app:layout_constraintBottom_toBottomOf="@+id/iv_pic"
-        app:layout_constraintLeft_toLeftOf="@+id/iv_pic" />
+        app:layout_constraintLeft_toLeftOf="@+id/iv_pic"
+        app:layout_constraintRight_toRightOf="@+id/iv_pic"
+        tools:text="啊稍等哈斯卡哈大等哈斯卡哈大" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -93,6 +93,7 @@
             android:id="@+id/fl_tenant_name"
             android:layout_width="0dp"
             android:layout_marginTop="11dp"
+            android:layout_marginEnd="14dp"
             android:layout_height="wrap_content"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
@@ -101,16 +102,21 @@
             <TextView
                 android:id="@+id/tv_tenant_name"
                 android:layout_width="wrap_content"
-                android:layout_height="18dp"
+                android:layout_height="wrap_content"
                 android:background="@drawable/shape_12ffa673_border_ffbf9a_4dp"
                 android:paddingStart="5dp"
                 android:paddingEnd="5dp"
+                android:layout_gravity="center_vertical"
+                android:gravity="center_vertical"
+                android:includeFontPadding="false"
                 android:maxLines="1"
+                android:paddingTop="1dp"
+                android:paddingBottom="1dp"
                 android:ellipsize="end"
                 android:textColor="@color/color_ff7b31"
                 android:textSize="@dimen/sp_12"
                 app:layout_constraintHorizontal_bias="0"
-                tools:text="星机构构武汉市小星星机构武汉市" />
+                tools:text="星机构武汉市构武汉市小星星机构武汉市星机构武汉市构武汉市小星星机构武汉市星机构武汉市构武汉市小星星机构武汉市" />
         </FrameLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 

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

@@ -99,12 +99,17 @@
             <TextView
                 android:id="@+id/tv_tenant_name"
                 android:layout_width="wrap_content"
-                android:layout_height="18dp"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="14dp"
                 android:background="@drawable/shape_12ffa673_border_ffbf9a_4dp"
                 android:paddingStart="5dp"
                 android:paddingEnd="5dp"
+                android:layout_gravity="center_vertical"
+                android:gravity="center_vertical"
+                android:includeFontPadding="false"
                 android:maxLines="1"
+                android:paddingTop="1dp"
+                android:paddingBottom="1dp"
                 android:ellipsize="end"
                 android:textColor="@color/color_ff7b31"
                 android:textSize="@dimen/sp_12"