新增2列设备

- 同步典型用法为当前链式 start() 写法
- 职责说明补充 Channel 发送队列描述
- release() 说明补充"清空队列"

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

app/build.gradle.kts

@@ -44,6 +44,7 @@ android {
     }
     buildFeatures {
         viewBinding = true
+        buildConfig = true
     }
 
     ndkVersion = "29.0.13846066"
@@ -67,10 +68,10 @@ dependencies {
 
     implementation("io.github.jeadyx:kmp-serialport:1.0.0")
 
-    // 基础依赖包，必须要依赖
-    implementation("com.geyifeng.immersionbar:immersionbar:3.2.2")
-    // kotlin扩展（可选）
-    implementation("com.geyifeng.immersionbar:immersionbar-ktx:3.2.2")
+//    // 基础依赖包，必须要依赖
+//    implementation("com.geyifeng.immersionbar:immersionbar:3.2.2")
+//    // kotlin扩展（可选）
+//    implementation("com.geyifeng.immersionbar:immersionbar-ktx:3.2.2")
 
     implementation("com.squareup.okhttp3:okhttp:4.9.1")
     implementation("com.squareup.okhttp3:logging-interceptor:4.9.1")

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/GlobalData.kt

@@ -0,0 +1,38 @@
+package com.shuwei.intelligent.shelves
+
+object GlobalData {
+
+//    /**
+//     * 设备id
+//     */
+//    var deviceId: String = ""
+
+//    /**
+//     * app版本号
+//     */
+//    var appVersion: String = "1"
+
+    var appBaseUrl: String = ""
+
+    /**
+     * 具体业务 BaseUrl
+     */
+    const val TEST_BASE_URL = "http://192.168.1.201:14801"
+    const val UAT_BASE_URL = "https://dev.yixiong-tech.com:8081"
+    const val PROD_BASE_URL = "https://api.dm.yixiong-tech.com:8443"
+
+}
+
+/**
+ * 全局常量
+ */
+object Constants {
+
+}
+
+/**
+ * key
+ */
+object GlobalKey {
+    const val KEY_BASE_URL = "baseUrlKey"
+}

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

@@ -3,11 +3,11 @@ package com.shuwei.intelligent.shelves.activity
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.graphics.Color
+import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import android.util.Log
-import android.util.SparseIntArray
+import androidx.activity.addCallback
 import androidx.activity.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
@@ -25,126 +25,106 @@ import com.shuwei.intelligent.shelves.model.SendWeightEvent
 import com.shuwei.intelligent.shelves.model.ShelfBody
 import com.shuwei.intelligent.shelves.model.ShelfModel
 import com.shuwei.intelligent.shelves.model.ShelfResult
-import com.shuwei.intelligent.shelves.model.WeightEvent
 import com.shuwei.intelligent.shelves.net.Loading
 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.net.apiService
-import com.shuwei.intelligent.shelves.serial.SerialPortManager
-import com.shuwei.intelligent.shelves.utils.HexUtils
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.C_TEMP_CMD
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.START_TEMP_CTRL_CMD
+import com.shuwei.intelligent.shelves.serial.ScaleManager
+import com.shuwei.intelligent.shelves.utils.GridLayoutTool
 import com.shuwei.intelligent.shelves.utils.IntervalExecutor
-import com.shuwei.intelligent.shelves.utils.binaryToHex
 import com.shuwei.intelligent.shelves.utils.ext.copyTextToClipboard
 import com.shuwei.intelligent.shelves.utils.ext.gone
 import com.shuwei.intelligent.shelves.utils.ext.toJsonString
 import com.shuwei.intelligent.shelves.utils.ext.toast
 import com.shuwei.intelligent.shelves.utils.ext.visible
-import com.shuwei.intelligent.shelves.utils.hexToBinary
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
 
 class HomeActivity : BaseActivity() {
 
-    companion object {
-        private const val TAG = "HomeActivity"
-        private const val LOG_PREFIX = "receiveSerialPortData:收到"
+    companion object {}
 
-        private const val MM_DD_EEEE__HH_MM_SS = "MM月dd日 EEEE  HH:mm:ss"
+    override val enableRightStatusMenu: Boolean = true
 
-        //协议头
-        const val HEADER = "D6DADEDB"
+    // 货架列表数据
+    private val list: MutableList<ShelfModel> = mutableListOf()
 
-        //协议尾
-        const val FOOTER = "FFFF"
-//        const val ACTIVE_CMD =
-//            "${HEADER}000281C5D70A7D428A4FA67B50F7DACA241938938B4B9CBD73673E9C8E7F2E15062D${FOOTER}"
+    // 当前选中货架下标
+    private var shelfIndex = 0
 
-        const val LEFT_SHELF_OPEN_CMD =
-            "${HEADER}020101000000000000000000000000000000000000${FOOTER}"
-        const val RIGHT_SHELF_OPEN_CMD =
-            "${HEADER}020100010000000000000000000000000000000000${FOOTER}"
+    // 当前温度（摄氏）
+    private var showTemperatureC = "0"
 
-        //const val TEMPERATURE_CMD = "${HEADER}1001${FOOTER}"
+    // 当前湿度
+    private var showHumidity = "0"
 
-        const val DEVICE_INFO_CMD = "${HEADER}0301000000000000000000000000${FOOTER}"
+    // 仅特定 deviceId 的部署点需要发送开锁指令
+    private fun isNeedOpenLock() = App.deviceId == "4787e213-90ab-3e32-88e0-ac271a937751"
 
-        const val START_TEMP_CTRL_CMD = "${HEADER}0F01360000${FOOTER}"
-
-        //const val START_CMD= "${HEADER}0F01050020${FOOTER}"
-//        const val ACTIVE_CMD = "${HEADER}000281C5D70A7D428948AD7254FADBB1516738938B4B9CBD73673E9D8E7F2E15062D$FOOTER"
-//        410激活码
-//        const val ACTIVE_CMD = "${HEADER}000281C5D70A7D42894EA17650F5D0BB516838E7863C9ABD766C38958AFF0F3C062D${FOOTER}"
-        //1楼餐厅激活码
-        const val ACTIVE_CMD =
-            "${HEADER}000281C5D70A7D428B44A57454F5DACA241938938B4B9CBD73673E9C8E7FC0C4992D${FOOTER}"
-
-        //华氏温度单位
-        const val F_TEMP_CMD = "${HEADER}0F01390000${FOOTER}"
-
-        //摄氏温度单位
-        const val C_TEMP_CMD = "${HEADER}0F01390001${FOOTER}"
-
-        //开灯（开 继电器1）
-        const val LIGHT_CLOSE = "${HEADER}020102020102020000000000000000000000000000${FOOTER}"
-        const val LIGHT_OPEN = "${HEADER}020102020002020000000000000000000000000000${FOOTER}"
-
-        const val TEMPERATURE_CTRL = "${HEADER}0F01040000${FOOTER}"
-
-        val list: MutableList<ShelfModel> = mutableListOf()
-        val weightArray = SparseIntArray()
-        var shelfIndex = 0
-
-        //        public fun getRealWeight():Double = weightArray[shelfIndex]?:0.0
-        // 温度
-        var showTemperatureC = "0"
-
-        // 湿度
-        var showHumidity = "0"
-    }
-
-    //401-false，1楼餐厅-true
-    private var isNeedOpenLock = true
+    private var deviceName = ""
 
     private lateinit var binding: ActivityHomeBinding
 
     private val viewModel: NetViewModel by viewModels()
 
-    @SuppressLint("NotifyDataSetChanged", "HardwareIds")
+    // 串口协议解析器，通过回调通知本 Activity
+    private fun initScaleManager() {
+        lifecycleScope.launch {
+            val ok = ScaleManager
+                .init(activateCode = ProtocolConstants.ACTIVE_MAP[App.deviceId] ?: "")
+                .onHeartbeat { _, data ->
+                    data.weights.forEach { weight ->
+                        val shelfNo = weight.index
+                        if (shelfNo in 1..list.size) {
+                            list.firstOrNull { it.deviceNo == shelfNo }?.let { model ->
+                                model.weight = weight.grams.toDouble()
+                                val pos = list.indexOf(model)
+                                shelfAdapter.notifyItemChanged(pos)
+                                log("getWeightInfo: deviceNo=${model.deviceNo},realWeight=${weight.grams}")
+                                EventBus.getDefault().post(SendWeightEvent(model.deviceNo, weight.grams))
+                            }
+                        }
+                    }
+                }
+                .onTempReport { _ ->
+                    updateLeftStatus(deviceName)
+                }
+                .onLog { message -> log(message) }
+                .start { data ->
+                    lastDataReceivedTime = System.currentTimeMillis()
+                    noDataWarningDialog?.takeIf { it.isShowing }?.dismiss()
+                    log("receiveSerialPortData: $data")
+                }
+            log("onCreate: openState=$ok")
+        }
+    }
+
+    @SuppressLint("NotifyDataSetChanged")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityHomeBinding.inflate(layoutInflater)
         EventBus.getDefault().register(this)
         setBackground()
         setContentView(binding.root)
+        onBackPressedDispatcher.addCallback(this) {
 
-//        updateLeftStatus("-°C / -%")
+        }
         updateLeftStatus("")
-
         initRecyclerView()
+
+        // 初始化 ScaleManager：注册回调、打开串口、启动接收
+        initScaleManager()
+
+        // 网络状态监听，独立协程，与串口初始化并行执行
         lifecycleScope.launch {
-            val openState = SerialPortManager.open()
-            log("onCreate: openState=$openState")
-            if (openState) {
-                SerialPortManager.startReceive { data ->
-                    // 更新UI显示接收数据
-                    lifecycleScope.launch {
-                        try {
-                            receiveSerialPortData(data)
-                        } catch (e: Exception) {
-                            e.printStackTrace()
-                        }
-                    }
-                }
-                //SerialPortManager.send(DEVICE_INFO_CMD)
-            }
-            repeatOnLifecycle(Lifecycle.State.CREATED) {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
                 launch {
                     viewModel.getAccessTokenUiState.collect { state ->
                         when (state) {
@@ -165,61 +145,53 @@ class HomeActivity : BaseActivity() {
                         }
                     }
                 }
+                launch {
+                    viewModel.updateOverdueStateUiState.collect { state ->
+                        if (state is UiState.Success<*>) {
+                            val respData = state.data as? RespData<*>
+                            if (respData == null) {
+                                log("updateOverdueState: 数据类型错误，期望 RespData")
+                                return@collect
+                            }
+                            val shelfResult = respData.data as? ShelfResult
+                            if (shelfResult == null) {
+                                log("updateOverdueState: 数据类型错误，期望 ShelfResult")
+                                return@collect
+                            }
+                            val items = shelfResult.containerGoodsList
+                            if (items.isNullOrEmpty()) {
+                                log("updateOverdueState: 货架列表为空")
+                                return@collect
+                            }
+                            applyOverdueState(items)
+                        }
+                    }
+                }
             }
         }
-        //sendCmd(ACTIVE_CMD)
 
         binding.root.postDelayed({
             sendCmd(START_TEMP_CTRL_CMD)
             sendCmd(C_TEMP_CMD)
         }, 5000)
 
-//        TaskManager.startTask()
-
         saveGoodsTask()
         overdueTask()
 
-//        var androidId = Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID)
-////        androidId = "d0e7a2d5f25c775c"
-//        log("onCreate: androidId=${androidId}")
-//        if (androidId == "65e1012638f78260" || androidId == "40f89e91ee40611d") {
-//            androidId = "d0e7a2d5f25c775c"
-//        }
-//        App.deviceId = androidId
-//        //"53babf69-0d2f-3875-a649-f2e12f80ad4c1"
-//
-//        val swDpValue = resources?.configuration?.smallestScreenWidthDp
-//        log("onCreate: swDpValue=$swDpValue")
-
-
-//        viewModel.getAccessToken(App.deviceId)
-
         viewModel.getShelfList(deviceId = App.deviceId)
-
-//        binding.root.postDelayed({
-//            loadTestData()
-//        }, 30*1000)
     }
 
-    private fun loadTestData() {
-        list.add(ShelfModel(deviceNo = 1, goodsName = "鸡蛋", deviceId = App.deviceId))
-        list.add(ShelfModel(deviceNo = 6, goodsName = "", deviceId = App.deviceId))
-        list.add(ShelfModel(deviceNo = 2, goodsName = "", deviceId = App.deviceId))
-        list.add(ShelfModel(deviceNo = 7, goodsName = "生姜", deviceId = App.deviceId))
-        list.add(ShelfModel(deviceNo = 3, goodsName = "黄瓜", deviceId = App.deviceId))
-        list.add(ShelfModel(deviceNo = 8, goodsName = "", deviceId = App.deviceId))
-        list.add(ShelfModel(deviceNo = 4, goodsName = "梨", deviceId = App.deviceId))
-        list.add(ShelfModel(deviceNo = 9, goodsName = "梨", deviceId = App.deviceId))
-        list.add(ShelfModel(deviceNo = 5, goodsName = "", deviceId = App.deviceId))
-        list.add(ShelfModel(deviceNo = 10, goodsName = "", deviceId = App.deviceId))
-        shelfAdapter.notifyDataSetChanged()
-    }
+    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 {
             App.accessToken = it.toString()
-            //UIUtils.toast(it.toString())
             viewModel.getShelfList(deviceId = App.deviceId)
         }
     }
@@ -232,32 +204,24 @@ class HomeActivity : BaseActivity() {
     private fun updateUI(data: RespData<*>) {
         binding.include?.root?.gone()
         window?.decorView?.postDelayed({ Loading.dismiss() }, 500)
-        if (data.data !is ShelfResult) {
+        val shelfResult = data.data as? ShelfResult
+        if (shelfResult == null) {
+            log("updateUI: 数据类型错误，期望 ShelfResult，实际类型：${data.data?.javaClass?.simpleName}")
             loadEmptyView()
             return
         }
-        deviceName = data.data.deviceName
+        deviceName = shelfResult.deviceName
+        updateLeftStatus(deviceName)
 
-//        updateLeftStatus("$deviceName  -°C / -%")
-        updateLeftStatus("$deviceName")
-
-        App.canteenId = data.data.placeId
-        val tempList = data.data.containerGoodsList
+        App.canteenId = shelfResult.placeId
+        var tempList = shelfResult.containerGoodsList
         if (tempList.isNullOrEmpty()) {
             loadEmptyView()
             return
         }
-//        if (tempList.size < 10) {
-//            toast("数据错误")
-//            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 })
-        }
+        tempList = GridLayoutTool.initListSort(tempList)
+        list.addAll(tempList)
         shelfAdapter.notifyDataSetChanged()
     }
 
@@ -267,375 +231,103 @@ class HomeActivity : BaseActivity() {
         loadEmptyView()
     }
 
-    /**
-     * 终端id
-     */
-    private var terminalId: String = ""
-
-    /**
-     * 固件版本
-     */
-    private var terminalVersion: String = ""
-
-    private val serialReader by lazy { StringBuilder() }
-
-    private fun receiveSerialPortData(srcData: String) {
-        log("receiveSerialPortData: $srcData")
-        var data = ""
-        if (srcData.contains(HEADER) && srcData.contains(FOOTER)) {
-            serialReader.clear()
-            val startIndex = srcData.lastIndexOf(HEADER)
-            var endIndex = srcData.indexOf(FOOTER) + FOOTER.length
-            if (endIndex < startIndex) {
-                //类似这种：31314FFFFFD6DADEDB01010C，FOOTER在HEADER前
-                data = srcData.substring(startIndex)
-                if (data.contains(FOOTER)) {
-                    endIndex = srcData.indexOf(FOOTER) + FOOTER.length
-                    data = data.substring(0, endIndex)
-                    handleReceivedData(data)
-                    serialReader.clear()
-                    return
-                }
-                serialReader.clear()
-                serialReader.append(data).append(",")
-                return
-            }
-            serialReader.append(srcData.substring(startIndex, endIndex))
-            data = serialReader.toString()
-            handleReceivedData(data)
-            serialReader.clear()
-            return
-        }
-        if (srcData.contains(HEADER) && srcData.contains(FOOTER).not()) {
-            serialReader.clear()
-            val startIndex = srcData.lastIndexOf(HEADER)
-            serialReader.append(srcData.substring(startIndex)).append(",")
-            return
-        }
-        if (srcData.contains(HEADER).not() && srcData.contains(FOOTER).not()) {
-            serialReader.append(srcData).append(",")
-            return
-        }
-        //if (srcData.contains(HEADER).not() && srcData.contains(FOOTER))
-        val endIndex = srcData.indexOf(FOOTER) + FOOTER.length
-        serialReader.append(srcData.substring(0, endIndex))
-        log("receiveSerialPortData:serialReader: $serialReader")
-        data = serialReader.toString().replace(",", "")
-        handleReceivedData(data)
-    }
-
-    private fun handleReceivedData(data: String) {
-        if (data.isEmpty()) {
-            return
-        }
-
-        val cmd = data.substring(HEADER.length, HEADER.length + 4)
-        val cmdFlag = cmd.substring(0, 2)
-        when (cmd) {
-            "0001" -> {
-                //终端发起激活指令，拿到固定数据体（终端ID-15字节、固件版本-5字节、命令次数-1字节）
-                val reqBody =
-                    data.substring(HEADER.length + cmd.length, data.length - FOOTER.length)
-                if (reqBody.length == 44) {
-                    terminalId = reqBody.substring(2, 32)
-                    terminalVersion = reqBody.substring(32, 42)
-                    log("${LOG_PREFIX}[激活]${cmdFlag}指令:${data}，终端id:${terminalId},固件版本:${terminalVersion}，发送激活命令:$ACTIVE_CMD")
-                    sendCmd(ACTIVE_CMD)
-                }
-            }
-
-            "0101", "8101" -> {
-                //心跳0102${p1}${p2}${version}
-                //心跳81（终端发起，当终端发送此命令时需要服务端存储串口屏显示信息）
-                val respCmd = "${HEADER}01020506${terminalVersion}$FOOTER"
-                log("${LOG_PREFIX}[心跳]${cmdFlag}指令:${data}，发送应答指令:${respCmd}")
-                sendCmd(respCmd)
-                heartBeat(data)
-            }
-
-            "0202" -> {
-                //开关锁反馈020200${deviceId}${version}
-                val respCmd = "${HEADER}020200${terminalId}${terminalVersion}$FOOTER"
-                log("${LOG_PREFIX}[开锁]${cmdFlag}指令:${data}，发送应答指令:${respCmd}")
-                sendCmd(respCmd)
-                //lockFeedback(data)
-            }
-
-            "0302" -> {
-                //获取设备状态
-                log("${LOG_PREFIX}[获取设备状态]${cmdFlag}指令:${data}")
-                getDeviceInfo(data)
-            }
-
-            "0501" -> {
-                //卡号上发
-                val respCmd = "${HEADER}050203$FOOTER"
-                log("${LOG_PREFIX}[卡号上发]${cmdFlag}指令:${data}，发送应答指令:${respCmd}")
-                sendCmd(respCmd)
-            }
-
-            "0B01" -> {
-                //操作记录上传
-                val respCmd = "${HEADER}0B0203$FOOTER"
-                log("${LOG_PREFIX}[操作记录上传]${cmdFlag}指令:${data}，发送应答指令:${respCmd}")
-                sendCmd(respCmd)
-            }
-
-            "0C01" -> {
-                //对时
-                val timeLong = System.currentTimeMillis() / 1000 + (8 * 3600)
-                val timeStr = "0000000" + String.format("%X", timeLong)
-                val time =
-                    timeStr.substring(timeStr.length - 8).chunked(2).reversed().joinToString("")
-                val respCmd = "${HEADER}0B02${time}$FOOTER"
-                log("${LOG_PREFIX}[对时]${cmdFlag}指令:${data}，发送应答指令:${respCmd}")
-                sendCmd(respCmd)
-            }
-
-            "0E01" -> {
-                //终端位置上报
-                val respCmd = "${HEADER}0E0200$FOOTER"
-                log("${LOG_PREFIX}[终端位置上报]${cmdFlag}指令:${data}，发送应答指令:${respCmd}")
-                sendCmd(respCmd)
-            }
-
-            "1001" -> {
-                //温控信息上报
-                val respCmd = "${HEADER}100200$FOOTER"
-                val logMsg =
-                    "${LOG_PREFIX}[温控信息上报]${cmdFlag}指令:${data}，发送应答指令:${respCmd}"
-                log(logMsg)
-                sendCmd(respCmd)
-                //val tempC = HexUtils.signedHexToDec(data.take(4)) * 0.1
-//                updateLeftStatus("$deviceName  ${"%.1f".format(tempC)}°C / -%")
-//                updateLeftStatus("$deviceName  -°C / -%")
-                updateLeftStatus("$deviceName")
-
-                //D6DADEDB1001015D020000000027001E00020000001E001C00B40000000000010000000100040000001900440003000F00000000000FFFE6000200010002FFD80044000300010005001E0001FFD80056001400280000000000000000008300090000003C00D2000000000000007F003700000000A100000031323136334238423134303233303456322E313100FFFF
-                runOnUiThread {
-                    if (tipDialog == null) {
-                        CommonDialog(this).apply {
-                            dialogTitle = "温馨提示"
-//                           dialogContent = logMsg
-                            confirmBlock = {
-                                logMsg?.copyTextToClipboard(this@HomeActivity)
-                            }
-                        }
-                    }
-                    if (tipDialog?.isShowing == false) {
-                        tipDialog?.dialogContent = logMsg
-                        tipDialog?.show()
-                    }
-                }
-            }
-
-            "1002" -> {
-                log("${LOG_PREFIX}[温控信息应答]1002数据：${data}")
-            }
-
-            "0F02" -> {
-                log("${LOG_PREFIX}[温控信息应答]0F02数据：${data}")
-                //D6DADEDB0F020331323136334238423134303233303456322E31313EFFFF00000055010000000000002707000001000000220100000000000091040000120100000100000095140080611400800000000000000000000000000000000000000000010100005031323136334238423134303233303456322E31313EFFFF
-                runOnUiThread { }
-            }
-
-            else -> {}
-        }
-    }
-
     private var tipDialog: CommonDialog? = null
 
-    private var fixedDataBody = ""
+    /** 最后一次成功收到串口数据的时间戳（毫秒） */
+    private var lastDataReceivedTime = System.currentTimeMillis()
 
-//    private fun lockFeedback(data: String) {
-//        runCatching {
-//            val fixedDataBodyEndIndex = data.length - FOOTER.length
-//            val fixedDataBodyStartIndex = HEADER.length + "0202".length + 42
-//            fixedDataBody = data.substring(fixedDataBodyStartIndex, fixedDataBodyEndIndex)
-//
-//            val lockNo = if (list[shelfIndex].deviceNo in 1..5) "01" else "02"
-//            val lockOneState = data.substring(HEADER.length + 4, HEADER.length + 6)
-//            if (lockOneState == "00") {
-//                //锁1关
-//                SerialPortManager.send("${HEADER}0202${lockNo}${FOOTER}")
-//            }
-//            val lockTwoState = data.substring(HEADER.length + 6, HEADER.length + 8)
-//            if (lockTwoState == "00") {
-//                //锁2关
-//                SerialPortManager.send("${HEADER}0202${lockNo}${FOOTER}")
-//            }
-//        }.onFailure {
-//            it.printStackTrace()
-//        }
-//    }
+    /** 无数据超时提示弹窗 */
+    private var noDataWarningDialog: CommonDialog? = null
 
-    private fun heartBeat(data: String) {
-        runCatching {
-            if (data.length < 200) {
-                return
+    /**
+     * 无数据看门狗：每30秒检查一次，若超过5分钟未收到数据则弹出提示。
+     * 收到数据后会自动重置计时并关闭弹窗。
+     */
+    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 =
+                            "长时间未收到数据，若无法开门或秤重量不更新情况，请考虑断电重启设备"
                     }
-            val weightStartIndex = 14
-            val weightEndIndex = weightStartIndex + 12 * 8
-            getWeightInfo(
-                start = weightStartIndex,
-                end = weightEndIndex,
-                data = data
-            )
-            val temperatureStartIndex = 158
-            val temperatureEndIndex = temperatureStartIndex + 2
-//            val temperatureHex = data.substring(temperatureStartIndex, temperatureEndIndex)
-//            val temperature = hexToDec(temperatureHex)
-//            val tempC = f2C(temperature.toDouble())
-//            showTemperatureC = "%.1f".format(tempC)
-
-            //val percent = 10 * list.count { it.goodsName.isNullOrBlank().not() }
-
-//            updateLeftStatus("${deviceName} [$temperatureHex] ${showTemperatureC}°C / -%")
-
-            getFixDataBody(data, temperatureEndIndex)
-        }.onFailure {
-            it.printStackTrace()
+                }
+                if (noDataWarningDialog?.isShowing == false) {
+                    noDataWarningDialog?.show()
+                }
+            }
+            handler.postDelayed(this, 30 * 1000L)
         }
     }
 
