diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt b/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt index 9c5f2e8..7cd493f 100644 --- a/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt +++ b/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt @@ -231,11 +231,15 @@ class HomeActivity : BaseActivity() { return } list.clear() - val subList01 = tempList.subList(0, tempList.size / 2) - val subList02 = tempList.subList(tempList.size / 2, tempList.size) - repeat(tempList.size / 2) { index -> - list.add(subList01[index].also { it.deviceId = App.deviceId }) - list.add(subList02[index].also { it.deviceId = App.deviceId }) + val leftSize = (tempList.size + 1) / 2 // 左列长度(向上取整) + val rightSize = tempList.size / 2 // 右列长度(向下取整) + repeat(rightSize) { index -> + list.add(tempList[index].also { it.deviceId = App.deviceId }) + list.add(tempList[leftSize + index].also { it.deviceId = App.deviceId }) + } + // 处理奇数长度:左列比右列多一个 + if (tempList.size % 2 != 0) { + list.add(tempList[rightSize].also { it.deviceId = App.deviceId }) } shelfAdapter.notifyDataSetChanged() }