Browse Source

1.优化代码

王鹏鹏 2 years ago
parent
commit
bc7c916372

+ 1 - 1
.idea/misc.xml

@@ -94,7 +94,7 @@
         <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/item_diagnosis.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/item_version.xml" value="0.19768518518518519" />
         <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/layout_help_item.xml" value="0.1" />
-        <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/layout_setting_item.xml" value="1.0" />
+        <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/layout_setting_item.xml" value="0.4527363184079602" />
         <entry key="..\:/workspace/hcp-pad/push/src/main/res/drawable/bg_item_push.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/push/src/main/res/drawable/bg_push.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/push/src/main/res/drawable/bg_train.xml" value="0.2165" />

+ 10 - 10
workbenches/src/main/res/layout/activity_free_train.xml

@@ -14,7 +14,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">
 
             <androidx.appcompat.widget.AppCompatImageView
@@ -43,7 +43,7 @@
             android:layout_marginTop="@dimen/divider_110px"
             android:layout_marginEnd="@dimen/divider_36px"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/layoutHead" />
 
         <androidx.cardview.widget.CardView
@@ -56,8 +56,8 @@
             app:cardBackgroundColor="@android:color/white"
             app:cardCornerRadius="@dimen/divider_38px"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toRightOf="@id/rvTrainType"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toEndOf="@id/rvTrainType"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
             <androidx.constraintlayout.widget.ConstraintLayout
@@ -73,8 +73,8 @@
                     android:textColor="@color/color_FF4A76FF"
                     android:textSize="@dimen/divider_42px"
                     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" />
 
                 <com.scwang.smartrefresh.layout.SmartRefreshLayout
@@ -82,8 +82,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     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
@@ -103,8 +103,8 @@
                     android:orientation="vertical"
                     android:visibility="gone"
                     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"
                     tools:ignore="MissingConstraints">
 

+ 8 - 8
workbenches/src/main/res/layout/activity_leisure_brain.xml

@@ -14,7 +14,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">
 
             <androidx.appcompat.widget.AppCompatImageView
@@ -44,7 +44,7 @@
             android:layout_marginEnd="@dimen/divider_36px"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/layoutHead" />
 
         <androidx.cardview.widget.CardView
@@ -57,8 +57,8 @@
             android:background="@android:color/white"
             app:cardCornerRadius="@dimen/divider_38px"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toRightOf="@id/rvLeisureBrainType"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toEndOf="@id/rvLeisureBrainType"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
             <androidx.constraintlayout.widget.ConstraintLayout
@@ -74,8 +74,8 @@
                     android:textColor="@color/color_FF4A76FF"
                     android:textSize="@dimen/divider_42px"
                     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.recyclerview.widget.RecyclerView
@@ -85,8 +85,8 @@
                     android:layout_margin="@dimen/divider_28px"
                     android:layout_marginTop="@dimen/divider_8px"
                     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" />
 
                 <LinearLayout

+ 5 - 5
workbenches/src/main/res/layout/activity_order_list.xml

@@ -16,7 +16,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_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.cardview.widget.CardView
@@ -59,8 +59,8 @@
             app:cardBackgroundColor="@android:color/white"
             app:cardCornerRadius="@dimen/divider_28px"
             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

+ 6 - 6
workbenches/src/main/res/layout/activity_service_package.xml

@@ -18,7 +18,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"
             tools:ignore="UseCompoundDrawables">
 
@@ -48,8 +48,8 @@
             app:cardBackgroundColor="@android:color/white"
             app:cardCornerRadius="@dimen/divider_39px"
             app:cardElevation="@dimen/divider_4px"
-            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.appcompat.widget.AppCompatTextView
@@ -72,7 +72,7 @@
             android:text="@string/order_list"
             android:textColor="@android:color/white"
             android:textSize="@dimen/divider_27px"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.card.MaterialCardView
@@ -86,8 +86,8 @@
             app:cardBackgroundColor="@android:color/white"
             app:cardCornerRadius="@dimen/divider_20px"
             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/titleLayout">
 
             <LinearLayout

+ 3 - 3
workbenches/src/main/res/layout/activity_train_content_details.xml

@@ -18,7 +18,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
@@ -47,8 +47,8 @@
             android:background="@drawable/bg_train_right"
             app:cardCornerRadius="@dimen/divider_38px"
             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/layoutHead">
 
             <androidx.recyclerview.widget.RecyclerView

