1.替换UI

.idea/misc.xml

@@ -477,6 +477,7 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_training_content_details.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/layout_empty.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/spinner_list_item.xml" value="0.1" />
+        <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/rv_empty.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/drawable/bg_item_live_broadcast.xml" value="0.1715" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/drawable/bg_live_status.xml" value="0.1715" />
         <entry key="..\:/workspace/hcp-pads/livebroadcast/src/main/res/drawable/selector_live_tab_center.xml" value="0.1715" />
@@ -488,10 +489,20 @@
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/layout/activity_setting.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/layout/activity_version_record.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/layout/layout_setting_item.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/push/src/main/res/drawable/bg_item_push.xml" value="0.164" />
+        <entry key="..\:/workspace/hcp-pads/push/src/main/res/drawable/bg_message_list.xml" value="0.164" />
+        <entry key="..\:/workspace/hcp-pads/push/src/main/res/drawable/selector_train_radio.xml" value="0.164" />
+        <entry key="..\:/workspace/hcp-pads/push/src/main/res/drawable/selector_train_radio_checked.xml" value="0.164" />
+        <entry key="..\:/workspace/hcp-pads/push/src/main/res/drawable/selector_train_radio_unchecked.xml" value="0.164" />
         <entry key="..\:/workspace/hcp-pads/push/src/main/res/layout/activity_messge_list.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/push/src/main/res/layout/item_push_list.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/push/src/main/res/layout/item_push_type.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/bg_work_benches_btn.xml" value="0.164" />
+        <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/drawable/selector_train_radio.xml" value="0.164" />
+        <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_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_service_package_type.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/yingyangfly/app/src/main/res/layout/activity_main.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/yingyangfly/app/src/main/res/layout/activity_push.xml" value="0.22239583333333332" />

baselib/src/main/java/com/yingyangfly/baselib/adapter/XBaseAdapter.kt

