修改老师端启动引导页样式,以及首页底部按钮样式,我的页面教学工具按钮样式

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

@@ -44,11 +44,10 @@
             android:id="@+id/tab_home"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:layout_marginStart="27dp"
             android:layout_marginTop="10dp"
             app:layout_constraintHorizontal_chainStyle="spread_inside"
             app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toLeftOf="@+id/tab_course"
+            app:layout_constraintRight_toRightOf="@+id/view_home"
             app:layout_constraintTop_toTopOf="parent"
             app:lottie_autoPlay="false"
             app:lottie_loop="false"
@@ -58,8 +57,8 @@
             android:id="@+id/tab_course"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            app:layout_constraintLeft_toRightOf="@+id/tab_home"
-            app:layout_constraintRight_toLeftOf="@+id/tab_chat"
+            app:layout_constraintLeft_toLeftOf="@+id/view_course"
+            app:layout_constraintRight_toRightOf="@+id/view_course"
             app:layout_constraintTop_toTopOf="@+id/tab_home"
             app:lottie_autoPlay="false"
             app:lottie_loop="false"
@@ -69,8 +68,8 @@
             android:id="@+id/tab_chat"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            app:layout_constraintLeft_toRightOf="@+id/tab_course"
-            app:layout_constraintRight_toLeftOf="@+id/tab_mall"
+            app:layout_constraintLeft_toLeftOf="@+id/view_chat"
+            app:layout_constraintRight_toRightOf="@+id/view_chat"
             app:layout_constraintTop_toTopOf="@+id/tab_home"
             app:lottie_autoPlay="false"
             app:lottie_loop="false"
@@ -97,8 +96,8 @@
             android:id="@+id/tab_mall"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            app:layout_constraintLeft_toRightOf="@+id/tab_chat"
-            app:layout_constraintRight_toLeftOf="@+id/tab_mine"
+            app:layout_constraintLeft_toLeftOf="@+id/view_mall"
+            app:layout_constraintRight_toRightOf="@+id/view_mall"
             app:layout_constraintTop_toTopOf="@+id/tab_home"
             app:lottie_autoPlay="false"
             app:lottie_loop="false"
@@ -108,9 +107,8 @@
             android:id="@+id/tab_mine"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:layout_marginEnd="27dp"
-            app:layout_constraintLeft_toRightOf="@+id/tab_mall"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintLeft_toLeftOf="@+id/view_mine"
+            app:layout_constraintRight_toRightOf="@+id/view_mine"
             app:layout_constraintTop_toTopOf="@+id/tab_home"
             app:lottie_autoPlay="false"
             app:lottie_loop="false"

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

@@ -507,8 +507,6 @@
             android:id="@+id/recycler_view_tools"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="7dp"
-            android:layout_marginEnd="7dp"
             android:overScrollMode="never"
             android:scrollbars="none"
             app:layout_constraintLeft_toLeftOf="@+id/view_top_bg"
@@ -668,13 +666,14 @@
 
         <TextView
             android:id="@+id/tv_open_live"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="13dp"
             android:drawableTop="@drawable/icon_open_live"
             android:drawablePadding="@dimen/dp_3"
             android:includeFontPadding="false"
             android:text="我的直播"
+            android:gravity="center"
             android:textColor="@color/color_333333"
             android:textSize="@dimen/sp_13"
             app:layout_constraintLeft_toLeftOf="@+id/view_bottom_bg"
@@ -684,7 +683,7 @@
 
         <TextView
             android:id="@+id/tv_live_course"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:drawableTop="@drawable/icon_live_course"
             android:drawablePadding="@dimen/dp_3"
@@ -700,7 +699,7 @@
 
         <TextView
             android:id="@+id/tv_video_course"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:drawableTop="@drawable/icon_video_course"
             android:drawablePadding="@dimen/dp_3"
@@ -716,7 +715,7 @@
 
         <TextView
             android:id="@+id/tv_piano_course"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:drawableTop="@drawable/icon_mine_piano_course"
             android:drawablePadding="@dimen/dp_3"
@@ -733,7 +732,7 @@
 
         <TextView
             android:id="@+id/tv_sparing_course_set"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="17dp"
             android:drawableTop="@drawable/icon_sparing_course_set"
@@ -750,7 +749,7 @@
 
         <TextView
             android:id="@+id/tv_homework"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:drawableTop="@drawable/icon_mine_homework"
             android:drawablePadding="@dimen/dp_3"
@@ -766,7 +765,7 @@
 
         <TextView
             android:id="@+id/tv_course_comment"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:drawableTop="@drawable/icon_mine_course_comment"
             android:drawablePadding="@dimen/dp_3"
@@ -782,7 +781,7 @@
 
         <TextView
             android:id="@+id/tv_mine_courseware"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:drawableTop="@drawable/icon_mine_courseware"
             android:drawablePadding="@dimen/dp_3"
@@ -798,7 +797,7 @@
 
         <TextView
             android:id="@+id/tv_award"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:drawableTop="@drawable/icon_mine_award"
             android:drawablePadding="@dimen/dp_3"

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

@@ -1,21 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/white">
 
     <View
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_304"
         android:background="@drawable/bg_guide_top" />
 
     <LinearLayout
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         android:id="@+id/ll_points"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/dp_97"
+        android:layout_marginBottom="@dimen/qb_px_67"
         android:orientation="horizontal">
 
         <View