+ 4 - 4
workbenches/src/main/res/layout/activity_train_data.xml

@@ -18,7 +18,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
@@ -48,7 +48,7 @@
             android:layout_marginEnd="@dimen/divider_36px"
             android:orientation="vertical"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/layoutHead">
 
             <RadioButton
@@ -90,8 +90,8 @@
             android:background="@drawable/bg_train_right"
             app:cardCornerRadius="@dimen/divider_38px"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toRightOf="@id/radioOperate"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toEndOf="@id/radioOperate"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
         </androidx.cardview.widget.CardView>

+ 34 - 34
workbenches/src/main/res/layout/activity_workbenches.xml

@@ -32,8 +32,8 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 app:layout_constraintHorizontal_weight="1"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toLeftOf="@id/functionLayout"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/functionLayout"
                 app:layout_constraintTop_toTopOf="parent">
 
                 <androidx.appcompat.widget.AppCompatImageView
@@ -43,7 +43,7 @@
                     android:layout_marginStart="@dimen/divider_54px"
                     android:layout_marginTop="@dimen/divider_34px"
                     app:isCircle="@{true}"
-                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:loadHeadImg="@{User.INSTANCE.avatar}" />
 
@@ -55,8 +55,8 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 app:layout_constraintHorizontal_weight="1.5"
-                app:layout_constraintLeft_toRightOf="@id/headLayout"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintStart_toEndOf="@id/headLayout"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
                 <LinearLayout
@@ -64,8 +64,8 @@
                     style="@style/workbenches_operate_btn"
                     android:layout_gravity="center_horizontal"
                     android:gravity="center_horizontal"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toLeftOf="@+id/layoutHelp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/layoutHelp"
                     tools:ignore="MissingConstraints">
 
                     <androidx.appcompat.widget.AppCompatImageView
@@ -87,8 +87,8 @@
                     android:id="@+id/layoutHelp"
                     style="@style/workbenches_operate_btn"
                     android:gravity="center_horizontal"
-                    app:layout_constraintLeft_toRightOf="@+id/layoutLiveBroadcast"
-                    app:layout_constraintRight_toLeftOf="@+id/layoutNotify"
+                    app:layout_constraintStart_toEndOf="@+id/layoutLiveBroadcast"
+                    app:layout_constraintEnd_toStartOf="@+id/layoutNotify"
                     tools:ignore="MissingConstraints">
 
                     <androidx.appcompat.widget.AppCompatImageView
@@ -108,8 +108,8 @@
                     android:id="@+id/layoutNotify"
                     style="@style/workbenches_operate_btn"
                     android:gravity="center_horizontal"
-                    app:layout_constraintLeft_toRightOf="@+id/layoutHelp"
-                    app:layout_constraintRight_toLeftOf="@+id/layoutServicePackage"
+                    app:layout_constraintStart_toEndOf="@+id/layoutHelp"
+                    app:layout_constraintEnd_toStartOf="@+id/layoutServicePackage"
                     tools:ignore="MissingConstraints">
 
                     <androidx.appcompat.widget.AppCompatImageView
@@ -119,8 +119,8 @@
                         android:layout_marginTop="@dimen/divider_37px"
                         android:background="@mipmap/icon_notify"
                         android:scaleType="centerInside"
-                        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" />
 
                     <View
@@ -130,16 +130,16 @@
                         android:layout_marginStart="@dimen/divider_10px"
                         android:layout_marginTop="@dimen/divider_37px"
                         android:background="@drawable/shape_ract_gold"
-                        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.appcompat.widget.AppCompatTextView
                         style="@style/workbenches_home_text"
                         android:layout_marginTop="@dimen/divider_8px"
                         android:text="@string/notify"
-                        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/notifyImage" />
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -147,8 +147,8 @@
                     android:id="@+id/layoutServicePackage"
                     style="@style/workbenches_operate_btn"
                     android:gravity="center_horizontal"
-                    app:layout_constraintLeft_toRightOf="@+id/layoutNotify"
-                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/layoutNotify"
+                    app:layout_constraintEnd_toEndOf="parent"
                     tools:ignore="MissingConstraints">
 
                     <androidx.appcompat.widget.AppCompatImageView
