refactor(serial): 将串口配置常量重命名为大写格式

- 将 portName 常量重命名为 PORT_NAME
- 将 baudRate 常量重命名为 BAUD_RATE
- 更新代码中对这些常量的引用以使用新的命名约定
- 保持串口通信功能完全不变

app/src/main/AndroidManifest.xml

@@ -43,7 +43,7 @@
             android:name=".activity.ShelfActivity"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
-        <activity android:name="com.shuwei.intelligent.shelves.activity.SettingActivity" />
+<!--        <activity android:name="com.shuwei.intelligent.shelves.activity.SettingActivity" />-->
         <activity android:name="com.shuwei.intelligent.shelves.activity.LogActivity" />
 
         <receiver

app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt

@@ -7,6 +7,7 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
+import androidx.activity.addCallback
 import androidx.activity.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
@@ -29,12 +30,15 @@ import com.shuwei.intelligent.shelves.net.NetViewModel
 import com.shuwei.intelligent.shelves.net.RespData
 import com.shuwei.intelligent.shelves.net.UiState
 import com.shuwei.intelligent.shelves.serial.ProtocolConstants.C_TEMP_CMD
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.FOOTER
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.HEADER
 import com.shuwei.intelligent.shelves.serial.ProtocolConstants.LEFT_SHELF_OPEN_CMD
 import com.shuwei.intelligent.shelves.serial.ProtocolConstants.RIGHT_SHELF_OPEN_CMD
 import com.shuwei.intelligent.shelves.serial.ProtocolConstants.START_TEMP_CTRL_CMD
 import com.shuwei.intelligent.shelves.serial.SerialFrameParser
 import com.shuwei.intelligent.shelves.serial.SerialPortManager
 import com.shuwei.intelligent.shelves.serial.SerialProtocolHandler
+import com.shuwei.intelligent.shelves.utils.GridLayoutTool
 import com.shuwei.intelligent.shelves.utils.IntervalExecutor
 import com.shuwei.intelligent.shelves.utils.ext.copyTextToClipboard
 import com.shuwei.intelligent.shelves.utils.ext.gone
