修复了排序问题

app/src/main/java/com/sw/platecabinet/utils/DateTimeUtils.kt

@@ -2,6 +2,7 @@ package com.sw.inbound.utils
 
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.flow
+import timber.log.Timber
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
@@ -67,7 +68,8 @@ object DateTimeUtils {
             val format = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
             format.parse(timeString)
         } catch (e: Exception) {
-            e.printStackTrace()
+//            e.printStackTrace()
+            Timber.e(e.message)
             null
         }
     }

app/src/main/java/com/sw/platecabinet/utils/ListArrangementUtil.kt

@@ -0,0 +1,81 @@
+package com.sw.platecabinet.utils
+
+import com.sw.platecabinet.model.response.EquipmentUserInfo
+import timber.log.Timber
+import kotlin.math.ceil
+
+/**
+ * 列表排序工具类
+ */
+object ListArrangementUtil {
+
+    /**
+     * page item水平排序
+     */
+    fun horizontalSortPageItem(
+        list: List<EquipmentUserInfo>,
+        columns: Int,
+        defaultValue: EquipmentUserInfo = EquipmentUserInfo()
+    ): List<EquipmentUserInfo> {
+        Timber.d("horizontalSortPageItem")
+        // 填充缺失的数据，确保能被 columns 整除
+        val filledList = if (list.size % columns != 0) {
+            list + List(columns - (list.size % columns)) { defaultValue }
+        } else {
+            list
+        }
+
+        val chunks = filledList.chunked(columns)
+        return (0 until columns)
+            .windowed(2, 2, partialWindows = true)
+            .flatMap { group ->
+                when (group.size) {
+                    2 -> chunks.flatMap { listOf(it[group[0]], it[group[1]]) }
+                    1 -> chunks.flatMap {
+                        listOf(
+                            it[group[0]],
+                            EquipmentUserInfo(equipmentBoxCode = null)
+                        )
+                    }.dropLast(1)
+
+                    else -> error("Unexpected group size")
+                }
+            }
+    }
+
+    /**
+     * item 垂直排序
+     */
+    fun verticalSortItem(list: List<EquipmentUserInfo>): List<EquipmentUserInfo> {
+        Timber.d("verticalSortItem")
+        val users = if (list.size % 2 != 0) {
+            Timber.d("列表长度必须是偶数")
+            list + EquipmentUserInfo()
+        } else {
+            list
+        }
+
+        val half = users.size / 2
+        val firstHalf = users.take(half)
+        val secondHalf = users.drop(half)
+
+        return firstHalf.zip(secondHalf) { a, b -> listOf(a, b) }.flatten()
+    }
+
+    /**
+     * page item垂直排序
+     */
+    fun convertToColumnFirst(
+        original: List<EquipmentUserInfo>,
+        cols: Int
+    ): List<EquipmentUserInfo> {
+        Timber.d("convertToColumnFirst")
+        val rows = ceil(original.size.toDouble() / cols).toInt()
+        return List(original.size) { pos ->
+            val row = pos % rows
+            val col = pos / rows
+            val originalPos = col + row * cols
+            original[originalPos]
+        }
+    }
+}