refactor(UI): 统一间距尺寸命名规范

- 将`MaxHeightRecyclerView`移至`ui-base`模块
- 删除未使用的`bg_card_item_land.xml`
- 调整部分布局文件中的间距值，使用新的命名规范
- 更新`dimens.xml`中的尺寸命名

app/src/main/java/com/grkj/iscs/features/init/fragment/InitDeviceRegistrationKeyAndLockFragment.kt

@@ -64,7 +64,7 @@ class InitDeviceRegistrationKeyAndLockFragment :
             }
         }
         binding.dockRv.linear().dividerSpace(
-            requireContext().resources.getDimension(com.grkj.ui_base.R.dimen.common_spacing_2x)
+            requireContext().resources.getDimension(com.grkj.ui_base.R.dimen.iscs_space_4)
                 .toInt(), DividerOrientation.GRID
         ).setup {
             addType<DockData.KeyDock>(R.layout.item_device_registration_key_layout)

app/src/main/java/com/grkj/iscs/features/main/fragment/hardware_manage/SlotsManageFragment.kt

@@ -54,7 +54,7 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
             navController.popBackStack()
         }
         binding.dockRv.linear().dividerSpace(
-            requireContext().resources.getDimension(com.grkj.ui_base.R.dimen.common_spacing_2x)
+            requireContext().resources.getDimension(com.grkj.ui_base.R.dimen.iscs_space_4)
                 .toInt(), DividerOrientation.GRID
         ).setup {
             addType<DockData.KeyDock>(R.layout.item_device_registration_key_layout)

app/src/main/res/drawable/bg_card_item_land.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?attr/colorWhite20" />
-    <corners android:radius="@dimen/iscs_radius_xl" />
-</shape>

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

@@ -122,8 +122,8 @@
                     <FrameLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginHorizontal="@dimen/common_margin_spacing_big"
-                        android:layout_marginTop="@dimen/common_margin_spacing_big"
+                        android:layout_marginHorizontal="@dimen/iscs_space_5"
+                        android:layout_marginTop="@dimen/iscs_space_5"
                         android:layout_weight="1"
                         android:background="@drawable/common_card_bg">
 
@@ -191,7 +191,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginHorizontal="@dimen/common_margin_spacing_big"
+                        android:layout_marginHorizontal="@dimen/iscs_space_5"
                         android:layout_marginTop="@dimen/iscs_space_4"
                         android:layout_weight="1"
                         android:background="@drawable/common_card_bg"

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

@@ -250,8 +250,8 @@
                     <FrameLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginHorizontal="@dimen/common_margin_spacing_big"
-                        android:layout_marginTop="@dimen/common_margin_spacing_big"
+                        android:layout_marginHorizontal="@dimen/iscs_space_5"
+                        android:layout_marginTop="@dimen/iscs_space_5"
                         android:layout_weight="1"
                         android:background="@drawable/common_card_bg">
 
@@ -319,7 +319,7 @@
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginHorizontal="@dimen/common_margin_spacing_big"
+                        android:layout_marginHorizontal="@dimen/iscs_space_5"
                         android:layout_marginTop="@dimen/iscs_space_4"
                         android:layout_weight="1"
                         android:background="@drawable/common_card_bg"

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

@@ -5,7 +5,7 @@
         android:id="@+id/login_container"
         android:layout_width="@dimen/login_method_item_layout_width"
         android:layout_height="@dimen/login_method_item_layout_height"
-        android:background="@drawable/bg_card_item_land">
+        android:background="@drawable/bg_card_item">
 
         <View
             android:id="@+id/login_tip_v"

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

@@ -21,7 +21,7 @@
             android:textSize="@dimen/iscs_text_md"
             android:visibility="gone" />
 
-        <com.grkj.iscs.view.MaxHeightRecyclerView
+        <com.grkj.ui_base.widget.MaxHeightRecyclerView
             android:id="@+id/drop_down_rv"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

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

@@ -9,7 +9,7 @@
             android:id="@+id/home_menu_rv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/common_margin_spacing_big"
-            android:layout_marginTop="@dimen/common_margin_spacing_big" />
+            android:layout_marginLeft="@dimen/iscs_space_5"
+            android:layout_marginTop="@dimen/iscs_space_5" />
     </RelativeLayout>
 </layout>

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

@@ -9,7 +9,7 @@
             android:id="@+id/home_menu_rv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/common_margin_spacing_big"
-            android:layout_marginTop="@dimen/common_margin_spacing_big" />
+            android:layout_marginLeft="@dimen/iscs_space_5"
+            android:layout_marginTop="@dimen/iscs_space_5" />
     </RelativeLayout>
 </layout>

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

@@ -8,7 +8,7 @@
             android:id="@+id/home_menu_rv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/common_margin_spacing_big"
-            android:layout_marginTop="@dimen/common_margin_spacing_big" />
+            android:layout_marginLeft="@dimen/iscs_space_5"
+            android:layout_marginTop="@dimen/iscs_space_5" />
     </RelativeLayout>
 </layout>

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

@@ -25,7 +25,7 @@
             android:layout_below="@+id/welcome_tip"
             android:layout_alignLeft="@+id/welcome_tip"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="@dimen/common_margin_spacing_big"
+            android:layout_marginTop="@dimen/iscs_space_5"
             app:i18nKey='@{"loto"}'
             android:textColor="?attr/colorTextPrimary"
             android:textSize="@dimen/iscs_text_h3"

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

@@ -8,7 +8,7 @@
             android:id="@+id/home_menu_rv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/common_margin_spacing_big"
-            android:layout_marginTop="@dimen/common_margin_spacing_big" />
+            android:layout_marginLeft="@dimen/iscs_space_5"
+            android:layout_marginTop="@dimen/iscs_space_5" />
     </RelativeLayout>
 </layout>

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

@@ -114,8 +114,8 @@
                 <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:layout_marginHorizontal="@dimen/common_margin_spacing_big"
-                    android:layout_marginTop="@dimen/common_margin_spacing_big"
+                    android:layout_marginHorizontal="@dimen/iscs_space_5"
+                    android:layout_marginTop="@dimen/iscs_space_5"
                     android:layout_weight="1"
                     android:background="@drawable/common_card_bg">
 
@@ -183,7 +183,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:layout_marginHorizontal="@dimen/common_margin_spacing_big"
+                    android:layout_marginHorizontal="@dimen/iscs_space_5"
                     android:layout_marginTop="@dimen/iscs_space_4"
                     android:layout_weight="1"
                     android:background="@drawable/common_card_bg"

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

@@ -28,7 +28,7 @@
                 android:id="@+id/workstation_layout"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_marginBottom="@dimen/common_spacing"
+                android:layout_marginBottom="@dimen/iscs_space_2"
                 android:background="@drawable/common_layout_bg"
                 android:minWidth="300dp"
                 android:visibility="gone"
@@ -38,7 +38,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:layout_marginVertical="@dimen/common_spacing"
+                    android:layout_marginVertical="@dimen/iscs_space_2"
                     android:gravity="center"
                     android:textColor="@color/white"
                     android:textSize="@dimen/iscs_text_sm"
@@ -67,7 +67,7 @@
                     android:background="@drawable/common_layout_bg"
                     android:minWidth="300dp"
                     android:orientation="vertical"
-                    android:padding="@dimen/common_spacing"
+                    android:padding="@dimen/iscs_space_2"
                     android:visibility="gone"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -96,7 +96,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
-                        android:layout_marginVertical="@dimen/common_spacing"
+                        android:layout_marginVertical="@dimen/iscs_space_2"
                         android:gravity="center"
                         android:textColor="@color/white"
                         android:textSize="@dimen/iscs_text_sm"

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

@@ -245,8 +245,8 @@
                 <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:layout_marginHorizontal="@dimen/common_margin_spacing_big"
-                    android:layout_marginTop="@dimen/common_margin_spacing_big"
+                    android:layout_marginHorizontal="@dimen/iscs_space_5"
+                    android:layout_marginTop="@dimen/iscs_space_5"
                     android:layout_weight="1"
                     android:background="@drawable/common_card_bg">
 
@@ -315,7 +315,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:layout_marginHorizontal="@dimen/common_margin_spacing_big"
+                    android:layout_marginHorizontal="@dimen/iscs_space_5"
                     android:layout_marginTop="@dimen/iscs_space_4"
                     android:layout_weight="1"
                     android:background="@drawable/common_card_bg"

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

@@ -9,7 +9,7 @@
             android:id="@+id/home_menu_rv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/common_margin_spacing_big"
-            android:layout_marginTop="@dimen/common_margin_spacing_big" />
+            android:layout_marginLeft="@dimen/iscs_space_5"
+            android:layout_marginTop="@dimen/iscs_space_5" />
     </RelativeLayout>
 </layout>

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

@@ -39,7 +39,7 @@
             android:layout_below="@+id/iv_key"
             android:layout_alignLeft="@+id/iv_key"
             android:layout_alignRight="@+id/iv_key"
-            android:layout_marginTop="@dimen/common_spacing"
+            android:layout_marginTop="@dimen/iscs_space_2"
             android:gravity="center_horizontal"
             android:orientation="horizontal"
             android:padding="2dp"

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

@@ -36,7 +36,7 @@
             android:gravity="center_horizontal"
             android:orientation="horizontal"
             android:padding="2dp"
-            android:layout_marginTop="@dimen/common_spacing"
+            android:layout_marginTop="@dimen/iscs_space_2"
             android:visibility="gone">
 
             <TextView

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

@@ -10,7 +10,7 @@
             android:layout_width="@dimen/login_method_item_layout_width"
             android:layout_height="@dimen/login_method_item_layout_height"
             android:layout_gravity="center"
-            android:background="@drawable/bg_card_item_land">
+            android:background="@drawable/bg_card_item">
 
             <View
                 android:id="@+id/login_tip_v"

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <declare-styleable name="MaxHeightRecyclerView">
-        <attr name="maxHeight" format="dimension"/>
-    </declare-styleable>
-</resources>

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

@@ -27,7 +27,7 @@
     <dimen name="normal_input_padding_vertical">2dp</dimen>
     <dimen name="normal_radio_root_layout_padding">56dp</dimen>
     <dimen name="normal_margin_left">10dp</dimen>
-    <dimen name="common_margin_spacing_big">40dp</dimen>
+    <dimen name="iscs_space_5">40dp</dimen>
     <dimen name="common_spacing_7x">70dp</dimen>
     <dimen name="common_spacing_1_5x">15dp</dimen>
     <dimen name="init_margin_space">60dp</dimen>

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

@@ -2,7 +2,7 @@
 <resources>
 
     <style name="TableCellKey">
-        <item name="android:padding">@dimen/common_spacing</item>
+        <item name="android:padding">@dimen/iscs_space_2</item>
         <item name="android:textStyle">bold</item>
         <item name="android:textColor">?attr/colorTextPrimary</item>
         <item name="android:textSize">@dimen/iscs_text_md</item>
@@ -17,7 +17,7 @@
     </style>
 
     <style name="TableCellValue">
-        <item name="android:padding">@dimen/common_spacing</item>
+        <item name="android:padding">@dimen/iscs_space_2</item>
         <item name="android:textColor">?attr/colorTextPrimary</item>
         <item name="android:textSize">@dimen/iscs_text_md</item>
         <item name="android:gravity">center_vertical</item>

app/src/main/java/com/grkj/iscs/view/MaxHeightRecyclerView.kt → ui-base/src/main/java/com/grkj/ui_base/widget/MaxHeightRecyclerView.kt

@@ -1,9 +1,9 @@
-package com.grkj.iscs.view
+package com.grkj.ui_base.widget
 
 import android.content.Context
 import android.util.AttributeSet
 import androidx.recyclerview.widget.RecyclerView
-import com.grkj.iscs.R
+import com.grkj.ui_base.R
 
 class MaxHeightRecyclerView @JvmOverloads constructor(
     context: Context,

ui-base/src/main/res/values/attrs.xml

@@ -174,4 +174,7 @@
             <enum name="field" value="1"/>
         </attr>
     </declare-styleable>
+    <declare-styleable name="MaxHeightRecyclerView">
+        <attr name="maxHeight" format="dimension"/>
+    </declare-styleable>
 </resources>

ui-base/src/main/res/values/dimens.xml

@@ -2,8 +2,6 @@
 <resources>
     <dimen name="common_text_padding">5dp</dimen>
     <dimen name="common_spacing">10dp</dimen>
-    <dimen name="common_spacing_2x">20dp</dimen>
-    <dimen name="common_margin_spacing_big">40dp</dimen>
     <dimen name="common_icon_size">15dp</dimen>
     <dimen name="common_status_circle_small">5dp</dimen>