@@ -45,8 +45,6 @@ open class XBaseAdapter<T>(
             holder.bindForecast(items[position], position)
             holder.setIsRecyclable(recyclable)
         } else if (isShowEmptyView) {
-            holder.itemView.iv_empty?.visibility =
-                if (emptyText.isEmpty()) View.VISIBLE else View.GONE
             holder.itemView.empty_view_message?.visibility =
                 if (emptyText.isEmpty()) View.GONE else View.VISIBLE
             holder.itemView.empty_view_message?.text = emptyText

baselib/src/main/res/layout/rv_empty.xml

@@ -7,25 +7,16 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:gravity="center"
         android:orientation="vertical">
 
-        <ImageView
-            android:id="@+id/iv_empty"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="@dimen/divider_85px"
-            android:background="@mipmap/icon_empt_data" />
-
         <TextView
             android:id="@+id/empty_view_message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="@dimen/divider_32px"
-            android:paddingEnd="@dimen/divider_18px"
+            android:layout_gravity="center"
             android:text="@string/there_is_currently_no_data_available"
-            android:textColor="@color/coloe_D8D8D8"
+            android:textColor="@color/color_d8000000"
             android:textSize="@dimen/divider_42px" />
 
     </LinearLayout>

push/src/main/java/com/yingyang/push/adapter/PushTypeAdapter.kt

@@ -26,9 +26,9 @@ class PushTypeAdapter(override val layoutId: Int = R.layout.item_push_type) :
     ) {
         binding.data = item
         if (currentPosition == position) {
-            binding.tvType.setTextColorResource(R.color.color_ffffff)
+            binding.tvType.setBackgroundResource(R.drawable.selector_train_radio_checked)
         } else {
-            binding.tvType.setTextColorResource(R.color.color_0a374a)
+            binding.tvType.setBackgroundResource(R.drawable.selector_train_radio_unchecked)
         }
         binding.tvType.setOnSingleClickListener {
             currentPosition = position

push/src/main/res/drawable/selector_train_radio_checked.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:shape="rectangle"
+    tools:ignore="ResourceName">
+    <corners android:radius="@dimen/divider_12px" />
+    <solid android:color="@android:color/white" />
+</shape>

push/src/main/res/drawable/selector_train_radio_unchecked.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <item>
+        <shape android:shape="rectangle">
+
+            <corners android:radius="@dimen/divider_12px"/>
+            <gradient
+                android:angle="180"
+                android:endColor="@color/color_cdf4f7"
+                android:startColor="@color/color_ddfbe01"
+                android:type="linear"
+                android:useLevel="true" />
+        </shape>
+    </item>
+
+</layer-list>
+

push/src/main/res/layout/item_push_type.xml

@@ -14,8 +14,7 @@
         android:id="@+id/messageLayout"
         android:layout_width="@dimen/divider_133px"
         android:layout_height="@dimen/divider_55px"
-        android:layout_marginTop="@dimen/divider_40px"
-        android:background="@mipmap/icon_push_text_type">
+        android:layout_marginTop="@dimen/divider_40px">
 
         <TextView
             android:id="@+id/tvType"
@@ -24,7 +23,7 @@
             android:gravity="center"
             android:paddingBottom="@dimen/divider_5px"
             android:text="@{data.dictLabel}"
-            android:textColor="@android:color/white"
+            android:textColor="@color/color_0a374a"
             android:textSize="@dimen/divider_24px"
             android:textStyle="bold" />
 

push/src/main/res/values/colors.xml

@@ -26,4 +26,6 @@
     <color name="color_ffffff" tools:ignore="ResourceName">#ffffff</color>
     <color name="color_00000000" tools:ignore="ResourceName">#00000000</color>
     <color name="color_0a374a" tools:ignore="ResourceName">#0a374a</color>
+    <color name="color_ddfbe01" tools:ignore="ResourceName">#ddfbe0</color>
+    <color name="color_cdf4f7" tools:ignore="ResourceName">#cdf4f7</color>
 </resources>

workbenches/src/main/res/drawable/selector_train_radio_checked.xml

@@ -3,11 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:shape="rectangle"
     tools:ignore="ResourceName">
-    <stroke
-        android:width="@dimen/divider_1px"
-        android:color="@android:color/white" />
     <corners android:radius="@dimen/divider_12px" />
     <solid android:color="@android:color/white" />
 </shape>
 
-

workbenches/src/main/res/drawable/selector_train_radio_unchecked.xml

@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:shape="rectangle"
     tools:ignore="ResourceName">
-    <stroke
-        android:width="@dimen/divider_1px"
-        android:color="@android:color/transparent" />
-    <corners android:radius="@dimen/divider_12px" />
-    <solid android:color="@android:color/transparent" />
-</shape>
 
+    <item>
+        <shape android:shape="rectangle">
 
+            <corners android:radius="@dimen/divider_12px"/>
+            <gradient
+                android:angle="180"
+                android:endColor="@color/color_cdf4f7"
+                android:startColor="@color/color_ddfbe01"
+                android:type="linear"
+                android:useLevel="true" />
+        </shape>
+    </item>
+
+</layer-list>

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

@@ -25,7 +25,7 @@
 
         <RadioGroup
             android:id="@+id/radioOperate"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/divider_195px"
             android:layout_height="match_parent"
             android:layout_marginStart="@dimen/divider_37px"
             android:layout_marginTop="@dimen/divider_110px"

workbenches/src/main/res/values/colors.xml

@@ -60,4 +60,6 @@
     <color name="color_AEC3FF" tools:ignore="ResourceName">#AEC3FF</color>
     <color name="color_111c48" tools:ignore="ResourceName">#111c48</color>
     <color name="color_11489b" tools:ignore="ResourceName">#11489b</color>
+    <color name="color_ddfbe01" tools:ignore="ResourceName">#ddfbe0</color>
+    <color name="color_cdf4f7" tools:ignore="ResourceName">#cdf4f7</color>
 </resources>