1.优化页面UI

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

@@ -35,33 +35,12 @@ class ServicePackageTypeAdapter(override val layoutId: Int = R.layout.item_servi
         position: Int
     ) {
         binding.data = item
-        val index = dataSize - 1
         if (position == currentPosition) {
             binding.tvType.setTextColorResource(R.color.color_ffffff)
-            when (position) {
-                0 -> {
-                    binding.tvType.setBackgroundResource(R.drawable.bg_service_package_left)
-                }
-                index -> {
-                    binding.tvType.setBackgroundResource(R.drawable.bg_service_package_right)
-                }
-                else -> {
-                    binding.tvType.setBackgroundResource(R.drawable.bg_service_package_selected)
-                }
-            }
+            binding.tvType.setBackgroundResource(R.color.color_FF2B70FF)
         } else {
             binding.tvType.setTextColorResource(R.color.color_FF2B70FF)
-            when (position) {
-                0 -> {
-                    binding.tvType.setBackgroundResource(R.drawable.selector_train_report_tab_left)
-                }
-                index -> {
-                    binding.tvType.setBackgroundResource(R.drawable.selector_train_report_tab_right)
-                }
-                else -> {
-                    binding.tvType.setBackgroundResource(R.drawable.bg_service_package_unselected)
-                }
-            }
+            binding.tvType.setBackgroundResource(R.color.color_ffffff)
         }
 
         binding.tvType.setOnSingleClickListener {

workbenches/src/main/java/com/yingyang/workbenches/servicepackage/ServicePackageActivity.kt

@@ -13,7 +13,6 @@ import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.JumpUtil
-import io.reactivex.disposables.Disposable
 
 /**
  * 服务套餐

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

@@ -74,13 +74,14 @@
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <androidx.cardview.widget.CardView
+        <com.google.android.material.card.MaterialCardView
             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"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -94,13 +95,22 @@
                 android:layout_gravity="center"
                 android:orientation="vertical">
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rvType"
+                <com.google.android.material.card.MaterialCardView
                     android:layout_width="wrap_content"
                     android:layout_height="@dimen/divider_55px"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginTop="@dimen/divider_26px"
-                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+                    android:theme="@style/Theme.MaterialComponents.NoActionBar"
+                    app:cardCornerRadius="@dimen/divider_20px"
+                    app:strokeColor="@color/color_FF2B70FF"
+                    app:strokeWidth="@dimen/divider_2px">
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rvType"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+                </com.google.android.material.card.MaterialCardView>
 
                 <Button
                     android:layout_width="match_parent"
@@ -123,7 +133,7 @@
 
             </LinearLayout>
 
-        </androidx.cardview.widget.CardView>
+        </com.google.android.material.card.MaterialCardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>

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

@@ -13,7 +13,7 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="horizontal">
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvType"
@@ -24,6 +24,11 @@
             android:paddingEnd="@dimen/divider_31px"
             android:text="@{data.dictLabel}"
             android:textSize="@dimen/divider_24px" />
+
+        <View
+            android:layout_width="2px"
+            android:layout_height="match_parent"
+            android:background="@color/color_FF2B70FF" />
     </LinearLayout>
 
 </layout>