1.替换UI

.idea/misc.xml

@@ -488,7 +488,7 @@
         <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/layout_setting_item.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/push/src/main/res/layout/activity_messge_list.xml" value="0.23697916666666666" />
-        <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/layout/activity_service_package.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/workbenches/src/main/res/layout/activity_service_package.xml" value="0.6" />
         <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" />
         <entry key="..\:/workspace/yingyangfly/baselib/src/main/res/drawable/bg_center_toast.xml" value="0.2265" />

baselib/src/main/java/com/yingyangfly/baselib/dialog/LoadingDialog.kt

@@ -29,8 +29,6 @@ class LoadingDialog constructor(context: Context) : AlertDialog(context, R.style
     }
 
     fun initViews() {
-        val inflater = LayoutInflater.from(context)
-//        mView = inflater.inflate(R.layout.dialog_loading, null)
         mView = ViewTool.inflateLayoutPixelsById(context, R.layout.dialog_loading, 1194, 834)
         setContentView(mView!!)
         fishImage = findViewById(R.id.fishImage)
@@ -55,10 +53,6 @@ class LoadingDialog constructor(context: Context) : AlertDialog(context, R.style
         dialogWindow.setBackgroundDrawableResource(R.color.transparent)
     }
 
-    fun show(msg: String) {
-        show()
-    }
-
     override fun show() {
         val window = window
         focusNotAle(window!!)

workbenches/src/main/java/com/yingyang/workbenches/adapter/ServicePackageTypeAdapter.kt

@@ -37,9 +37,9 @@ class ServicePackageTypeAdapter(override val layoutId: Int = R.layout.item_servi
         binding.data = item
         if (position == currentPosition) {
             binding.tvType.setTextColorResource(R.color.color_ffffff)
-            binding.tvType.setBackgroundResource(R.color.color_FF2B70FF)
+            binding.tvType.setBackgroundResource(R.color.color_11489b)
         } else {
-            binding.tvType.setTextColorResource(R.color.color_FF2B70FF)
+            binding.tvType.setTextColorResource(R.color.color_11489b)
             binding.tvType.setBackgroundResource(R.color.color_ffffff)
         }
 

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

@@ -38,7 +38,7 @@
                 style="@style/layout_properties_self_adaption"
                 android:layout_gravity="center"
                 android:text="@string/service_package"
-                android:textColor="@color/color_FF4974FF"
+                android:textColor="@color/color_111c48"
                 android:textSize="@dimen/divider_34px"
                 android:textStyle="bold" />
 
@@ -55,16 +55,14 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <com.google.android.material.card.MaterialCardView
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_marginStart="@dimen/divider_60px"
             android:layout_marginTop="@dimen/divider_35px"
             android:layout_marginEnd="@dimen/divider_60px"
             android:layout_marginBottom="@dimen/divider_27px"
-            android:theme="@style/Theme.MaterialComponents.NoActionBar"
-            app:cardBackgroundColor="@android:color/white"
-            app:cardCornerRadius="@dimen/divider_20px"
+            android:background="@mipmap/icon_bg_servic_package"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -82,7 +80,7 @@
                     android:layout_marginTop="@dimen/divider_26px"
                     android:theme="@style/Theme.MaterialComponents.NoActionBar"
                     app:cardCornerRadius="@dimen/divider_20px"
-                    app:strokeColor="@color/color_FF2B70FF"
+                    app:strokeColor="@color/color_11489b"
                     app:strokeWidth="@dimen/divider_2px">
 
                     <androidx.recyclerview.widget.RecyclerView
@@ -102,7 +100,7 @@
 
             </LinearLayout>
 
-        </com.google.android.material.card.MaterialCardView>
+        </FrameLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>

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

@@ -58,4 +58,6 @@
     <color name="color_FF626B80" tools:ignore="ResourceName">#FF626B80</color>
     <color name="color_FFD7D7D7" tools:ignore="ResourceName">#FFD7D7D7</color>
     <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>
 </resources>