refactor(界面调整):

- 锁分组界面调整
- 锁分组item布局优化
- 新增选择分组提示

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

@@ -185,8 +185,7 @@ class SelectMemberFragment : BaseFragment<FragmentSelectMemeberBinding>() {
         itemBinding.groupName.text = item.jobTicketGroupInfo.groupName
         itemBinding.groupLockerRv.setDebouncedClickListener {
             isLockerSelect = true
-            itemBinding.groupTitleLayout.isSelected = !itemBinding.groupTitleLayout.isSelected
-            itemBinding.groupName.isSelected = itemBinding.groupTitleLayout.isSelected
+            itemBinding.groupName.isSelected = !itemBinding.groupName.isSelected
             viewModel.currentSelectGroup = item.jobTicketGroupInfo
             binding.selectMemberTip.text =
                 getString(R.string.select_locker_tip, viewModel.currentSelectGroup?.groupName ?: "")

app/src/main/res/layout-land/fragment_select_point.xml

@@ -127,20 +127,42 @@
                 android:layout_weight="1"
                 android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/add_group"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginVertical="5dp"
-                    android:layout_marginLeft="@dimen/common_spacing"
-                    android:layout_gravity="right"
-                    android:background="@drawable/common_btn"
-                    android:drawablePadding="@dimen/common_spacing"
-                    android:gravity="center"
-                    android:paddingHorizontal="@dimen/common_spacing_2x"
-                    android:text="@string/add_group"
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/common_btn_text_size" />
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:drawableLeft="@mipmap/tip"
+                        android:drawablePadding="@dimen/common_spacing"
+                        android:gravity="center_vertical"
+                        android:text="@string/select_group_tip"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/common_text_size" />
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="1dp"
+                        android:layout_weight="1" />
+
+                    <TextView
+                        android:id="@+id/add_group"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="right|center_vertical"
+                        android:layout_marginVertical="5dp"
+                        android:layout_marginLeft="@dimen/common_spacing"
+                        android:background="@drawable/common_btn"
+                        android:drawablePadding="@dimen/common_spacing"
+                        android:gravity="center"
+                        android:paddingHorizontal="@dimen/common_spacing_2x"
+                        android:text="@string/add_group"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/common_btn_text_size" />
+                </LinearLayout>
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/point_group_rv"

app/src/main/res/layout-land/item_locker_group.xml

@@ -9,37 +9,27 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:background="@drawable/home_card_bg"
             android:gravity="center_vertical"
             android:minWidth="@dimen/item_locker_group_min_width"
-            android:layout_gravity="center_vertical"
             android:orientation="vertical">
 
-            <LinearLayout
-                android:id="@+id/group_title_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+            <TextView
+                android:id="@+id/group_name"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
                 android:background="@drawable/bg_item_group_title_layout"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingVertical="@dimen/common_spacing_small">
-
-                <TextView
-                    android:id="@+id/group_name"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@drawable/bg_group_name_input_selector"
-                    android:enabled="false"
-                    android:focusable="false"
-                    android:layout_gravity="center"
-                    android:focusableInTouchMode="false"
-                    android:gravity="center"
-                    android:paddingHorizontal="@dimen/common_spacing"
-                    android:text="@string/selected_point_info_title"
-                    android:textColor="@color/text_color_item_group_title_text"
-                    android:textSize="@dimen/normal_text_size_18" />
-
-            </LinearLayout>
+                android:enabled="false"
+                android:focusable="false"
+                android:focusableInTouchMode="false"
+                android:gravity="center"
+                android:paddingHorizontal="@dimen/common_spacing"
+                android:paddingVertical="@dimen/common_spacing_small"
+                android:text="@string/selected_point_info_title"
+                android:textColor="@color/text_color_item_group_title_text"
+                android:textSize="@dimen/normal_text_size_18" />
 
             <View
                 android:layout_width="match_parent"

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

@@ -94,20 +94,42 @@
                 android:layout_weight="1"
                 android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/add_group"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="right"
-                    android:layout_marginVertical="5dp"
-                    android:layout_marginLeft="@dimen/common_spacing"
-                    android:background="@drawable/common_btn"
-                    android:drawablePadding="@dimen/common_spacing"
-                    android:gravity="center"
-                    android:paddingHorizontal="@dimen/common_spacing_2x"
-                    android:text="@string/add_group"
-                    android:textColor="@color/black"
-                    android:textSize="@dimen/common_btn_text_size" />
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:drawableLeft="@mipmap/tip"
+                        android:drawablePadding="@dimen/common_spacing"
+                        android:gravity="center_vertical"
+                        android:textColor="@color/black"
+                        android:text="@string/select_group_tip"
+                        android:textSize="@dimen/common_text_size" />
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="1dp"
+                        android:layout_weight="1" />
+
+                    <TextView
+                        android:id="@+id/add_group"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="right|center_vertical"
+                        android:layout_marginVertical="5dp"
+                        android:layout_marginLeft="@dimen/common_spacing"
+                        android:background="@drawable/common_btn"
+                        android:drawablePadding="@dimen/common_spacing"
+                        android:gravity="center"
+                        android:paddingHorizontal="@dimen/common_spacing_2x"
+                        android:text="@string/add_group"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/common_btn_text_size" />
+                </LinearLayout>
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/point_group_rv"

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

@@ -15,31 +15,21 @@
             android:minWidth="@dimen/item_locker_group_min_width"
             android:orientation="vertical">
 
-            <LinearLayout
-                android:id="@+id/group_title_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+            <TextView
+                android:id="@+id/group_name"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
                 android:background="@drawable/bg_item_group_title_layout"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingVertical="@dimen/common_spacing_small">
-
-                <TextView
-                    android:id="@+id/group_name"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@drawable/bg_group_name_input_selector"
-                    android:enabled="false"
-                    android:focusable="false"
-                    android:focusableInTouchMode="false"
-                    android:gravity="center"
-                    android:layout_gravity="center"
-                    android:paddingHorizontal="@dimen/common_spacing"
-                    android:text="@string/selected_point_info_title"
-                    android:textColor="@color/text_color_item_group_title_text"
-                    android:textSize="@dimen/normal_text_size_18" />
-
-            </LinearLayout>
+                android:enabled="false"
+                android:focusable="false"
+                android:focusableInTouchMode="false"
+                android:gravity="center"
+                android:paddingHorizontal="@dimen/common_spacing"
+                android:paddingVertical="@dimen/common_spacing_small"
+                android:text="@string/selected_point_info_title"
+                android:textColor="@color/text_color_item_group_title_text"
+                android:textSize="@dimen/normal_text_size_18" />
 
             <View
                 android:layout_width="match_parent"

app/src/main/res/values-en/strings.xml

@@ -474,5 +474,6 @@
     <string name="group_name_must_not_empty">Group name must not empty</string>
     <string name="not_group_can_lock">There are currently no groups that can be locked</string>
     <string name="not_group_can_unlock">There are currently no groups to unlock</string>
+    <string name="select_group_tip">Click on the blank area of the group to select</string>
 
 </resources>

app/src/main/res/values-zh/strings.xml

@@ -474,5 +474,6 @@
     <string name="group_name_must_not_empty">分组名称不能为空</string>
     <string name="not_group_can_lock">当前无分组可上锁</string>
     <string name="not_group_can_unlock">当前无分组可解锁</string>
+    <string name="select_group_tip">点击分组空白区域进行选中</string>
 
 </resources>

app/src/main/res/values/strings.xml

@@ -477,5 +477,6 @@
     <string name="group_name_must_not_empty">分组名称不能为空</string>
     <string name="not_group_can_lock">当前无分组可上锁</string>
     <string name="not_group_can_unlock">当前无分组可解锁</string>
+    <string name="select_group_tip">点击分组空白区域选中</string>
 
 </resources>