@@ -76,11 +80,12 @@ class HomeActivity : BaseActivity() {
     private val viewModel: NetViewModel by viewModels()
 
     // 串口协议解析器，通过回调通知本 Activity
-    private val serialProtocolHandler = SerialProtocolHandler(object : SerialProtocolHandler.Callback {
+    private val serialProtocolHandler =
+        SerialProtocolHandler(object : SerialProtocolHandler.Callback {
             override fun onSendCmd(cmd: String) = sendCmd(cmd)
 
             override fun onWeightUpdated(shelfNo: Int, weight: Int) {
-            if (shelfNo in 1..10 && list.size == 10) {
+                if (shelfNo in 1..list.size) {
                     list.firstOrNull { it.deviceNo == shelfNo }?.let { model ->
                         model.weight = weight.toDouble()
                         val pos = list.indexOf(model)
@@ -93,16 +98,17 @@ class HomeActivity : BaseActivity() {
 
             override fun onTempReport(logMsg: String) {
                 updateLeftStatus(deviceName)
-            if (tipDialog == null) {
+                log(logMsg)
-                tipDialog = CommonDialog(this@HomeActivity).apply {
+//            if (tipDialog == null) {
-                    dialogTitle = "温馨提示"
+//                tipDialog = CommonDialog(this@HomeActivity).apply {
-                    confirmBlock = { logMsg.copyTextToClipboard(this@HomeActivity) }
+//                    dialogTitle = "温馨提示"
-                }
+//                    confirmBlock = { logMsg.copyTextToClipboard(this@HomeActivity) }
-            }
+//                }
-            if (tipDialog?.isShowing == false) {
+//            }
-                tipDialog?.dialogContent = logMsg
+//            if (tipDialog?.isShowing == false) {
-                tipDialog?.show()
+//                tipDialog?.dialogContent = logMsg
-            }
+//                tipDialog?.show()
+//            }
             }
 
             override fun onLog(message: String) = log(message)
@@ -117,7 +123,9 @@ class HomeActivity : BaseActivity() {
         EventBus.getDefault().register(this)
         setBackground()
         setContentView(binding.root)
+        onBackPressedDispatcher.addCallback(this) {
 
+        }
         updateLeftStatus("")
         initRecyclerView()
 
@@ -166,7 +174,7 @@ class HomeActivity : BaseActivity() {
                 launch {
                     viewModel.updateOverdueStateUiState.collect { state ->
                         if (state is UiState.Success<*>) {
-                            val respData = state.data as? com.shuwei.intelligent.shelves.net.RespData<*>
+                            val respData = state.data as? RespData<*>
                             if (respData == null) {
                                 log("updateOverdueState: 数据类型错误，期望 RespData")
                                 return@collect
@@ -199,6 +207,13 @@ class HomeActivity : BaseActivity() {
         viewModel.getShelfList(deviceId = App.deviceId)
     }
 
+    private val defDeviceList = listOf(
+        //原410货柜
+        "7a991439-3a12-3ef7-809b-c0258b839473",
+        //原1楼餐厅货柜
+        "4787e213-90ab-3e32-88e0-ac271a937751"
+    )
+
     private fun getTokenSuccess(data: RespData<*>) {
         log("getTokenSuccess: $data")
         data.data?.let {
@@ -225,18 +240,14 @@ class HomeActivity : BaseActivity() {
         updateLeftStatus(deviceName)
 
         App.canteenId = shelfResult.placeId
-        val tempList = shelfResult.containerGoodsList
+        var tempList = shelfResult.containerGoodsList
         if (tempList.isNullOrEmpty()) {
             loadEmptyView()
             return
         }
         list.clear()
-        val subList01 = tempList.subList(0, tempList.size / 2)
+        tempList = GridLayoutTool.initListSort(tempList)
-        val subList02 = tempList.subList(tempList.size / 2, tempList.size)
+        list.addAll(tempList)
-        repeat(tempList.size / 2) { index ->
-            list.add(subList01[index].also { it.deviceId = App.deviceId })
-            list.add(subList02[index].also { it.deviceId = App.deviceId })
-        }
         shelfAdapter.notifyDataSetChanged()
     }
 
@@ -269,12 +280,16 @@ class HomeActivity : BaseActivity() {
      */
     private val noDataWatchdogTask = object : Runnable {
         override fun run() {
+            // 生命周期检查，防止 Activity 销毁后继续执行
+            if (isFinishing || isDestroyed) return
+
             val elapsed = System.currentTimeMillis() - lastDataReceivedTime
             if (elapsed >= 5 * 60 * 1000L) {
                 if (noDataWarningDialog == null) {
                     noDataWarningDialog = CommonDialog(this@HomeActivity).apply {
                         dialogTitle = "设备提示"
-                        dialogContent = "长时间未收到数据，若无法开门或秤重量不更新情况，请考虑断电重启设备"
+                        dialogContent =
+                            "长时间未收到数据，若无法开门或秤重量不更新情况，请考虑断电重启设备"
                     }
                 }
                 if (noDataWarningDialog?.isShowing == false) {
@@ -361,10 +376,11 @@ class HomeActivity : BaseActivity() {
     }
 
     private fun initRecyclerView() {
-        binding.rvShelf.run {
+        val layoutManager = GridLayoutTool.getLayoutManager(this@HomeActivity) ?: return
-            layoutManager = GridLayoutManager(this@HomeActivity, 2, GridLayoutManager.VERTICAL, false)
+        binding.rvShelf.let {
-            adapter = shelfAdapter
+            it.layoutManager = layoutManager
-            itemAnimator.let {
+            it.adapter = shelfAdapter
+            it.itemAnimator.let {
                 if (it is DefaultItemAnimator) {
                     it.supportsChangeAnimations = false
                 }
@@ -422,7 +438,8 @@ class HomeActivity : BaseActivity() {
      * 保存定时任务
      */
     private fun saveGoodsTask() {
-        saveTaskJob = taskExecutor.startIntervalTaskWithInitialDelay(1 * 60 * 1000L, 5 * 60 * 1000L) {
+        saveTaskJob =
+            taskExecutor.startIntervalTaskWithInitialDelay(1 * 60 * 1000L, 5 * 60 * 1000L) {
                 syncShelfGoodsToServer()
             }
     }
@@ -461,8 +478,8 @@ class HomeActivity : BaseActivity() {
      * 构建 ShelfBody 并提交到服务端（被定时任务与 ShelfActivity 返回共用）
      */
     private fun syncShelfGoodsToServer() {
-        log("performSync: list:${list.toJsonString()}")
+        log("performSync显示list:${list.toJsonString()}")
-        val submitList = list.sortedBy { it.deviceNo }
+        val submitList = GridLayoutTool.submitListSort(list)
         submitList.forEach {
             if (it.goodsId.isNullOrBlank()) {
                 it.weight = it.weightBak
@@ -475,7 +492,7 @@ class HomeActivity : BaseActivity() {
             it.humidity = showHumidity
             it.goodsList = submitList
         }
-        log("performSync: body:${body.toJsonString()}")
+        log("performSync提交body:${body.toJsonString()}")
         viewModel.saveShelfGoodsList(body)
     }
 }

app/src/main/java/com/shuwei/intelligent/shelves/activity/ShelfActivity.kt

@@ -364,9 +364,9 @@ class ShelfActivity : BaseActivity() {
             val zeroClearingCmd = "${ProtocolConstants.HEADER}0401${hex}${ProtocolConstants.FOOTER}"
             log("编号${shelfNo}货架执行清零指令：${zeroClearingCmd}")
             sendCmd(zeroClearingCmd)
-            sendCmd(
+//            sendCmd(
-                if (shelfNo in 1..5) ProtocolConstants.LEFT_SHELF_OPEN_CMD else ProtocolConstants.RIGHT_SHELF_OPEN_CMD
+//                if (shelfNo in 1..5) ProtocolConstants.LEFT_SHELF_OPEN_CMD else ProtocolConstants.RIGHT_SHELF_OPEN_CMD
-            )
+//            )
             //清零
             realWeight = 0
 //                binding.tvFoodWeight.text = "${realWeight}克"
@@ -374,7 +374,7 @@ class ShelfActivity : BaseActivity() {
             sendCmd(ProtocolConstants.DEVICE_INFO_CMD)
             startTime = System.currentTimeMillis()
             Loading.show(this@ShelfActivity)
-//            window.decorView.postDelayed({ Loading.dismiss() }, 5000)
+            window.decorView.postDelayed({ Loading.dismiss() }, 10000)
         }
         KeyboardUtil.hideKeyboard(window.decorView)
     }

app/src/main/java/com/shuwei/intelligent/shelves/base/BaseActivity.kt

@@ -68,7 +68,13 @@ open class BaseActivity : AppCompatActivity() {
         lightSwitchClick()
 
         binding.tvLeftStatus.setOnDoubleClickListener {
-            finish()
+            //finish()
+            val intent = Intent(Intent.ACTION_MAIN).apply {
+                addCategory(Intent.CATEGORY_HOME)
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            }
+            startActivity(intent)
+
         }
         binding.tvRightStatus.setOnDoubleClickListener {
             if (enableRightStatusMenu) showRightStatusPopup(binding.tvRightStatus)
@@ -99,7 +105,7 @@ open class BaseActivity : AppCompatActivity() {
     }
 
     fun updateLeftStatus(data: String) {
-        binding.tvLeftStatus.text = data
+        binding.tvLeftStatus.text = data.ifBlank { "                  " }
     }
 
     fun updateRightStatus(data: String) {

app/src/main/java/com/shuwei/intelligent/shelves/serial/ProtocolConstants.kt

@@ -1,5 +1,7 @@
 package com.shuwei.intelligent.shelves.serial
 
+import com.shuwei.intelligent.shelves.App
+
 /**
  * 串口通信协议常量定义
  * 统一管理所有协议头、协议尾、各类指令及帧解析偏移量
@@ -63,7 +65,11 @@ object ProtocolConstants {
     const val DEVICE_STATUS_WEIGHT_OFFSET = HEADER.length + 14
 
     /** 货架数量（每侧5格，共10格，协议中12组） */
-    const val SHELF_SENSOR_COUNT = 12
+    fun shelfSensorCount(): Int {
+        return if (device2Columns.contains(App.deviceId)) 12
+        else if (device3Columns.contains(App.deviceId)) 24
+        else 0
+    }
 
     /** 每组重量数据字节数（十六进制字符数） */
     const val BYTES_PER_WEIGHT = 8
@@ -72,10 +78,18 @@ object ProtocolConstants {
     const val TEMPERATURE_FIELD_LEN = 2
 
     /** 心跳帧最小有效长度 */
-    const val HEARTBEAT_MIN_LENGTH = 200
+    fun heartbeatMinLength(): Int {
+        return if (device2Columns.contains(App.deviceId)) 200
+        else if (device3Columns.contains(App.deviceId)) 296
+        else 0
+    }
 
     /** 心跳帧中温度字段起始偏移（经协议分析得出，前面含重量+其他传感器数据） */
-    const val HEARTBEAT_TEMPERATURE_START = 158
+    fun heartbeatTemperatureStart(): Int {
+        return if (device2Columns.contains(App.deviceId)) 158
+        else if (device3Columns.contains(App.deviceId)) 158+96
+        else 0
+    }
 
     /** 激活请求体有效长度 */
     const val ACTIVATE_BODY_LENGTH = 44
@@ -88,8 +102,11 @@ object ProtocolConstants {
     // ----------------------------------------------------------------
 
     /** 激活指令（1楼餐厅） */
-    const val ACTIVE_CMD =
+//    const val ACTIVE_CMD =
-        "${HEADER}000281C5D70A7D428B44A57454F5DACA241938938B4B9CBD73673E9C8E7FC0C4992D${FOOTER}"
+//        "${HEADER}000281C5D70A7D428B44A57454F5DACA241938938B4B9CBD73673E9C8E7FC0C4992D${FOOTER}"
+
+//    410激活码
+//        const val ACTIVE_CMD = "${HEADER}000281C5D70A7D42894EA17650F5D0BB516838E7863C9ABD766C38958AFF0F3C062D${FOOTER}"
 
     /** 左货架开锁指令 */
     const val LEFT_SHELF_OPEN_CMD =
@@ -119,4 +136,45 @@ object ProtocolConstants {
 
     /** 温控指令 */
     const val TEMPERATURE_CTRL = "${HEADER}0F01040000${FOOTER}"
+
+    /**
+     * 设备2列，10格
+     */
+    val device2Columns = listOf(
+        //原410货柜
+        "7a991439-3a12-3ef7-809b-c0258b839473",
+        //原1楼餐厅货柜
+        "4787e213-90ab-3e32-88e0-ac271a937751"
+    )
+
+    /**
+     * 设备3列，15格，左侧1列竖向编号1、2、3、4、5，右侧2列5行编号为6-7、8-9、10-11、12-13、14-15
+     */
+    val device3ColumnsOrder = listOf(1, 6, 7, 2, 8, 9, 3, 10, 11, 4, 12, 13, 5, 14, 15)
+    /**
+     * 设备2列，10格，左侧1列竖向编号1、2、3、4、5，右侧1列6,7,8,9,10
+     */
+    val device2ColumnsOrder = listOf(1, 6, 2, 7, 3, 8, 4, 9, 5, 10)
+
+    /**
+     * 设备3列，15格，左侧1列竖向编号1、2、3、4、5，右侧2列5行编号为6-7、8-9、10-11、12-13、14-15
+     */
+    val device3Columns = listOf(
+        //新设备1
+        "d369f9b0-1c5b-3066-ba72-988e1449cecc",
+        //新设备2
+        "505ce1b1-facc-3eb2-855a-3dadda5ba358"
+    )
+
+    /** 激活指令map，key为设备号，value为激活码 */
+    val ACTIVE_MAP = mutableMapOf(
+        //原410货柜
+        "7a991439-3a12-3ef7-809b-c0258b839473" to "${HEADER}000281C5D70A7D42894EA17650F5D0BB516838E7863C9ABD766C38958AFF0F3C062D${FOOTER}",
+        //原1楼餐厅货柜
+        "4787e213-90ab-3e32-88e0-ac271a937751" to "${HEADER}000281C5D70A7D428B44A57454F5DACA241938938B4B9CBD73673E9C8E7FC0C4992D${FOOTER}",
+        //新设备1，临时使用1楼餐厅激活码
+        "d369f9b0-1c5b-3066-ba72-988e1449cecc" to "${HEADER}000281C5D70A7D428B44A57454F5DACA241938938B4B9CBD73673E9C8E7FC0C4992D${FOOTER}",
+        //新设备2，临时使用1楼餐厅激活码
+        "505ce1b1-facc-3eb2-855a-3dadda5ba358" to "${HEADER}000281C5D70A7D428B44A57454F5DACA241938938B4B9CBD73673E9C8E7FC0C4992D${FOOTER}",
+    )
 }

app/src/main/java/com/shuwei/intelligent/shelves/serial/SerialPortManager.kt

@@ -13,8 +13,9 @@ import java.nio.charset.Charset
 import java.util.Locale
 
 object SerialPortManager {
-    private const val portName: String = "/dev/ttyS1"
+
-    private const val baudRate: Int = 115200
+    private const val PORT_NAME: String = "/dev/ttyS1"
+    private const val BAUD_RATE: Int = 115200
     private var serialPort: AndroidSerialPort? = null
 
     //    private var serialPort: SerialPort? = null
@@ -25,8 +26,8 @@ object SerialPortManager {
         return try {
             serialPort = SerialPortFactory.create().apply {
                 open(
-                    portName = portName,
+                    portName = PORT_NAME,
-                    baudRate = baudRate,
+                    baudRate = BAUD_RATE,
                     dataBits = 8,
                     stopBits = 1,
                     parity = SerialPort.PARITY_NONE

app/src/main/java/com/shuwei/intelligent/shelves/serial/SerialProtocolHandler.kt

@@ -1,7 +1,8 @@
 package com.shuwei.intelligent.shelves.serial
 
+import com.shuwei.intelligent.shelves.App
 import com.shuwei.intelligent.shelves.serial.ProtocolConstants.ACTIVATE_BODY_LENGTH
-import com.shuwei.intelligent.shelves.serial.ProtocolConstants.ACTIVE_CMD
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.ACTIVE_MAP
 import com.shuwei.intelligent.shelves.serial.ProtocolConstants.BYTES_PER_WEIGHT
 import com.shuwei.intelligent.shelves.serial.ProtocolConstants.CMD_ACTIVATE
 import com.shuwei.intelligent.shelves.serial.ProtocolConstants.CMD_CARD_UPLOAD
@@ -19,10 +20,7 @@ import com.shuwei.intelligent.shelves.serial.ProtocolConstants.DEVICE_STATUS_WEI
 import com.shuwei.intelligent.shelves.serial.ProtocolConstants.FIX_BODY_LENGTH
 import com.shuwei.intelligent.shelves.serial.ProtocolConstants.FOOTER
 import com.shuwei.intelligent.shelves.serial.ProtocolConstants.HEADER
-import com.shuwei.intelligent.shelves.serial.ProtocolConstants.HEARTBEAT_MIN_LENGTH
-import com.shuwei.intelligent.shelves.serial.ProtocolConstants.HEARTBEAT_TEMPERATURE_START
 import com.shuwei.intelligent.shelves.serial.ProtocolConstants.HEARTBEAT_WEIGHT_OFFSET
-import com.shuwei.intelligent.shelves.serial.ProtocolConstants.SHELF_SENSOR_COUNT
 import com.shuwei.intelligent.shelves.serial.ProtocolConstants.TEMPERATURE_FIELD_LEN
 import com.shuwei.intelligent.shelves.utils.binaryToHex
 import com.shuwei.intelligent.shelves.utils.hexToBinary
@@ -96,8 +94,9 @@ class SerialProtocolHandler(private val callback: Callback) {
         if (reqBody.length == ACTIVATE_BODY_LENGTH) {
             terminalId = reqBody.substring(2, 32)
             terminalVersion = reqBody.substring(32, 42)
-            callback.onLog("收到[激活]${cmdFlag}指令:${data}，终端id:${terminalId},固件版本:${terminalVersion}，发送激活命令:$ACTIVE_CMD")
+            val activeCode = ACTIVE_MAP[App.deviceId]?:""
-            callback.onSendCmd(ACTIVE_CMD)
+            callback.onLog("收到[激活]${cmdFlag}指令:${data}，终端id:${terminalId},固件版本:${terminalVersion}，发送激活命令:$activeCode")
+            callback.onSendCmd(activeCode)
         }
     }
 
@@ -120,7 +119,7 @@ class SerialProtocolHandler(private val callback: Callback) {
     private fun handleDeviceStatus(data: String, cmdFlag: String) {
         callback.onLog("收到[获取设备状态]${cmdFlag}指令:${data}")
         val weightStartIndex = DEVICE_STATUS_WEIGHT_OFFSET
-        val weightEndIndex = weightStartIndex + SHELF_SENSOR_COUNT * BYTES_PER_WEIGHT
+        val weightEndIndex = weightStartIndex + ProtocolConstants.shelfSensorCount() * BYTES_PER_WEIGHT
         val temperatureEndIndex = weightEndIndex + TEMPERATURE_FIELD_LEN
         try {
             parseWeightData(start = weightStartIndex, end = weightEndIndex, data = data)
@@ -176,11 +175,11 @@ class SerialProtocolHandler(private val callback: Callback) {
      */
     private fun parseHeartbeatData(data: String) {
         runCatching {
-            if (data.length < HEARTBEAT_MIN_LENGTH) return
+            if (data.length < ProtocolConstants.heartbeatMinLength()) return
             val weightStartIndex = HEARTBEAT_WEIGHT_OFFSET
-            val weightEndIndex = weightStartIndex + SHELF_SENSOR_COUNT * BYTES_PER_WEIGHT
+            val weightEndIndex = weightStartIndex + ProtocolConstants.shelfSensorCount() * BYTES_PER_WEIGHT
             parseWeightData(start = weightStartIndex, end = weightEndIndex, data = data)
-            val temperatureEndIndex = HEARTBEAT_TEMPERATURE_START + TEMPERATURE_FIELD_LEN
+            val temperatureEndIndex = ProtocolConstants.heartbeatTemperatureStart() + TEMPERATURE_FIELD_LEN
             parseFixDataBody(data, temperatureEndIndex)
         }.onFailure { it.printStackTrace() }
     }
@@ -210,7 +209,11 @@ class SerialProtocolHandler(private val callback: Callback) {
                 firstByteBinary = "0${firstByteBinary.substring(1)}"
                 val firstByteHex = binaryToHex(firstByteBinary)
                 weightHex = firstByteHex + weightHex.substring(2)
-                -1 * (weightHex.toLongOrNull(16)?.toInt() ?: 0)
+                //-1 * (weightHex.toLongOrNull(16)?.toInt() ?: 0)
+                // 直接用 Long 解析，然后减去 2^32 得到有符号值
+                val unsigned = weightHex.toLongOrNull(16) ?: 0L
+                val signed = if (unsigned >= 0x80000000L) unsigned - 0x100000000L else unsigned
+                signed.toInt()
             }
             callback.onWeightUpdated(index, realWeight)
             count += BYTES_PER_WEIGHT

app/src/main/java/com/shuwei/intelligent/shelves/utils/GridLayoutTool.kt

@@ -0,0 +1,54 @@
+package com.shuwei.intelligent.shelves.utils
+
+import android.content.Context
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.shuwei.intelligent.shelves.App
+import com.shuwei.intelligent.shelves.model.ShelfModel
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants
+
+object GridLayoutTool {
+
+    /**
+     * 设备2列，10格
+     */
+    private val device2Columns = ProtocolConstants.device2Columns
+
+    /**
+     * 设备3列，15格，左侧1列竖向编号1、2、3、4、5，右侧2列5行编号为6-7、8-9、10-11、12-13、14-15
+     */
+    private val device3Columns = ProtocolConstants.device3Columns
+
+    fun getLayoutManager(context: Context): RecyclerView.LayoutManager? {
+        return if (device2Columns.contains(App.deviceId)) {
+            GridLayoutManager(context, 2, GridLayoutManager.VERTICAL, false)
+        } else if (device3Columns.contains(App.deviceId)) {
+            GridLayoutManager(context, 3, GridLayoutManager.VERTICAL, false)
+        } else {
+            null
+        }
+    }
+
+    /**
+     * 初始化list显示顺序
+     */
+    fun initListSort(source: List<ShelfModel>): List<ShelfModel> {
+        val map = source.associateBy { it.deviceNo }
+        return if (device3Columns.contains(App.deviceId)) {
+            // 按全局定义的显示顺序取对应数据，找不到则跳过
+            ProtocolConstants.device3ColumnsOrder.mapNotNull { map[it] }
+        } else if (device2Columns.contains(App.deviceId)) {
+            ProtocolConstants.device2ColumnsOrder.mapNotNull { map[it] }
+        } else {
+            source
+        }
+    }
+
+    /**
+     * 提交接口list顺序
+     */
+    fun submitListSort(source: List<ShelfModel>): List<ShelfModel> {
+        return source.sortedBy { it.deviceNo }
+    }
+
+}

app/src/main/res/drawable/loading.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="240dp"
+    android:height="240dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+
+    <!-- 由小到大排列的圆点，构成旋转加载指示器 -->
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M876.864,782.592c3.264,0 6.272,-3.2 6.272,-6.656c0,-3.456 -3.008,-6.592 -6.272,-6.592c-3.264,0 -6.272,3.2 -6.272,6.592c0,3.456 3.008,6.656 6.272,6.656z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M736.32,935.936c2.304,2.432 5.568,3.84 8.768,3.84a12.16,12.16 0,0 0,8.832 -3.84a13.76,13.76 0,0 0,0 -18.56a12.224,12.224 0,0 0,-8.832 -3.84a12.16,12.16 0,0 0,-8.768 3.84a13.696,13.696 0,0 0,0 18.56z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M552.32,1018.24c3.456,3.648 8.32,5.76 13.184,5.76a18.368,18.368 0,0 0,13.184 -5.76a20.608,20.608 0,0 0,0 -27.968a18.368,18.368 0,0 0,-13.184 -5.824a18.368,18.368 0,0 0,-13.184 5.76a20.608,20.608 0,0 0,0 28.032z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M353.984,1012.48c4.608,4.8 11.072,7.68 17.6,7.68a24.448,24.448 0,0 0,17.536 -7.68a27.456,27.456 0,0 0,0 -37.248a24.448,24.448 0,0 0,-17.536 -7.68a24.448,24.448 0,0 0,-17.6 7.68a27.52,27.52 0,0 0,0 37.184z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M178.304,920.64c5.76,6.08 13.824,9.6 21.952,9.6a30.592,30.592 0,0 0,22.016 -9.6a34.368,34.368 0,0 0,0 -46.592a30.592,30.592 0,0 0,-22.016 -9.6a30.592,30.592 0,0 0,-21.952 9.6a34.368,34.368 0,0 0,0 46.592z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M57.152,761.28c6.912,7.36 16.64,11.648 26.368,11.648a36.736,36.736 0,0 0,26.432 -11.584a41.28,41.28 0,0 0,0 -55.936a36.736,36.736 0,0 0,-26.432 -11.584a36.8,36.8 0,0 0,-26.368 11.52a41.28,41.28 0,0 0,0 56z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12.736,564.672a42.88,42.88 0,0 0,30.784 13.44a42.88,42.88 0,0 0,30.784 -13.44a48.128,48.128 0,0 0,0 -65.216a42.88,42.88 0,0 0,-30.72 -13.44a42.88,42.88 0,0 0,-30.848 13.44a48.128,48.128 0,0 0,0 65.216z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M52.544,369.28a48.96,48.96 0,0 0,35.2 15.36a48.96,48.96 0,0 0,35.2 -15.36a54.976,54.976 0,0 0,0 -74.56a48.96,48.96 0,0 0,-35.2 -15.424a48.96,48.96 0,0 0,-35.2 15.424a54.976,54.976 0,0 0,0 74.56z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M168.32,212.48c10.368,11.008 24.96,17.408 39.68,17.408c14.592,0 29.184,-6.4 39.552,-17.408a61.888,61.888 0,0 0,0 -83.84a55.104,55.104 0,0 0,-39.616 -17.408c-14.656,0 -29.248,6.4 -39.616,17.408a61.888,61.888 0,0 0,0 83.84z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M337.344,124.8c11.52,12.16 27.712,19.264 43.968,19.264c16.256,0 32.448,-7.04 43.968,-19.264a68.672,68.672 0,0 0,0 -93.184a61.248,61.248 0,0 0,-43.968 -19.264a61.248,61.248 0,0 0,-43.968 19.264a68.736,68.736 0,0 0,0 93.184z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M526.976,123.712c12.672,13.44 30.528,21.248 48.448,21.248s35.712,-7.808 48.384,-21.248a75.584,75.584 0,0 0,0 -102.464A67.392,67.392 0,0 0,575.36 0c-17.92,0 -35.776,7.808 -48.448,21.248a75.584,75.584 0,0 0,0 102.464z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M700.8,210.304c13.824,14.592 33.28,23.104 52.736,23.104c19.584,0 39.04,-8.512 52.8,-23.104a82.432,82.432 0,0 0,0 -111.744a73.472,73.472 0,0 0,-52.8 -23.168c-19.52,0 -38.912,8.512 -52.736,23.168a82.432,82.432 0,0 0,0 111.744z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M824.832,368.832c14.976,15.872 36.032,25.088 57.216,25.088c21.12,0 42.24,-9.216 57.152,-25.088a89.344,89.344 0,0 0,0 -121.088a79.616,79.616 0,0 0,-57.152 -25.088c-21.184,0 -42.24,9.216 -57.216,25.088a89.344,89.344 0,0 0,0 121.088z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M875.264,572.864c16.128,17.088 38.784,27.008 61.632,27.008c22.784,0 45.44,-9.92 61.568,-27.008a96.256,96.256 0,0 0,0 -130.432a85.76,85.76 0,0 0,-61.568 -27.072c-22.848,0 -45.44,9.984 -61.632,27.072a96.192,96.192 0,0 0,0 130.432z" />
+
+</vector>

app/src/main/res/layout/activity_base.xml

@@ -23,7 +23,7 @@
             android:layout_gravity="start"
             android:textSize="24sp"
             android:fontFamily="sans-serif-medium"
-            tools:text="1-1冷藏柜  -2°C / 87%" />
+            android:text="            " />
 
         <TextView
             android:id="@+id/tv_right_status"

app/src/main/res/layout/activity_init.xml

@@ -73,9 +73,9 @@
             <!-- 加载动画 -->
             <ImageView
                 android:id="@+id/ivLoading"
-                android:layout_width="160dp"
+                android:layout_width="120dp"
-                android:layout_height="160dp"
+                android:layout_height="120dp"
-                android:src="@drawable/loading_spinner"
+                android:src="@drawable/loading"
                 android:contentDescription="加载中" />
 
             <!-- 倒计时文字 -->
@@ -85,7 +85,7 @@
                 android:layout_height="wrap_content"
                 android:text="60秒"
                 android:textSize="40sp"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textStyle="bold"
                 android:layout_marginTop="50dp" />
 
@@ -95,7 +95,7 @@
                 android:layout_height="wrap_content"
                 android:text="网络连接检测中，请稍后……"
                 android:textSize="22sp"
-                android:textColor="#555555"
+                android:textColor="@color/white"
                 android:layout_marginTop="20dp" />
 
         </LinearLayout>
@@ -123,7 +123,7 @@
                 android:layout_height="wrap_content"
                 android:text="网络连接失败"
                 android:textSize="36sp"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textStyle="bold"
                 android:layout_marginBottom="40dp" />