@@ -171,9 +171,9 @@
             android:id="@+id/cardCognitiveTraining"
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_65px"
-            android:layout_marginLeft="@dimen/divider_53px"
+            android:layout_marginStart="@dimen/divider_53px"
             android:layout_marginTop="@dimen/divider_35px"
-            android:layout_marginRight="@dimen/divider_53px"
+            android:layout_marginEnd="@dimen/divider_53px"
             android:background="@drawable/tips_shadow_bg"
             android:text="@string/cognitive_training"
             android:textColor="@color/color_FF4A76FF"
@@ -204,7 +204,7 @@
                     android:layout_marginTop="@dimen/divider_31px"
                     android:layout_marginBottom="@dimen/divider_31px"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:loadImg="@{task.getGameImage()}"
                     app:roundRadius="@{8}" />
@@ -220,7 +220,7 @@
                     android:textSize="@dimen/divider_28px"
                     android:textStyle="bold"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintLeft_toLeftOf="parent" />
+                    app:layout_constraintStart_toStartOf="parent" />
 
                 <View
                     android:id="@+id/viewLine"
@@ -231,7 +231,7 @@
                     android:layout_marginBottom="@dimen/divider_2px"
                     android:background="@color/color_FFE0E0E0"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintLeft_toRightOf="@id/taskImage"
+                    app:layout_constraintStart_toEndOf="@id/taskImage"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <LinearLayout
@@ -239,8 +239,8 @@
                     android:layout_height="match_parent"
                     android:orientation="vertical"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintLeft_toRightOf="@id/viewLine"
-                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/viewLine"
+                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent">
 
                     <androidx.appcompat.widget.AppCompatTextView
@@ -365,8 +365,8 @@
                 android:layout_marginStart="@dimen/divider_103px"
                 android:background="@drawable/bg_home_buttom_button"
                 android:text="@string/free_training"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toLeftOf="@+id/layoutOnlineAssessment"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/layoutOnlineAssessment"
                 tools:ignore="MissingConstraints" />
 
             <Button
@@ -374,8 +374,8 @@
                 style="@style/workbenches_card_button"
                 android:background="@drawable/bg_home_buttom_button"
                 android:text="@string/online_assessment"
-                app:layout_constraintLeft_toRightOf="@+id/layoutFreeTraining"
-                app:layout_constraintRight_toLeftOf="@+id/layoutHealthScience"
+                app:layout_constraintStart_toEndOf="@+id/layoutFreeTraining"
+                app:layout_constraintEnd_toStartOf="@+id/layoutHealthScience"
                 tools:ignore="MissingConstraints" />
 
             <Button
@@ -383,8 +383,8 @@
                 style="@style/workbenches_card_button"
                 android:background="@drawable/bg_home_buttom_button"
                 android:text="@string/health_science_popularization"
-                app:layout_constraintLeft_toRightOf="@+id/layoutOnlineAssessment"
-                app:layout_constraintRight_toLeftOf="@+id/layoutLeisureBrain"
+                app:layout_constraintStart_toEndOf="@+id/layoutOnlineAssessment"
+                app:layout_constraintEnd_toStartOf="@+id/layoutLeisureBrain"
                 tools:ignore="MissingConstraints" />
 
             <Button
@@ -393,8 +393,8 @@
                 android:layout_marginEnd="@dimen/divider_103px"
                 android:background="@drawable/bg_home_buttom_button"
                 android:text="@string/leisure_brain_building"
-                app:layout_constraintLeft_toRightOf="@+id/layoutHealthScience"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/layoutHealthScience"
+                app:layout_constraintEnd_toEndOf="parent"
                 tools:ignore="MissingConstraints" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>

+ 25 - 25
workbenches/src/main/res/layout/dialog_purchase_services.xml

@@ -15,7 +15,7 @@
             android:layout_marginTop="@dimen/divider_36px"
             android:layout_marginEnd="@dimen/divider_184px"
             android:background="@mipmap/icon_close"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -23,8 +23,8 @@
             android:layout_height="@dimen/divider_597px"
             android:background="@drawable/bg_purchase_services"
             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">
 
             <Button
@@ -36,8 +36,8 @@
                 android:textColor="@android:color/white"
                 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" />
 
             <TextView