-    private var deviceName = ""
-
-    private fun getWeightInfo(start: Int, end: Int, data: String) {
-        var index = 1
-        var count = start
-        while (count < end) {
-            val weightInfo = data.substring(count, count + 8)
-            var weightHex = ""
-            weightInfo.run {
-                weightHex =
-                    substring(6, 8) + substring(4, 6) + substring(2, 4) + substring(0, 2)
-            }
-            var realWeight = 0
-            var firstByteBinary = hexToBinary(weightHex.substring(0, 2))
-            if (firstByteBinary.startsWith("0")) {
-                //正数
-                realWeight = weightHex.toInt()
-            } else {
-                //负数
-                firstByteBinary = "0${firstByteBinary.substring(1)}"
-                val firstByteHex = binaryToHex(firstByteBinary)
-                weightHex = firstByteHex + weightHex.substring(2)
-                realWeight = -1 * weightHex.toInt()
-            }
-            weightArray.put(index, realWeight)
-
-            if (index in 1..10 && list.size == 10) {
-                list.firstOrNull { it.deviceNo == index }?.let {
-                    it.weight = realWeight.toDouble()
-                    val pos = list.indexOf(it)
-                    shelfAdapter.notifyItemChanged(pos)
-                    log("getWeightInfo: deviceNo=${it.deviceNo},realWeight=${realWeight}")
-                    EventBus.getDefault().post(SendWeightEvent(it.deviceNo, realWeight))
-                }
-//                val pos = index - 1
-//                val item = list[pos]
-//                item.weight = realWeight.toDouble()
-//                shelfAdapter.notifyItemChanged(pos)
-//                log("getWeightInfo: deviceNo=${item.deviceNo},realWeight=${realWeight}")
-//                EventBus.getDefault().post(SendWeightEvent(item.deviceNo, realWeight))
-            }
-
-            count += 8
-            index++
-        }
-//        ShelfActivity.updateWeight(getRealWeight())
-//        if (list.isNotEmpty()) {
-//            val intent = Intent(ShelfActivity.RECEIVER_DEVICE_INFO + list[shelfIndex].deviceNo)
-//            intent.putExtra(ShelfActivity.SHELF_WEIGHT, weightArray[shelfIndex])
-//            LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
-//        }
-    }
-
-    private fun getDeviceInfo(data: String) {
-        log("getDeviceInfo: data=$data")
-        val weightStartIndex = HEADER.length + 14
-        val temperatureStartIndex = weightStartIndex + 12 * 8
-        val temperatureEndIndex = temperatureStartIndex + 2
-        val temperatureHex = try {
-            data.substring(temperatureStartIndex, temperatureEndIndex)
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return
-        }
-//        val temperature = hexToDec(temperatureHex)
-//        val tempC = f2C(temperature.toDouble())
-//        showTemperatureC = "%.1f".format(tempC)
-
-        //val percent = 10 * list.count { it.goodsName.isNullOrBlank().not() }
-
-//        updateLeftStatus("${deviceName}  ${showTemperatureC}°C / -%")
-
-
-//        val tempC = HexUtils.signedHexToDec(temperatureHex) * 0.1
-//        updateLeftStatus("$deviceName  -°C / -%")
-        updateLeftStatus("$deviceName")
-
-        getWeightInfo(
-            start = weightStartIndex,
-            end = temperatureStartIndex,
-            data = data
-        )
-
-        getFixDataBody(data, temperatureEndIndex)
-    }
-
-    fun getFixDataBody(data: String, temperatureEndIndex: Int) {
-        try {
-            if (terminalId.isNotBlank() && terminalVersion.isNotBlank()) {
-                return
-            }
-            val fixDataBodyStartIndex = temperatureEndIndex + 1
-            val fixDataBody = data.substring(fixDataBodyStartIndex, data.length - FOOTER.length)
-            if (fixDataBody.length == 42) {
-                terminalId = fixDataBody.substring(0, 30)
-                terminalVersion = fixDataBody.substring(30, 40)
-                log("receiveSerialPortData:从设备状态获取数据，终端id:${terminalId},固件版本:${terminalVersion}")
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
+    /**
+     * 用户超时无操作时关灯
+     */
+    override fun onUserInactive() {
+        switchLight(false)
     }
 
     override fun onDestroy() {
-        lifecycleScope.launch {
-            SerialPortManager.close()
-        }
-//        TaskManager.cancelTask()
+        // 清理 Handler 所有回调，防止内存泄漏
+        handler.removeCallbacksAndMessages(null)
+
+        // 关闭并释放 Dialog 引用，防止内存泄漏
+        tipDialog?.dismiss()
+        tipDialog = null
+        noDataWarningDialog?.dismiss()
+        noDataWarningDialog = null
+
+        runBlocking { ScaleManager.release() }
         saveTaskJob?.cancel()
         overdueTaskJob?.cancel()
         EventBus.getDefault().unregister(this)
         super.onDestroy()
     }
 
-    @Suppress("DEPRECATION")
     private val shelfAdapter by lazy {
         ShelfAdapter(list).apply {
             setOnItemClickListener { _, _, position ->
+                onShelfItemClicked(position)
+            }
+        }
+    }
+
+    /**
+     * 处理货架格子点击事件：按需开锁，然后跳转 ShelfActivity
+     */
+    private fun onShelfItemClicked(position: Int) {
         shelfIndex = position
         lifecycleScope.launch {
-                    if (isNeedOpenLock) {
+            if (isNeedOpenLock()) {
                 val openCmd = if (list[position].deviceNo in 1..5)
-                            LEFT_SHELF_OPEN_CMD
+                    ScaleManager.buildOpenLock1Cmd()
                 else
-                            RIGHT_SHELF_OPEN_CMD
-                        val openState = SerialPortManager.send(openCmd)
+                    ScaleManager.buildOpenLock2Cmd()
+                ScaleManager.sendCmd(openCmd)
             }
-//                    if (openState.not()) {
-//                        toast("${list[position].goodsName}柜门开启失败")
-//                        return@launch
-//                    }
-                    //SerialPortManager.send(START_CMD)
             launch(Intent(this@HomeActivity, ShelfActivity::class.java).also {
                 it.putExtra(ShelfActivity.SHELF_MODEL, list[position])
-                    }) {
-                        it?.run {
-                            val model =
-                                getSerializableExtra(ShelfActivity.SHELF_MODEL) as ShelfModel
+            }) { result ->
+                result?.let { onShelfActivityResult(position, it) }
+            }
+        }
+    }
+
+    /**
+     * 处理 ShelfActivity 返回结果：更新本地列表数据并同步到服务端
+     */
+    private fun onShelfActivityResult(position: Int, intent: Intent) {
+        @Suppress("DEPRECATION")
+        val model = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            intent.getSerializableExtra(ShelfActivity.SHELF_MODEL, ShelfModel::class.java)
+        } else {
+            intent.getSerializableExtra(ShelfActivity.SHELF_MODEL) as? ShelfModel
+        } ?: return
         list[position].apply {
             goodsId = model.goodsId
             goodsName = model.goodsName
@@ -644,40 +336,16 @@ class HomeActivity : BaseActivity() {
                 putCabinetDay = model.putCabinetDay
             }
         }
-                            notifyItemChanged(position)
-
-                            try {
-
-                                val submitList = list.sortedBy { item -> item.deviceNo }
-                                val body = ShelfBody().also { body ->
-                                    body.deviceId = App.deviceId ?: ""
-                                    body.canteenId = App.canteenId
-                                    body.temperature = showTemperatureC
-                                    body.humidity = showHumidity
-                                    body.goodsList = submitList
-                                }
-                                Log.d("mzf", "performSync: body:${body.toJsonString()}")
-                                lifecycleScope.launch {
-                                    val resp = apiService.saveShelfGoodsList(body = body)
-                                    Log.d("mzf", "performSync: resp:${resp.toJsonString()}")
-                                }
-                            } catch (e: Exception) {
-                                e.printStackTrace()
-                            }
-                        }
-                    }
-                }
-            }
-        }
+        shelfAdapter.notifyItemChanged(position)
+        syncShelfGoodsToServer()
     }
 
     private fun initRecyclerView() {
-        binding.rvShelf.run {
-            layoutManager =
-                GridLayoutManager(this@HomeActivity, 2, GridLayoutManager.VERTICAL, false)
-            adapter = shelfAdapter
-
-            itemAnimator.let {
+        val layoutManager = GridLayoutTool.getLayoutManager(this@HomeActivity) ?: return
+        binding.rvShelf.let {
+            it.layoutManager = layoutManager
+            it.adapter = shelfAdapter
+            it.itemAnimator.let {
                 if (it is DefaultItemAnimator) {
                     it.supportsChangeAnimations = false
                 }
@@ -685,42 +353,28 @@ class HomeActivity : BaseActivity() {
         }
     }
 
-    private fun updateDateTime() {
-        val sdf = SimpleDateFormat(MM_DD_EEEE__HH_MM_SS, Locale.CHINA)
-        val dateTime = sdf.format(Date())
-        updateRightStatus(dateTime)
-    }
-
     private val handler = Handler(Looper.getMainLooper())
-    private val updateTask = object : Runnable {
-        override fun run() {
-            updateDateTime()
-            handler.postDelayed(this, 1000)
-        }
-    }
 
     override fun onResume() {
         super.onResume()
         hideStatusBar()
-        handler.post(updateTask)
-//        D6DADEDB00010031323136334238423134303233303456322E313100FFFF
-//        sendCmd("${HEADER}00010031323136334238423134303233303456322E313152${FOOTER}")
+        // 启动无数据看门狗（每30秒检查一次）
+        handler.postDelayed(noDataWatchdogTask, 30 * 1000L)
     }
 
     override fun onPause() {
         super.onPause()
-        handler.removeCallbacks(updateTask)
+        // 停止无数据看门狗
+        handler.removeCallbacks(noDataWatchdogTask)
     }
 
     @SuppressLint("NotifyDataSetChanged")
     private fun loadEmptyView() {
         list.clear()
         shelfAdapter.notifyDataSetChanged()
-
         binding.include?.let {
             it.root.visible()
             it.root.setOnClickListener {
-                //viewModel.getAccessToken(App.deviceId)
                 viewModel.getShelfList(deviceId = App.deviceId)
             }
             it.ivEmptyIcon.setImageResource(R.drawable.ic_empty_white)
@@ -729,12 +383,7 @@ class HomeActivity : BaseActivity() {
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
-    public fun weightEvent(event: WeightEvent) {
-
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public fun clearEmptyShelf(event: ClearShelfEvent) {
+    fun clearEmptyShelf(event: ClearShelfEvent) {
         val item = list.firstOrNull { it.deviceNo == event.shelfNo }
         item?.apply {
             goodsId = ""
@@ -754,8 +403,9 @@ class HomeActivity : BaseActivity() {
      * 保存定时任务
      */
     private fun saveGoodsTask() {
-        saveTaskJob = taskExecutor.startIntervalTaskWithInitialDelay(1 * 60 * 1000L, 5 * 60 * 1000L) {
-            saveShelfGoodsList()
+        saveTaskJob =
+            taskExecutor.startIntervalTaskWithInitialDelay(1 * 60 * 1000L, 5 * 60 * 1000L) {
+                syncShelfGoodsToServer()
             }
     }
 
@@ -771,8 +421,14 @@ class HomeActivity : BaseActivity() {
     }
 
     private fun updateOverdueState() {
-        viewModel.updateOverdueState { state, items ->
-            if (items.isNullOrEmpty()) return@updateOverdueState
+        viewModel.updateOverdueState()
+    }
+
+    /**
+     * 将接口返回的过期状态应用到本地列表，仅在状态变化时刷新对应 item
+     */
+    private fun applyOverdueState(items: List<ShelfModel>) {
+        if (items.size != list.size) return
         list.forEachIndexed { index, model ->
             // 接口过期状态变化后更新状态
             if (items[index].overdue != model.overdue) {
@@ -782,30 +438,26 @@ class HomeActivity : BaseActivity() {
             }
         }
     }
-    }
 
-    private fun saveShelfGoodsList() {
-        log("performSync: list:${list.toJsonString()}")
-        val submitList = list.sortedBy { it.deviceNo }
+    /**
+     * 构建 ShelfBody 并提交到服务端（被定时任务与 ShelfActivity 返回共用）
+     */
+    private fun syncShelfGoodsToServer() {
+        log("performSync显示list:${list.toJsonString()}")
+        val submitList = GridLayoutTool.submitListSort(list)
         submitList.forEach {
             if (it.goodsId.isNullOrBlank()) {
                 it.weight = it.weightBak
             }
         }
-//            submitList.forEach {
-//                it.temperature = HomeActivity.showTemperatureC
-//                it.humidity = HomeActivity.showHumidity
-//            }
         val body = ShelfBody().also {
-            it.deviceId = App.deviceId
+            it.deviceId = App.deviceId ?: ""
             it.canteenId = App.canteenId
             it.temperature = showTemperatureC
             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/InitActivity.kt

@@ -1,13 +1,22 @@
 package com.shuwei.intelligent.shelves.activity
 
 import android.annotation.SuppressLint
+import android.content.Intent
+import android.graphics.Color
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.os.SystemClock
 import android.util.Log
+import android.view.KeyEvent
+import android.view.animation.RotateAnimation
 import androidx.activity.viewModels
+import androidx.core.graphics.toColorInt
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.shuwei.intelligent.shelves.App
+import com.shuwei.intelligent.shelves.GlobalData
 import com.shuwei.intelligent.shelves.base.BaseActivity
 import com.shuwei.intelligent.shelves.databinding.ActivityInitBinding
 import com.shuwei.intelligent.shelves.model.DeviceConfigInfo
@@ -15,6 +24,7 @@ import com.shuwei.intelligent.shelves.net.NetViewModel
 import com.shuwei.intelligent.shelves.net.UiState
 import com.shuwei.intelligent.shelves.net.UrlConfig
 import com.shuwei.intelligent.shelves.utils.AppUtil
+import com.shuwei.intelligent.shelves.utils.NetworkUtils
 import com.shuwei.intelligent.shelves.utils.QRCodeUtil
 import com.shuwei.intelligent.shelves.utils.SpTool
 import com.shuwei.intelligent.shelves.utils.ext.dp
@@ -39,6 +49,9 @@ class InitActivity : BaseActivity() {
     private lateinit var binding: ActivityInitBinding
 
     private val viewModel: NetViewModel by viewModels()
+    private val handler = Handler(Looper.getMainLooper())
+    private var startTime = 0L // 倒计时开始时间
+    private var lastNetworkCheckTime = 0L // 上次检测网络的时间
 
     @SuppressLint("HardwareIds")
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -51,7 +64,12 @@ class InitActivity : BaseActivity() {
 //        App.deviceId = "4787e213-90ab-3e32-88e0-ac271a937751"
         Log.d(TAG, "onCreate: deviceId = ${App.deviceId}")
         SpTool.put(SpTool.DEVICE_ID, App.deviceId)
-        App.configUrl = UrlConfig.BASE_URL
+        val appBaseUrl = SpTool.baseUrl
+        if (!appBaseUrl.isBlank()) {
+            GlobalData.appBaseUrl = appBaseUrl
+        } else {
+            GlobalData.appBaseUrl = GlobalData.PROD_BASE_URL
+        }
         App.canteenId = "0"
 
 //        var deviceId = AppUtil.getUDID(this)
@@ -73,7 +91,8 @@ class InitActivity : BaseActivity() {
         binding.ivQrCode.invisible()
         binding.btnInit.invisible()
 
-        countDown()
+//        countDown()
+        initViews()
     }
 
     private fun countDown() {
@@ -131,7 +150,7 @@ class InitActivity : BaseActivity() {
                                 state.data.data?.let {
                                     if (it is DeviceConfigInfo) {
                                         SpTool.put(SpTool.DEVICE_CONFIG_CACHE, it.toJsonString())
-                                        App.configUrl = it.appPackageUrl?:""
+                                        GlobalData.appBaseUrl = it.appPackageUrl?:""
                                         App.canteenId = it.canteenId?:""
 
                                         startActivity<HomeActivity>()
@@ -156,9 +175,147 @@ class InitActivity : BaseActivity() {
         if (config == null) {
             return false
         }
-        App.configUrl = config.appPackageUrl?:""
+        GlobalData.appBaseUrl = config.appPackageUrl?:""
         App.canteenId = config.canteenId?:""
         return true
     }
 
+
+    /**
+     * 初始化控件事件
+     */
+    private fun initViews() {
+        // 连接网络按钮点击事件
+        binding.btnConnectNetwork.setOnClickListener {
+            openNetworkSettings()
+        }
+
+        // 启动加载动画 - 持续旋转
+        startLoadingAnimation()
+    }
+
+    /**
+     * 启动加载动画 - ImageView 持续旋转
+     */
+    private fun startLoadingAnimation() {
+        val rotateAnimation = RotateAnimation(
+            0f, 360f,
+            RotateAnimation.RELATIVE_TO_SELF, 0.5f,
+            RotateAnimation.RELATIVE_TO_SELF, 0.5f
+        ).apply {
+            duration = 1200 // 旋转周期 1.2 秒
+            repeatCount = RotateAnimation.INFINITE // 无限循环
+            repeatMode = RotateAnimation.RESTART
+        }
+        binding.ivLoading.startAnimation(rotateAnimation)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (NetworkUtils.isNetworkConnected(this)) {
+            navigateToHome()
+            return
+        }
+        startCountdown()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        // 页面不可见时停止倒计时
+        handler.removeCallbacksAndMessages(null)
+    }
+
+    /**
+     * 启动 60 秒倒计时
+     */
+    private fun startCountdown() {
+        startTime = SystemClock.elapsedRealtime()
+        lastNetworkCheckTime = 0
+        binding.llNetwork.setBackgroundColor(Color.TRANSPARENT)
+        binding.llLoading.visibility = android.view.View.VISIBLE
+        binding.llNetworkButton.visibility = android.view.View.GONE
+        binding.tvCountdown.text = "60秒"
+        scheduleCountdown()
+    }
+
+    /**
+     * 定时更新倒计时
+     * 使用 SystemClock.elapsedRealtime() 确保精确计时
+     */
+    private fun scheduleCountdown() {
+        handler.postDelayed({
+            val elapsedTime = SystemClock.elapsedRealtime() - startTime
+            val remainingTime = 60 - (elapsedTime / 1000).toInt()
+            val currentNetworkCheckTime = (elapsedTime / 1000).toInt()
+
+            // 每 10 秒检测一次网络
+            if (currentNetworkCheckTime > 0 && currentNetworkCheckTime % 10 == 0 && currentNetworkCheckTime != lastNetworkCheckTime.toInt()) {
+                lastNetworkCheckTime = currentNetworkCheckTime.toLong()
+                checkNetworkConnection()
+            }
+
+            // 倒计时未结束，继续更新 UI
+            if (remainingTime > 0) {
+                binding.tvCountdown.text = "${remainingTime}秒"
+                scheduleCountdown()
+            } else {
+                // 倒计时结束，最后检测一次网络
+                if (NetworkUtils.isNetworkConnected(this)) {
+                    navigateToHome()
+                } else {
+                    // 网络未连接，显示"连接网络"按钮
+                    showNetworkButton()
+                }
+            }
+        }, 100) // 每 100ms 检查一次，确保精确性
+    }
+
+    /**
+     * 检测网络连接
+     */
+    private fun checkNetworkConnection() {
+        if (NetworkUtils.isNetworkConnected(this)) {
+            // 网络连接成功，停止倒计时并跳转到 HomeActivity
+            handler.removeCallbacksAndMessages(null)
+            navigateToHome()
+        }
+    }
+
+    /**
+     * 跳转到 HomeActivity
+     */
+    private fun navigateToHome() {
+        startActivity<HomeActivity>()
+        finish()
+    }
+
+    /**
+     * 显示"连接网络"按钮
+     */
+    private fun showNetworkButton() {
+        binding.llNetwork.setBackgroundColor("#5C77F7".toColorInt())
+        binding.llLoading.visibility = android.view.View.GONE
+        binding.llNetworkButton.visibility = android.view.View.VISIBLE
+    }
+
+    /**
+     * 打开系统网络设置页面
+     */
+    private fun openNetworkSettings() {
+        val intent = Intent(android.provider.Settings.ACTION_WIFI_SETTINGS)
+        startActivity(intent)
+    }
+
+    /**
+     * 禁用返回键
+     */
+    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
+        return if (keyCode == KeyEvent.KEYCODE_BACK) {
+            // 禁用返回键，不执行任何操作
+            true
+        } else {
+            super.onKeyDown(keyCode, event)
+        }
+    }
+
 }

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

@@ -1,28 +1,53 @@
 package com.shuwei.intelligent.shelves.activity
 
+import android.graphics.Color
 import android.os.Bundle
+import android.view.Gravity
+import android.widget.TextView
+import androidx.core.widget.addTextChangedListener
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import com.shuwei.intelligent.shelves.adapter.LogAdapter
 import com.shuwei.intelligent.shelves.base.BaseActivity
 import com.shuwei.intelligent.shelves.databinding.ActivityLogListBinding
 import com.shuwei.intelligent.shelves.dialog.CommonDialog
 import com.shuwei.intelligent.shelves.utils.ext.copyTextToClipboard
+import com.shuwei.intelligent.shelves.utils.ext.dp
 import com.shuwei.intelligent.shelves.utils.ext.gone
 import com.shuwei.intelligent.shelves.utils.ext.startActivity
 import com.shuwei.intelligent.shelves.utils.ext.toast
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants
 import com.shuwei.intelligent.shelves.utils.ext.visible
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
 
 class LogActivity : BaseActivity() {
 
     companion object {
         const val IS_LOG_DIR = "isLogDir"
         const val LOG_DATE = "logDate"
+        const val YYYY_MM_DD__EEEE_HH_MM_SS = "yyyy年MM月dd日 EEEE***HH:mm:ss"
+    }
+
+    /**
+     * 覆写时钟回调：左侧状态栏显示年月日星期，右侧状态栏显示时分秒
+     */
+    override fun onClockTick() {
+        val sdf = SimpleDateFormat(YYYY_MM_DD__EEEE_HH_MM_SS, Locale.CHINA)
+        val arr = sdf.format(Date()).split("***")
+        updateLeftStatus(arr[0])
+        updateRightStatus(arr[1])
     }
 
     private lateinit var binding:ActivityLogListBinding
     private var isLogDir = false
     private var logDate = ""
     private val logList = mutableListOf<String>()
+    private val originalLogList = mutableListOf<String>() // 原始日志备份
     private val logAdapter by lazy {
         LogAdapter(logList).apply {
             setOnItemClickListener { _, _, position ->
@@ -62,24 +87,20 @@ class LogActivity : BaseActivity() {
             logAdapter.notifyDataSetChanged()
         }
 
-        if (isLogDir) {
-            logList.addAll(fileLogger.getLogFiles())
-        } else {
-            logList.addAll(fileLogger.readLogsByName(logDate))
-        }
-
         binding.rvLogList.let {
             it.layoutManager = LinearLayoutManager(this)
             it.adapter = logAdapter
         }
+
+        setupSearch()
+        setupJumpButton()
+
         binding.btnFind.run {
             if (isLogDir) gone() else visible()
         }
         binding.btnFind.setOnClickListener {
-            if (isLogDir) {
-                return@setOnClickListener
-            }
-            val list = logList.filter { it.contains("${HomeActivity.HEADER}1001") }
+            if (isLogDir) return@setOnClickListener
+            val list = logList.filter { it.contains("${ProtocolConstants.HEADER}${ProtocolConstants.CMD_TEMP_REPORT}") }
             if (list.isEmpty()) {
                 toast("未找到到1001指令")
                 return@setOnClickListener
@@ -88,6 +109,95 @@ class LogActivity : BaseActivity() {
             logList.addAll(list)
             logAdapter.notifyDataSetChanged()
         }
+
+        // 后台加载日志数据
+        lifecycleScope.launch {
+            binding.progressBar.visible()
+            val data = withContext(Dispatchers.IO) {
+                if (isLogDir) fileLogger.getLogFiles()
+                else fileLogger.readLogsByName(logDate)
+            }
+            logList.addAll(data)
+            originalLogList.addAll(data)
+            logAdapter.notifyDataSetChanged()
+            binding.progressBar.gone()
+            setupTimeNavigation()
+        }
+    }
+
+    // 搜索功能
+    private fun setupSearch() {
+        binding.etSearch.addTextChangedListener(afterTextChanged = { s ->
+            val keyword = s?.toString() ?: ""
+            logList.clear()
+            logList.addAll(if (keyword.isEmpty()) originalLogList else originalLogList.filter { it.contains(keyword, ignoreCase = true) })
+            logAdapter.notifyDataSetChanged()
+        })
+    }
+
+    // 快速跳转功能
+    private fun setupJumpButton() {
+        var isAtTop = true
+        binding.fabJump.setOnClickListener {
+            if (isAtTop) {
+                binding.rvLogList.scrollToPosition(logList.size - 1)
+            } else {
+                binding.rvLogList.scrollToPosition(0)
+            }
+            isAtTop = !isAtTop
+        }
+    }
+
+    // 时间导航功能
+    private fun setupTimeNavigation() {
+        if (isLogDir) {
+            binding.hsvTimeNav.gone()
+            return
+        }
+
+        val timeMap = mutableMapOf<String, Int>()
+        val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
+
+        originalLogList.forEachIndexed { index, log ->
+            val timeStr = log.substringAfter("[").substringBefore("]")
+            try {
+                val date = dateFormat.parse(timeStr)
+                date?.let {
+                    val hourKey = SimpleDateFormat("HH:00", Locale.getDefault()).format(it)
+                    if (!timeMap.containsKey(hourKey)) {
+                        timeMap[hourKey] = index
+                    }
+                }
+            } catch (e: Exception) {
+                // 忽略解析失败的日志
+            }
+        }
+
+        if (timeMap.isEmpty()) {
+            binding.hsvTimeNav.gone()
+            return
+        }
+
+        timeMap.toSortedMap().forEach { (hour, position) ->
+            val btn = TextView(this).apply {
+                text = hour
+                textSize = 14f
+                setTextColor(Color.BLACK)
+                setPadding(12.dp, 8.dp, 12.dp, 8.dp)
+                gravity = Gravity.CENTER
+                setBackgroundColor(Color.parseColor("#E0E0E0"))
+                setOnClickListener {
+                    binding.rvLogList.scrollToPosition(position)
+                }
+            }
+            val params = android.widget.LinearLayout.LayoutParams(
+                android.widget.LinearLayout.LayoutParams.WRAP_CONTENT,
+                android.widget.LinearLayout.LayoutParams.MATCH_PARENT
+            ).apply {
+                marginEnd = 8.dp
+            }
+            binding.llTimeNav.addView(btn, params)
+        }
     }
 
 }

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

@@ -1,66 +1,66 @@
-package com.shuwei.intelligent.shelves.activity
-
-import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import com.shuwei.intelligent.shelves.base.BaseActivity
-import com.shuwei.intelligent.shelves.databinding.ActivitySettingBinding
-import com.shuwei.intelligent.shelves.utils.KeyboardUtil
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-
-class SettingActivity: BaseActivity() {
-
-    private lateinit var binding: ActivitySettingBinding
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivitySettingBinding.inflate(layoutInflater)
-        setBackground()
-        setContentView(binding.root)
-        binding.btnSendCmd.setOnClickListener{
-            val cmd = binding.etInputCmd.text.toString().trim()
-            if (cmd.isBlank()) {
-                return@setOnClickListener
-            }
-            var record = binding.tvCmdRecord.text.toString().trim()
-            record = cmd+"\n"+record
-            binding.tvCmdRecord.text = record
-            val realCmd = "${HomeActivity.HEADER}0F01${cmd}${HomeActivity.FOOTER}"
-            sendCmd(realCmd)
-        }
-        binding.ivBack.setOnClickListener { finish() }
-        binding.root.setOnClickListener { v ->
-            KeyboardUtil.hideKeyboard(v)
-        }
-    }
-
-
-    private fun updateDateTime() {
-        val sdf = SimpleDateFormat(ShelfActivity.YYYY_MM_DD__EEEE_HH_MM_SS, Locale.CHINA)
-        val dateTime = sdf.format(Date())
-        val arr = dateTime.split("***")
-        updateLeftStatus(arr[0])
-        updateRightStatus(arr[1])
-    }
-
-    private val handler = Handler(Looper.getMainLooper())
-    private val updateTask = object : Runnable {
-        override fun run() {
-            updateDateTime()
-            handler.postDelayed(this, 1000)
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        hideStatusBar()
-        handler.post(updateTask)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        handler.removeCallbacks(updateTask)
-    }
-
-}
+//package com.shuwei.intelligent.shelves.activity
+//
+//import android.os.Bundle
+//import android.os.Handler
+//import android.os.Looper
+//import com.shuwei.intelligent.shelves.base.BaseActivity
+//import com.shuwei.intelligent.shelves.databinding.ActivitySettingBinding
+//import com.shuwei.intelligent.shelves.utils.KeyboardUtil
+//import java.text.SimpleDateFormat
+//import java.util.Date
+//import java.util.Locale
+//
+//class SettingActivity: BaseActivity() {
+//
+//    private lateinit var binding: ActivitySettingBinding
+//    override fun onCreate(savedInstanceState: Bundle?) {
+//        super.onCreate(savedInstanceState)
+//        binding = ActivitySettingBinding.inflate(layoutInflater)
+//        setBackground()
+//        setContentView(binding.root)
+//        binding.btnSendCmd.setOnClickListener{
+//            val cmd = binding.etInputCmd.text.toString().trim()
+//            if (cmd.isBlank()) {
+//                return@setOnClickListener
+//            }
+//            var record = binding.tvCmdRecord.text.toString().trim()
+//            record = cmd+"\n"+record
+//            binding.tvCmdRecord.text = record
+//            val realCmd = "${HomeActivity.HEADER}0F01${cmd}${HomeActivity.FOOTER}"
+//            sendCmd(realCmd)
+//        }
+//        binding.ivBack.setOnClickListener { finish() }
+//        binding.root.setOnClickListener { v ->
+//            KeyboardUtil.hideKeyboard(v)
+//        }
+//    }
+//
+//
+//    private fun updateDateTime() {
+//        val sdf = SimpleDateFormat(ShelfActivity.YYYY_MM_DD__EEEE_HH_MM_SS, Locale.CHINA)
+//        val dateTime = sdf.format(Date())
+//        val arr = dateTime.split("***")
+//        updateLeftStatus(arr[0])
+//        updateRightStatus(arr[1])
+//    }
+//
+//    private val handler = Handler(Looper.getMainLooper())
+//    private val updateTask = object : Runnable {
+//        override fun run() {
+//            updateDateTime()
+//            handler.postDelayed(this, 1000)
+//        }
+//    }
+//
+//    override fun onResume() {
+//        super.onResume()
+//        hideStatusBar()
+//        handler.post(updateTask)
+//    }
+//
+//    override fun onPause() {
+//        super.onPause()
+//        handler.removeCallbacks(updateTask)
+//    }
+//
+//}

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

@@ -3,8 +3,6 @@ package com.shuwei.intelligent.shelves.activity
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import android.util.Log
 import android.widget.LinearLayout
 import androidx.activity.viewModels
@@ -18,7 +16,7 @@ import com.chad.library.adapter4.util.setOnDebouncedItemClick
 import com.scwang.smart.refresh.layout.constant.RefreshState
 import com.shuwei.intelligent.shelves.App
 import com.shuwei.intelligent.shelves.R
-import com.shuwei.intelligent.shelves.activity.HomeActivity.Companion.DEVICE_INFO_CMD
+import com.shuwei.intelligent.shelves.serial.ScaleManager
 import com.shuwei.intelligent.shelves.adapter.SearchAdapter
 import com.shuwei.intelligent.shelves.base.BaseActivity
 import com.shuwei.intelligent.shelves.databinding.ActivityShelfBinding
@@ -148,7 +146,7 @@ class ShelfActivity : BaseActivity() {
             //binding.tvFoodWeight.text = "0克"
             EventBus.getDefault().post(ClearShelfEvent(shelfModel!!.deviceNo, tempWeight))
         }
-        sendCmd(DEVICE_INFO_CMD)
+        sendCmd(ScaleManager.buildGetStatusCmd())
         lifecycleScope.launch {
             repeatOnLifecycle(Lifecycle.State.STARTED) {
                 viewModel.getGoodsListUiState.collect { state ->
@@ -305,31 +303,23 @@ class ShelfActivity : BaseActivity() {
         }
     }
 
-    private fun updateDateTime() {
+    /**
+     * 覆写时钟回调：左侧状态栏显示年月日星期，右侧状态栏显示时分秒
+     */
+    override fun onClockTick() {
         val sdf = SimpleDateFormat(YYYY_MM_DD__EEEE_HH_MM_SS, Locale.CHINA)
-        val dateTime = sdf.format(Date())
-        val arr = dateTime.split("***")
+        val arr = sdf.format(Date()).split("***")
         updateLeftStatus(arr[0])
         updateRightStatus(arr[1])
     }
 
-    private val handler = Handler(Looper.getMainLooper())
-    private val updateTask = object : Runnable {
-        override fun run() {
-            updateDateTime()
-            handler.postDelayed(this, 1000)
-        }
-    }
-
     override fun onResume() {
         super.onResume()
         hideStatusBar()
-        handler.post(updateTask)
     }
 
     override fun onPause() {
         super.onPause()
-        handler.removeCallbacks(updateTask)
     }
 
     @SuppressLint("NotifyDataSetChanged")
@@ -369,22 +359,20 @@ class ShelfActivity : BaseActivity() {
     private fun clearZero() {
         lifecycleScope.launch {
             val shelfNo = shelfModel?.deviceNo ?: 0
-            val hex = shelfNo.toString(16).padStart(2, '0').uppercase()
-            Log.d(TAG, "onCreate: hex=$hex")
-            val zeroClearingCmd = "${HomeActivity.HEADER}0401${hex}${HomeActivity.FOOTER}"
+            val zeroClearingCmd = ScaleManager.buildScaleZeroCmd(shelfNo)
             log("编号${shelfNo}货架执行清零指令：${zeroClearingCmd}")
             sendCmd(zeroClearingCmd)
-            sendCmd(
-                if (shelfNo in 1..5) HomeActivity.LEFT_SHELF_OPEN_CMD else HomeActivity.RIGHT_SHELF_OPEN_CMD
-            )
+//            sendCmd(
+//                if (shelfNo in 1..5) ProtocolConstants.LEFT_SHELF_OPEN_CMD else ProtocolConstants.RIGHT_SHELF_OPEN_CMD
+//            )
             //清零
             realWeight = 0
 //                binding.tvFoodWeight.text = "${realWeight}克"
 
-            sendCmd(DEVICE_INFO_CMD)
+            sendCmd(ScaleManager.buildGetStatusCmd())
             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

@@ -5,27 +5,34 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
+import android.view.LayoutInflater
 import android.view.View
+import android.widget.PopupWindow
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
-import androidx.lifecycle.lifecycleScope
-import com.gyf.immersionbar.BarHide
-import com.gyf.immersionbar.ImmersionBar
-import com.shuwei.intelligent.shelves.activity.HomeActivity
-import com.shuwei.intelligent.shelves.activity.HomeActivity.Companion.LIGHT_CLOSE
-import com.shuwei.intelligent.shelves.activity.HomeActivity.Companion.LIGHT_OPEN
-import com.shuwei.intelligent.shelves.R
 import com.shuwei.intelligent.shelves.activity.LogActivity
-import com.shuwei.intelligent.shelves.activity.SettingActivity
+import com.shuwei.intelligent.shelves.R
 import com.shuwei.intelligent.shelves.databinding.ActivityBaseBinding
-import com.shuwei.intelligent.shelves.serial.SerialPortManager
+import com.shuwei.intelligent.shelves.databinding.PopupRightStatusMenuBinding
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.LIGHT_CLOSE
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.LIGHT_OPEN
+import com.shuwei.intelligent.shelves.serial.ScaleManager
 import com.shuwei.intelligent.shelves.utils.FileLogger
 import com.shuwei.intelligent.shelves.utils.ext.clickWithDebounce
+import com.shuwei.intelligent.shelves.utils.ext.dp
 import com.shuwei.intelligent.shelves.utils.ext.startActivity
 import kotlinx.coroutines.launch
 
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
+import com.shuwei.intelligent.shelves.utils.ext.setOnDoubleClickListener
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
 @Suppress("DEPRECATION")
 open class BaseActivity : AppCompatActivity() {
     val TAG = this.javaClass.simpleName
@@ -46,6 +53,7 @@ open class BaseActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        hideSystemBars()
         binding = ActivityBaseBinding.inflate(layoutInflater)
         setContentView(binding.root)
         statusBarDarkFont()
@@ -56,31 +64,28 @@ open class BaseActivity : AppCompatActivity() {
                 }
             }
 
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-//            window.setDecorFitsSystemWindows(false)
-//            window.insetsController?.apply {
-//                hide(WindowInsets.Type.statusBars()) // 隐藏状态栏
-//                systemBarsBehavior =
-//                    WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE // 滑动时临时显示
-//            }
-//        }
-
         lightSwitchClick()
+
+        binding.tvLeftStatus.setOnDoubleClickListener {
+            //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)
+        }
     }
 
-    fun hideStatusBar() {
-//        enableEdgeToEdge()
-//        val uiOptions = (View.SYSTEM_UI_FLAG_FULLSCREEN // 隐藏状态栏
-//                or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) // 隐藏导航栏（可选）
-//        window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN
+    /** 是否允许右侧状态栏双击弹出菜单，默认关闭，仅 HomeActivity 开启 */
+    protected open val enableRightStatusMenu: Boolean = false
 
-        ImmersionBar.with(this)
-            .hideBar(BarHide.FLAG_HIDE_STATUS_BAR)
-            .init()
-    }
+    fun hideStatusBar() {}
 
     fun statusBarDarkFont() {
-        //window.decorView.systemUiVisibility = if (enable) View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR else 0
         val color = ContextCompat.getColor(this, R.color.white)
         binding.tvLeftStatus.setTextColor(color)
         binding.tvRightStatus.setTextColor(color)
@@ -99,7 +104,7 @@ open class BaseActivity : AppCompatActivity() {
     }
 
     fun updateLeftStatus(data: String) {
-        binding.tvLeftStatus.text = data
+        binding.tvLeftStatus.text = data.ifBlank { "                  " }
     }
 
     fun updateRightStatus(data: String) {
@@ -110,11 +115,35 @@ open class BaseActivity : AppCompatActivity() {
     private val TIME_OUT: Long = (5 * 60 * 1000).toLong()
     private val mHandler by lazy { Handler(Looper.getMainLooper()) }
     private val mTimeoutRunnable = Runnable {
-        if (this is HomeActivity) {
-            this.switchLight(false)
+        // 用户长时间无操作时回调，子类可覆写实现具体逻辑（如关灯）
+        onUserInactive()
+    }
+
+    // ---- 右侧状态栏时钟 ----
+    // 默认时间格式：月日星期 时:分:秒
+    private val CLOCK_FORMAT = "MM月dd日 EEEE  HH:mm:ss"
+    private val clockFormatter by lazy { SimpleDateFormat(CLOCK_FORMAT, Locale.CHINA) }
+
+    /**
+     * 每秒时钟回调，默认将当前时间显示在右侧状态栏。
+     * 子类可覆写以自定义格式或同时更新左侧状态栏。
+     */
+    open fun onClockTick() {
+        updateRightStatus(clockFormatter.format(Date()))
+    }
+
+    private val clockTask = object : Runnable {
+        override fun run() {
+            onClockTick()
+            mHandler.postDelayed(this, 1000)
         }
     }
 
+    /**
+     * 用户超时无操作时回调，默认空实现，子类按需覆写
+     */
+    open fun onUserInactive() {}
+
     override fun onUserInteraction() {
         super.onUserInteraction()
         //开灯
@@ -131,14 +160,18 @@ open class BaseActivity : AppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
-        // 启动定时器
+        // 启动超时定时器
         mHandler.postDelayed(mTimeoutRunnable, TIME_OUT)
+        // 启动右侧状态栏时钟
+        mHandler.post(clockTask)
     }
 
     override fun onPause() {
         super.onPause()
-        // 取消定时器
+        // 取消超时定时器
         mHandler.removeCallbacks(mTimeoutRunnable)
+        // 停止右侧状态栏时钟
+        mHandler.removeCallbacks(clockTask)
     }
 
     fun switchLight(isOpen: Boolean) {
@@ -156,23 +189,33 @@ open class BaseActivity : AppCompatActivity() {
             val tag = binding.tvLeftStatus.tag?.toString()?.toBoolean() ?: true
             switchLight(tag.not())
         }
-        binding.tvRightStatus.clickWithDebounce {
-            if (this is HomeActivity) {
+    }
+
+    private fun showRightStatusPopup(anchor: View) {
+        val menuBinding = PopupRightStatusMenuBinding.inflate(LayoutInflater.from(this))
+        val popup = PopupWindow(
+            menuBinding.root,
+            120.dp,
+            101.dp,
+            true
+        )
+        menuBinding.tvEnvSwitch.setOnClickListener {
+            popup.dismiss()
+            EnvSwitchDialog(this).show()
+        }
+        menuBinding.tvLog.setOnClickListener {
+            popup.dismiss()
             startActivity<LogActivity> {
                 putExtra(LogActivity.IS_LOG_DIR, true)
             }
-                return@clickWithDebounce
-            }
-            startActivity<SettingActivity> { }
         }
+        popup.showAsDropDown(anchor)
     }
 
 
     fun sendCmd(cmd: String) {
-        lifecycleScope.launch {
-            val result = SerialPortManager.send(cmd)
-            log("发送命令${cmd}结果:${result}")
-        }
+        ScaleManager.sendCmd(cmd)
+        log("发送命令: $cmd")
     }
 
     val fileLogger by lazy { FileLogger(this) }
@@ -181,4 +224,34 @@ open class BaseActivity : AppCompatActivity() {
         fileLogger.log(message)
     }
 
+    /**
+     * 窗口焦点变化时回调
+     * 场景：弹出 Dialog 后焦点丢失，Dialog 消失后焦点恢复，此时需重新隐藏系统栏，
+     * 避免系统栏在 Dialog 关闭后意外"复活"
+     */
+    override fun onWindowFocusChanged(hasFocus: Boolean) {
+        super.onWindowFocusChanged(hasFocus)
+        if (hasFocus) {
+            hideSystemBars()
+        }
+    }
+
+    /**
+     * 隐藏状态栏和导航栏
+     * 使用 WindowInsetsControllerCompat（Androidx 推荐方式，向下兼容性好）
+     * - 状态栏：完全隐藏
+     * - 导航栏：完全隐藏，底部上滑时临时出现，松手后自动收回（BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE）
+     */
+    private fun hideSystemBars() {
+        // 允许布局延伸到系统栏区域（edge-to-edge），避免内容被系统栏遮挡
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        WindowInsetsControllerCompat(window, window.decorView).apply {
+            // 同时隐藏状态栏和导航栏
+            hide(WindowInsetsCompat.Type.systemBars())
+            // 底部上滑时临时显示导航栏，松手后自动隐藏（沉浸式 Sticky 模式）
+            systemBarsBehavior =
+                WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+        }
+    }
+
 }

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

@@ -0,0 +1,69 @@
+package com.shuwei.intelligent.shelves.base
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.WindowManager
+import com.shuwei.intelligent.shelves.GlobalData
+import com.shuwei.intelligent.shelves.databinding.DialogEnvSwitchBinding
+import com.shuwei.intelligent.shelves.utils.SpTool
+import com.shuwei.intelligent.shelves.utils.ToastUtil
+import com.shuwei.intelligent.shelves.utils.ext.dp
+
+/**
+ * 环境切换弹窗
+ *
+ * 提供 TEST / UAT / PROD 三套环境的切换功能，
+ * 初始化时自动根据 [GlobalData.appBaseUrl] 选中当前环境，
+ * 确认后更新 [GlobalData.appBaseUrl] 并通过 [onEnvChanged] 回调通知外部。
+ *
+ * @param context       上下文
+ * @param onEnvChanged  确认切换后的回调，参数为新的 baseUrl
+ */
+class EnvSwitchDialog(
+    context: Context,
+    private val onEnvChanged: (newBaseUrl: String) -> Unit = {}
+) : BaseDialog(
+    context,
+    defWidth = 600.dp,
+    defHeight = WindowManager.LayoutParams.WRAP_CONTENT
+) {
+
+    private lateinit var binding: DialogEnvSwitchBinding
+
+    override fun getRootView(): View {
+        binding = DialogEnvSwitchBinding.inflate(LayoutInflater.from(context))
+        return binding.root
+    }
+
+    override fun initView() {
+        // 根据当前 appBaseUrl 预选对应 RadioButton，不匹配则不选
+        when (GlobalData.appBaseUrl) {
+            GlobalData.TEST_BASE_URL -> binding.rbTest.isChecked = true
+            GlobalData.UAT_BASE_URL  -> binding.rbUat.isChecked  = true
+            GlobalData.PROD_BASE_URL -> binding.rbProd.isChecked = true
+        }
+
+        // 取消按钮
+        binding.btnCancel.setOnClickListener { dismiss() }
+
+        // 确认按钮
+        binding.btnConfirm.setOnClickListener {
+            // 未选中任何选项时提示用户
+            if (binding.rgEnv.checkedRadioButtonId == -1) {
+                ToastUtil.show(context,"请选择环境")
+                return@setOnClickListener
+            }
+            val newUrl = when (binding.rgEnv.checkedRadioButtonId) {
+                binding.rbTest.id -> GlobalData.TEST_BASE_URL
+                binding.rbUat.id  -> GlobalData.UAT_BASE_URL
+                binding.rbProd.id -> GlobalData.PROD_BASE_URL
+                else              -> return@setOnClickListener
+            }
+            GlobalData.appBaseUrl = newUrl
+            SpTool.baseUrl = newUrl
+            onEnvChanged(newUrl)
+            dismiss()
+        }
+    }
+}

app/src/main/java/com/shuwei/intelligent/shelves/net/HttpManager.kt

@@ -2,7 +2,8 @@ package com.shuwei.intelligent.shelves.net
 
 import android.annotation.SuppressLint
 import android.util.Log
-import com.shuwei.intelligent.shelves.App
+import com.shuwei.intelligent.shelves.BuildConfig
+import com.shuwei.intelligent.shelves.GlobalData
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Response
@@ -18,7 +19,7 @@ import kotlin.apply
 
 val apiService: ApiService = Retrofit.Builder()
 //    .baseUrl(UrlConfig.BASE_URL)
-    .baseUrl(UrlConfig.DEVICE_BASE_URL)
+    .baseUrl(GlobalData.appBaseUrl)
     .client(HttpManager.instance.client)
     .addConverterFactory(GsonConverterFactory.create())
     .build()
@@ -28,9 +29,9 @@ class HttpManager private constructor() {
     val client: OkHttpClient by lazy {
         OkHttpClient.Builder()
             .apply {
-                connectTimeout(15, TimeUnit.SECONDS)
+                connectTimeout(30, TimeUnit.SECONDS)
                 readTimeout(30, TimeUnit.SECONDS)
-                writeTimeout(15, TimeUnit.SECONDS)
+                writeTimeout(30, TimeUnit.SECONDS)
                 sslSocketFactory(createSSLSocketFactory(), TrustAllCerts())
                 hostnameVerifier { _, _ -> true }
 //                addInterceptor(LoggingInterceptor())
@@ -38,11 +39,11 @@ class HttpManager private constructor() {
                     Log.d("HttpManager","okhttp logger ==>${it}")
                 }).apply {
                     level =
-//                        if (MyApp.DEBUG) {
+                        if (BuildConfig.DEBUG) {
                         HttpLoggingInterceptor.Level.BODY
-//                    } else {
-//                        HttpLoggingInterceptor.Level.NONE
-//                    }
+                    } else {
+                        HttpLoggingInterceptor.Level.NONE
+                    }
                 })
 //                addInterceptor { chain ->
 //                    val request = chain.request().newBuilder()

app/src/main/java/com/shuwei/intelligent/shelves/net/NetViewModel.kt

@@ -5,31 +5,16 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.shuwei.intelligent.shelves.App
 import com.shuwei.intelligent.shelves.model.ShelfBody
-import com.shuwei.intelligent.shelves.model.ShelfModel
-import com.shuwei.intelligent.shelves.net.HttpManager.Companion.instance
 import com.shuwei.intelligent.shelves.utils.ext.toJsonString
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
 
 class NetViewModel : ViewModel() {
 
-//    val apiService: ApiService = HttpManager.instance.apiService
-//    val apiService: ApiService = Retrofit.Builder()
-//        .baseUrl(UrlConfig.BASE_URL)
-//        .client(HttpManager.instance.client)
-//        .addConverterFactory(GsonConverterFactory.create())
-//        .build()
-//        .create(ApiService::class.java)
-
     private val _getShelfListUiState = MutableStateFlow<UiState>(UiState.Initial)
     val getShelfListUiState: StateFlow<UiState> = _getShelfListUiState
 
-//    private val _saveShelfGoodsListUiState = MutableStateFlow<UiState>(UiState.Initial)
-//    val saveShelfGoodsListUiState: StateFlow<UiState> = _saveShelfGoodsListUiState
-
     private val _getGoodsListUiState = MutableStateFlow<UiState>(UiState.Initial)
     val getGoodsListUiState: StateFlow<UiState> = _getGoodsListUiState
 
@@ -42,6 +27,8 @@ class NetViewModel : ViewModel() {
     private val _getDeviceConfigUiState = MutableStateFlow<UiState>(UiState.Initial)
     val getDeviceConfigUiState: StateFlow<UiState> = _getDeviceConfigUiState
 
+    private val _updateOverdueStateUiState = MutableStateFlow<UiState>(UiState.Initial)
+    val updateOverdueStateUiState: StateFlow<UiState> = _updateOverdueStateUiState
 
     fun getDeviceToken(deviceId: String) {
         viewModelScope.launch {
@@ -61,17 +48,16 @@ class NetViewModel : ViewModel() {
 
     fun getDeviceConfig(deviceId: String, deviceToken: String) {
         viewModelScope.launch {
-            _getDeviceTokenUiState.value = UiState.Loading
+            _getDeviceConfigUiState.value = UiState.Loading
             runCatching {
-                val response =
-                    apiService.getDeviceInfo(equipmentCode = deviceId)
+                val response = apiService.getDeviceInfo(equipmentCode = deviceId)
                 if (response.isSuccess()) {
-                    _getDeviceTokenUiState.value = UiState.Success(response)
+                    _getDeviceConfigUiState.value = UiState.Success(response)
                 } else {
-                    _getDeviceTokenUiState.value = UiState.Error(response.msg ?: "请求失败")
+                    _getDeviceConfigUiState.value = UiState.Error(response.msg ?: "请求失败")
                 }
             }.onFailure {
-                _getDeviceTokenUiState.value = UiState.Error(it.message ?: "请求异常")
+                _getDeviceConfigUiState.value = UiState.Error(it.message ?: "请求异常")
             }
         }
     }
@@ -108,37 +94,21 @@ class NetViewModel : ViewModel() {
         }
     }
 
-    fun updateOverdueState(block:(Boolean, List<ShelfModel>?)-> Unit) {
+    fun updateOverdueState() {
         viewModelScope.launch {
             runCatching {
                 val response = apiService.getShelfList(deviceId = App.deviceId)
                 if (response.isSuccess()) {
-                    block(true, response.data?.containerGoodsList)
+                    _updateOverdueStateUiState.value = UiState.Success(response)
                 } else {
-                    block(false, emptyList())
+                    _updateOverdueStateUiState.value = UiState.Error(response.msg ?: "请求失败")
                 }
             }.onFailure {
-                block(false, null)
+                _updateOverdueStateUiState.value = UiState.Error(it.message ?: "请求异常")
             }
         }
     }
 
-//    fun saveShelfGoodsList(body: ShelfBody) {
-//        viewModelScope.launch {
-//            _saveShelfGoodsListUiState.value = UiState.Loading
-//            runCatching {
-//                val response = apiService.saveShelfGoodsList(body)
-//                if (response.success) {
-//                    _saveShelfGoodsListUiState.value = UiState.Success(response)
-//                } else {
-//                    _saveShelfGoodsListUiState.value = UiState.Error(response.message ?: "请求失败")
-//                }
-//            }.onFailure {
-//                _saveShelfGoodsListUiState.value = UiState.Error(it.message ?: "请求异常")
-//            }
-//        }
-//    }
-
     fun getGoodsList(
         canteenId: String = "",
         goodsName: String = "",
@@ -148,9 +118,6 @@ class NetViewModel : ViewModel() {
         viewModelScope.launch {
             _getGoodsListUiState.value = UiState.Loading
             runCatching {
-                if (App.configUrl.isNullOrBlank()) {
-                    App.configUrl = UrlConfig.BASE_URL
-                }
                 val response = apiService.getGoodsList(
                     canteenId = canteenId,
                     goodsName = goodsName,
@@ -178,7 +145,5 @@ class NetViewModel : ViewModel() {
                 Log.d("NetViewModel", "saveShelfGoodsList异常：${it.message}")
             }
         }
-
     }
-
 }

app/src/main/java/com/shuwei/intelligent/shelves/net/UrlConfig.kt

@@ -1,6 +1,7 @@
 package com.shuwei.intelligent.shelves.net
 
 import com.shuwei.intelligent.shelves.App
+import com.shuwei.intelligent.shelves.GlobalData
 
 object UrlConfig {
 //    const val DEVICE_BASE_URL = "http://device.shuziweidao.com:8889"
@@ -13,18 +14,18 @@ object UrlConfig {
 //     */
 //    const val DEVICE_CONFIG = "${DEVICE_BASE_URL}/equipment/stEquipment/queryByEquipmentCode"
 
-    const val BASE_URL = "https://dev.yixiong-tech.com:8081"
-//        const val BASE_URL = "https://yyjk.shuziweidao.com/gateway"
-//        const val BASE_URL = "http://192.168.1.201:14801"
-    const val DEVICE_BASE_URL = BASE_URL
+//    const val BASE_URL = "https://dev.yixiong-tech.com:8081"
+////        const val BASE_URL = "https://yyjk.shuziweidao.com/gateway"
+////        const val BASE_URL = "http://192.168.1.201:14801"
+//    const val DEVICE_BASE_URL = BASE_URL
 
-    var GET_ACCESS_TOKEN = "${App.configUrl}/restaurant/equipment/stEquipment/getEquipmentToken"
+    var GET_ACCESS_TOKEN = "${GlobalData.appBaseUrl}/restaurant/equipment/stEquipment/getEquipmentToken"
     var GET_SHELF_LIST =
-        "${App.configUrl}/terminal/neglect/smartShelves/app/smartShelves/app/getShelvesListByDeviceId"
+        "${GlobalData.appBaseUrl}/terminal/neglect/smartShelves/app/smartShelves/app/getShelvesListByDeviceId"
     var GET_GOODS_LIST =
-        "${App.configUrl}/terminal/neglect/smartShelves/app/smartShelves/app/getGoodsPageList"
+        "${GlobalData.appBaseUrl}/terminal/neglect/smartShelves/app/smartShelves/app/getGoodsPageList"
     var SAVE_SHELF_GOODS_LIST =
-        "${App.configUrl}/terminal/neglect/smartShelves/app/smartShelves/app/saveShelvesGoodsList"
+        "${GlobalData.appBaseUrl}/terminal/neglect/smartShelves/app/smartShelves/app/saveShelvesGoodsList"
 
 }
 

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

@@ -0,0 +1,24 @@
+package com.shuwei.intelligent.shelves.serial
+
+/**
+ * 心跳数据（命令 0x01 / 0x81，终端发起）
+ *
+ * @param scaleCount  秤的数量
+ * @param weights     各台秤的重量列表，索引从1开始
+ * @param simCardNo   物联卡号（20字节ASCII）
+ * @param lock1Door   锁1门状态：0-关 1-开
+ * @param lock1Lock   锁1锁状态：0-关 1-开
+ * @param lock2Door   锁2门状态：0-关 1-开
+ * @param lock2Lock   锁2锁状态：0-关 1-开
+ * @param temperature 温度值（原始字节，单位由温控器决定）
+ */
+data class HeartbeatData(
+    val scaleCount: Int,
+    val weights: List<ScaleWeight>,
+    val simCardNo: String,
+    val lock1Door: Int,
+    val lock1Lock: Int,
+    val lock2Door: Int,
+    val lock2Lock: Int,
+    val temperature: Int
+)

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

@@ -0,0 +1,182 @@
+package com.shuwei.intelligent.shelves.serial
+
+import com.shuwei.intelligent.shelves.App
+
+/**
+ * 串口通信协议常量定义
+ * 统一管理所有协议头、协议尾、各类指令及帧解析偏移量
+ */
+object ProtocolConstants {
+
+    /** 协议头 */
+    const val HEADER = "D6DADEDB"
+
+    /** 协议尾 */
+    const val FOOTER = "FFFF"
+
+    // ----------------------------------------------------------------
+    // 指令码（cmd 字段，4字符）
+    // ----------------------------------------------------------------
+
+    /** 终端激活指令 */
+    const val CMD_ACTIVATE = "0001"
+
+    /** 心跳指令（服务端发起） */
+    const val CMD_HEARTBEAT = "0101"
+
+    /** 心跳指令（终端发起） */
+    const val CMD_HEARTBEAT_TERMINAL = "8101"
+
+    /** 开关锁反馈 */
+    const val CMD_LOCK_FEEDBACK = "0202"
+
+    /** 获取设备状态 */
+    const val CMD_DEVICE_STATUS = "0302"
+
+    /** 卡号上发 */
+    const val CMD_CARD_UPLOAD = "0501"
+
+    /** 操作记录上传 */
+    const val CMD_OPERATION_RECORD = "0B01"
+
+    /** 对时 */
+    const val CMD_TIME_SYNC = "0C01"
+
+    /** 终端位置上报 */
+    const val CMD_POSITION_REPORT = "0E01"
+
+    /** 温控信息上报 */
+    const val CMD_TEMP_REPORT = "1001"
+
+    /** 温控信息应答 */
+    const val CMD_TEMP_RESPONSE = "1002"
+
+    /** 温控应答（备用） */
+    const val CMD_TEMP_RESPONSE_ALT = "0F02"
+
+    // ----------------------------------------------------------------
+    // 帧数据偏移 / 尺寸常量
+    // ----------------------------------------------------------------
+
+    /** 心跳帧中重量数据起始偏移（相对帧起始） */
+    const val HEARTBEAT_WEIGHT_OFFSET = 14
+
+    /** 设备状态帧中重量数据起始偏移（含协议头长度） */
+    const val DEVICE_STATUS_WEIGHT_OFFSET = HEADER.length + 14
+
+    /** 货架数量（每侧5格，共10格，协议中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
+
+    /** 温度字段字符长度 */
+    const val TEMPERATURE_FIELD_LEN = 2
+
+    /** 心跳帧最小有效长度 */
+    fun heartbeatMinLength(): Int {
+        return if (device2Columns.contains(App.deviceId)) 200
+        else if (device3Columns.contains(App.deviceId)) 296
+        else 0
+    }
+
+    /** 心跳帧中温度字段起始偏移（经协议分析得出，前面含重量+其他传感器数据） */
+    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
+
+    /** 固定数据体有效长度（terminalId 30 + terminalVersion 10 + 其他 2） */
+    const val FIX_BODY_LENGTH = 42
+
+    // ----------------------------------------------------------------
+    // 完整指令
+    // ----------------------------------------------------------------
+
+    /** 激活指令（1楼餐厅） */
+//    const val ACTIVE_CMD =
+//        "${HEADER}000281C5D70A7D428B44A57454F5DACA241938938B4B9CBD73673E9C8E7FC0C4992D${FOOTER}"
+
+//    410激活码
+//        const val ACTIVE_CMD = "${HEADER}000281C5D70A7D42894EA17650F5D0BB516838E7863C9ABD766C38958AFF0F3C062D${FOOTER}"
+
+    /** 左货架开锁指令 */
+    const val LEFT_SHELF_OPEN_CMD =
+        "${HEADER}020101000000000000000000000000000000000000${FOOTER}"
+
+    /** 右货架开锁指令 */
+    const val RIGHT_SHELF_OPEN_CMD =
+        "${HEADER}020100010000000000000000000000000000000000${FOOTER}"
+
+    /** 获取设备信息指令 */
+    const val DEVICE_INFO_CMD = "${HEADER}0301000000000000000000000000${FOOTER}"
+
+    /** 启动温控指令 */
+    const val START_TEMP_CTRL_CMD = "${HEADER}0F01360000${FOOTER}"
+
+    /** 华氏温度单位指令 */
+    const val F_TEMP_CMD = "${HEADER}0F01390000${FOOTER}"
+
+    /** 摄氏温度单位指令 */
+    const val C_TEMP_CMD = "${HEADER}0F01390001${FOOTER}"
+
+    /** 关灯指令（继电器1关） */
+    const val LIGHT_CLOSE = "${HEADER}020102020102020000000000000000000000000000${FOOTER}"
+
+    /** 开灯指令（继电器1开） */
+    const val LIGHT_OPEN = "${HEADER}020102020002020000000000000000000000000000${FOOTER}"
+
+    /** 温控指令 */
+    const val TEMPERATURE_CTRL = "${HEADER}0F01040000${FOOTER}"
+
+    /**
+     * 设备2列，10格
+     */
+    val device2Columns = listOf(
+        //原410货柜
+        "7a991439-3a12-3ef7-809b-c0258b839473",
+        //原1楼餐厅货柜
+        "4787e213-90ab-3e32-88e0-ac271a937751",
+        //新设备
+        "c9ffac4b-231c-352d-b553-919136c3fe1b"
+    )
+
+    /**
+     * 设备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/ScaleFrame.kt

@@ -0,0 +1,42 @@
+package com.shuwei.intelligent.shelves.serial
+
+/**
+ * 协议帧通用数据结构
+ * 每一帧解析后的原始信息，所有命令共用此结构
+ *
+ * @param cmd             命令字节，对应 ScaleProtocolConstants.CMD_* 常量
+ * @param flag            标志字节
+ * @param rawBody         数据体原始字节（不含协议头尾、命令、标志、固定数据体）
+ * @param terminalId      终端ID（15字节），ASCII字符串
+ * @param firmwareVersion 固件版本（5字节），ASCII字符串
+ * @param cmdCount        命令次数
+ */
+data class ScaleFrame(
+    val cmd: Byte,
+    val flag: Byte,
+    val rawBody: ByteArray,
+    val terminalId: String,
+    val firmwareVersion: String,
+    val cmdCount: Int
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is ScaleFrame) return false
+        return cmd == other.cmd &&
+                flag == other.flag &&
+                rawBody.contentEquals(other.rawBody) &&
+                terminalId == other.terminalId &&
+                firmwareVersion == other.firmwareVersion &&
+                cmdCount == other.cmdCount
+    }
+
+    override fun hashCode(): Int {
+        var result = cmd.toInt()
+        result = 31 * result + flag.toInt()
+        result = 31 * result + rawBody.contentHashCode()
+        result = 31 * result + terminalId.hashCode()
+        result = 31 * result + firmwareVersion.hashCode()
+        result = 31 * result + cmdCount
+        return result
+    }
+}

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

@@ -0,0 +1,281 @@
+package com.shuwei.intelligent.shelves.serial
+
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.BODY_OFFSET
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.BYTES_PER_WEIGHT
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.FIRMWARE_VERSION_LEN
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.FIXED_BODY_LEN
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.FOOTER_HEX
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.FOOTER_LEN
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.HEADER_HEX
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.SIM_CARD_NO_LEN
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.TERMINAL_ID_LEN
+import com.shuwei.intelligent.shelves.utils.hexToBytes
+
+/**
+ * 协议帧组装与解析器
+ *
+ * 职责一：将串口原始分片十六进制字符串拼装为完整协议帧
+ * 职责二：将完整帧解析为 ScaleFrame，自动提取固定数据体字段
+ * 职责三：提供心跳、状态等数据体的具体解析方法
+ * 职责四：提供重量字节解析工具（BCD编码、小端序、最高位符号位）
+ *
+ * 设计为无业务依赖，可独立复制到其他项目使用
+ */
+class ScaleFrameParser {
+
+    /** 分片拼装缓冲区 */
+    private val buffer = StringBuilder()
+
+    // ----------------------------------------------------------------
+    // 一、帧组装（串口分片 -> 完整帧十六进制字符串）
+    // ----------------------------------------------------------------
+
+    /**
+     * 追加串口原始分片数据，尝试拼装为完整帧
+     *
+     * @param srcData 串口收到的原始十六进制字符串片段
+     * @return 完整协议帧字符串；帧尚不完整时返回 null
+     */
+    fun appendData(srcData: String): String? {
+        val hasHeader = srcData.contains(HEADER_HEX)
+        val hasFooter = srcData.contains(FOOTER_HEX)
+        return when {
+            hasHeader && hasFooter  -> parseCompleteInSingleChunk(srcData)
+            hasHeader && !hasFooter -> {
+                // 只有帧头，等待后续分片
+                buffer.clear()
+                buffer.append(srcData.substring(srcData.lastIndexOf(HEADER_HEX))).append(",")
+                null
+            }
+            !hasHeader && !hasFooter -> {
+                // 中间分片，追加缓冲
+                buffer.append(srcData).append(",")
+                null
+            }
+            else -> {
+                // 只有帧尾，与缓冲区拼接成完整帧
+                val endIndex = srcData.indexOf(FOOTER_HEX) + FOOTER_HEX.length
+                buffer.append(srcData.substring(0, endIndex))
+                val frame = buffer.toString().replace(",", "")
+                buffer.clear()
+                frame.takeIf { it.isNotEmpty() }
+            }
+        }
+    }
+
+    /**
+     * 处理单个分片中同时含有帧头和帧尾的情况
+     */
+    private fun parseCompleteInSingleChunk(srcData: String): String? {
+        buffer.clear()
+        val startIndex = srcData.lastIndexOf(HEADER_HEX)
+        val endIndex   = srcData.indexOf(FOOTER_HEX) + FOOTER_HEX.length
+        return if (endIndex <= startIndex) {
+            // 帧尾在帧头之前：是上一帧的残留尾部 + 新帧头部
+            val partial = srcData.substring(startIndex)
+            if (partial.contains(FOOTER_HEX)) {
+                val newEnd = partial.indexOf(FOOTER_HEX) + FOOTER_HEX.length
+                partial.substring(0, newEnd)
+            } else {
+                buffer.append(partial).append(",")
+                null
+            }
+        } else {
+            // 正常完整帧
+            srcData.substring(startIndex, endIndex)
+        }
+    }
+
+    /** 清空分片缓冲区 */
+    fun reset() {
+        buffer.clear()
+    }
+
+    // ----------------------------------------------------------------
+    // 二、帧解析（完整帧十六进制字符串 -> ScaleFrame）
+    // ----------------------------------------------------------------
+
+    /**
+     * 解析完整协议帧为 ScaleFrame
+     *
+     * 帧结构：[协议头4] [CMD1] [FLAG1] [数据体N] [终端ID15] [固件版本5] [命令次数1] [协议尾2]
+     *
+     * @param hexFrame 完整帧十六进制字符串（含协议头尾）
+     * @return 解析成功返回 ScaleFrame；校验失败或格式错误返回 null
+     */
+    fun parseFrame(hexFrame: String): ScaleFrame? {
+        // 最小帧：协议头(8) + cmd(2) + flag(2) + 固定数据体(42) + 协议尾(4) = 58 字符
+        if (hexFrame.length < 58) return null
+        if (!hexFrame.startsWith(HEADER_HEX) || !hexFrame.endsWith(FOOTER_HEX)) return null
+
+        return runCatching {
+            val bytes = hexFrame.hexToBytes()
+            val totalLen = bytes.size
+
+            val cmd  = bytes[ScaleProtocolConstants.HEADER_LEN]
+            val flag = bytes[ScaleProtocolConstants.HEADER_LEN + 1]
+
+            // 固定数据体位于协议尾之前
+            val fixedBodyStart = totalLen - FOOTER_LEN - FIXED_BODY_LEN
+            if (fixedBodyStart < BODY_OFFSET) return null
+
+            val fixedBody = bytes.copyOfRange(fixedBodyStart, totalLen - FOOTER_LEN)
+
+            // 解析固定数据体三个字段
+            val terminalId      = String(fixedBody, 0, TERMINAL_ID_LEN, Charsets.US_ASCII)
+            val firmwareVersion = String(fixedBody, TERMINAL_ID_LEN, FIRMWARE_VERSION_LEN, Charsets.US_ASCII)
+            val cmdCount        = fixedBody[TERMINAL_ID_LEN + FIRMWARE_VERSION_LEN].toInt() and 0xFF
+
+            // 命令专属数据体（固定数据体和协议头尾之间的部分）
+            val rawBody = bytes.copyOfRange(BODY_OFFSET, fixedBodyStart)
+
+            ScaleFrame(
+                cmd             = cmd,
+                flag            = flag,
+                rawBody         = rawBody,
+                terminalId      = terminalId,
+                firmwareVersion = firmwareVersion,
+                cmdCount        = cmdCount
+            )
+        }.getOrNull()
+    }
+
+    // ----------------------------------------------------------------
+    // 三、数据体解析
+    // ----------------------------------------------------------------
+
+    /**
+     * 解析心跳数据体（命令 0x01 / 0x81，终端发起）
+     *
+     * rawBody 格式：
+     * [秤数量 1] [秤重量 N×4] [物联卡号 20] [锁1门 1] [锁1锁 1] [锁2门 1] [锁2锁 1] [温度 1]
+     *
+     * @param body ScaleFrame.rawBody
+     * @return 解析成功返回 HeartbeatData；数据不足返回 null
+     */
+    fun parseHeartbeat(body: ByteArray): HeartbeatData? {
+        if (body.isEmpty()) return null
+        return runCatching {
+            var offset = 0
+
+            val scaleCount = body[offset++].toInt() and 0xFF
+            val minBodyLen = 1 + scaleCount * BYTES_PER_WEIGHT + SIM_CARD_NO_LEN + 4 + 1
+            if (body.size < minBodyLen) return null
+
+            val weights = (1..scaleCount).map { index ->
+                val grams = parseWeightBytes(body, offset)
+                offset += BYTES_PER_WEIGHT
+                ScaleWeight(index, grams)
+            }
+
+            // 物联卡号：ASCII字符串，去除尾部空字符
+            val simCardNo = String(body, offset, SIM_CARD_NO_LEN, Charsets.US_ASCII)
+                .trimEnd('\u0000').trim()
+            offset += SIM_CARD_NO_LEN
+
+            val lock1Door   = body[offset++].toInt() and 0xFF
+            val lock1Lock   = body[offset++].toInt() and 0xFF
+            val lock2Door   = body[offset++].toInt() and 0xFF
+            val lock2Lock   = body[offset++].toInt() and 0xFF
+            val temperature = body[offset].toInt() and 0xFF
+
+            HeartbeatData(
+                scaleCount  = scaleCount,
+                weights     = weights,
+                simCardNo   = simCardNo,
+                lock1Door   = lock1Door,
+                lock1Lock   = lock1Lock,
+                lock2Door   = lock2Door,
+                lock2Lock   = lock2Lock,
+                temperature = temperature
+            )
+        }.getOrNull()
+    }
+
+    /**
+     * 解析获取状态响应数据体（命令 0x03，终端响应）
+     *
+     * rawBody 格式：
+     * [锁1锁 1] [锁1门 1] [锁2锁 1] [锁2门 1] [秤数量 1] [秤重量 N×4] [温度 1]
+     *
+     * @param body ScaleFrame.rawBody
+     * @return 解析成功返回 StatusData；数据不足返回 null
+     */
+    fun parseStatus(body: ByteArray): StatusData? {
+        if (body.size < 6) return null
+        return runCatching {
+            var offset = 0
+
+            val lock1Lock  = body[offset++].toInt() and 0xFF
+            val lock1Door  = body[offset++].toInt() and 0xFF
+            val lock2Lock  = body[offset++].toInt() and 0xFF
+            val lock2Door  = body[offset++].toInt() and 0xFF
+            val scaleCount = body[offset++].toInt() and 0xFF
+
+            val minBodyLen = 5 + scaleCount * BYTES_PER_WEIGHT + 1
+            if (body.size < minBodyLen) return null
+
+            val weights = (1..scaleCount).map { index ->
+                val grams = parseWeightBytes(body, offset)
+                offset += BYTES_PER_WEIGHT
+                ScaleWeight(index, grams)
+            }
+
+            val temperature = body[offset].toInt() and 0xFF
+
+            StatusData(
+                lock1Lock   = lock1Lock,
+                lock1Door   = lock1Door,
+                lock2Lock   = lock2Lock,
+                lock2Door   = lock2Door,
+                scaleCount  = scaleCount,
+                weights     = weights,
+                temperature = temperature
+            )
+        }.getOrNull()
+    }
+
+    // ----------------------------------------------------------------
+    // 四、重量解析工具
+    // ----------------------------------------------------------------
+
+    /**
+     * 解析4字节小端序重量数据
+     *
+     * 编码规则（BCD + 小端序 + 最高位符号位）：
+     * - 4字节小端序存储，低字节在前，高字节在后
+     * - 高字节最高位（bit7）为符号位：0=正数，1=负数
+     * - 其余位组成8位BCD十进制字符串，作为十进制整数读取，单位为克
+     *
+     * 示例：
+     *   [0x13, 0x10, 0x00, 0x00] → 大端序 "00001013" → 十进制 1013g =  1.013KG
+     *   [0x13, 0x01, 0x02, 0x00] → 大端序 "00020113" → 十进制 2113g = 20.113KG（注：原例实为20113g，见下）
+     *   [0x13, 0x10, 0x00, 0x80] → 大端序 "80001013" → 符号位=1 → 十进制 -1013g = -1.013KG
+     *
+     * 注意：大端序十六进制字符串按十进制解析（非十六进制），这是BCD编码的关键
+     *
+     * @param bytes  字节数组
+     * @param offset 起始偏移量（连续4字节）
+     * @return 重量（克），负数表示低于去皮零点
+     */
+    fun parseWeightBytes(bytes: ByteArray, offset: Int): Int {
+        val b0 = bytes[offset].toInt()     and 0xFF  // 最低字节
+        val b1 = bytes[offset + 1].toInt() and 0xFF
+        val b2 = bytes[offset + 2].toInt() and 0xFF
+        val b3 = bytes[offset + 3].toInt() and 0xFF  // 最高字节（含符号位）
+
+        // 检查最高字节的最高位是否为1（负数标志）
+        val isNegative  = (b3 and 0x80) != 0
+        val b3Cleared   = b3 and 0x7F  // 清除符号位
+
+        // 构造大端序8位十六进制字符串
+        val hexStr = "%02X%02X%02X%02X".format(b3Cleared, b2, b1, b0)
+
+        // 将十六进制字符串作为十进制整数解析（BCD解码）
+        // "00001013" → toLong() = 1013，而非 toLong(16) = 4115
+        val absValue = hexStr.toLongOrNull() ?: 0L
+
+        return if (isNegative) -absValue.toInt() else absValue.toInt()
+    }
+
+}

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

@@ -0,0 +1,614 @@
+package com.shuwei.intelligent.shelves.serial
+
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.CMD_ACTIVATE
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.CMD_CARD_UPLOAD
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.CMD_GET_STATUS
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.CMD_HEARTBEAT
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.CMD_HEARTBEAT_STORE
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.CMD_OPERATION_RECORD
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.CMD_POSITION_REPORT
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.CMD_TEMP_REPORT
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.CMD_TIME_SYNC
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.CMD_UNLOCK
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.FOOTER_HEX
+import com.shuwei.intelligent.shelves.serial.ScaleProtocolConstants.HEADER_HEX
+import com.shuwei.intelligent.shelves.utils.hexToBytes
+import com.shuwei.intelligent.shelves.utils.toHexString2
+import io.github.jeadyx.jserialport.AndroidSerialPort
+import io.github.jeadyx.jserialport.SerialPort
+import io.github.jeadyx.jserialport.SerialPortFactory
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.util.Locale
+import java.util.TimeZone
+
+/**
+ * 称重控制板管理器（单例入口）
+ *
+ * 职责：
+ *   - 管理串口连接生命周期（start/release）
+ *   - 通过内部发送队列（Channel）保证指令按顺序写入串口
+ *   - 接收串口原始分片数据，自动拼装帧并分发到对应回调
+ *   - 内置各命令的自动应答逻辑（心跳/对时/卡号等）
+ *   - 提供链式回调注册 和 常用指令构建
+ *
+ * 典型用法：
+ * ```kotlin
+ * lifecycleScope.launch {
+ *     ScaleManager
+ *         .init(activateCode = ACTIVE_MAP[deviceId] ?: "")
+ *         .onHeartbeat { _, data ->
+ *             data.weights.forEach { Log.d("Scale", "秤${it.index}: ${it.grams}g") }
+ *         }
+ *         .onLog { msg -> Log.d("Scale", msg) }
+ *         .start { data ->
+ *             // 主线程前置钩子，处理看门狗计时等副作用
+ *         }
+ * }
+ *
+ * // 主动发送指令
+ * ScaleManager.sendCmd(ScaleManager.buildGetStatusCmd())
+ *
+ * // 页面销毁时释放（关闭串口 + 清空队列 + 清理回调）
+ * runBlocking { ScaleManager.release() }
+ * ```
+ */
+object ScaleManager {
+
+    /** 串口端口名，默认 /dev/ttyS1 */
+    var portName: String = "/dev/ttyS1"
+    /** 串口波特率，默认 115200 */
+    var baudRate: Int = 115200
+
+    private val parser = ScaleFrameParser()
+    private var serialPort: AndroidSerialPort? = null
+    private var scope = CoroutineScope(Dispatchers.IO)
+
+    /** 发送队列：保证串口写入顺序，避免并发写冲突 */
+    private val sendChannel = Channel<String>(capacity = Channel.UNLIMITED)
+
+    /** 当前设备激活码，非空时收到激活请求自动应答 */
+    private var activateCode: String = ""
+
+    /** 心跳应答：心跳上报间隔（秒），默认5秒 */
+    var heartbeatInterval: Int = 5
+
+    /** 心跳应答：开锁后未开门自动落锁时间（秒），默认6秒 */
+    var lockTimeout: Int = 6
+
+    // 各命令监听列表
+    private val heartbeatListeners     = mutableListOf<(ScaleFrame, HeartbeatData) -> Unit>()
+    private val statusListeners        = mutableListOf<(ScaleFrame, StatusData) -> Unit>()
+    private val lockListeners          = mutableListOf<(ScaleFrame) -> Unit>()
+    private val cardListeners          = mutableListOf<(ScaleFrame) -> Unit>()
+    private val operationListeners     = mutableListOf<(ScaleFrame) -> Unit>()
+    private val timeSyncListeners      = mutableListOf<(ScaleFrame) -> Unit>()
+    private val positionListeners      = mutableListOf<(ScaleFrame) -> Unit>()
+    private val tempReportListeners    = mutableListOf<(ScaleFrame) -> Unit>()
+    private val activateListeners      = mutableListOf<(ScaleFrame) -> Unit>()
+    /** 任意命令的原始帧监听，用于协议中尚未提供专项解析的命令 */
+    private val rawListeners           = mutableMapOf<Byte, MutableList<(ScaleFrame) -> Unit>>()
+    private val logListeners           = mutableListOf<(String) -> Unit>()
+
+    // ----------------------------------------------------------------
+    // 初始化
+    // ----------------------------------------------------------------
+
+    /**
+     * 初始化，设置设备激活码
+     *
+     * @param activateCode 当前设备的激活应答帧十六进制字符串，非空时收到激活请求自动应答
+     * @return this，支持链式调用
+     */
+    fun init(activateCode: String = ""): ScaleManager {
+        this.activateCode = activateCode
+        return this
+    }
+
+    // ----------------------------------------------------------------
+    // 串口生命周期
+    // ----------------------------------------------------------------
+
+    /**
+     * 打开串口并启动接收，在回调注册完成后调用（链式末尾）
+     *
+     * @param preHook 每帧数据到达时的前置钩子（主线程），用于看门狗计时、UI副作用等
+     * @return true=串口打开成功并已启动接收，false=串口打开失败
+     */
+    suspend fun start(preHook: ((String) -> Unit)? = null): Boolean {
+        if (!openPort()) return false
+        startReceive(preHook)
+        return true
+    }
+
+    private suspend fun openPort(): Boolean {
+        if (!scope.isActive) {
+            scope = CoroutineScope(Dispatchers.IO)
+        }
+        return try {
+            serialPort = SerialPortFactory.create().apply {
+                open(
+                    portName = portName,
+                    baudRate = baudRate,
+                    dataBits = 8,
+                    stopBits = 1,
+                    parity = SerialPort.PARITY_NONE
+                )
+            } as AndroidSerialPort?
+            // 启动单一消费者协程，顺序消费发送队列
+            scope.launch {
+                for (hexStr in sendChannel) {
+                    try {
+                        serialPort?.write(hexStr.hexToBytes())
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                        log("发送命令失败: ${e.message}")
+                    }
+                }
+            }
+            true
+        } catch (e: Exception) {
+            e.printStackTrace()
+            false
+        }
+    }
+
+    private fun startReceive(preHook: ((String) -> Unit)? = null) {
+        scope.launch {
+            while (isActive) {
+                try {
+                    val flow = serialPort?.read()
+                    flow?.collect { buffer ->
+                        val data = buffer.toHexString2().uppercase(Locale.ROOT)
+                        withContext(Dispatchers.Main) {
+                            try {
+                                preHook?.invoke(data)
+                                onDataReceived(data)
+                            } catch (e: Exception) {
+                                e.printStackTrace()
+                                log("串口数据处理异常: ${e.message}")
+                            }
+                        }
+                    }
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+                delay(50)
+            }
+        }
+    }
+
+    // ----------------------------------------------------------------
+    // 数据接收入口
+    // ----------------------------------------------------------------
+
+    /**
+     * 接收串口原始数据（在串口回调中调用此方法）
+     *
+     * 内部自动完成分片拼装 → 帧解析 → 命令分发 → 自动应答
+     *
+     * @param hexData 串口收到的十六进制字符串（可能为分片数据）
+     */
+    fun onDataReceived(hexData: String) {
+        val completeFrame = parser.appendData(hexData) ?: return
+        val frame = parser.parseFrame(completeFrame) ?: run {
+            log("帧解析失败，原始数据：$completeFrame")
+            return
+        }
+        dispatch(frame, completeFrame)
+    }
+
+    // ----------------------------------------------------------------
+    // 回调注册（链式调用）
+    // ----------------------------------------------------------------
+
+    /**
+     * 注册心跳回调（命令 0x01 / 0x81，终端发起）
+     * 回调参数：[ScaleFrame 帧信息] [HeartbeatData 心跳数据（含重量、锁状态、温度）]
+     */
+    fun onHeartbeat(listener: (ScaleFrame, HeartbeatData) -> Unit): ScaleManager {
+        heartbeatListeners.add(listener)
+        return this
+    }
+
+    /**
+     * 注册获取状态回调（命令 0x03，服务端请求后终端响应）
+     * 回调参数：[ScaleFrame 帧信息] [StatusData 状态数据（含重量、锁状态、温度）]
+     */
+    fun onStatus(listener: (ScaleFrame, StatusData) -> Unit): ScaleManager {
+        statusListeners.add(listener)
+        return this
+    }
+
+    /**
+     * 注册开锁反馈回调（命令 0x02，终端发起，关门后上报）
+     * 回调参数：[ScaleFrame 帧信息]，锁状态等信息在 ScaleFrame.rawBody 中
+     */
+    fun onLockFeedback(listener: (ScaleFrame) -> Unit): ScaleManager {
+        lockListeners.add(listener)
+        return this
+    }
+
+    /**
+     * 注册卡号上发回调（命令 0x05，终端发起）
+     * 回调参数：[ScaleFrame 帧信息]，卡号等信息在 ScaleFrame.rawBody 中
+     */
+    fun onCardUpload(listener: (ScaleFrame) -> Unit): ScaleManager {
+        cardListeners.add(listener)
+        return this
+    }
+
+    /**
+     * 注册操作记录上传回调（命令 0x0B，终端发起）
+     * 回调参数：[ScaleFrame 帧信息]，操作记录在 ScaleFrame.rawBody 中
+     */
+    fun onOperationRecord(listener: (ScaleFrame) -> Unit): ScaleManager {
+        operationListeners.add(listener)
+        return this
+    }
+
+    /**
+     * 注册对时回调（命令 0x0C，终端发起）
+     * 管理器已自动回复当前时间戳，此回调用于业务侧感知对时事件
+     */
+    fun onTimeSync(listener: (ScaleFrame) -> Unit): ScaleManager {
+        timeSyncListeners.add(listener)
+        return this
+    }
+
+    /**
+     * 注册终端位置上报回调（命令 0x0E，终端发起，仅4G版本）
+     * 回调参数：[ScaleFrame 帧信息]，基站信息（MCC/MNC/LAC/CI）在 ScaleFrame.rawBody 中
+     */
+    fun onPositionReport(listener: (ScaleFrame) -> Unit): ScaleManager {
+        positionListeners.add(listener)
+        return this
+    }
+
+    /**
+     * 注册温控信息上报回调（命令 0x10，终端发起）
+     * 回调参数：[ScaleFrame 帧信息]，寄存器内容在 ScaleFrame.rawBody 中
+     */
+    fun onTempReport(listener: (ScaleFrame) -> Unit): ScaleManager {
+        tempReportListeners.add(listener)
+        return this
+    }
+
+    /**
+     * 注册终端激活回调（命令 0x00，终端发起）
+     * 注意：激活应答（含激活码）需在此回调中手动调用 sendCmd() 发送
+     */
+    fun onActivate(listener: (ScaleFrame) -> Unit): ScaleManager {
+        activateListeners.add(listener)
+        return this
+    }
+
+    /**
+     * 注册任意命令的原始帧监听（用于协议中尚未专项解析的命令，或扩展监听）
+     *
+     * @param cmd 命令字节，对应 ScaleProtocolConstants.CMD_* 常量
+     */
+    fun onRawFrame(cmd: Byte, listener: (ScaleFrame) -> Unit): ScaleManager {
+        rawListeners.getOrPut(cmd) { mutableListOf() }.add(listener)
+        return this
+    }
+
+    /**
+     * 注册日志回调，所有内部日志通过此回调输出
+     */
+    fun onLog(listener: (String) -> Unit): ScaleManager {
+        logListeners.add(listener)
+        return this
+    }
+
+    // ----------------------------------------------------------------
+    // 发送指令
+    // ----------------------------------------------------------------
+
+    /**
+     * 发送十六进制字符串指令，指令进入发送队列按顺序写入串口
+     *
+     * @param hexStr 完整帧十六进制字符串，含协议头尾
+     */
+    fun sendCmd(hexStr: String) {
+        if (!scope.isActive) {
+            log("警告：ScaleManager 串口未打开或已释放")
+            return
+        }
+        sendChannel.trySend(hexStr)
+    }
+
+    // ----------------------------------------------------------------
+    // 常用指令构建
+    // ----------------------------------------------------------------
+
+    /**
+     * 构建获取设备状态指令
+     * 协议：CMD=03 FLAG=01 [预留12字节]
+     */
+    fun buildGetStatusCmd(): String =
+        "${HEADER_HEX}0301${"00".repeat(12)}${FOOTER_HEX}"
+
+    /**
+     * 构建开锁/控制指令
+     *
+     * @param lock1  锁1操作：1=开 0=关 其他值（如0xFF）=不动作
+     * @param lock2  锁2操作：1=开 0=关 其他值=不动作
+     * @param relay1 继电器1：1=开 0=关 其他值=不动作
+     * @param relay2 继电器2：1=开 0=关 其他值=不动作
+     * @param relay3 继电器3：1=开 0=关 其他值=不动作
+     * @param orderId 订单号，超出14字节截断，不足补零
+     */
+    fun buildUnlockCmd(
+        lock1: Int  = 0xFF,
+        lock2: Int  = 0xFF,
+        relay1: Int = 0xFF,
+        relay2: Int = 0xFF,
+        relay3: Int = 0xFF,
+        orderId: String = ""
+    ): String {
+        val orderBytes = orderId.toByteArray(Charsets.US_ASCII).copyOf(14)
+        val orderHex   = orderBytes.joinToString("") { "%02X".format(it) }
+        return "${HEADER_HEX}0201" +
+                "%02X%02X%02X%02X%02X".format(lock1 and 0xFF, lock2 and 0xFF, relay1 and 0xFF, relay2 and 0xFF, relay3 and 0xFF) +
+                orderHex +
+                FOOTER_HEX
+    }
+
+    /**
+     * 构建开锁1指令（左门）
+     * @param orderId 订单号，可选
+     */
+    fun buildOpenLock1Cmd(orderId: String = ""): String =
+        buildUnlockCmd(lock1 = 1, lock2 = 0xFF, relay1 = 0xFF, relay2 = 0xFF, relay3 = 0xFF, orderId = orderId)
+
+    /**
+     * 构建开锁2指令（右门）
+     * @param orderId 订单号，可选
+     */
+    fun buildOpenLock2Cmd(orderId: String = ""): String =
+        buildUnlockCmd(lock1 = 0xFF, lock2 = 1, relay1 = 0xFF, relay2 = 0xFF, relay3 = 0xFF, orderId = orderId)
+
+    /**
+     * 构建秤置零指令
+     * 协议：CMD=04 FLAG=01 [秤号1字节]
+     *
+     * @param scaleIndex 秤号，从1开始
+     */
+    fun buildScaleZeroCmd(scaleIndex: Int): String =
+        "${HEADER_HEX}0401%02X${FOOTER_HEX}".format(scaleIndex and 0xFF)
+
+    /**
+     * 构建秤标定指令
+     * 协议：CMD=06 FLAG=01 [秤号1字节] [砝码值4字节小端序]
+     *
+     * @param scaleIndex 秤号，从1开始
+     * @param weightGrams 砝码重量（克），如10kg砝码传入10000
+     */
+    fun buildScaleCalibrateCmd(scaleIndex: Int, weightGrams: Int): String {
+        // 砝码值转小端序4字节（BCD编码：克数按十进制写入十六进制位）
+        val weightHex = "%08d".format(weightGrams)  // BCD：十进制值直接作为十六进制字符串
+        val leHex = weightHex.chunked(2).reversed().joinToString("")
+        return "${HEADER_HEX}0601%02X${leHex}${FOOTER_HEX}".format(scaleIndex and 0xFF)
+    }
+
+    /**
+     * 构建温控器控制指令
+     * 协议：CMD=0F FLAG=01 [操作编码1字节] [设定值2字节]
+     *
+     * @param opCode  操作编码（参考温控器说明书）
+     * @param setValue 设定值
+     */
+    fun buildTempCtrlCmd(opCode: Int, setValue: Int): String =
+        "${HEADER_HEX}0F01%02X%04X${FOOTER_HEX}".format(opCode and 0xFF, setValue and 0xFFFF)
+
+    /**
+     * 构建临时参数设置指令
+     * 协议：CMD=11 FLAG=01 [参数编码1字节] [设定值1字节]
+     *
+     * @param paramCode 参数编码（1=关门语音触发条件 2=未关门语音提示 3=锁常开设置）
+     * @param value     设定值
+     */
+    fun buildTempParamSetCmd(paramCode: Int, value: Int): String =
+        "${HEADER_HEX}1101%02X%02X${FOOTER_HEX}".format(paramCode and 0xFF, value and 0xFF)
+
+    // ----------------------------------------------------------------
+    // 资源释放
+    // ----------------------------------------------------------------
+
+    /**
+     * 释放所有资源：清空回调列表、发送函数及帧缓冲
+     * 通常在 Activity/Fragment 销毁或不再使用时调用
+     */
+    suspend fun release() {
+        sendChannel.close()
+        scope.cancel()
+        serialPort?.close()
+        serialPort = null
+        heartbeatListeners.clear()
+        statusListeners.clear()
+        lockListeners.clear()
+        cardListeners.clear()
+        operationListeners.clear()
+        timeSyncListeners.clear()
+        positionListeners.clear()
+        tempReportListeners.clear()
+        activateListeners.clear()
+        rawListeners.clear()
+        logListeners.clear()
+        activateCode = ""
+        parser.reset()
+    }
+
+    // ----------------------------------------------------------------
+    // 内部命令分发与自动应答
+    // ----------------------------------------------------------------
+
+    private fun dispatch(frame: ScaleFrame, rawHex: String) {
+        when (frame.cmd) {
+            CMD_ACTIVATE         -> handleActivate(frame, rawHex)
+            CMD_HEARTBEAT,
+            CMD_HEARTBEAT_STORE  -> handleHeartbeat(frame, rawHex)
+            CMD_UNLOCK           -> handleLockFeedback(frame, rawHex)
+            CMD_GET_STATUS       -> handleStatus(frame, rawHex)
+            CMD_CARD_UPLOAD      -> handleCardUpload(frame, rawHex)
+            CMD_OPERATION_RECORD -> handleOperationRecord(frame, rawHex)
+            CMD_TIME_SYNC        -> handleTimeSync(frame, rawHex)
+            CMD_POSITION_REPORT  -> handlePositionReport(frame, rawHex)
+            CMD_TEMP_REPORT      -> handleTempReport(frame, rawHex)
+            else -> {
+                rawListeners[frame.cmd]?.forEach { it(frame) }
+                log("收到未处理命令：0x%02X，终端ID：${frame.terminalId}，原始数据：$rawHex".format(frame.cmd))
+            }
+        }
+    }
+
+    /**
+     * 处理终端激活（CMD=0x00）
+     * 若 activateMap 中存在当前 deviceId 对应的激活码，则自动应答；
+     * 否则仍回调 onActivate，由业务方自行处理
+     */
+    private fun handleActivate(frame: ScaleFrame, rawHex: String) {
+        log("收到[终端激活]指令，终端ID：${frame.terminalId}，固件版本：${frame.firmwareVersion}，原始数据：$rawHex")
+        val activeCmd = activateCode
+        if (!activeCmd.isNullOrBlank()) {
+            sendCmd(activeCmd)
+            log("激活码自动应答：$activeCmd")
+        }
+        activateListeners.forEach { it(frame) }
+        rawListeners[frame.cmd]?.forEach { it(frame) }
+    }
+
+    /**
+     * 处理心跳（CMD=0x01 / 0x81）
+     * 自动应答：[心跳间隔] [上锁时间] [设备固件版本5字节]
+     */
+    private fun handleHeartbeat(frame: ScaleFrame, rawHex: String) {
+        val firmwareHex = frame.firmwareVersion.toAsciiHex()
+        val resp = "${HEADER_HEX}0102%02X%02X${firmwareHex}${FOOTER_HEX}".format(
+            heartbeatInterval and 0xFF,
+            lockTimeout and 0xFF
+        )
+        sendCmd(resp)
+
+        val data = parser.parseHeartbeat(frame.rawBody)
+        if (data != null) {
+            heartbeatListeners.forEach { it(frame, data) }
+        }
+        rawListeners[frame.cmd]?.forEach { it(frame) }
+        log("收到[心跳]指令，终端ID：${frame.terminalId}，秤数量：${data?.scaleCount ?: 0}，原始数据：$rawHex")
+    }
+
+    /**
+     * 处理开锁反馈（CMD=0x02，终端发起，关门后上报）
+     * 自动应答：[锁号00] [终端ID 15字节] [固件版本 5字节]
+     */
+    private fun handleLockFeedback(frame: ScaleFrame, rawHex: String) {
+        val terminalIdHex = frame.terminalId.toAsciiHex()
+        val firmwareHex   = frame.firmwareVersion.toAsciiHex()
+        val resp = "${HEADER_HEX}020200${terminalIdHex}${firmwareHex}${FOOTER_HEX}"
+        sendCmd(resp)
+        lockListeners.forEach { it(frame) }
+        rawListeners[frame.cmd]?.forEach { it(frame) }
+        log("收到[开锁反馈]指令，终端ID：${frame.terminalId}，原始数据：$rawHex")
+    }
+
+    /**
+     * 处理获取状态响应（CMD=0x03，终端响应）
+     * 无需应答，直接解析并分发
+     */
+    private fun handleStatus(frame: ScaleFrame, rawHex: String) {
+        val data = parser.parseStatus(frame.rawBody)
+        if (data != null) {
+            statusListeners.forEach { it(frame, data) }
+        }
+        rawListeners[frame.cmd]?.forEach { it(frame) }
+        log("收到[获取状态]响应，终端ID：${frame.terminalId}，秤数量：${data?.scaleCount ?: 0}，原始数据：$rawHex")
+    }
+
+    /**
+     * 处理卡号上发（CMD=0x05，终端发起）
+     * 自动应答：成功 0x03
+     */
+    private fun handleCardUpload(frame: ScaleFrame, rawHex: String) {
+        val resp = "${HEADER_HEX}050203${FOOTER_HEX}"
+        sendCmd(resp)
+        cardListeners.forEach { it(frame) }
+        rawListeners[frame.cmd]?.forEach { it(frame) }
+        log("收到[卡号上发]指令，终端ID：${frame.terminalId}，原始数据：$rawHex")
+    }
+
+    /**
+     * 处理操作记录上传（CMD=0x0B，终端发起）
+     * 自动应答：成功 0x03
+     */
+    private fun handleOperationRecord(frame: ScaleFrame, rawHex: String) {
+        val resp = "${HEADER_HEX}0B0203${FOOTER_HEX}"
+        sendCmd(resp)
+        operationListeners.forEach { it(frame) }
+        rawListeners[frame.cmd]?.forEach { it(frame) }
+        log("收到[操作记录上传]指令，终端ID：${frame.terminalId}，原始数据：$rawHex")
+    }
+
+    /**
+     * 处理对时请求（CMD=0x0C，终端发起，仅以太网版本）
+     * 自动应答：当前 Unix 时间戳（含时区偏移），小端序4字节
+     */
+    private fun handleTimeSync(frame: ScaleFrame, rawHex: String) {
+        val nowMs    = System.currentTimeMillis()
+        val timeSec  = nowMs / 1000 + TimeZone.getDefault().getOffset(nowMs) / 1000
+        // 取低32位，转为小端序4字节十六进制
+        val timeHex  = "%08X".format(timeSec.toInt())
+            .chunked(2).reversed().joinToString("")
+        val resp = "${HEADER_HEX}0C02${timeHex}${FOOTER_HEX}"
+        sendCmd(resp)
+        timeSyncListeners.forEach { it(frame) }
+        rawListeners[frame.cmd]?.forEach { it(frame) }
+        log("收到[对时]请求，终端ID：${frame.terminalId}，时间戳：${timeSec}，应答：$resp")
+    }
+
+    /**
+     * 处理终端位置上报（CMD=0x0E，终端发起，仅4G版本）
+     * 自动应答：保留字节 0x00
+     */
+    private fun handlePositionReport(frame: ScaleFrame, rawHex: String) {
+        val resp = "${HEADER_HEX}0E0200${FOOTER_HEX}"
+        sendCmd(resp)
+        positionListeners.forEach { it(frame) }
+        rawListeners[frame.cmd]?.forEach { it(frame) }
+        log("收到[终端位置上报]指令，终端ID：${frame.terminalId}，原始数据：$rawHex")
+    }
+
+    /**
+     * 处理温控信息上报（CMD=0x10，终端发起）
+     * 自动应答：保留字节 0x00
+     */
+    private fun handleTempReport(frame: ScaleFrame, rawHex: String) {
+        val resp = "${HEADER_HEX}100200${FOOTER_HEX}"
+        sendCmd(resp)
+        tempReportListeners.forEach { it(frame) }
+        rawListeners[frame.cmd]?.forEach { it(frame) }
+        log("收到[温控信息上报]指令，终端ID：${frame.terminalId}，原始数据：$rawHex")
+    }
+
+    // ----------------------------------------------------------------
+    // 私有工具
+    // ----------------------------------------------------------------
+
+    private fun log(message: String) {
+        logListeners.forEach { it(message) }
+    }
+
+    /**
+     * 将 ASCII 字符串转为十六进制字符串，用于指令构造
+     * 例："V2.10" → "56322E3130"
+     */
+    private fun String.toAsciiHex(): String =
+        toByteArray(Charsets.US_ASCII).joinToString("") { "%02X".format(it) }
+}

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

@@ -0,0 +1,121 @@
+package com.shuwei.intelligent.shelves.serial
+
+/**
+ * 称重控制板接口协议常量
+ * 统一管理协议头尾、所有命令字节及帧结构偏移量
+ * 设计为独立常量对象，不依赖任何业务类，可复制到其他项目直接使用
+ */
+object ScaleProtocolConstants {
+
+    // ----------------------------------------------------------------
+    // 协议头尾
+    // ----------------------------------------------------------------
+
+    /** 协议头字节数组 */
+    val HEADER: ByteArray = byteArrayOf(0xD6.toByte(), 0xDA.toByte(), 0xDE.toByte(), 0xDB.toByte())
+
+    /** 协议头十六进制字符串 */
+    const val HEADER_HEX: String = "D6DADEDB"
+
+    /** 协议尾字节数组 */
+    val FOOTER: ByteArray = byteArrayOf(0xFF.toByte(), 0xFF.toByte())
+
+    /** 协议尾十六进制字符串 */
+    const val FOOTER_HEX: String = "FFFF"
+
+    // ----------------------------------------------------------------
+    // 命令字节（cmd 字段，1字节）
+    // 发起方说明：终端=秤控制板主动上报；服务端=Android端主动发送
+    // ----------------------------------------------------------------
+
+    /** 0x00 终端激活（终端发起） */
+    const val CMD_ACTIVATE: Byte = 0x00
+
+    /** 0x01 心跳（终端发起） */
+    const val CMD_HEARTBEAT: Byte = 0x01
+
+    /** 0x81 心跳（终端发起，需存储串口屏显示信息） */
+    const val CMD_HEARTBEAT_STORE: Byte = 0x81.toByte()
+
+    /** 0x02 开锁（服务端发起） */
+    const val CMD_UNLOCK: Byte = 0x02
+
+    /** 0x03 获取状态（服务端发起） */
+    const val CMD_GET_STATUS: Byte = 0x03
+
+    /** 0x04 秤置零（服务端发起） */
+    const val CMD_SCALE_ZERO: Byte = 0x04
+
+    /** 0x05 卡号上发（终端发起） */
+    const val CMD_CARD_UPLOAD: Byte = 0x05
+
+    /** 0x06 秤标定（服务端发起） */
+    const val CMD_SCALE_CALIBRATE: Byte = 0x06
+
+    /** 0x07 价签设置（服务端发起） */
+    const val CMD_PRICE_TAG_SET: Byte = 0x07
+
+    /** 0x08 串口屏（服务端发起） */
+    const val CMD_SERIAL_SCREEN: Byte = 0x08
+
+    /** 0x09 语音播报（服务端发起） */
+    const val CMD_VOICE_BROADCAST: Byte = 0x09
+
+    /** 0x0A 价签（第二块串口屏/透传）设置（服务端发起） */
+    const val CMD_PRICE_TAG_SET2: Byte = 0x0A
+
+    /** 0x0B 操作记录上传（终端发起） */
+    const val CMD_OPERATION_RECORD: Byte = 0x0B
+
+    /** 0x0C 对时（终端发起） */
+    const val CMD_TIME_SYNC: Byte = 0x0C
+
+    /** 0x0E 终端位置上报（终端发起） */
+    const val CMD_POSITION_REPORT: Byte = 0x0E
+
+    /** 0x0F 温控器控制（服务端发起） */
+    const val CMD_TEMP_CTRL: Byte = 0x0F
+
+    /** 0x10 温控信息上报（终端发起） */
+    const val CMD_TEMP_REPORT: Byte = 0x10
+
+    /** 0x11 临时参数设置（服务端发起） */
+    const val CMD_TEMP_PARAM_SET: Byte = 0x11
+
+    // ----------------------------------------------------------------
+    // 帧结构固定偏移量（单位：字节）
+    // ----------------------------------------------------------------
+
+    /** 协议头长度 */
+    const val HEADER_LEN: Int = 4
+
+    /** 命令字段长度 */
+    const val CMD_LEN: Int = 1
+
+    /** 标志字段长度 */
+    const val FLAG_LEN: Int = 1
+
+    /** 数据体起始偏移（协议头 + 命令 + 标志） */
+    const val BODY_OFFSET: Int = HEADER_LEN + CMD_LEN + FLAG_LEN
+
+    /** 协议尾长度 */
+    const val FOOTER_LEN: Int = 2
+
+    /** 单台秤重量字节数 */
+    const val BYTES_PER_WEIGHT: Int = 4
+
+    /** 物联卡号字节数 */
+    const val SIM_CARD_NO_LEN: Int = 20
+
+    /** 固定数据体：终端ID字节数 */
+    const val TERMINAL_ID_LEN: Int = 15
+
+    /** 固定数据体：固件版本字节数 */
+    const val FIRMWARE_VERSION_LEN: Int = 5
+
+    /** 固定数据体：命令次数字节数 */
+    const val CMD_COUNT_LEN: Int = 1
+
+    /** 固定数据体总长度（终端ID + 固件版本 + 命令次数） */
+    const val FIXED_BODY_LEN: Int = TERMINAL_ID_LEN + FIRMWARE_VERSION_LEN + CMD_COUNT_LEN
+}

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

@@ -0,0 +1,15 @@
+package com.shuwei.intelligent.shelves.serial
+
+/**
+ * 单台秤的重量数据
+ *
+ * @param index    秤的编号，从1开始
+ * @param grams    重量，单位克，负数表示去皮/负重
+ */
+data class ScaleWeight(
+    val index: Int,
+    val grams: Int
+) {
+    /** 重量转换为千克，保留3位小数 */
+    val kg: Double get() = grams / 1000.0
+}

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

@@ -1,78 +0,0 @@
-package com.shuwei.intelligent.shelves.serial
-
-import android.annotation.SuppressLint
-import androidx.lifecycle.lifecycleScope
-import com.shuwei.intelligent.shelves.utils.hexToBytes
-import com.shuwei.intelligent.shelves.utils.toHexString2
-import io.github.jeadyx.jserialport.AndroidSerialPort
-import io.github.jeadyx.jserialport.SerialPort
-import io.github.jeadyx.jserialport.SerialPortFactory
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.collectLatest
-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 var serialPort: AndroidSerialPort? = null
-
-    //    private var serialPort: SerialPort? = null
-    private val scope = CoroutineScope(Dispatchers.IO)
-
-    // 打开串口
-    suspend fun open(): Boolean {
-        return try {
-            serialPort = SerialPortFactory.create().apply {
-                open(
-                    portName = portName,
-                    baudRate = baudRate,
-                    dataBits = 8,
-                    stopBits = 1,
-                    parity = SerialPort.PARITY_NONE
-                )
-            } as AndroidSerialPort?
-            true
-        } catch (e: Exception) {
-            e.printStackTrace()
-            false
-        }
-    }
-
-    // 发送数据
-    suspend fun send(data: String): Boolean {
-        return try {
-            serialPort?.write(data.hexToBytes())
-            true
-        } catch (e: Exception) {
-            e.printStackTrace()
-            false
-        }
-    }
-
-    // 启动接收协程
-    @Suppress("DEPRECATION")
-    @SuppressLint("DefaultLocale")
-    fun startReceive(callback: (String) -> Unit) {
-        scope.launch {
-            while (isActive) {
-                try {
-                    val flow = serialPort?.read()
-                    flow?.collect { buffer ->
-                        val data = buffer.toHexString2().toUpperCase()
-                        callback(data)
-                    }
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                }
-                delay(50)
-            }
-        }
-    }
-
-    // 关闭串口
-    suspend fun close() {
-        scope.cancel()
-        serialPort?.close()
-    }
-}

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

@@ -0,0 +1,22 @@
+package com.shuwei.intelligent.shelves.serial
+
+/**
+ * 获取设备状态数据（命令 0x03，服务端发起后终端响应）
+ *
+ * @param lock1Lock   锁1锁状态：0-关 1-开
+ * @param lock1Door   锁1门状态：0-关 1-开
+ * @param lock2Lock   锁2锁状态：0-关 1-开
+ * @param lock2Door   锁2门状态：0-关 1-开
+ * @param scaleCount  秤的数量
+ * @param weights     各台秤的重量列表，索引从1开始
+ * @param temperature 温度值（原始字节，单位由温控器决定）
+ */
+data class StatusData(
+    val lock1Lock: Int,
+    val lock1Door: Int,
+    val lock2Lock: Int,
+    val lock2Door: Int,
+    val scaleCount: Int,
+    val weights: List<ScaleWeight>,
+    val temperature: Int
+)

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/java/com/shuwei/intelligent/shelves/utils/NetworkUtils.kt

@@ -0,0 +1,24 @@
+package com.shuwei.intelligent.shelves.utils
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
+
+/**
+ * 网络连接检测工具类
+ * 提供检测设备网络连接状态的功能
+ */
+object NetworkUtils {
+
+    /**
+     * 检测设备是否连接到网络
+     * @param context 应用上下文
+     * @return true 表示已连接网络，false 表示未连接
+     */
+    fun isNetworkConnected(context: Context): Boolean {
+        val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        val network = connectivityManager.activeNetwork ?: return false
+        val capabilities = connectivityManager.getNetworkCapabilities(network) ?: return false
+        return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.shuwei.intelligent.shelves.utils
 
 import com.shuwei.intelligent.shelves.App
+import com.shuwei.intelligent.shelves.GlobalKey
 import com.shuwei.intelligent.shelves.utils.ext.put
 import kotlin.to
 
@@ -28,4 +29,10 @@ object SpTool {
     fun getBoolean(key: String, defValue: Boolean = false): Boolean {
         return pref.getBoolean(key, defValue)
     }
+
+    var baseUrl: String
+        get() = getString(GlobalKey.KEY_BASE_URL, "")
+        set(value) {
+            put(GlobalKey.KEY_BASE_URL, value)
+        }
 }

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

@@ -25,6 +25,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import android.content.ClipData
 import android.content.ClipboardManager
+import android.os.SystemClock
 
 fun Context.toast(
     message: String?,
@@ -175,3 +176,22 @@ fun String.copyTextToClipboard(context: Context) {
     Toast.makeText(context, "文本已复制到剪贴板", Toast.LENGTH_SHORT).show()
 }
 
+/**
+ * 为View添加双击点击事件的扩展函数
+ */
+fun View.setOnDoubleClickListener(onDoubleClickListener: (View) -> Unit) {
+    var lastClickTime = 0L
+    var lastClickView: View? = null
+
+    this.setOnClickListener { view ->
+        val currentTime = SystemClock.elapsedRealtime()
+        if (lastClickView === view && currentTime - lastClickTime < 500) {
+            // 双击事件触发
+            onDoubleClickListener(view)
+            lastClickTime = 0
+        } else {
+            lastClickTime = currentTime
+            lastClickView = view
+        }
+    }
+}

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#30000000">
+    <item>
+        <shape android:shape="rectangle">
+
+            <solid android:color="@color/white" />
+            <corners android:radius="8dp" />
+            <stroke
+                android:width="1dp"
+                android:color="@color/bg_card_blue" />
+        </shape>
+    </item>
+</ripple>

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#30000000">
+    <item>
+        <shape android:shape="rectangle">
+
+            <solid android:color="@color/bg_card_blue" />
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+</ripple>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/white"/>
+    <corners android:radius="12dp"/>
+</shape>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#4ECDC4" />
+    <corners android:radius="12dp" />
+    <stroke
+        android:width="2dp"
+        android:color="#2BA39F" />
+</shape>

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="80dp"
+    android:height="80dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <!-- 网络断开的图标 -->
+    <path
+        android:fillColor="#FF6B6B"
+        android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2c-4.42,-4.42 -11.58,-4.42 -16,0zM9,17h6v2h-6z" />
+</vector>

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/drawable/loading_spinner.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="ring"
+    android:innerRadiusRatio="3"
+    android:thicknessRatio="8"
+    android:useLevel="false">
+    <gradient
+        android:type="sweep"
+        android:startColor="#FF6B6B"
+        android:centerColor="#4ECDC4"
+        android:endColor="#FF6B6B"
+        android:angle="0" />
+</shape>
+

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

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:background="@color/bg_page">
-
-    <FrameLayout
-        android:id="@+id/flStatusBar"
-        android:layout_width="match_parent"
-        android:layout_height="68dp"
-        android:paddingStart="25dp"
-        android:paddingEnd="25dp"
-        android:paddingTop="25dp">
-
-        <TextView
-            android:id="@+id/tv_left_status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/white"
-            android:layout_gravity="start"
-            android:textSize="24sp"
-            android:fontFamily="sans-serif-medium"
-            tools:text="1-1冷藏柜  -2°C / 87%" />
-
-        <TextView
-            android:id="@+id/tv_right_status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/white"
-            android:layout_gravity="end"
-            android:fontFamily="sans-serif-medium"
-            android:textSize="24sp"
-            tools:text="6月22日 星期日  15:26:33" />
-    </FrameLayout>
-
-
-    <FrameLayout
-        android:id="@+id/flContainer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</LinearLayout>

app/src/main/res/layout-sw600dp/activity_home.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:background="@color/bg_page">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rvShelf"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-        app:spanCount="2"
-        android:overScrollMode="never"
-        android:layout_marginStart="12dp"
-        android:layout_marginEnd="12dp"
-        tools:listitem="@layout/list_item_shelf"/>
-
-
-    <include
-        android:id="@+id/include"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        layout="@layout/layout_empty_view"
-        android:visibility="gone"/>
-</FrameLayout>

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

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <ImageView
-        android:layout_width="450dp"
-        android:layout_height="430dp"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="150dp"
-        android:src="@drawable/img_init"
-        tools:ignore="ContentDescription"
-        android:visibility="invisible"/>
-
-    <TextView
-        android:id="@+id/btnInit"
-        android:layout_width="300dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="100dp"
-        android:background="@drawable/bg_init_button"
-        android:gravity="center"
-        android:padding="10dp"
-        android:text="设备初始化"
-        android:textColor="@color/white"
-        android:textSize="30sp"
-        android:textStyle="bold"
-        android:visibility="visible"
-        tools:ignore="HardcodedText" />
-
-    <Space
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
-
-    <ImageView
-        android:id="@+id/ivQrCode"
-        android:layout_width="200dp"
-        android:layout_height="200dp"
-        android:layout_gravity="center_horizontal|bottom"
-        android:layout_marginBottom="50dp"
-        tools:ignore="ContentDescription"
-        tools:src="@mipmap/ic_logo512" />
-
-</LinearLayout>

app/src/main/res/layout-sw600dp/activity_log_list.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:gravity="center_vertical">
-
-        <ImageView
-            android:id="@+id/ivBack"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_gravity="top|start"
-            android:layout_marginStart="12dp"
-            android:layout_marginTop="12dp"
-            android:src="@drawable/ic_back_512"
-            tools:ignore="ContentDescription" />
-
-        <TextView
-            android:id="@+id/tvTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            tools:text="设置"
-            android:textColor="@color/black"
-            android:textSize="28sp" />
-
-        <Button
-            android:id="@+id/btnFind"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="15dp"
-            android:textSize="18sp"
-            android:layout_gravity="end|center_vertical"
-            android:text="查找1001指令"/>
-    </FrameLayout>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rvLogList"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</LinearLayout>

app/src/main/res/layout-sw600dp/activity_shelf.xml

@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:background="@color/bg_page">
-
-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="376dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="24dp"
-        app:cardBackgroundColor="@color/white"
-        app:cardCornerRadius="12dp"
-        app:cardElevation="0dp">
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:layout_marginStart="24dp"
-                android:layout_marginEnd="24dp"
-                android:gravity="center_horizontal"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/tvShelfName"
-                    android:layout_width="wrap_content"
-                    android:layout_height="60dp"
-                    android:layout_marginTop="24dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:gravity="center"
-                    android:textColor="@color/bg_page"
-                    android:textSize="30sp"
-                    tools:text="货架 - 03" />
-
-                <Space
-                    android:layout_width="wrap_content"
-                    android:layout_height="0dp"
-                    android:layout_weight="1" />
-
-                <TextView
-                    android:id="@+id/tvFoodWeight"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:includeFontPadding="false"
-                    android:maxLines="1"
-                    android:textColor="@color/food_weight_orange"
-                    android:textSize="60sp"
-                    android:textStyle="bold"
-                    tools:text="1506克" />
-
-                <Space
-                    android:layout_width="wrap_content"
-                    android:layout_height="0dp"
-                    android:layout_weight="1" />
-
-                <TextView
-                    android:id="@+id/tvFoodName"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:textColor="@color/food_name_black"
-                    android:textSize="36sp"
-                    android:textStyle="bold"
-                    tools:text="金针菇" />
-
-                <Space
-                    android:layout_width="wrap_content"
-                    android:layout_height="0dp"
-                    android:layout_weight="1" />
-            </LinearLayout>
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btnClearZero"
-                android:layout_width="120dp"
-                android:layout_height="60dp"
-                android:layout_gravity="top|end"
-                android:layout_marginTop="24dp"
-                android:layout_marginEnd="24dp"
-                android:backgroundTint="@color/bg_page"
-                android:ellipsize="end"
-                android:fontFamily="sans-serif-medium"
-                android:insetTop="0dp"
-                android:insetBottom="0dp"
-                android:maxLines="1"
-                android:text="清零"
-                android:textColor="@color/white"
-                android:textSize="30sp"
-                app:cornerRadius="12dp"
-                app:elevation="0dp"
-                tools:ignore="HardcodedText" />
-
-            <ImageView
-                android:id="@+id/ivBack"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:layout_gravity="top|start"
-                android:layout_marginStart="24dp"
-                android:layout_marginTop="24dp"
-                android:src="@drawable/ic_back_512"
-                tools:ignore="ContentDescription" />
-        </FrameLayout>
-
-    </com.google.android.material.card.MaterialCardView>
-
-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="24dp"
-        android:layout_marginEnd="24dp"
-        android:layout_marginBottom="24dp"
-        app:cardBackgroundColor="@color/white"
-        app:cardCornerRadius="12dp"
-        app:cardElevation="0dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="80dp"
-                android:layout_marginStart="48dp"
-                android:layout_marginTop="48dp"
-                android:layout_marginEnd="48dp"
-                android:background="@drawable/shape_search"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:layout_width="32dp"
-                    android:layout_height="32dp"
-                    android:layout_marginStart="24dp"
-                    android:layout_marginEnd="24dp"
-                    android:src="@drawable/ic_search_food" />
-
-                <EditText
-                    android:id="@+id/etInputFood"
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:layout_marginEnd="24dp"
-                    android:background="@null"
-                    android:fontFamily="sans-serif-medium"
-                    android:hint="输入食材名称"
-                    android:imeOptions="actionSearch"
-                    android:inputType="text"
-                    android:maxLines="1"
-                    android:paddingStart="1dp"
-                    android:paddingEnd="1dp"
-                    android:text=""
-                    android:textColor="@color/food_name_black"
-                    android:textColorHint="#B4BEC8"
-                    android:textSize="30sp"
-                    tools:ignore="Autofill,HardcodedText,TextFields" />
-            </LinearLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_marginTop="24dp"
-                android:layout_weight="1">
-
-                <com.scwang.smart.refresh.layout.SmartRefreshLayout
-                    android:id="@+id/refreshLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-
-                    <com.scwang.smart.refresh.header.ClassicsHeader
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
-
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/rvSearch"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:clipToPadding="false"
-                        android:overScrollMode="never"
-                        android:paddingStart="36dp"
-                        android:paddingTop="12dp"
-                        android:paddingEnd="36dp"
-                        android:paddingBottom="12dp"
-                        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-                        app:spanCount="2"
-                        tools:itemCount="10"
-                        tools:listitem="@layout/list_item_search" />
-
-                    <com.scwang.smart.refresh.footer.ClassicsFooter
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
-
-                </com.scwang.smart.refresh.layout.SmartRefreshLayout>
-
-                <include
-                    android:id="@+id/include"
-                    layout="@layout/layout_empty_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone" />
-
-            </FrameLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnClearEmpty"
-                    android:layout_width="0dp"
-                    android:layout_height="80dp"
-                    android:layout_marginStart="48dp"
-                    android:layout_marginTop="24dp"
-                    android:layout_marginEnd="24dp"
-                    android:layout_marginBottom="24dp"
-                    android:layout_weight="1"
-                    android:backgroundTint="@color/bg_page"
-                    android:ellipsize="end"
-                    android:insetTop="0dp"
-                    android:insetBottom="0dp"
-                    android:maxLines="1"
-                    android:text="清空"
-                    android:textColor="@color/white"
-                    android:textSize="30sp"
-                    android:textStyle="bold"
-                    app:cornerRadius="12dp"
-                    app:elevation="0dp"
-                    tools:ignore="HardcodedText" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btnConfirm"
-                    android:layout_width="0dp"
-                    android:layout_height="80dp"
-                    android:layout_marginStart="24dp"
-                    android:layout_marginTop="24dp"
-                    android:layout_marginEnd="48dp"
-                    android:layout_marginBottom="24dp"
-                    android:layout_weight="1"
-                    android:backgroundTint="@color/bg_page"
-                    android:ellipsize="end"
-                    android:insetTop="0dp"
-                    android:insetBottom="0dp"
-                    android:maxLines="1"
-                    android:text="确定"
-                    android:textColor="@color/white"
-                    android:textSize="30sp"
-                    android:textStyle="bold"
-                    app:cornerRadius="12dp"
-                    app:elevation="0dp"
-                    tools:ignore="HardcodedText" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </com.google.android.material.card.MaterialCardView>
-</LinearLayout>

app/src/main/res/layout-sw600dp/custom_toast.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@drawable/shape_dialog">
-
-    <TextView
-        android:id="@+id/tvMessage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:paddingStart="25dp"
-        android:paddingTop="13dp"
-        android:paddingBottom="13dp"
-        android:paddingEnd="25dp"
-        android:textColor="@color/white_f6"
-        android:textSize="32sp"
-        tools:text="暂无数据" />
-
-</FrameLayout>

app/src/main/res/layout-sw600dp/dialog_loading.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:paddingStart="20dp"
-    android:paddingTop="10dp"
-    android:paddingEnd="20dp"
-    android:paddingBottom="10dp"
-    android:background="@drawable/shape_dialog"
-    tools:ignore="MissingDefaultResource">
-
-    <ProgressBar
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:indeterminateTint="@color/white_f6" />
-
-    <TextView
-        android:id="@+id/tvMessage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
-        android:text="加载中……"
-        android:textColor="@color/white_f6"
-        android:textSize="26sp"
-        tools:ignore="HardcodedText" />
-</LinearLayout>

app/src/main/res/layout-sw600dp/layout_empty_view.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    android:layout_gravity="center"
-    android:orientation="vertical"
-    tools:ignore="MissingDefaultResource,UseCompoundDrawables">
-
-    <ImageView
-        android:id="@+id/ivEmptyIcon"
-        android:layout_width="250dp"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_empty_gray"
-        android:adjustViewBounds="true"
-        tools:ignore="ContentDescription" />
-
-    <TextView
-        android:id="@+id/tvEmptyContent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/black999"
-        android:layout_marginTop="50dp"
-        android:textSize="50sp"
-        android:text="暂无数据"
-        tools:ignore="HardcodedText" />
-</LinearLayout>

app/src/main/res/layout-sw600dp/list_item_log.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="60dp">
-
-    <TextView
-        android:id="@+id/tvLogName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="30dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="@color/white"
-        android:textSize="20sp"
-        tools:text="2025-11-18" />
-
-    <com.google.android.material.divider.MaterialDivider
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_gravity="bottom"
-        android:layout_marginHorizontal="30dp"
-        app:dividerColor="@color/gray_edit" />
-</FrameLayout>

app/src/main/res/layout-sw600dp/list_item_search.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"-->
-<!--    xmlns:tools="http://schemas.android.com/tools"-->
-<!--    android:layout_width="match_parent"-->
-<!--    android:layout_height="80dp"-->
-<!--    android:layout_margin="12dp">-->
-
-<!--    <TextView-->
-<!--        android:id="@+id/btnFoodName"-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        android:layout_gravity="center"-->
-<!--        android:ellipsize="end"-->
-<!--        android:gravity="center"-->
-<!--        android:maxLines="1"-->
-<!--        android:paddingStart="5dp"-->
-<!--        android:paddingEnd="5dp"-->
-<!--        android:fontFamily="sans-serif-medium"-->
-<!--        android:textColor="@color/black999"-->
-<!--        android:textSize="30sp"-->
-<!--        tools:text="土豆丝" />-->
-<!--</FrameLayout>-->
-<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/btnFoodName"
-    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-    android:layout_width="match_parent"
-    android:layout_height="80dp"
-    android:layout_margin="12dp"
-    android:ellipsize="end"
-    android:fontFamily="sans-serif-medium"
-    android:gravity="center"
-    android:insetTop="0dp"
-    android:insetBottom="0dp"
-    android:maxLines="1"
-    app:paddingStart="5dp"
-    app:paddingEnd="5dp"
-    android:insetRight="0dp"
-    android:insetLeft="0dp"
-    android:paddingHorizontal="8dp"
-    android:textColor="@color/black999"
-    android:textSize="30sp"
-    app:cornerRadius="12dp"
-    app:strokeWidth="2dp"
-    tools:text="土豆丝土豆丝土豆丝土豆丝土豆丝土豆丝"
-    />
-

app/src/main/res/layout-sw600dp/list_item_shelf.xml

@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/layoutCard"
-    android:layout_width="match_parent"
-    android:layout_height="216dp"
-    android:layout_margin="12dp"
-    app:cardBackgroundColor="@color/bg_card_blue"
-    app:cardCornerRadius="12dp"
-    app:cardElevation="0dp"
-    app:rippleColor="#B0BEC5">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-        android:padding="24dp">
-
-        <TextView
-            android:id="@+id/tvShelfName"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="@color/shelf_name_white"
-            android:textSize="20sp"
-            android:textStyle="bold"
-            tools:text="货架-01" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1" />
-
-        <TextView
-            android:id="@+id/tvFoodName"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@color/white"
-            android:textSize="30sp"
-            android:textStyle="bold"
-            tools:text="空" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="0.833" />
-
-        <TextView
-            android:id="@+id/tvFoodWeight"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@color/food_weight_blue"
-            android:textSize="24sp"
-            android:textStyle="bold"
-            tools:text="0千克" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="0.933" />
-
-        <TextView
-            android:id="@+id/tvStoreDate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@color/food_weight_blue"
-            android:textSize="18sp"
-            tools:text="-" />
-    </LinearLayout>
-
-    <ImageView
-        android:id="@+id/ivStaleFood"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:src="@drawable/ic_stale_food_512"
-        android:layout_gravity="top|end"
-        tools:ignore="ContentDescription"
-        android:visibility="gone"/>
-
-</com.google.android.material.card.MaterialCardView>

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

@@ -5,39 +5,34 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:fitsSystemWindows="false"
     tools:background="@color/bg_page">
 
     <FrameLayout
         android:id="@+id/flStatusBar"
         android:layout_width="match_parent"
-        android:layout_height="30dp">
-<!--        android:paddingTop="9dp"-->
+        android:layout_height="68dp"
+        android:paddingStart="25dp"
+        android:paddingEnd="25dp"
+        android:paddingTop="25dp">
 
         <TextView
             android:id="@+id/tv_left_status"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
+            android:layout_height="wrap_content"
             android:textColor="@color/white"
             android:layout_gravity="start"
-            android:textSize="12sp"
-            android:paddingStart="12dp"
-            android:paddingEnd="0dp"
+            android:textSize="24sp"
             android:fontFamily="sans-serif-medium"
-            tools:text="1-1冷藏柜  -2°C / 87%" />
+            android:text="            " />
 
         <TextView
             android:id="@+id/tv_right_status"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
+            android:layout_height="wrap_content"
             android:textColor="@color/white"
             android:layout_gravity="end"
             android:fontFamily="sans-serif-medium"
-            android:textSize="12sp"
-            android:paddingStart="0dp"
-            android:paddingEnd="12dp"
+            android:textSize="24sp"
             tools:text="6月22日 星期日  15:26:33" />
     </FrameLayout>
 

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

@@ -13,8 +13,8 @@
         app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
         app:spanCount="2"
         android:overScrollMode="never"
-        android:layout_marginStart="6dp"
-        android:layout_marginEnd="6dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
         tools:listitem="@layout/list_item_shelf"/>
 
 
@@ -24,12 +24,4 @@
         android:layout_height="match_parent"
         layout="@layout/layout_empty_view"
         android:visibility="gone"/>
-
-<!--    <include-->
-<!--        android:id="@+id/includeLight"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        layout="@layout/layout_light_switch"-->
-<!--        android:visibility="gone"/>-->
-
 </FrameLayout>

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

@@ -1,32 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout  xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/llDeviceInit"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-    android:orientation="vertical">
+        android:orientation="vertical"
+        android:visibility="gone">
 
         <ImageView
-        android:layout_width="225dp"
-        android:layout_height="215dp"
+            android:layout_width="450dp"
+            android:layout_height="430dp"
             android:layout_gravity="center_horizontal"
-        android:layout_marginTop="75dp"
+            android:layout_marginTop="150dp"
             android:src="@drawable/img_init"
             tools:ignore="ContentDescription"
             android:visibility="invisible"/>
 
         <TextView
             android:id="@+id/btnInit"
-        android:layout_width="150dp"
+            android:layout_width="300dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-        android:layout_marginTop="50dp"
+            android:layout_marginTop="100dp"
             android:background="@drawable/bg_init_button"
             android:gravity="center"
             android:padding="10dp"
             android:text="设备初始化"
             android:textColor="@color/white"
-        android:textSize="15sp"
+            android:textSize="30sp"
             android:textStyle="bold"
             android:visibility="visible"
             tools:ignore="HardcodedText" />
@@ -38,11 +44,102 @@
 
         <ImageView
             android:id="@+id/ivQrCode"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
+            android:layout_width="200dp"
+            android:layout_height="200dp"
             android:layout_gravity="center_horizontal|bottom"
-        android:layout_marginBottom="25dp"
+            android:layout_marginBottom="50dp"
             tools:ignore="ContentDescription"
             tools:src="@mipmap/ic_logo512" />
 
     </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/llNetwork"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center">
+
+        <!-- Loading 动画容器 -->
+        <LinearLayout
+            android:id="@+id/llLoading"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:visibility="visible"
+            android:layout_marginTop="260dp">
+
+            <!-- 加载动画 -->
+            <ImageView
+                android:id="@+id/ivLoading"
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:src="@drawable/loading"
+                android:contentDescription="加载中" />
+
+            <!-- 倒计时文字 -->
+            <TextView
+                android:id="@+id/tvCountdown"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="60秒"
+                android:textSize="40sp"
+                android:textColor="@color/white"
+                android:textStyle="bold"
+                android:layout_marginTop="50dp" />
+
+            <!-- 提示文字 -->
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="网络连接检测中，请稍后……"
+                android:textSize="22sp"
+                android:textColor="@color/white"
+                android:layout_marginTop="20dp" />
+
+        </LinearLayout>
+
+        <!-- 连接网络按钮容器 -->
+        <LinearLayout
+            android:id="@+id/llNetworkButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:visibility="gone">
+
+            <!-- 网络错误图标 -->
+            <ImageView
+                android:layout_width="140dp"
+                android:layout_height="140dp"
+                android:src="@drawable/ic_network_error"
+                android:contentDescription="网络连接失败"
+                android:layout_marginBottom="30dp" />
+
+            <!-- 连接失败提示 -->
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="网络连接失败"
+                android:textSize="36sp"
+                android:textColor="@color/white"
+                android:textStyle="bold"
+                android:layout_marginBottom="40dp" />
+
+            <!-- 连接网络按钮 -->
+            <Button
+                android:id="@+id/btnConnectNetwork"
+                android:layout_width="350dp"
+                android:layout_height="70dp"
+                android:text="连接网络"
+                android:textSize="24sp"
+                android:textStyle="bold"
+                android:textColor="@android:color/white"
+                android:background="@drawable/btn_connect_network" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</FrameLayout>

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

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+<LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -33,14 +38,61 @@
             android:id="@+id/btnFind"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:textSize="12sp"
+            android:layout_marginEnd="15dp"
+            android:textSize="18sp"
             android:layout_gravity="end|center_vertical"
             android:text="查找1001指令"/>
     </FrameLayout>
 
+    <EditText
+        android:id="@+id/etSearch"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_marginHorizontal="12dp"
+        android:layout_marginTop="8dp"
+        android:background="@android:color/white"
+        android:hint="搜索日志..."
+        android:paddingHorizontal="12dp"
+        android:textSize="14sp"
+        android:singleLine="true"
+        tools:ignore="Autofill,TextFields" />
+
+    <HorizontalScrollView
+        android:id="@+id/hsvTimeNav"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_marginTop="8dp"
+        android:scrollbars="none">
+
+        <LinearLayout
+            android:id="@+id/llTimeNav"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            android:paddingHorizontal="12dp" />
+    </HorizontalScrollView>
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvLogList"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 </LinearLayout>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fabJump"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:src="@android:drawable/ic_menu_sort_by_size"
+        app:fabSize="normal"
+        tools:ignore="ContentDescription" />
+
+    <ProgressBar
+        android:id="@+id/progressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone" />
+
+</FrameLayout>

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

@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:background="@color/bg_page">
-
-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="260dp"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="6dp"
-        android:layout_marginEnd="12dp"
-        app:cardBackgroundColor="@color/white"
-        app:cardCornerRadius="6dp"
-        app:cardElevation="0dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:padding="10dp">
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:gravity="center_vertical">
-
-                <ImageView
-                    android:id="@+id/ivBack"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:layout_gravity="top|start"
-                    android:layout_marginTop="12dp"
-                    android:layout_marginStart="12dp"
-                    android:src="@drawable/ic_back_512"
-                    tools:ignore="ContentDescription" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="28sp"
-                    android:layout_gravity="center"
-                    android:text="设置"
-                    android:textColor="@color/black"/>
-
-            </FrameLayout>
-
-<!--            <EditText-->
-<!--                android:id="@+id/etInputCmdPrefix"-->
-<!--                android:layout_width="match_parent"-->
-<!--                android:layout_height="60dp"-->
-<!--                android:hint="请输入命令"-->
-<!--                android:maxLines="1"-->
-<!--                android:text=""-->
-<!--                android:textSize="22sp" />-->
-
-            <EditText
-                android:id="@+id/etInputCmd"
-                android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:hint="请输入命令内容"
-                android:maxLines="1"
-                android:textSize="22sp" />
-
-            <Button
-                android:id="@+id/btnSendCmd"
-                android:layout_width="180dp"
-                android:layout_height="60dp"
-                android:textSize="22sp"
-                android:layout_gravity="center"
-                android:layout_marginTop="30dp"
-                android:text="发送命令" />
-        </LinearLayout>
-    </com.google.android.material.card.MaterialCardView>
-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginBottom="12dp"
-        app:cardBackgroundColor="@color/white"
-        app:cardCornerRadius="6dp"
-        app:cardElevation="0dp">
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="10dp">
-
-                <TextView
-                    android:id="@+id/tvCmdRecord"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:textSize="20sp"
-                    android:text=""/>
-
-            </LinearLayout>
-        </ScrollView>
-    </com.google.android.material.card.MaterialCardView>
-
-</LinearLayout>

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

@@ -9,12 +9,12 @@
 
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
-        android:layout_height="190dp"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="6dp"
-        android:layout_marginEnd="12dp"
+        android:layout_height="376dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="24dp"
         app:cardBackgroundColor="@color/white"
-        app:cardCornerRadius="6dp"
+        app:cardCornerRadius="12dp"
         app:cardElevation="0dp">
 
         <FrameLayout
@@ -25,20 +25,20 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_gravity="center"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="12dp"
+                android:layout_marginStart="24dp"
+                android:layout_marginEnd="24dp"
                 android:gravity="center_horizontal"
                 android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/tvShelfName"
                     android:layout_width="wrap_content"
-                    android:layout_height="30dp"
-                    android:layout_marginTop="12dp"
+                    android:layout_height="60dp"
+                    android:layout_marginTop="24dp"
                     android:fontFamily="sans-serif-medium"
                     android:gravity="center"
                     android:textColor="@color/bg_page"
-                    android:textSize="15sp"
+                    android:textSize="30sp"
                     tools:text="货架 - 03" />
 
                 <Space
@@ -54,7 +54,7 @@
                     android:includeFontPadding="false"
                     android:maxLines="1"
                     android:textColor="@color/food_weight_orange"
-                    android:textSize="30sp"
+                    android:textSize="60sp"
                     android:textStyle="bold"
                     tools:text="1506克" />
 
@@ -70,7 +70,7 @@
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:textColor="@color/food_name_black"
-                    android:textSize="18sp"
+                    android:textSize="36sp"
                     android:textStyle="bold"
                     tools:text="金针菇" />
 
@@ -82,11 +82,11 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnClearZero"
-                android:layout_width="65dp"
-                android:layout_height="30dp"
+                android:layout_width="120dp"
+                android:layout_height="60dp"
                 android:layout_gravity="top|end"
-                android:layout_marginTop="12dp"
-                android:layout_marginEnd="12dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="24dp"
                 android:backgroundTint="@color/bg_page"
                 android:ellipsize="end"
                 android:fontFamily="sans-serif-medium"
@@ -95,21 +95,20 @@
                 android:maxLines="1"
                 android:text="清零"
                 android:textColor="@color/white"
-                android:textSize="15sp"
-                app:cornerRadius="6dp"
+                android:textSize="30sp"
+                app:cornerRadius="12dp"
                 app:elevation="0dp"
                 tools:ignore="HardcodedText" />
 
             <ImageView
                 android:id="@+id/ivBack"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
                 android:layout_gravity="top|start"
-                android:layout_marginTop="12dp"
-                android:layout_marginStart="12dp"
+                android:layout_marginStart="24dp"
+                android:layout_marginTop="24dp"
                 android:src="@drawable/ic_back_512"
                 tools:ignore="ContentDescription" />
-
         </FrameLayout>
 
     </com.google.android.material.card.MaterialCardView>
@@ -117,12 +116,12 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginBottom="12dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         app:cardBackgroundColor="@color/white"
-        app:cardCornerRadius="6dp"
+        app:cardCornerRadius="12dp"
         app:cardElevation="0dp">
 
         <LinearLayout
@@ -132,26 +131,26 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="16dp"
-                android:layout_marginEnd="16dp"
+                android:layout_height="80dp"
+                android:layout_marginStart="48dp"
+                android:layout_marginTop="48dp"
+                android:layout_marginEnd="48dp"
                 android:background="@drawable/shape_search"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
                 <ImageView
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginEnd="12dp"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    android:layout_marginStart="24dp"
+                    android:layout_marginEnd="24dp"
                     android:src="@drawable/ic_search_food" />
 
                 <EditText
                     android:id="@+id/etInputFood"
                     android:layout_width="match_parent"
-                    android:layout_height="36dp"
-                    android:layout_marginEnd="12dp"
+                    android:layout_height="60dp"
+                    android:layout_marginEnd="24dp"
                     android:background="@null"
                     android:fontFamily="sans-serif-medium"
                     android:hint="输入食材名称"
@@ -163,14 +162,14 @@
                     android:text=""
                     android:textColor="@color/food_name_black"
                     android:textColorHint="#B4BEC8"
-                    android:textSize="15sp"
+                    android:textSize="30sp"
                     tools:ignore="Autofill,HardcodedText,TextFields" />
             </LinearLayout>
 
             <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="24dp"
                 android:layout_weight="1">
 
                 <com.scwang.smart.refresh.layout.SmartRefreshLayout
@@ -188,10 +187,10 @@
                         android:layout_height="match_parent"
                         android:clipToPadding="false"
                         android:overScrollMode="never"
-                        android:paddingStart="12dp"
-                        android:paddingTop="4dp"
-                        android:paddingEnd="12dp"
-                        android:paddingBottom="4dp"
+                        android:paddingStart="36dp"
+                        android:paddingTop="12dp"
+                        android:paddingEnd="36dp"
+                        android:paddingBottom="12dp"
                         app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
                         app:spanCount="2"
                         tools:itemCount="10"
@@ -209,23 +208,24 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:visibility="gone" />
+
             </FrameLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:gravity="center_vertical">
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnClearEmpty"
                     android:layout_width="0dp"
+                    android:layout_height="80dp"
+                    android:layout_marginStart="48dp"
+                    android:layout_marginTop="24dp"
+                    android:layout_marginEnd="24dp"
+                    android:layout_marginBottom="24dp"
                     android:layout_weight="1"
-                    android:layout_height="40dp"
-                    android:layout_marginStart="24dp"
-                    android:layout_marginTop="12dp"
-                    android:layout_marginEnd="12dp"
-                    android:layout_marginBottom="12dp"
                     android:backgroundTint="@color/bg_page"
                     android:ellipsize="end"
                     android:insetTop="0dp"
@@ -233,22 +233,21 @@
                     android:maxLines="1"
                     android:text="清空"
                     android:textColor="@color/white"
-                    android:textSize="15sp"
+                    android:textSize="30sp"
                     android:textStyle="bold"
-                    app:cornerRadius="6dp"
+                    app:cornerRadius="12dp"
                     app:elevation="0dp"
                     tools:ignore="HardcodedText" />
 
-
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnConfirm"
                     android:layout_width="0dp"
+                    android:layout_height="80dp"
+                    android:layout_marginStart="24dp"
+                    android:layout_marginTop="24dp"
+                    android:layout_marginEnd="48dp"
+                    android:layout_marginBottom="24dp"
                     android:layout_weight="1"
-                    android:layout_height="40dp"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginTop="12dp"
-                    android:layout_marginEnd="24dp"
-                    android:layout_marginBottom="12dp"
                     android:backgroundTint="@color/bg_page"
                     android:ellipsize="end"
                     android:insetTop="0dp"
@@ -256,11 +255,12 @@
                     android:maxLines="1"
                     android:text="确定"
                     android:textColor="@color/white"
-                    android:textSize="15sp"
+                    android:textSize="30sp"
                     android:textStyle="bold"
-                    app:cornerRadius="6dp"
+                    app:cornerRadius="12dp"
                     app:elevation="0dp"
                     tools:ignore="HardcodedText" />
+
             </LinearLayout>
 
         </LinearLayout>

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

@@ -11,12 +11,12 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:gravity="center"
-        android:paddingStart="12dp"
-        android:paddingTop="6dp"
-        android:paddingBottom="6dp"
-        android:paddingEnd="12dp"
+        android:paddingStart="25dp"
+        android:paddingTop="13dp"
+        android:paddingBottom="13dp"
+        android:paddingEnd="25dp"
         android:textColor="@color/white_f6"
-        android:textSize="16sp"
+        android:textSize="32sp"
         tools:text="暂无数据" />
 
 </FrameLayout>

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

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="600dp"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_white_radius12"
+    android:orientation="vertical"
+    android:paddingHorizontal="40dp"
+    android:paddingVertical="36dp">
+
+    <!-- 标题 -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="环境切换"
+        android:textColor="#ff141428"
+        android:textSize="36sp"
+        android:textStyle="bold" />
+
+    <!-- 分割线 -->
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:layout_marginTop="24dp"
+        android:background="#FFDCDCF0" />
+
+    <!-- 环境选项 -->
+    <RadioGroup
+        android:id="@+id/rgEnv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        android:orientation="vertical">
+
+        <RadioButton
+            android:id="@+id/rbTest"
+            android:layout_width="match_parent"
+            android:layout_height="72dp"
+            android:gravity="center_vertical"
+            android:paddingStart="16dp"
+            android:text="测试环境"
+            android:textColor="#ff141428"
+            android:textSize="28sp" />
+
+        <RadioButton
+            android:id="@+id/rbUat"
+            android:layout_width="match_parent"
+            android:layout_height="72dp"
+            android:gravity="center_vertical"
+            android:paddingStart="16dp"
+            android:text="UAT 环境"
+            android:textColor="#ff141428"
+            android:textSize="28sp" />
+
+        <RadioButton
+            android:id="@+id/rbProd"
+            android:layout_width="match_parent"
+            android:layout_height="72dp"
+            android:gravity="center_vertical"
+            android:paddingStart="16dp"
+            android:text="生产环境"
+            android:textColor="#ff141428"
+            android:textSize="28sp" />
+
+    </RadioGroup>
+
+    <!-- 分割线 -->
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:layout_marginTop="24dp"
+        android:background="#FFDCDCF0" />
+
+    <!-- 底部按钮 -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="88dp"
+        android:layout_marginTop="24dp"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btnCancel"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginEnd="20dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_cancel"
+            android:text="取消"
+            android:textColor="@color/bg_card_blue"
+            android:textSize="28sp" />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btnConfirm"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginStart="20dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_confirm"
+            android:text="确认"
+            android:textColor="#FFFFFF"
+            android:textSize="28sp" />
+
+    </LinearLayout>
+
+</LinearLayout>

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

@@ -5,25 +5,25 @@
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingStart="10dp"
-    android:paddingTop="5dp"
-    android:paddingEnd="10dp"
-    android:paddingBottom="5dp"
-    android:background="@drawable/shape_dialog_small"
+    android:paddingStart="20dp"
+    android:paddingTop="10dp"
+    android:paddingEnd="20dp"
+    android:paddingBottom="10dp"
+    android:background="@drawable/shape_dialog"
     tools:ignore="MissingDefaultResource">
 
     <ProgressBar
-        android:layout_width="26dp"
-        android:layout_height="26dp"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
         android:indeterminateTint="@color/white_f6" />
 
     <TextView
         android:id="@+id/tvMessage"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="5dp"
+        android:layout_marginStart="10dp"
         android:text="加载中……"
         android:textColor="@color/white_f6"
-        android:textSize="14sp"
+        android:textSize="26sp"
         tools:ignore="HardcodedText" />
 </LinearLayout>

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

@@ -10,7 +10,7 @@
 
     <ImageView
         android:id="@+id/ivEmptyIcon"
-        android:layout_width="120dp"
+        android:layout_width="250dp"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_empty_gray"
         android:adjustViewBounds="true"
@@ -21,8 +21,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/black999"
-        android:layout_marginTop="20dp"
-        android:textSize="20sp"
+        android:layout_marginTop="50dp"
+        android:textSize="50sp"
         android:text="暂无数据"
         tools:ignore="HardcodedText" />
 </LinearLayout>

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

@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="#DDFFFFFF">
-
-    <ImageView
-        android:id="@+id/ivLightHide"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:layout_marginVertical="10dp"
-        android:layout_marginEnd="10dp"
-        android:layout_gravity="end|center_vertical"
-        android:src="@drawable/close"/>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:orientation="horizontal"
-        android:gravity="center_vertical">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:text="继电器1"
-            android:layout_marginStart="50dp"
-            android:textColor="@color/black"/>
-
-        <TextView
-            android:id="@+id/btnLightOpen"
-            android:layout_width="80dp"
-            android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:text="开"
-            android:gravity="center"
-            android:background="@drawable/bg_init_button"
-            android:layout_marginStart="50dp"
-            android:textColor="@color/black"/>
-
-        <TextView
-            android:id="@+id/btnLightClose"
-            android:layout_width="80dp"
-            android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:text="关"
-            android:gravity="center"
-            android:background="@drawable/bg_init_button"
-            android:layout_marginStart="50dp"
-            android:textColor="@color/black"/>
-
-    </LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:orientation="horizontal"
-        android:gravity="center_vertical">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:text="继电器2"
-            android:layout_marginStart="50dp"
-            android:textColor="@color/black"/>
-
-        <TextView
-            android:id="@+id/btnLightOpen2"
-            android:layout_width="80dp"
-            android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:text="开"
-            android:gravity="center"
-            android:background="@drawable/bg_init_button"
-            android:layout_marginStart="50dp"
-            android:textColor="@color/black"/>
-
-        <TextView
-            android:id="@+id/btnLightClose2"
-            android:layout_width="80dp"
-            android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:text="关"
-            android:gravity="center"
-            android:background="@drawable/bg_init_button"
-            android:layout_marginStart="50dp"
-            android:textColor="@color/black"/>
-
-    </LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:orientation="horizontal"
-        android:gravity="center_vertical">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:text="继电器3"
-            android:layout_marginStart="50dp"
-            android:textColor="@color/black"/>
-
-        <TextView
-            android:id="@+id/btnLightOpen3"
-            android:layout_width="80dp"
-            android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:text="开"
-            android:gravity="center"
-            android:background="@drawable/bg_init_button"
-            android:layout_marginStart="50dp"
-            android:textColor="@color/black"/>
-
-        <TextView
-            android:id="@+id/btnLightClose3"
-            android:layout_width="80dp"
-            android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:text="关"
-            android:gravity="center"
-            android:background="@drawable/bg_init_button"
-            android:layout_marginStart="50dp"
-            android:textColor="@color/black"/>
-
-    </LinearLayout>
-
-</LinearLayout>

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

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"-->
+<?xml version="1.0" encoding="utf-8"?>
+<!--<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"-->
 <!--    xmlns:tools="http://schemas.android.com/tools"-->
 <!--    android:layout_width="match_parent"-->
 <!--    android:layout_height="80dp"-->
@@ -25,23 +26,23 @@
     android:id="@+id/btnFoodName"
     style="@style/Widget.MaterialComponents.Button.OutlinedButton"
     android:layout_width="match_parent"
-    android:layout_height="40dp"
-    android:layout_margin="6dp"
+    android:layout_height="80dp"
+    android:layout_margin="12dp"
     android:ellipsize="end"
     android:fontFamily="sans-serif-medium"
     android:gravity="center"
     android:insetTop="0dp"
     android:insetBottom="0dp"
     android:maxLines="1"
+    app:paddingStart="5dp"
+    app:paddingEnd="5dp"
     android:insetRight="0dp"
     android:insetLeft="0dp"
     android:paddingHorizontal="8dp"
     android:textColor="@color/black999"
-    android:textSize="15sp"
-    app:cornerRadius="6dp"
-    app:strokeWidth="1dp"
-    tools:text="土豆丝土豆丝土豆丝土豆丝土豆丝土豆丝" />
-    <!--    android:paddingHorizontal="2dp"-->
-    <!--    android:paddingLeft="5dp"-->
-    <!--    android:paddingRight="5dp"-->
+    android:textSize="30sp"
+    app:cornerRadius="12dp"
+    app:strokeWidth="2dp"
+    tools:text="土豆丝土豆丝土豆丝土豆丝土豆丝土豆丝"
+    />
 

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

@@ -4,11 +4,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/layoutCard"
     android:layout_width="match_parent"
-    android:layout_height="140dp"
-    android:layout_margin="6dp"
+    android:layout_height="216dp"
+    android:layout_margin="12dp"
     app:cardBackgroundColor="@color/bg_card_blue"
-    app:cardCornerRadius="6dp"
-    app:cardElevation="2dp"
+    app:cardCornerRadius="12dp"
+    app:cardElevation="0dp"
     app:rippleColor="#B0BEC5">
 
     <LinearLayout
@@ -16,14 +16,14 @@
         android:layout_height="match_parent"
         android:gravity="center_horizontal"
         android:orientation="vertical"
-        android:padding="12dp">
+        android:padding="24dp">
 
         <TextView
             android:id="@+id/tvShelfName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="@color/shelf_name_white"
-            android:textSize="12sp"
+            android:textSize="20sp"
             android:textStyle="bold"
             tools:text="货架-01" />
 
@@ -39,7 +39,7 @@
             android:ellipsize="end"
             android:maxLines="1"
             android:textColor="@color/white"
-            android:textSize="16sp"
+            android:textSize="30sp"
             android:textStyle="bold"
             tools:text="空" />
 
@@ -55,7 +55,7 @@
             android:ellipsize="end"
             android:maxLines="1"
             android:textColor="@color/food_weight_blue"
-            android:textSize="14sp"
+            android:textSize="24sp"
             android:textStyle="bold"
             tools:text="0千克" />
 
@@ -71,14 +71,14 @@
             android:ellipsize="end"
             android:maxLines="1"
             android:textColor="@color/food_weight_blue"
-            android:textSize="12sp"
+            android:textSize="18sp"
             tools:text="-" />
     </LinearLayout>
 
     <ImageView
         android:id="@+id/ivStaleFood"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
         android:src="@drawable/ic_stale_food_512"
         android:layout_gravity="top|end"
         tools:ignore="ContentDescription"

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

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="120dp"
+    android:layout_height="wrap_content"
+    android:background="@android:color/white"
+    android:elevation="8dp"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/tv_env_switch"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:gravity="center"
+        android:text="切换环境"
+        android:textColor="#333333"
+        android:textSize="14sp" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:background="#E0E0E0" />
+
+    <TextView
+        android:id="@+id/tv_log"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:gravity="center"
+        android:text="查看日志"
+        android:textColor="#333333"
+        android:textSize="14sp" />
+
+</LinearLayout>

app/src/test/java/com/shuwei/intelligent/shelves/serial/ScaleFrameParserTest.kt

@@ -0,0 +1,475 @@
+package com.shuwei.intelligent.shelves.serial
+
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Test
+
+/**
+ * ScaleFrameParser 单元测试
+ *
+ * 测试数据来源：秤心跳数据.md 中的实际抓包数据
+ * 关键验证点：重量使用 BCD 解码（而非十六进制），与旧代码存在差异
+ */
+class ScaleFrameParserTest {
+
+    private lateinit var parser: ScaleFrameParser
+
+    // ----------------------------------------------------------------
+    // 测试数据常量（来自 秤心跳数据.md）
+    // ----------------------------------------------------------------
+
+    /** 旧设备（12台秤）心跳帧1 */
+    private val OLD_HEARTBEAT_1 =
+        "D6DADEDB01010C0000000008000000020000800100008000000000010000800500008001000080030000800200008099180080721800800000000000000000000000000000000000000000010101015037414645333633333334333731373056322E313007FFFF"
+
+    /** 旧设备（12台秤）心跳帧2 */
+    private val OLD_HEARTBEAT_2 =
+        "D6DADEDB01010C0900000027170000122500007511000001000000090000001100000012000000430000000800008000150080591500800000000000000000000000000000000000000000010100005031323136334238423134303233303456322E313112FFFF"
+
+    /** 新设备（24台秤）心跳帧1 */
+    private val NEW_HEARTBEAT_1 =
+        "D6DADEDB0101189322000000000000053300001534000079230000611100000000000007000080030000000300000004000080010000000100008003000000180600004214008083130080741200800115008066130080501400800411008033120080631600800000000000000000000000000000000000000000010101015031463137334238423134303233303456322E313130FFFF"
+
+    /** 旧设备（12台秤）获取状态响应 */
+    private val OLD_STATUS =
+        "D6DADEDB0302010100000C1100000027170000122500007711000001000000110000001300000012000000430000001000008000150080441500805031323136334238423134303233303456322E313113FFFF"
+
+    /** 新设备（24台秤）获取状态响应 */
+    private val NEW_STATUS =
+        "D6DADEDB030201010101181422000037110000783100009033000054000080100000000100000028240000070000000100008006000080030000801806000009000000461100004014008081130080721200800115008064130080501400809810008033120080651600805031463137334238423134303233303456322E31314AFFFF"
+
+    @Before
+    fun setUp() {
+        parser = ScaleFrameParser()
+    }
+
+    // ================================================================
+    // 一、重量 BCD 解析测试
+    // ================================================================
+
+    /**
+     * 协议文档示例：13 10 00 00 = 1.013KG = 1013g
+     * 旧代码（hex）：0x1013 = 4115g  ← 错误
+     * 新代码（BCD）："00001013".toLong() = 1013g ← 正确
+     */
+    @Test
+    fun testWeight_protocolExample_1013g() {
+        val bytes = byteArrayOf(0x13, 0x10, 0x00, 0x00)
+        val result = parser.parseWeightBytes(bytes, 0)
+        assertEquals("协议示例 1.013KG 解析错误", 1013, result)
+    }
+
+    /**
+     * 协议文档示例：13 01 02 00 = 20.113KG = 20113g
+     * 旧代码（hex）：0x20113 = 131347... 越界  ← 错误
+     * 新代码（BCD）："00020113".toLong() = 20113g ← 正确
+     */
+    @Test
+    fun testWeight_protocolExample_20113g() {
+        val bytes = byteArrayOf(0x13, 0x01, 0x02, 0x00)
+        val result = parser.parseWeightBytes(bytes, 0)
+        assertEquals("协议示例 20.113KG 解析错误", 20113, result)
+    }
+
+    /**
+     * 协议文档示例：13 10 00 80 = -1.013KG = -1013g（负数，最高位为1）
+     */
+    @Test
+    fun testWeight_protocolExample_negative_1013g() {
+        val bytes = byteArrayOf(0x13, 0x10, 0x00, 0x80.toByte())
+        val result = parser.parseWeightBytes(bytes, 0)
+        assertEquals("协议示例 -1.013KG 解析错误", -1013, result)
+    }
+
+    /** 零重量 */
+    @Test
+    fun testWeight_zero() {
+        val bytes = byteArrayOf(0x00, 0x00, 0x00, 0x00)
+        assertEquals(0, parser.parseWeightBytes(bytes, 0))
+    }
+
+    /**
+     * 实际心跳数据：08 00 00 00 = 8g（正数，小值时 BCD 与 hex 相同）
+     */
+    @Test
+    fun testWeight_actual_8g() {
+        val bytes = byteArrayOf(0x08, 0x00, 0x00, 0x00)
+        assertEquals(8, parser.parseWeightBytes(bytes, 0))
+    }
+
+    /**
+     * 实际心跳数据：02 00 00 80 = -2g（负数小值）
+     */
+    @Test
+    fun testWeight_actual_negative_2g() {
+        val bytes = byteArrayOf(0x02, 0x00, 0x00, 0x80.toByte())
+        assertEquals(-2, parser.parseWeightBytes(bytes, 0))
+    }
+
+    /**
+     * 实际心跳数据：99 18 00 80 = -1899g
+     * 旧代码（hex）：-0x1899 = -6297g  ← 错误（差3倍多）
+     * 新代码（BCD）：-1899g ← 正确（约1.9KG货物）
+     */
+    @Test
+    fun testWeight_actual_negative_1899g() {
+        val bytes = byteArrayOf(0x99.toByte(), 0x18, 0x00, 0x80.toByte())
+        val result = parser.parseWeightBytes(bytes, 0)
+        assertEquals("心跳数据 -1899g 解析错误，旧代码会给出 -6297g", -1899, result)
+    }
+
+    /**
+     * 实际心跳数据：72 18 00 80 = -1872g
+     * 旧代码（hex）：-0x1872 = -6258g  ← 错误
+     * 新代码（BCD）：-1872g ← 正确
+     */
+    @Test
+    fun testWeight_actual_negative_1872g() {
+        val bytes = byteArrayOf(0x72, 0x18, 0x00, 0x80.toByte())
+        assertEquals(-1872, parser.parseWeightBytes(bytes, 0))
+    }
+
+    /**
+     * 实际状态数据：27 17 00 00 = 1727g
+     * 旧代码（hex）：0x1727 = 5927g  ← 错误（3.4倍）
+     * 新代码（BCD）：1727g ← 正确（约1.7KG货物，合理）
+     */
+    @Test
+    fun testWeight_actual_1727g() {
+        val bytes = byteArrayOf(0x27, 0x17, 0x00, 0x00)
+        val result = parser.parseWeightBytes(bytes, 0)
+        assertEquals("状态数据 1727g 解析错误，旧代码会给出 5927g", 1727, result)
+    }
+
+    /**
+     * 实际状态数据：12 25 00 00 = 2512g
+     * 旧代码（hex）：0x2512 = 9490g  ← 错误
+     * 新代码（BCD）：2512g ← 正确
+     */
+    @Test
+    fun testWeight_actual_2512g() {
+        val bytes = byteArrayOf(0x12, 0x25, 0x00, 0x00)
+        assertEquals(2512, parser.parseWeightBytes(bytes, 0))
+    }
+
+    /** 验证 offset 参数：从字节数组中间某位置解析 */
+    @Test
+    fun testWeight_withOffset() {
+        val bytes = byteArrayOf(
+            0x00, 0x00,              // 前缀，不参与解析
+            0x13, 0x10, 0x00, 0x00  // 1013g，从 offset=2 解析
+        )
+        assertEquals(1013, parser.parseWeightBytes(bytes, 2))
+    }
+
+    // ================================================================
+    // 二、帧结构解析测试（parseFrame）
+    // ================================================================
+
+    @Test
+    fun testParseFrame_oldHeartbeat1_basicFields() {
+        val frame = parser.parseFrame(OLD_HEARTBEAT_1)
+        assertNotNull("帧解析不应返回 null", frame)
+        frame!!
+        assertEquals("CMD 应为 0x01（心跳）", 0x01.toByte(), frame.cmd)
+        assertEquals("FLAG 应为 0x01（终端发起）", 0x01.toByte(), frame.flag)
+    }
+
+    @Test
+    fun testParseFrame_oldHeartbeat1_fixedBody() {
+        val frame = parser.parseFrame(OLD_HEARTBEAT_1)!!
+        // 37414645333633333334333731373056322E313007FFFF 前固定数据体
+        // 终端ID: 37 41 46 45 33 36 33 33 33 34 33 37 31 37 30 → "7AFE36333437170"
+        assertEquals("终端ID长度应为15", 15, frame.terminalId.length)
+        assertEquals("终端ID解析错误", "7AFE36333437170", frame.terminalId)
+        // 固件版本: 56 32 2E 31 30 → "V2.10"
+        assertEquals("固件版本解析错误", "V2.10", frame.firmwareVersion)
+        assertEquals("命令次数解析错误", 7, frame.cmdCount)
+    }
+
+    @Test
+    fun testParseFrame_oldHeartbeat2_fixedBody() {
+        val frame = parser.parseFrame(OLD_HEARTBEAT_2)!!
+        // 终端ID: 50 31 32 31 36 33 42 38 42 31 34 30 32 33 30 → "P12163B8B140230"
+        assertEquals("终端ID解析错误", "12163B8B1402304", frame.terminalId)
+        assertEquals("固件版本解析错误", "V2.11", frame.firmwareVersion)
+        assertEquals("命令次数解析错误", 18, frame.cmdCount)
+    }
+
+    @Test
+    fun testParseFrame_newHeartbeat1_fixedBody() {
+        val frame = parser.parseFrame(NEW_HEARTBEAT_1)!!
+        // 终端ID: 50 31 46 31 37 33 42 38 42 31 34 30 32 33 30 → "P1F173B8B140230"
+        assertEquals("新设备终端ID解析错误", "1F173B8B1402304", frame.terminalId)
+        assertEquals("新设备固件版本解析错误", "V2.11", frame.firmwareVersion)
+        assertEquals("新设备命令次数解析错误", 48, frame.cmdCount)
+    }
+
+    @Test
+    fun testParseFrame_invalidData_returnsNull() {
+        assertNull("空字符串应返回 null", parser.parseFrame(""))
+        assertNull("过短数据应返回 null", parser.parseFrame("D6DADEDB0101FFFF"))
+        assertNull("无效协议头应返回 null", parser.parseFrame("AABBCCDD0101FFFF"))
+    }
+
+    // ================================================================
+    // 三、心跳数据解析测试（parseHeartbeat）
+    // ================================================================
+
+    @Test
+    fun testHeartbeat_oldDevice_scaleCount() {
+        val frame = parser.parseFrame(OLD_HEARTBEAT_1)!!
+        val data = parser.parseHeartbeat(frame.rawBody)
+        assertNotNull("心跳数据不应为 null", data)
+        assertEquals("旧设备秤数量应为12", 12, data!!.scaleCount)
+    }
+
+    @Test
+    fun testHeartbeat_oldDevice_weights() {
+        val frame = parser.parseFrame(OLD_HEARTBEAT_1)!!
+        val data = parser.parseHeartbeat(frame.rawBody)!!
+        val weights = data.weights
+
+        assertEquals("秤列表大小应与秤数量一致", 12, weights.size)
+
+        // 秤1：00000000 → 0g
+        assertEquals("秤1重量", 0, weights[0].grams)
+        assertEquals("秤1编号", 1, weights[0].index)
+
+        // 秤2：08000000 → 8g
+        assertEquals("秤2重量", 8, weights[1].grams)
+
+        // 秤3：02000080 → -2g（负数）
+        assertEquals("秤3重量（去皮负值）", -2, weights[2].grams)
+
+        // 秤4：01000080 → -1g
+        assertEquals("秤4重量", -1, weights[3].grams)
+
+        // 秤5：00000000 → 0g
+        assertEquals("秤5重量", 0, weights[4].grams)
+
+        // 秤7：05000080 → -5g
+        assertEquals("秤7重量", -5, weights[6].grams)
+
+        // 秤11：99180080 → -1899g（BCD；旧代码 hex 会得到 -6297g）
+        assertEquals("秤11重量（BCD:-1899g，hex错误值:-6297g）", -1899, weights[10].grams)
+
+        // 秤12：72180080 → -1872g（BCD；旧代码 hex 会得到 -6258g）
+        assertEquals("秤12重量（BCD:-1872g，hex错误值:-6258g）", -1872, weights[11].grams)
+    }
+
+    @Test
+    fun testHeartbeat_oldDevice_lockStates() {
+        val frame = parser.parseFrame(OLD_HEARTBEAT_1)!!
+        val data = parser.parseHeartbeat(frame.rawBody)!!
+        assertEquals("锁1门状态应为开(1)", 1, data.lock1Door)
+        assertEquals("锁1锁状态应为开(1)", 1, data.lock1Lock)
+        assertEquals("锁2门状态应为开(1)", 1, data.lock2Door)
+        assertEquals("锁2锁状态应为开(1)", 1, data.lock2Lock)
+    }
+
+    @Test
+    fun testHeartbeat_oldDevice_temperature() {
+        val frame = parser.parseFrame(OLD_HEARTBEAT_1)!!
+        val data = parser.parseHeartbeat(frame.rawBody)!!
+        // 温度字节 0x50 = 80
+        assertEquals("温度字节应为 80（0x50）", 80, data.temperature)
+    }
+
+    @Test
+    fun testHeartbeat_newDevice_scaleCount() {
+        val frame = parser.parseFrame(NEW_HEARTBEAT_1)!!
+        val data = parser.parseHeartbeat(frame.rawBody)!!
+        assertEquals("新设备秤数量应为24", 24, data.scaleCount)
+        assertEquals("秤列表大小应为24", 24, data.weights.size)
+    }
+
+    @Test
+    fun testHeartbeat_newDevice_weight1() {
+        val frame = parser.parseFrame(NEW_HEARTBEAT_1)!!
+        val data = parser.parseHeartbeat(frame.rawBody)!!
+        // 秤1：93220000 → big-endian "00002293" → BCD 2293g
+        assertEquals("新设备秤1重量(BCD:2293g，hex错误值:8851g)", 2293, data.weights[0].grams)
+    }
+
+    @Test
+    fun testHeartbeat_newDevice_weight3() {
+        val frame = parser.parseFrame(NEW_HEARTBEAT_1)!!
+        val data = parser.parseHeartbeat(frame.rawBody)!!
+        // 秤3：05330000 → big-endian "00003305" → BCD 3305g
+        assertEquals("新设备秤3重量(BCD:3305g，hex错误值:13061g)", 3305, data.weights[2].grams)
+    }
+
+    @Test
+    fun testHeartbeat_weightKg() {
+        val weight = ScaleWeight(index = 1, grams = 1013)
+        assertEquals("kg 转换错误", 1.013, weight.kg, 0.0001)
+        val negWeight = ScaleWeight(index = 2, grams = -1899)
+        assertEquals("负重量 kg 转换错误", -1.899, negWeight.kg, 0.0001)
+    }
+
+    // ================================================================
+    // 四、获取状态数据解析测试（parseStatus）
+    // ================================================================
+
+    @Test
+    fun testStatus_oldDevice_lockStates() {
+        val frame = parser.parseFrame(OLD_STATUS)!!
+        assertEquals("CMD 应为 0x03（获取状态）", 0x03.toByte(), frame.cmd)
+        val data = parser.parseStatus(frame.rawBody)!!
+        assertEquals("锁1锁状态", 1, data.lock1Lock)
+        assertEquals("锁1门状态", 1, data.lock1Door)
+        assertEquals("锁2锁状态", 0, data.lock2Lock)
+        assertEquals("锁2门状态", 0, data.lock2Door)
+    }
+
+    @Test
+    fun testStatus_oldDevice_scaleCount() {
+        val frame = parser.parseFrame(OLD_STATUS)!!
+        val data = parser.parseStatus(frame.rawBody)!!
+        assertEquals("旧设备状态秤数量应为12", 12, data.scaleCount)
+    }
+
+    @Test
+    fun testStatus_oldDevice_weights() {
+        val frame = parser.parseFrame(OLD_STATUS)!!
+        val data = parser.parseStatus(frame.rawBody)!!
+        val weights = data.weights
+
+        // 秤1：11000000 → big-endian "00000011" → BCD 11g（hex也是17g，差异小但仍不同）
+        assertEquals("状态秤1重量(BCD:11g，hex:17g)", 11, weights[0].grams)
+
+        // 秤2：27170000 → big-endian "00001727" → BCD 1727g（hex:5927g，差异巨大）
+        assertEquals("状态秤2重量(BCD:1727g，hex错误值:5927g)", 1727, weights[1].grams)
+
+        // 秤3：12250000 → BCD 2512g（hex:9490g）
+        assertEquals("状态秤3重量(BCD:2512g，hex错误值:9490g)", 2512, weights[2].grams)
+
+        // 秤4：77110000 → BCD 1177g（hex:4471g）
+        assertEquals("状态秤4重量(BCD:1177g，hex错误值:4471g)", 1177, weights[3].grams)
+
+        // 秤5：01000000 → 1g
+        assertEquals("状态秤5重量", 1, weights[4].grams)
+
+        // 秤10：10000080 → -10g（负数）
+        assertEquals("状态秤10重量（去皮负值）", -10, weights[9].grams)
+
+        // 秤11：00150080 → big-endian "80001500"，清符号位 "00001500" → BCD -1500g
+        assertEquals("状态秤11重量(BCD:-1500g，hex:-5376g)", -1500, weights[10].grams)
+
+        // 秤12：44150080 → "00001544" → BCD -1544g
+        assertEquals("状态秤12重量(BCD:-1544g，hex:-5444g)", -1544, weights[11].grams)
+    }
+
+    @Test
+    fun testStatus_newDevice_scaleCount() {
+        val frame = parser.parseFrame(NEW_STATUS)!!
+        val data = parser.parseStatus(frame.rawBody)!!
+        assertEquals("新设备状态秤数量应为24", 24, data.scaleCount)
+    }
+
+    @Test
+    fun testStatus_newDevice_weight1() {
+        val frame = parser.parseFrame(NEW_STATUS)!!
+        val data = parser.parseStatus(frame.rawBody)!!
+        // 秤1：14220000 → big-endian "00002214" → BCD 2214g
+        assertEquals("新设备状态秤1重量(BCD:2214g)", 2214, data.weights[0].grams)
+    }
+
+    // ================================================================
+    // 五、分片拼装测试（appendData）
+    // ================================================================
+
+    @Test
+    fun testAppendData_completeFrame_returnedImmediately() {
+        val result = parser.appendData(OLD_HEARTBEAT_1)
+        assertNotNull("完整帧应直接返回", result)
+        assertEquals("返回的帧内容应完整", OLD_HEARTBEAT_1, result)
+    }
+
+    @Test
+    fun testAppendData_twoFragments() {
+        // 将完整帧从中间切分为两段
+        val mid = OLD_HEARTBEAT_1.length / 2
+        val part1 = OLD_HEARTBEAT_1.substring(0, mid)
+        val part2 = OLD_HEARTBEAT_1.substring(mid)
+
+        // 第一段（含帧头，不含帧尾）→ 应返回 null
+        val result1 = parser.appendData(part1)
+        assertNull("第一分片不应返回完整帧", result1)
+
+        // 第二段（含帧尾，不含帧头）→ 应拼装完成并返回完整帧
+        val result2 = parser.appendData(part2)
+        assertNotNull("第二分片拼装后应返回完整帧", result2)
+        assertEquals("拼装后帧内容应与原始数据一致", OLD_HEARTBEAT_1, result2)
+    }
+
+    @Test
+    fun testAppendData_threeFragments() {
+        // 将完整帧切成三段
+        val len = OLD_HEARTBEAT_1.length
+        val part1 = OLD_HEARTBEAT_1.substring(0, len / 3)
+        val part2 = OLD_HEARTBEAT_1.substring(len / 3, len * 2 / 3)
+        val part3 = OLD_HEARTBEAT_1.substring(len * 2 / 3)
+
+        assertNull("第1段不应返回完整帧", parser.appendData(part1))
+        assertNull("第2段不应返回完整帧", parser.appendData(part2))
+        val result = parser.appendData(part3)
+        assertNotNull("第3段拼装后应返回完整帧", result)
+        assertEquals("三段拼装结果应与原始数据一致", OLD_HEARTBEAT_1, result)
+    }
+
+    @Test
+    fun testAppendData_reset_clearsBuffer() {
+        val mid = OLD_HEARTBEAT_1.length / 2
+        // 先追加第一段（写入缓冲）
+        parser.appendData(OLD_HEARTBEAT_1.substring(0, mid))
+        // 重置后再追加完整帧，应正常返回
+        parser.reset()
+        val result = parser.appendData(OLD_HEARTBEAT_1)
+        assertNotNull("reset 后追加完整帧应正常返回", result)
+    }
+
+    @Test
+    fun testAppendData_newFrameAfterComplete() {
+        // 模拟连续两帧数据，第二帧紧跟在第一帧末尾
+        val twoFrames = OLD_HEARTBEAT_1 + OLD_HEARTBEAT_2
+        // 包含帧头和帧尾，应只返回第一帧
+        val result = parser.appendData(twoFrames)
+        assertNotNull("连续两帧中应能解析出完整帧", result)
+        assertTrue("应返回以协议头开头的帧", result!!.startsWith("D6DADEDB"))
+        assertTrue("应返回以协议尾结尾的帧", result.endsWith("FFFF"))
+    }
+
+    // ================================================================
+    // 六、端到端集成测试（appendData + parseFrame + parseHeartbeat）
+    // ================================================================
+
+    @Test
+    fun testEndToEnd_oldHeartbeat_fragmentedThenParse() {
+        val mid = OLD_HEARTBEAT_1.length / 2
+        parser.appendData(OLD_HEARTBEAT_1.substring(0, mid))
+        val frameHex = parser.appendData(OLD_HEARTBEAT_1.substring(mid))!!
+
+        val frame = parser.parseFrame(frameHex)!!
+        val data = parser.parseHeartbeat(frame.rawBody)!!
+
+        assertEquals(0x01.toByte(), frame.cmd)
+        assertEquals(12, data.scaleCount)
+        assertEquals(8, data.weights[1].grams)   // 秤2: 8g
+        assertEquals(-1899, data.weights[10].grams) // 秤11: -1899g
+        assertEquals("7AFE36333437170", frame.terminalId)
+    }
+
+    @Test
+    fun testEndToEnd_newHeartbeat_parseComplete() {
+        val frameHex = parser.appendData(NEW_HEARTBEAT_1)!!
+        val frame = parser.parseFrame(frameHex)!!
+        val data = parser.parseHeartbeat(frame.rawBody)!!
+
+        assertEquals(24, data.scaleCount)
+        assertEquals(2293, data.weights[0].grams)  // 秤1: 2293g
+        assertEquals("1F173B8B1402304", frame.terminalId)
+        assertEquals("V2.11", frame.firmwareVersion)
+    }
+}

秤心跳数据.md

@@ -0,0 +1,74 @@
+协议头 ：4 字节
+命令 ：1 字节 
+标志 ：1 字节 
+数据体 ：不同命令不固定，详细见下方 
+协议尾 ：2字节 
+ 
+
+协议头 ：0xD6 0xDA 0xDE 0xDB 
+命令： 
+◼ 0x00：终端激活（终端发起） 
+◼ 0x01：心跳（终端发起） 
+◼ 0x81：心跳（终端发起，当终端发送此命令时需要服务端存储串口屏显示信息） 
+◼ 0x02：开锁（服务端发起） 
+◼ 0x03：获取状态（服务端发起） 
+◼ 0x04：秤置零（服务端发起） 
+◼ 0x06：秤标定（服务端发起） 
+◼ 0x05：卡号上发（终端发起） 
+◼ 0x07：价签设置（服务端发起） 
+◼ 0x08：串口屏（服务端发起） 
+◼ 0x09：语音播报（服务端发起） 
+◼ 0x0A：价签（第二块串口屏/透传）设置（服务端发起） 
+◼ 0x0B：操作记录上传（终端发起） 
+◼ 0x0C：对时（终端发起） 
+◼ 0x0E：终端位置上报（终端发起） 
+◼ 0x0F：温控器控制（服务端发起） 
+◼ 0x10：温控信息上报（终端发起） 
+◼ 0x11：临时参数设置（服务端发起） 
+
+固定数据体 ：（终端ID ：15 字节，固件版本 ：5字节，命令次数 ：1字节）
+
+0x01心跳终端发起数据体内容格式：
+    秤数量 ：1 字节 
+    N个秤重量数据 ：N x 4字节 
+    物联卡号 ：20 字节 
+    锁1门状态 ：1 字节
+    锁1锁状态 ：1 字节
+    锁2门状态 ：1 字节
+    锁2锁状态 ：1 字节
+    温度 ：1 字节 
+    固定数据体 ：（终端ID ：15 字节，固件版本 ：5字节，命令次数 ：1字节）
+
+
+0x03获取状态服务端响应数据体内容格式：
+    锁1锁状态 ：1 字节
+    锁1门状态 ：1 字节
+    锁2锁状态 ：1 字节
+    锁2门状态 ：1 字节
+    秤数量 ：1 字节 
+    N个秤重量数据 ：N x 4字节 
+    温度 ：1 字节 
+    固定数据体 ：（终端ID ：15 字节，固件版本 ：5字节，命令次数 ：1字节）
+
+示例数据见下方----------------------------
+
+旧设备10台秤心跳数据：
+D6DADEDB01010C0000000008000000020000800100008000000000010000800500008001000080030000800200008099180080721800800000000000000000000000000000000000000000010101015037414645333633333334333731373056322E313007FFFF
+
+D6DADEDB01010C0900000027170000122500007511000001000000090000001100000012000000430000000800008000150080591500800000000000000000000000000000000000000000010100005031323136334238423134303233303456322E313112FFFF
+
+新设备15台秤心跳数据：
+D6DADEDB0101189322000000000000053300001534000079230000611100000000000007000080030000000300000004000080010000000100008003000000180600004214008083130080741200800115008066130080501400800411008033120080631600800000000000000000000000000000000000000000010101015031463137334238423134303233303456322E313130FFFF
+
+D6DADEDB0101181422000037110000823100009233000054000080100000000100000030240000050000000300008002000080050000802006000007000000441100004014008081130080721200800315008064130080521400809610008033120080631600800000000000000000000000000000000000000000010101015031463137334238423134303233303456322E313147FFFF
+
+D6DADEDB0101180635000075190000842800000100008014000080060000800100008004000080050000801500008007000000080000800700008003000000050000008118008054180080231800801018008059170080221800809418008075320080761900800000000000000000000000000000000000000000010101015033453137334238423134303233303456322E313139FFFF
+
+
+旧设备10台秤获取状态数据：
+D6DADEDB0302010100000C1100000027170000122500007711000001000000110000001300000012000000430000001000008000150080441500805031323136334238423134303233303456322E313113FFFF
+
+新设备15台秤获取状态数据：
+D6DADEDB030201010101180635000077190000842800000100008014000080040000800100008004000080050000801500008007000000080000800900008005000000030000008118008054180080231800801018008059170080221800809418008079320080761900805033453137334238423134303233303456322E31313CFFFF
+
+D6DADEDB030201010101181422000037110000783100009033000054000080100000000100000028240000070000000100008006000080030000801806000009000000461100004014008081130080721200800115008064130080501400809810008033120080651600805031463137334238423134303233303456322E31314AFFFF