1.优化代码

personalcenter/src/main/res/layout/activity_equipment_services.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout 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">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -14,8 +13,8 @@
             android:textColor="@android:color/black"
             android:textSize="@dimen/divider_36px"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>

personalcenter/src/main/res/layout/activity_help.xml

@@ -19,7 +19,7 @@
                 android:layout_width="@dimen/divider_195px"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
                 <ImageView
@@ -52,8 +52,8 @@
                 android:textColor="@color/color_FF4974FF"
                 android:textSize="@dimen/divider_34px"
                 android:textStyle="bold"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 

personalcenter/src/main/res/layout/activity_personal_center.xml

@@ -26,7 +26,7 @@
                 android:layout_width="@dimen/divider_195px"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
                 <ImageView
@@ -59,8 +59,8 @@
                 android:textColor="@color/color_FF4974FF"
                 android:textSize="@dimen/divider_34px"
                 android:textStyle="bold"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <LinearLayout
@@ -70,7 +70,7 @@
                 android:layout_marginEnd="@dimen/divider_74px"
                 android:gravity="center_horizontal"
                 android:orientation="vertical"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
                 <androidx.appcompat.widget.AppCompatImageView
@@ -96,9 +96,9 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_marginLeft="@dimen/divider_60px"
+            android:layout_marginStart="@dimen/divider_60px"
             android:layout_marginTop="@dimen/divider_56px"
-            android:layout_marginRight="@dimen/divider_60px"
+            android:layout_marginEnd="@dimen/divider_60px"
             android:layout_weight="1"
             android:background="@drawable/bg_personal_center">
 
@@ -108,8 +108,8 @@
                 android:layout_marginStart="@dimen/divider_33px"
                 android:layout_marginTop="@dimen/divider_57px"
                 android:text='@{"姓名："+data.getUserNameInfo()}'
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toLeftOf="@id/tvBirthday"
+                app:layout_constraintEnd_toStartOf="@id/tvBirthday"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:ignore="HardcodedText" />
 
@@ -118,8 +118,8 @@
                 style="@style/text_personal_center"
                 android:text='@{"出生日期："+data.getBirthDateInfo()}'
                 app:layout_constraintBaseline_toBaselineOf="@+id/tvName"
-                app:layout_constraintLeft_toRightOf="@id/tvName"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/tvName"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:ignore="HardcodedText" />
 
@@ -129,8 +129,8 @@
                 android:layout_marginStart="@dimen/divider_33px"
                 android:layout_marginTop="@dimen/divider_28px"
                 android:text='@{"开通训练日期："+data.getStartTime()}'
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toLeftOf="@id/tvOrderDeadline"
+                app:layout_constraintEnd_toStartOf="@id/tvOrderDeadline"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tvName"
                 tools:ignore="HardcodedText" />
 
@@ -139,8 +139,8 @@
                 style="@style/text_personal_center"
                 android:text='@{"订单截止日期："+data.getEndTime()}'
                 app:layout_constraintBaseline_toBaselineOf="@+id/tvOpeningTrainingDate"
-                app:layout_constraintLeft_toRightOf="@id/tvOpeningTrainingDate"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/tvOpeningTrainingDate"
                 app:layout_constraintTop_toBottomOf="@+id/tvBirthday"
                 tools:ignore="HardcodedText" />
 
@@ -150,8 +150,8 @@
                 android:layout_marginStart="@dimen/divider_33px"
                 android:layout_marginTop="@dimen/divider_25px"
                 android:text='@{"医生："+data.getDoctorNameInfo()}'
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toLeftOf="@id/tvMedicineDepartment"
+                app:layout_constraintEnd_toStartOf="@id/tvMedicineDepartment"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tvOpeningTrainingDate"
                 tools:ignore="HardcodedText" />
 
@@ -160,8 +160,8 @@
                 style="@style/text_personal_center"
                 android:text='@{"院内科室："+data.getHospitalDepartmentInfo()}'
                 app:layout_constraintBaseline_toBaselineOf="@+id/tvDoctor"
-                app:layout_constraintLeft_toRightOf="@id/tvDoctor"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/tvDoctor"
                 app:layout_constraintTop_toBottomOf="@+id/tvOpeningTrainingDate"
                 tools:ignore="HardcodedText" />
 
@@ -174,8 +174,8 @@
                 android:text='@{"就诊医院："+data.getOrgNameInfo()}'
                 android:textColor="@color/color_FF333333"
                 android:textSize="@dimen/divider_24px"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tvDoctor"
                 tools:ignore="HardcodedText" />
 
@@ -188,7 +188,7 @@
                 android:text="@string/diagnosis"
                 android:textColor="@color/color_FF333333"
                 android:textSize="@dimen/divider_24px"
-                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tvHospital" />
 
             <androidx.recyclerview.widget.RecyclerView