@@ -48,8 +48,8 @@
                 android:textColor="@color/color_FF333333"
                 android:textSize="@dimen/divider_32px"
                 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_toBottomOf="@+id/purchaseServicesBtn" />
 
             <TextView
@@ -61,8 +61,8 @@
                 android:textColor="@color/color_FF333333"
                 android:textSize="@dimen/divider_32px"
                 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_toBottomOf="@+id/tvPackageMoney" />
 
             <androidx.constraintlayout.widget.ConstraintLayout
@@ -72,8 +72,8 @@
                 android:layout_marginTop="@dimen/divider_76px"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintHorizontal_weight="1"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toLeftOf="@id/alipayLayout"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/alipayLayout"
                 app:layout_constraintTop_toBottomOf="@+id/tvPay">
 
                 <androidx.appcompat.widget.AppCompatImageView
@@ -81,8 +81,8 @@
                     android:layout_width="@dimen/divider_106px"
                     android:layout_height="@dimen/divider_88px"
                     android:background="@mipmap/icon_wechat"
-                    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.appcompat.widget.AppCompatTextView
@@ -92,8 +92,8 @@
                     android:text="@string/wechat_payment"
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_28px"
-                    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/imageWeChat" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
@@ -105,8 +105,8 @@
                 android:layout_marginTop="@dimen/divider_76px"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintHorizontal_weight="1"
-                app:layout_constraintLeft_toRightOf="@id/weChatLayout"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintStart_toEndOf="@id/weChatLayout"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tvPay">
 
                 <androidx.appcompat.widget.AppCompatImageView
@@ -114,8 +114,8 @@
                     android:layout_width="@dimen/divider_90px"
                     android:layout_height="@dimen/divider_90px"
                     android:background="@mipmap/icon_alipay"
-                    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.appcompat.widget.AppCompatTextView
@@ -125,8 +125,8 @@
                     android:text="@string/alipay_payment"
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_28px"
-                    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/imageAlipay" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
@@ -136,8 +136,8 @@
                 android:layout_width="@dimen/divider_230px"
                 android:layout_height="@dimen/divider_230px"
                 android:visibility="gone"
-                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/purchaseServicesBtn" />
 
             <Button
@@ -151,8 +151,8 @@
                 android:text="@string/payment_completed"
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/divider_28px"
-                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/payImage" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>

+ 18 - 18
workbenches/src/main/res/layout/fragment_data_monitor.xml

@@ -21,8 +21,8 @@
             android:textColor="@color/color_FF4A76FF"
             android:textSize="@dimen/divider_42px"
             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
@@ -33,8 +33,8 @@
             android:layout_marginTop="@dimen/divider_32px"
             android:background="@drawable/bg_calendar"
             app:layout_constraintHorizontal_weight="1.5"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toLeftOf="@id/weekLayout"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/weekLayout"
             app:layout_constraintTop_toBottomOf="@+id/tvTitle">
 
             <androidx.appcompat.widget.AppCompatImageView
@@ -43,7 +43,7 @@
                 android:layout_height="@dimen/divider_35px"
                 android:layout_marginStart="@dimen/divider_79px"
                 android:layout_marginTop="@dimen/divider_26px"
-                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -53,8 +53,8 @@
                 android:layout_marginTop="@dimen/divider_31px"
                 android:textColor="@color/color_FF333333"
                 android:textSize="@dimen/divider_32px"
-                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.appcompat.widget.AppCompatImageView
@@ -63,7 +63,7 @@
                 android:layout_height="@dimen/divider_35px"
                 android:layout_marginTop="@dimen/divider_26px"
                 android:layout_marginEnd="@dimen/divider_79px"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <LinearLayout
@@ -72,8 +72,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/divider_26px"
                 android:orientation="horizontal"
-                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/tvDate">
 
                 <androidx.appcompat.widget.AppCompatTextView
@@ -111,8 +111,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_marginTop="@dimen/divider_20px"
-                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/weekLayoutLeft" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -127,8 +127,8 @@
             android:background="@drawable/bg_calendar"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintHorizontal_weight="1"
-            app:layout_constraintLeft_toRightOf="@id/calendarLayout"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toEndOf="@id/calendarLayout"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -141,8 +141,8 @@
             android:gravity="center"
             android:textColor="@color/color_FF333333"
             android:textSize="@dimen/divider_32px"
