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 @@
+
+
+
+
+
+
+
+
+
+
+
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(),
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? = 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) {
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 = it.toMutableList()
+ if (index == pageList.size - 1) {
+ itemList = (itemList + List(GlobalData.arrayVertical) {
+ EquipmentUserInfo()
+ }) as MutableList
+ }
+ 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()
+// for (i in 1 .. 30){
+// list.add(EquipmentUserInfo(id = i, equipmentBoxCode = i.toString()))
+// }
+// _equipmentList.value = list
}
/**