refactor(更新)

- 点位分组更新

app/src/main/java/com/grkj/iscs/features/main/fragment/common/SelectPointFragment.kt

@@ -124,7 +124,8 @@ class SelectPointFragment : BaseFragment<FragmentSelectPointBinding>() {
         val tempSelectedPointData =
             GlobalDataTempStore.getInstance().getData(DataTransferConstants.KEY_SELECTED_POINT_DATA)
         if (tempSelectedPointData is List<*>) {
-            selectedPointData = (tempSelectedPointData as List<PointManageVo>).toMutableList()
+            selectedPointData =
+                (tempSelectedPointData as List<Pair<String, List<PointManageVo>>>).toMutableList()
         }
         val previewStepTitle = GlobalDataTempStore.getInstance()
             .getData(DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA) as String
@@ -142,11 +143,13 @@ class SelectPointFragment : BaseFragment<FragmentSelectPointBinding>() {
                 .getData(DataTransferConstants.KEY_IS_UNLOCK_FIRST) as Boolean
         }
         viewModel.getPointData().observe(this) {
-            binding.selectedPointRv.models = selectedPointData
+            binding.pointGroupRv.models = selectedPointData
             binding.unselectedPointRv.models = viewModel.pointManageData.apply {
-                forEach { it.isSelected = it.pointId in selectedPointData.map { it.pointId } }
-                sortedBy { it.isSelected }
-            }
+                forEach {
+                    it.isSelected =
+                        it.pointId in selectedPointData.flatMap { it.second }.map { it.pointId }
+                }
+            }.filter { it.isSelected == false }
         }
     }
 }

app/src/main/res/layout/item_point_group.xml

@@ -10,11 +10,12 @@
         android:orientation="vertical">
 
         <LinearLayout
+            android:id="@+id/group_title_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
-            android:paddingVertical="@dimen/common_spacing_small"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/common_spacing_small">
 
             <EditText
                 android:id="@+id/group_name"
@@ -35,7 +36,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
                 android:layout_marginRight="@dimen/common_spacing"
-                android:background="@drawable/common_btn"
+                android:background="@drawable/common_btn_selector"
                 android:drawablePadding="@dimen/common_spacing"
                 android:gravity="center"
                 android:paddingHorizontal="@dimen/common_spacing_2x"

ui-base/src/main/res/drawable/common_btn_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/common_btn_white_board" android:state_selected="true" />
+    <item android:drawable="@drawable/common_btn" />
+</selector>