Forráskód Böngészése

refactor(硬件管理):
- 槽位管理锁布局样式优化
- `SlotsManageFragment`代码格式化

周文健 2 hónapja
szülő
commit
6bbe529258

+ 22 - 10
app/src/main/java/com/grkj/iscs/features/main/fragment/hardware_manage/SlotsManageFragment.kt

@@ -6,6 +6,7 @@ import androidx.fragment.app.viewModels
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
 import com.drake.brv.utils.dividerSpace
+import com.drake.brv.utils.grid
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.setup
 import com.google.android.flexbox.AlignItems
@@ -243,7 +244,11 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
                     viewModel.exceptionKeyData.find { it.keyNfc == itemKey.rfid } != null ||
                             viewModel.exceptionSlotsData.find {
                                 it.row?.toInt() == itemKey.row && it.col?.toInt() == (modelPosition + 1)
-                            }?.status == CommonDictDataEnum.SLOT_STATUS.commonDictRes.find { it.dictLabel == I18nManager.t("abnormal") }?.dictValue
+                            }?.status == CommonDictDataEnum.SLOT_STATUS.commonDictRes.find {
+                        it.dictLabel == I18nManager.t(
+                            "abnormal"
+                        )
+                    }?.dictValue
                 itemKeyBinding.ivKey.isSelected = itemKey.isExist
                 itemKeyBinding.switchLayout.isVisible =
                     MainDomainData.roleKeys?.contains(RoleEnum.ADMIN.roleKey) == true ||
@@ -309,12 +314,7 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
         lockDock: DockData.LockDock,
     ) {
         val itemBinding = getBinding<ItemDeviceRegistrationLockLayoutBinding>()
-        itemBinding.rvLockLayout.layoutManager = FlexboxLayoutManager(context).apply {
-            flexDirection = FlexDirection.ROW               // 横向
-            justifyContent = JustifyContent.SPACE_EVENLY     // 等间距居中
-            alignItems = AlignItems.CENTER               // 垂直居中对齐
-        }
-        itemBinding.rvLockLayout.setup {
+        itemBinding.rvLockLayout.grid(10).dividerSpace(10, DividerOrientation.GRID).setup {
             addType<DockBean.LockBean>(R.layout.item_device_slot_manage_lock)
             onBind {
                 val itemLockBinding = getBinding<ItemDeviceSlotManageLockBinding>()
@@ -323,7 +323,11 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
                     viewModel.exceptionLockData.find { it.lockNfc == itemLock.rfid } != null ||
                             viewModel.exceptionSlotsData.find {
                                 it.row?.toInt() == itemLock.row && it.col?.toInt() == (modelPosition + 1)
-                            }?.status == CommonDictDataEnum.SLOT_STATUS.commonDictRes.find { it.dictLabel == I18nManager.t("abnormal") }?.dictValue
+                            }?.status == CommonDictDataEnum.SLOT_STATUS.commonDictRes.find {
+                        it.dictLabel == I18nManager.t(
+                            "abnormal"
+                        )
+                    }?.dictValue
                 itemLockBinding.root.isSelected = itemLock.isExist
                 itemLockBinding.switchLayout.isVisible =
                     MainDomainData.roleKeys?.contains(RoleEnum.ADMIN.roleKey) == true ||
@@ -404,7 +408,11 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
                             viewModel.exceptionKeyData.find { it.keyNfc == itemPortable.rfid } != null ||
                                     viewModel.exceptionSlotsData.find {
                                         it.row?.toInt() == itemPortable.row && it.col?.toInt() == (modelPosition + 1)
-                                    }?.status == CommonDictDataEnum.SLOT_STATUS.commonDictRes.find { it.dictLabel == I18nManager.t("abnormal") }?.dictValue
+                                    }?.status == CommonDictDataEnum.SLOT_STATUS.commonDictRes.find {
+                                it.dictLabel == I18nManager.t(
+                                    "abnormal"
+                                )
+                            }?.dictValue
                         itemKeyBinding.ivKey.isSelected = itemPortable.isExist
                         itemKeyBinding.switchLayout.isVisible =
                             MainDomainData.roleKeys?.contains(RoleEnum.ADMIN.roleKey) == true ||
@@ -473,7 +481,11 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
                             viewModel.exceptionLockData.find { it.lockNfc == itemPortable.rfid } != null ||
                                     viewModel.exceptionSlotsData.find {
                                         it.row?.toInt() == itemPortable.row && it.col?.toInt() == (modelPosition + 1)
-                                    }?.status == CommonDictDataEnum.SLOT_STATUS.commonDictRes.find { it.dictLabel == I18nManager.t("abnormal") }?.dictValue
+                                    }?.status == CommonDictDataEnum.SLOT_STATUS.commonDictRes.find {
+                                it.dictLabel == I18nManager.t(
+                                    "abnormal"
+                                )
+                            }?.dictValue
                         itemLockBinding.root.isSelected = itemPortable.isExist
                         itemLockBinding.switchLayout.isVisible =
                             MainDomainData.roleKeys?.contains(RoleEnum.ADMIN.roleKey) == true ||

+ 3 - 2
app/src/main/res/layout/item_device_slot_manage_key.xml

@@ -9,8 +9,8 @@
 
         <ImageView
             android:id="@+id/iv_key"
-            android:layout_width="@dimen/init_key_iv_width"
-            android:layout_height="@dimen/init_key_iv_height"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:background="@drawable/dock_key_selector" />
 
         <View
@@ -40,6 +40,7 @@
             android:layout_alignLeft="@+id/iv_key"
             android:layout_alignRight="@+id/iv_key"
             android:gravity="center_horizontal"
+            android:layout_marginTop="@dimen/common_spacing"
             android:orientation="horizontal"
             android:padding="2dp"
             android:visibility="gone">

+ 3 - 2
app/src/main/res/layout/item_device_slot_manage_lock.xml

@@ -10,8 +10,8 @@
 
         <FrameLayout
             android:id="@+id/root"
-            android:layout_width="@dimen/init_lock_iv_width"
-            android:layout_height="@dimen/init_lock_iv_height"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
             android:background="@drawable/dock_lock_selector" />
 
@@ -35,6 +35,7 @@
             android:gravity="center_horizontal"
             android:orientation="horizontal"
             android:padding="2dp"
+            android:layout_marginTop="@dimen/common_spacing"
             android:visibility="gone">
 
             <TextView