@@ -38,16 +44,23 @@
     </LinearLayout>
 
     <TextView
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_title"
+        app:layout_constraintBottom_toTopOf="@+id/ll_points"
         android:id="@+id/tv_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_above="@+id/ll_points"
-        android:layout_marginBottom="@dimen/dp_112"
         android:text="一站式乐器教学平台"
         android:textColor="@color/color_9e9e9e" />
 
     <TextView
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/tv_content"
+        app:layout_constraintTop_toBottomOf="@+id/im_center"
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -60,13 +73,19 @@
         android:textStyle="bold" />
 
     <ImageView
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/tv_title"
         android:id="@+id/im_center"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_330"
+        android:adjustViewBounds="true"
+        app:layout_constraintWidth_percent="0.7"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintVertical_chainStyle="packed"
         android:layout_above="@+id/tv_title"
         android:layout_marginLeft="14dp"
         android:layout_marginBottom="24dp"
-        android:layout_marginTop="174dp"
         android:layout_marginRight="14dp"
         android:src="@drawable/icon_guid_center_1" />
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,22 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/white">
 
     <View
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_304"
         android:background="@drawable/bg_guide_top" />
 
 
     <LinearLayout
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
         android:id="@+id/ll_points"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/dp_97"
+        android:layout_marginBottom="@dimen/qb_px_67"
         android:orientation="horizontal">
 
         <View
@@ -44,24 +50,34 @@
         android:layout_height="@dimen/dp_40"
         android:layout_above="@+id/ll_points"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="46dp"
+        android:layout_marginTop="46dp"
         android:background="@drawable/shape_course_status_ing"
         android:gravity="center"
         android:text="立即体验"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_content"
         android:textColor="@color/white"
         android:textSize="@dimen/sp_18" />
 
     <TextView
+        app:layout_constraintBottom_toTopOf="@+id/ll_points"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_title"
         android:id="@+id/tv_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_above="@+id/ll_points"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/dp_112"
         android:text="展示个人风采，传播专业知识"
         android:textColor="@color/color_9e9e9e" />
 
     <TextView
+        app:layout_constraintBottom_toTopOf="@+id/tv_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/im_center"
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -74,15 +90,20 @@
         android:textStyle="bold" />
 
     <ImageView
+        app:layout_constraintBottom_toTopOf="@+id/tv_title"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintWidth_percent="0.7"
+        android:layout_width="0dp"
+        app:layout_constraintVertical_chainStyle="packed"
+        android:layout_height="wrap_content"
         android:id="@+id/im_center"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_330"
+        android:adjustViewBounds="true"
         android:layout_above="@+id/tv_title"
         android:layout_marginLeft="14dp"
-        android:layout_marginTop="174dp"
         android:layout_marginRight="14dp"
         android:layout_marginBottom="24dp"
         android:src="@drawable/icon_guid_center_3" />
 
-
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,21 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/white">
 
     <View
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_304"
         android:background="@drawable/bg_guide_top" />
 
     <LinearLayout
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         android:id="@+id/ll_points"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/dp_97"
+        android:layout_marginBottom="@dimen/qb_px_67"
         android:orientation="horizontal">
 
         <View
@@ -38,16 +44,23 @@
     </LinearLayout>
 
     <TextView
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_title"
+        app:layout_constraintBottom_toTopOf="@+id/ll_points"
         android:id="@+id/tv_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_above="@+id/ll_points"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/dp_112"
         android:text="师生面对面讲解，解锁新技巧"
         android:textColor="@color/color_9e9e9e" />
 
     <TextView
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/tv_content"
+        app:layout_constraintTop_toBottomOf="@+id/im_center"
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -60,13 +73,19 @@
         android:textStyle="bold" />
 
     <ImageView
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/tv_title"
         android:id="@+id/im_center"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_330"
+        android:adjustViewBounds="true"
+        app:layout_constraintWidth_percent="0.7"
+        app:layout_constraintVertical_chainStyle="packed"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:layout_above="@+id/tv_title"
         android:layout_marginLeft="14dp"
-        android:layout_marginTop="174dp"
         android:layout_marginRight="14dp"
         android:layout_marginBottom="24dp"
         android:src="@drawable/icon_guid_center_2" />
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

usercenter/src/main/res/layout/activity_login.xml

@@ -43,7 +43,7 @@
         app:layout_constraintTop_toBottomOf="@+id/tv_header_title" />
 
 
-    <EditText
+    <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_phone_num"
         android:layout_width="match_parent"
         android:layout_height="@dimen/common_line_height"
@@ -82,7 +82,7 @@
         app:layout_constraintLeft_toLeftOf="@+id/tv_phone_num"
         app:layout_constraintTop_toBottomOf="@+id/view_phone_divide" />
 
-    <EditText
+    <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_password"
         android:layout_width="0dp"
         android:layout_height="@dimen/common_line_height"

usercenter/src/main/res/layout/activity_verify_code_login.xml

@@ -43,7 +43,7 @@
         app:layout_constraintTop_toBottomOf="@+id/tv_header_title" />
 
 
-    <EditText
+    <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_phone_num"
         android:layout_width="match_parent"
         android:layout_height="@dimen/common_line_height"