@@ -196,8 +196,8 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/divider_24px"
-                app:layout_constraintLeft_toRightOf="@id/tvDiagnosis"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/tvDiagnosis"
                 app:layout_constraintTop_toBottomOf="@+id/tvHospital"
                 tools:listitem="@layout/item_diagnosis" />
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -211,15 +211,15 @@
                 style="@style/text_bottom_live_broadcast"
                 android:layout_marginStart="@dimen/divider_108px"
                 android:text="@string/user_service_agreement"
-                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
                 android:id="@+id/tvPrivacyPolicy"
                 style="@style/text_bottom_live_broadcast"
                 android:text="@string/privacy_policy"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
@@ -227,7 +227,7 @@
                 style="@style/text_bottom_live_broadcast"
                 android:layout_marginEnd="@dimen/divider_120px"
                 android:text="@string/equipment_leasing_and_services"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -17,7 +17,7 @@
             android:layout_marginTop="@dimen/divider_35px"
             android:gravity="center"
             android:orientation="horizontal"
-            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
             <androidx.appcompat.widget.AppCompatImageView
@@ -45,8 +45,8 @@
             android:textColor="@android:color/white"
             android:textSize="@dimen/divider_38px"
             android:textStyle="bold"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -58,16 +58,16 @@
             android:layout_marginBottom="@dimen/divider_122px"
             android:background="@drawable/bg_setting_center"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvTitle">
 
             <com.yingyang.personalcenter.widget.SettingItemView
                 android:id="@+id/wifiLayout"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/divider_97px"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:setting_image="@mipmap/icon_wifi"
                 app:setting_text="@string/wlan" />
@@ -76,8 +76,8 @@
                 android:id="@+id/mobileNetworkLayout"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/divider_97px"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/wifiLayout"
                 app:setting_image="@mipmap/icon_network"
                 app:setting_text="@string/mobile_network" />
@@ -86,8 +86,8 @@
                 android:id="@+id/brightnessLayout"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/divider_97px"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/mobileNetworkLayout"
                 app:setting_image="@mipmap/icon_brightness"
                 app:setting_text="@string/brightness" />
@@ -96,8 +96,8 @@
                 android:id="@+id/soundLayout"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/divider_97px"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/brightnessLayout"
                 app:setting_image="@mipmap/icon_sound"
                 app:setting_text="@string/sound" />
@@ -106,8 +106,8 @@
                 android:id="@+id/versionLayout"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/divider_97px"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/soundLayout"
                 app:setting_image="@mipmap/icon_version"
                 app:setting_text="@string/version_record" />
@@ -124,8 +124,8 @@
             android:textSize="@dimen/divider_28px"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

personalcenter/src/main/res/layout/activity_version_record.xml

@@ -17,7 +17,7 @@
             android:layout_marginTop="@dimen/divider_35px"
             android:gravity="center"
             android:orientation="horizontal"
-            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
             <androidx.appcompat.widget.AppCompatImageView
@@ -45,8 +45,8 @@
             android:textColor="@android:color/white"
             android:textSize="@dimen/divider_38px"
             android:textStyle="bold"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -58,8 +58,8 @@
             android:layout_marginBottom="@dimen/divider_122px"
             android:background="@drawable/bg_setting_center"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvTitle">
 
             <androidx.recyclerview.widget.RecyclerView

personalcenter/src/main/res/layout/item_version.xml

@@ -45,8 +45,8 @@
             android:layout_marginEnd="@dimen/divider_30px"
             android:background="@color/color_FFF0F0F0"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>

personalcenter/src/main/res/layout/layout_help_item.xml

@@ -14,7 +14,7 @@
         android:textColor="@color/color_FF333333"
         android:textSize="@dimen/divider_28px"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.appcompat.widget.AppCompatImageView
@@ -24,7 +24,7 @@
         android:layout_marginEnd="@dimen/divider_50px"
         android:background="@mipmap/icon_route"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <View
@@ -34,7 +34,7 @@
         android:layout_marginEnd="@dimen/divider_31px"
         android:background="@color/color_FFB4B4B4"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

personalcenter/src/main/res/layout/layout_setting_item.xml

@@ -13,7 +13,7 @@
         android:layout_marginStart="@dimen/divider_73px"
         android:scaleType="centerInside"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -25,7 +25,7 @@
         android:text="@string/setting_page"
         android:textColor="@color/color_FF333333"
         android:textSize="@dimen/divider_24px"
-        app:layout_constraintLeft_toRightOf="@+id/settingImage"
+        app:layout_constraintStart_toEndOf="@+id/settingImage"
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.appcompat.widget.AppCompatImageView
@@ -34,7 +34,7 @@
         android:layout_marginEnd="@dimen/divider_50px"
         android:background="@mipmap/icon_route"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <View
@@ -44,7 +44,7 @@
         android:layout_marginEnd="@dimen/divider_16px"
         android:background="@color/color_FFF0F0F0"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>