-            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/calendarLayout" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -155,8 +155,8 @@
             android:textColor="@color/color_FF333333"
             android:textSize="@dimen/divider_32px"
             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/tvSummarize" />
 
 

+ 19 - 19
workbenches/src/main/res/layout/fragment_train_content.xml

@@ -19,8 +19,8 @@
             android:layout_marginTop="@dimen/divider_60px"
             android:background="@drawable/bg_training_content"
             android:gravity="center"
-            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">
 
             <com.yingyang.workbenches.widget.NiceSpinner
@@ -33,8 +33,8 @@
                 android:textSize="@dimen/divider_28px"
                 app:hideArrow="true"
                 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"
                 tools:ignore="RtlSymmetry" />
 
@@ -44,7 +44,7 @@
                 android:layout_marginEnd="@dimen/divider_13px"
                 android:src="@mipmap/icon_arrow_down"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -57,8 +57,8 @@
             android:layout_marginTop="@dimen/divider_26px"
             android:layout_marginEnd="@dimen/divider_32px"
             android:background="@drawable/bg_training_content_title"
-            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/treatmentLayout">
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -66,8 +66,8 @@
                 style="@style/training_content_title_appcompattextview"
                 android:text="@string/date"
                 app:layout_constraintHorizontal_weight="1"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toLeftOf="@id/tvExerciseTherapy"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/tvExerciseTherapy"
                 tools:ignore="MissingConstraints" />
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -75,8 +75,8 @@
                 style="@style/training_content_title_appcompattextview"
                 android:text="@string/exercise_therapy"
                 app:layout_constraintHorizontal_weight="1"
-                app:layout_constraintLeft_toRightOf="@id/tvDate"
-                app:layout_constraintRight_toLeftOf="@id/tvTrainingProgress"
+                app:layout_constraintStart_toEndOf="@id/tvDate"
+                app:layout_constraintEnd_toStartOf="@id/tvTrainingProgress"
                 tools:ignore="MissingConstraints" />
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -84,8 +84,8 @@
                 style="@style/training_content_title_appcompattextview"
                 android:text="@string/training_progress"
                 app:layout_constraintHorizontal_weight="1"
-                app:layout_constraintLeft_toRightOf="@id/tvExerciseTherapy"
-                app:layout_constraintRight_toLeftOf="@id/tvCognitiveTraining"
+                app:layout_constraintStart_toEndOf="@id/tvExerciseTherapy"
+                app:layout_constraintEnd_toStartOf="@id/tvCognitiveTraining"
                 tools:ignore="MissingConstraints" />
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -93,16 +93,16 @@
                 style="@style/training_content_title_appcompattextview"
                 android:text="@string/cognitive_training"
                 app:layout_constraintHorizontal_weight="2"
-                app:layout_constraintLeft_toRightOf="@id/tvTrainingProgress"
-                app:layout_constraintRight_toLeftOf="@id/tvDetail"
+                app:layout_constraintStart_toEndOf="@id/tvTrainingProgress"
+                app:layout_constraintEnd_toStartOf="@id/tvDetail"
                 tools:ignore="MissingConstraints" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvDetail"
                 style="@style/training_content_title_appcompattextview"
                 app:layout_constraintHorizontal_weight="1"
-                app:layout_constraintLeft_toRightOf="@id/tvCognitiveTraining"
-                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintStart_toEndOf="@id/tvCognitiveTraining"
+                app:layout_constraintEnd_toEndOf="parent"
                 tools:ignore="MissingConstraints" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -117,8 +117,8 @@
             android:background="@drawable/bg_training_content_list"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             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/contentTitleLayout" />
 
         <LinearLayout

+ 8 - 8
workbenches/src/main/res/layout/fragment_train_report.xml

@@ -23,8 +23,8 @@
             android:gravity="center"
             android:visibility="gone"
             android:orientation="horizontal"
-            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">
 
             <RadioButton
@@ -45,13 +45,13 @@
             android:id="@+id/layoutTitle"
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_62px"
-            android:layout_marginLeft="@dimen/divider_36px"
+            android:layout_marginStart="@dimen/divider_36px"
             android:layout_marginTop="@dimen/divider_38px"
-            android:layout_marginRight="@dimen/divider_36px"
+            android:layout_marginEnd="@dimen/divider_36px"
             android:background="@drawable/bg_record_title"
             android:gravity="center_vertical"
