1.替换UI

.idea/misc.xml

@@ -503,6 +503,7 @@
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/selector_train_radio_checked.xml" value="0.164" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/selector_train_radio_unchecked.xml" value="0.164" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/layout/activity_free_train.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/layout/activity_leisure_brain.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/layout/activity_service_package.xml" value="0.3953084274543875" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/layout/activity_train_data.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/layout/item_free_training_type.xml" value="0.23697916666666666" />

workbenches/src/main/res/layout/activity_free_train.xml

@@ -29,53 +29,49 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/layoutHead" />
 
-        <androidx.cardview.widget.CardView
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_marginStart="@dimen/divider_38px"
             android:layout_marginTop="@dimen/divider_18px"
             android:layout_marginEnd="@dimen/divider_18px"
             android:layout_marginBottom="@dimen/divider_18px"
-            app:cardBackgroundColor="@android:color/white"
-            app:cardCornerRadius="@dimen/divider_38px"
+            android:background="@mipmap/icon_bg_pushmeaage"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/rvTrainType"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.constraintlayout.widget.ConstraintLayout style="@style/layout_properties_specify_width_geight">
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvTitle"
+                style="@style/layout_properties_self_adaption"
+                android:layout_marginTop="@dimen/divider_31px"
+                android:text="@string/all_training"
+                android:textColor="@color/color_FF4A76FF"
+                android:textSize="@dimen/divider_42px"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tvTitle"
-                    style="@style/layout_properties_self_adaption"
-                    android:layout_marginTop="@dimen/divider_31px"
-                    android:text="@string/all_training"
-                    android:textColor="@color/color_FF4A76FF"
-                    android:textSize="@dimen/divider_42px"
-                    android:textStyle="bold"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+            <com.scwang.smartrefresh.layout.SmartRefreshLayout
+                android:id="@+id/freeTrainSwipe"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tvTitle">
 
-                <com.scwang.smartrefresh.layout.SmartRefreshLayout
-                    android:id="@+id/freeTrainSwipe"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvTitle">
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rvTrain"
+                    style="@style/layout_properties_specify_width_geight"
+                    android:layout_marginStart="@dimen/divider_16px"
+                    android:layout_marginTop="@dimen/divider_8px"
+                    android:layout_marginBottom="@dimen/divider_8px" />
 
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/rvTrain"
-                        style="@style/layout_properties_specify_width_geight"
-                        android:layout_marginStart="@dimen/divider_16px"
-                        android:layout_marginTop="@dimen/divider_8px"
-                        android:layout_marginBottom="@dimen/divider_8px" />
-
-                </com.scwang.smartrefresh.layout.SmartRefreshLayout>
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.cardview.widget.CardView>
+            </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>

workbenches/src/main/res/layout/activity_leisure_brain.xml

@@ -30,46 +30,42 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/layoutHead" />
 
-        <androidx.cardview.widget.CardView
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_marginStart="@dimen/divider_38px"
             android:layout_marginTop="@dimen/divider_18px"
             android:layout_marginEnd="@dimen/divider_18px"
             android:layout_marginBottom="@dimen/divider_18px"
-            android:background="@android:color/white"
-            app:cardCornerRadius="@dimen/divider_38px"
+            android:background="@mipmap/icon_bg_pushmeaage"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/rvLeisureBrainType"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.constraintlayout.widget.ConstraintLayout style="@style/layout_properties_specify_width_geight">
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvTitle"
+                style="@style/layout_properties_self_adaption"
+                android:layout_marginTop="@dimen/divider_31px"
+                android:text="@string/all_training"
+                android:textColor="@color/color_FF4A76FF"
+                android:textSize="@dimen/divider_42px"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tvTitle"
-                    style="@style/layout_properties_self_adaption"
-                    android:layout_marginTop="@dimen/divider_31px"
-                    android:text="@string/all_training"
-                    android:textColor="@color/color_FF4A76FF"
-                    android:textSize="@dimen/divider_42px"
-                    android:textStyle="bold"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rvLeisureBrain"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_margin="@dimen/divider_28px"
-                    android:layout_marginTop="@dimen/divider_8px"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.cardview.widget.CardView>
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rvLeisureBrain"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_margin="@dimen/divider_28px"
+                android:layout_marginTop="@dimen/divider_8px"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>

workbenches/src/main/res/layout/activity_train_data.xml

@@ -74,19 +74,18 @@
 
         </RadioGroup>
 
-        <androidx.cardview.widget.CardView
+        <FrameLayout
             android:id="@+id/layoutOperate"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_margin="@dimen/divider_18px"
-            android:background="@drawable/bg_train_right"
-            app:cardCornerRadius="@dimen/divider_38px"
+            android:background="@mipmap/icon_bg_pushmeaage"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/radioOperate"
             app:layout_constraintTop_toTopOf="parent">
 
-        </androidx.cardview.widget.CardView>
+        </FrameLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>