From 307fc70ae2c001f7390f206957306fba356fda37 Mon Sep 17 00:00:00 2001
From: zxj <275873859@qq.com>
Date: Mon, 28 Jul 2025 10:50:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=BA=86=E5=9E=82=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            | 11 +++++++++
 .../java/com/sw/platecabinet/GlobalData.kt    |  2 +-
 .../activity/LoginByFaceActivity.kt           |  1 +
 .../fragment/SettingListFragment.kt           | 23 +++++++++++++++----
 .../viewmodel/SettingViewModel.kt             |  5 ++++
 5 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index b49c564..34febdd 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,6 +4,17 @@
     <selectionStates>
       <SelectionState runConfigName="SmartPlateCabinet.app">
         <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2025-07-25T08:39:03.160022800Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="Default" identifier="serial=?;connection=93a2ccce" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
+      </SelectionState>
+      <SelectionState runConfigName="LoginByFaceActivity">
+        <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
     </selectionStates>
   </component>
diff --git a/app/src/main/java/com/sw/platecabinet/GlobalData.kt b/app/src/main/java/com/sw/platecabinet/GlobalData.kt
index c462b34..1937575 100644
--- a/app/src/main/java/com/sw/platecabinet/GlobalData.kt
+++ b/app/src/main/java/com/sw/platecabinet/GlobalData.kt
@@ -20,7 +20,7 @@ object GlobalData {
     /**
      * 竖排数量
      */
-    var arrayVertical: Int = 11
+    var arrayVertical: Int = 10
 
     /**
      * 排列方式 0 垂直 1 水平
diff --git a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
index 7caa625..5912f31 100644
--- a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
+++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
@@ -339,6 +339,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
 
 
     override fun onGlobalLayout() {
+        Timber.d("onGlobalLayout")
         binding.dualCameraTexturePreviewRgb.getViewTreeObserver().removeOnGlobalLayoutListener(this)
         // 请求权限
         checkCameraPermission()
diff --git a/app/src/main/java/com/sw/platecabinet/fragment/SettingListFragment.kt b/app/src/main/java/com/sw/platecabinet/fragment/SettingListFragment.kt
index 8172287..2b48501 100644
--- a/app/src/main/java/com/sw/platecabinet/fragment/SettingListFragment.kt
+++ b/app/src/main/java/com/sw/platecabinet/fragment/SettingListFragment.kt
@@ -1,6 +1,7 @@
 package com.sw.platecabinet.fragment
 
 import android.view.View
+import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -42,7 +43,7 @@ class SettingListFragment :
      * 垂直滚动的adapter
      */
     private var itemAdapter: GenericItemAdapter<EquipmentUserInfo, ItemBindViewBinding>? = null
-    private val itemsPerPage = GlobalData.arrayCross * GlobalData.arrayVertical // 每行2个，每列11个，共22个
+    private val itemsPerPage = 2 * GlobalData.arrayVertical // 每行2个，每列11个，共22个
 
     override fun registerDataChange() {
         super.registerDataChange()
@@ -107,6 +108,11 @@ class SettingListFragment :
         item: EquipmentUserInfo,
         position: Int
     ) {
+        if (item.equipmentBoxCode?.isEmpty() == true) {
+            this.llRoot.isVisible = false
+            return
+        }
+        this.llRoot.isVisible = true
         this.tvNum.text = formatNumber(item.equipmentBoxCode ?: "")
         if (item.isBound()) {
             val date = DateTimeUtils.parseDateTime(item.updateTime)
@@ -176,14 +182,21 @@ class SettingListFragment :
     fun updateAdapter(items: List<EquipmentUserInfo>) {
         if (GlobalData.arrayCross > 2) {
             var pages = if (items.size > itemsPerPage) {
-                items.chunked(itemsPerPage) {
-                    convertToColumnFirst(it, 11)
+                val pageList = items.chunked(itemsPerPage)
+                pageList.mapIndexed { index, it ->
+                    var itemList: MutableList<EquipmentUserInfo> = it.toMutableList()
+                    if (index == pageList.size - 1) {
+                        itemList = (itemList + List(GlobalData.arrayVertical) {
+                            EquipmentUserInfo()
+                        }) as MutableList<EquipmentUserInfo>
+                    }
+                    convertToColumnFirst(itemList, GlobalData.arrayVertical)
                 }
             } else {
                 listOf(
                     // 根据条件判断是否需要重新排列
-//                items
-                    convertToColumnFirst(items, 11)
+                    items
+//                    convertToColumnFirst(items, GlobalData.arrayVertical)
                 )
             }
             pageAdapter?.updatePages(pages)
diff --git a/app/src/main/java/com/sw/platecabinet/viewmodel/SettingViewModel.kt b/app/src/main/java/com/sw/platecabinet/viewmodel/SettingViewModel.kt
index caa881c..395cb86 100644
--- a/app/src/main/java/com/sw/platecabinet/viewmodel/SettingViewModel.kt
+++ b/app/src/main/java/com/sw/platecabinet/viewmodel/SettingViewModel.kt
@@ -46,6 +46,11 @@ class SettingViewModel : BaseViewModel() {
                 _equipmentList.value = response.data ?: emptyList()
             }
         }
+//        val list = mutableListOf<EquipmentUserInfo>()
+//        for (i in 1 .. 30){
+//            list.add(EquipmentUserInfo(id = i, equipmentBoxCode = i.toString()))
+//        }
+//        _equipmentList.value = list
     }
 
     /**