-            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/radioGroup">
 
             <TextView
@@ -77,8 +77,8 @@
             android:layout_marginEnd="@dimen/divider_36px"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             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/layoutTitle" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>

+ 2 - 2
workbenches/src/main/res/layout/item_date.xml

@@ -25,8 +25,8 @@
             android:textColor="@color/color_FF9FA5B4"
             android:textSize="@dimen/divider_24px"
             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>

+ 6 - 6
workbenches/src/main/res/layout/item_free_training.xml

@@ -35,8 +35,8 @@
                     android:layout_marginTop="@dimen/divider_5px"
                     android:theme="@style/Theme.MaterialComponents.NoActionBar"
                     app:cardCornerRadius="@dimen/divider_36px"
-                    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:strokeColor="@android:color/white"
                     app:strokeWidth="@dimen/divider_4px">
@@ -60,8 +60,8 @@
                     android:gravity="center"
                     android:orientation="horizontal"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    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/cardImage">
 
                     <TextView
@@ -88,8 +88,8 @@
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/divider_18px"
                 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" />
 
         </FrameLayout>

+ 6 - 6
workbenches/src/main/res/layout/item_leisure_brain_list.xml

@@ -27,8 +27,8 @@
                 android:layout_height="match_parent"
                 app:isCircle="@{false}"
                 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"
                 app:loadHeadImg="@{data.videoCoverImage}" />
 
@@ -37,8 +37,8 @@
                 android:layout_height="@dimen/divider_72px"
                 android:layout_marginTop="@dimen/divider_60px"
                 android:background="@mipmap/icon_video"
-                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.appcompat.widget.AppCompatTextView
@@ -53,8 +53,8 @@
                 android:textSize="@dimen/divider_24px"
                 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"
                 tools:text="@string/accumulated_training_duration" />
 
 

+ 6 - 6
workbenches/src/main/res/layout/item_order_list.xml

@@ -27,7 +27,7 @@
             android:text='@{data.description}'
             android:textColor="@color/color_FF2B70FF"
             android:textSize="@dimen/divider_28px"
-            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
@@ -39,7 +39,7 @@
             android:text='@{"订单编号:"+ data.payOrderId}'
             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/tvPackageType" />
 
         <TextView
@@ -52,7 +52,7 @@
             android:text='@{"费用:"+data.payMoneyYUAN}'
             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/tvPayOrderId" />
 
         <TextView
@@ -64,7 +64,7 @@
             android:text="@string/contact_after_sales_service"
             android:textColor="@color/color_FF2B70FF"
             android:textSize="@dimen/divider_24px"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
@@ -77,7 +77,7 @@
             android:text='@{"支付时间:"+data.sendPayTime}'
             android:textColor="@color/color_FF333333"
             android:textSize="@dimen/divider_24px"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvContactAfterSalesService" />
 
         <TextView
@@ -89,7 +89,7 @@
             android:text='@{"订单类型::"+data.packageType}'
             android:textColor="@color/color_FF333333"
             android:textSize="@dimen/divider_24px"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvSendPayTime" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 

+ 6 - 6
workbenches/src/main/res/layout/item_service_package_list.xml

@@ -27,8 +27,8 @@
             android:text="@{data.packageName}"
             android:textColor="@android:color/white"
             android:textSize="@dimen/divider_34px"
-            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.appcompat.widget.AppCompatTextView
@@ -39,8 +39,8 @@
             android:text='@{data.priceYUAN+"元"}'
             android:textColor="@color/color_FFC46D40"
             android:textSize="@dimen/divider_48px"
-            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" />
 
         <Button
@@ -55,8 +55,8 @@
             android:textColor="@android:color/white"
             android:textSize="@dimen/divider_24px"
             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>

+ 10 - 10
workbenches/src/main/res/layout/item_training_content.xml

@@ -23,8 +23,8 @@
             android:gravity="center_horizontal"
             android:text="@{data.taskStartTime}"
             app:layout_constraintHorizontal_weight="1"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toLeftOf="@id/tvExerciseTherapy"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/tvExerciseTherapy"
             tools:ignore="MissingConstraints" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -33,8 +33,8 @@
             android:gravity="center_horizontal"
             android:text="@{data.taskName}"
             app:layout_constraintHorizontal_weight="1"
-            app:layout_constraintLeft_toRightOf="@id/tvDate"
-            app:layout_constraintRight_toLeftOf="@id/tvTrainingProgress"
+            app:layout_constraintStart_toEndOf="@id/tvDate"
+            app:layout_constraintEnd_toStartOf="@id/tvTrainingProgress"
             tools:ignore="MissingConstraints" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -42,8 +42,8 @@
             style="@style/item_training_content_appcompattextview"
             android:gravity="center_horizontal"
             app:layout_constraintHorizontal_weight="1"
-            app:layout_constraintLeft_toRightOf="@id/tvExerciseTherapy"
-            app:layout_constraintRight_toLeftOf="@id/tvCognitiveTraining"
+            app:layout_constraintStart_toEndOf="@id/tvExerciseTherapy"
+            app:layout_constraintEnd_toStartOf="@id/tvCognitiveTraining"
             tools:ignore="MissingConstraints" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -52,8 +52,8 @@
             android:layout_marginStart="@dimen/divider_32px"
             android:text="@{data.gameNames}"
             app:layout_constraintHorizontal_weight="2"
-            app:layout_constraintLeft_toRightOf="@id/tvTrainingProgress"
-            app:layout_constraintRight_toLeftOf="@id/tvDetail"
+            app:layout_constraintStart_toEndOf="@id/tvTrainingProgress"
+            app:layout_constraintEnd_toStartOf="@id/tvDetail"
             tools:ignore="MissingConstraints" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -64,8 +64,8 @@
             android:text="@string/detail"
             android:textColor="@color/color_FF383838"
             app:layout_constraintHorizontal_weight="1"
-            app:layout_constraintLeft_toRightOf="@id/tvCognitiveTraining"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toEndOf="@id/tvCognitiveTraining"
+            app:layout_constraintEnd_toEndOf="parent"
             tools:ignore="MissingConstraints" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>

+ 2 - 2
workbenches/src/main/res/layout/item_training_content_details.xml

@@ -23,8 +23,8 @@
             android:textColor="@color/color_FF4A76FF"
             android:textSize="@dimen/divider_26px"
             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>

+ 6 - 6
workbenches/src/main/res/values/themes.xml

@@ -76,8 +76,8 @@
         <item name="android:layout_width">@dimen/divider_335px</item>
         <item name="android:layout_height">@dimen/divider_62px</item>
         <item name="android:layout_marginTop">@dimen/divider_60px</item>
-        <item name="layout_constraintLeft_toLeftOf">parent</item>
-        <item name="layout_constraintRight_toRightOf">parent</item>
+        <item name="layout_constraintStart_toStartOf">parent</item>
+        <item name="layout_constraintEnd_toEndOf">parent</item>
         <item name="background">@drawable/bg_training_content</item>
         <item name="layout_constraintTop_toTopOf">parent</item>
     </style>
@@ -87,7 +87,7 @@
         <item name="android:layout_height">@dimen/divider_23px</item>
         <item name="android:layout_marginEnd">@dimen/divider_21px</item>
         <item name="layout_constraintBottom_toBottomOf">parent</item>
-        <item name="layout_constraintRight_toRightOf">parent</item>
+        <item name="layout_constraintEnd_toEndOf">parent</item>
         <item name="layout_constraintTop_toTopOf">parent</item>
     </style>
 
@@ -98,7 +98,7 @@
         <item name="android:textSize">@dimen/divider_28px</item>
         <item name="android:textColor">@color/color_FF4A76FF</item>
         <item name="layout_constraintBottom_toBottomOf">parent</item>
-        <item name="layout_constraintLeft_toLeftOf">parent</item>
+        <item name="layout_constraintStart_toStartOf">parent</item>
         <item name="layout_constraintTop_toTopOf">parent</item>
     </style>
 
@@ -135,8 +135,8 @@
         <item name="android:layout_height">0dp</item>
         <item name="android:orientation">vertical</item>
         <item name="layout_constraintBottom_toBottomOf">parent</item>
-        <item name="layout_constraintLeft_toLeftOf">parent</item>
-        <item name="layout_constraintRight_toRightOf">parent</item>
+        <item name="layout_constraintStart_toStartOf">parent</item>
+        <item name="layout_constraintEnd_toEndOf">parent</item>
     </style>
 
     <style name="empty_image_view_style" tools:ignore="ResourceName">