refactor(HomeActivity): 修复内存泄漏并优化错误处理

1. 修复内存泄漏问题 - 在 onDestroy 中清理所有 Handler 回调 - 在 onDestroy 中释放 Dialog 引用 2. 增强类型安全 - updateUI 中增加类型检查和日志 - updateOverdueState 中增加完整的类型检查 3. 优化串口异常处理 - 串口数据处理异常时向用户提示 4. 消除代码重复 - 删除冗余的 saveShelfGoodsList 方法 - 定时任务直接调用 syncShelfGoodsToServer Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
refactor: 全面重构 HomeActivity 架构并修复多项 Bug
2026-04-01 14:19:45 +08:00 · 2026-04-01 11:26:05 +08:00 · 2026-04-01 10:18:00 +08:00 · 2026-03-31 19:16:56 +08:00 · 2026-03-31 14:06:04 +08:00 · 2026-03-31 10:58:32 +08:00
18 changed files with 995 additions and 636 deletions
@@ -44,6 +44,7 @@ android {
    }
    buildFeatures {
        viewBinding = true
+        buildConfig = true
    }

    ndkVersion = "29.0.13846066"
@@ -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"
+}
@@ -3,11 +3,10 @@ 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.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
@@ -25,22 +24,23 @@ 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.ProtocolConstants.C_TEMP_CMD
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.LEFT_SHELF_OPEN_CMD
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.RIGHT_SHELF_OPEN_CMD
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.START_TEMP_CTRL_CMD
+import com.shuwei.intelligent.shelves.serial.SerialFrameParser
 import com.shuwei.intelligent.shelves.serial.SerialPortManager
-import com.shuwei.intelligent.shelves.utils.HexUtils
+import com.shuwei.intelligent.shelves.serial.SerialProtocolHandler
 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 org.greenrobot.eventbus.EventBus
@@ -53,70 +53,66 @@ import java.util.Locale
 class HomeActivity : BaseActivity() {

    companion object {
-        private const val TAG = "HomeActivity"
-        private const val LOG_PREFIX = "receiveSerialPortData:收到"
-
        private const val MM_DD_EEEE__HH_MM_SS = "MM月dd日 EEEE  HH:mm:ss"
-
-        //协议头
-        const val HEADER = "D6DADEDB"
-
-        //协议尾
-        const val FOOTER = "FFFF"
-//        const val ACTIVE_CMD =
-//            "${HEADER}000281C5D70A7D428A4FA67B50F7DACA241938938B4B9CBD73673E9C8E7F2E15062D${FOOTER}"
-
-        const val LEFT_SHELF_OPEN_CMD =
-            "${HEADER}020101000000000000000000000000000000000000${FOOTER}"
-        const val RIGHT_SHELF_OPEN_CMD =
-            "${HEADER}020100010000000000000000000000000000000000${FOOTER}"
-
-        //const val TEMPERATURE_CMD = "${HEADER}1001${FOOTER}"
-
-        const val DEVICE_INFO_CMD = "${HEADER}0301000000000000000000000000${FOOTER}"
-
-        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 val list: MutableList<ShelfModel> = mutableListOf()
+
+    // 当前选中货架下标
+    private var shelfIndex = 0
+
+    // 当前温度（摄氏）
+    private var showTemperatureC = "0"
+
+    // 当前湿度
+    private var showHumidity = "0"
+
+    // 是否在点击货架时发送开锁指令；有门锁的部署点（如1楼餐厅）为 true，无门锁的部署点（如401室）为 false
    private var isNeedOpenLock = true

+    private var deviceName = ""
+
    private lateinit var binding: ActivityHomeBinding

    private val viewModel: NetViewModel by viewModels()

-    @SuppressLint("NotifyDataSetChanged", "HardwareIds")
+    // 串口协议解析器，通过回调通知本 Activity
+    private val serialProtocolHandler = SerialProtocolHandler(object : SerialProtocolHandler.Callback {
+        override fun onSendCmd(cmd: String) = sendCmd(cmd)
+
+        override fun onWeightUpdated(shelfNo: Int, weight: Int) {
+            if (shelfNo in 1..10 && list.size == 10) {
+                list.firstOrNull { it.deviceNo == shelfNo }?.let { model ->
+                    model.weight = weight.toDouble()
+                    val pos = list.indexOf(model)
+                    shelfAdapter.notifyItemChanged(pos)
+                    log("getWeightInfo: deviceNo=${model.deviceNo},realWeight=$weight")
+                    EventBus.getDefault().post(SendWeightEvent(model.deviceNo, weight))
+                }
+            }
+        }
+
+        override fun onTempReport(logMsg: String) {
+            updateLeftStatus(deviceName)
+            if (tipDialog == null) {
+                tipDialog = CommonDialog(this@HomeActivity).apply {
+                    dialogTitle = "温馨提示"
+                    confirmBlock = { logMsg.copyTextToClipboard(this@HomeActivity) }
+                }
+            }
+            if (tipDialog?.isShowing == false) {
+                tipDialog?.dialogContent = logMsg
+                tipDialog?.show()
+            }
+        }
+
+        override fun onLog(message: String) = log(message)
+    })
+
+    private val serialFrameParser = SerialFrameParser()
+
+    @SuppressLint("NotifyDataSetChanged")
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        binding = ActivityHomeBinding.inflate(layoutInflater)
@@ -124,27 +120,31 @@ class HomeActivity : BaseActivity() {
        setBackground()
        setContentView(binding.root)

-//        updateLeftStatus("-°C / -%")
        updateLeftStatus("")
-
        initRecyclerView()
+
+        // 串口初始化，独立协程，不阻塞网络状态监听
        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()
+                        runCatching { receiveSerialPortData(data) }
+                            .onFailure {
+                                it.printStackTrace()
+                                log("串口数据处理异常: ${it.message}")
+                                toast("串口数据处理异常，请检查设备连接")
                            }
                    }
                }
-                //SerialPortManager.send(DEVICE_INFO_CMD)
            }
-            repeatOnLifecycle(Lifecycle.State.CREATED) {
+        }
+
+        // 网络状态监听，独立协程，与串口初始化并行执行
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
                launch {
                    viewModel.getAccessTokenUiState.collect { state ->
                        when (state) {
@@ -165,61 +165,46 @@ class HomeActivity : BaseActivity() {
                        }
                    }
                }
+                launch {
+                    viewModel.updateOverdueStateUiState.collect { state ->
+                        if (state is UiState.Success<*>) {
+                            val respData = state.data as? com.shuwei.intelligent.shelves.net.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 fun getTokenSuccess(data: RespData<*>) {
        log("getTokenSuccess: $data")
        data.data?.let {
            App.accessToken = it.toString()
-            //UIUtils.toast(it.toString())
            viewModel.getShelfList(deviceId = App.deviceId)
        }
    }
@@ -232,25 +217,21 @@ 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
+        val 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)
@@ -267,355 +248,81 @@ 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 -> {}
-        }
+        // 重置无数据计时，并关闭已显示的超时提示弹窗
+        lastDataReceivedTime = System.currentTimeMillis()
+        noDataWarningDialog?.takeIf { it.isShowing }?.dismiss()
+        val frame = serialFrameParser.parse(srcData) ?: return
+        serialProtocolHandler.handle(frame)
    }

    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() {
+            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 {
+        // 清理 Handler 所有回调，防止内存泄漏
+        handler.removeCallbacksAndMessages(null)
+
+        // 关闭并释放 Dialog 引用，防止内存泄漏
+        tipDialog?.dismiss()
+        tipDialog = null
+        noDataWarningDialog?.dismiss()
+        noDataWarningDialog = null
+
        SerialPortManager.close()
-        }
-//        TaskManager.cancelTask()
        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) {
@@ -623,19 +330,26 @@ class HomeActivity : BaseActivity() {
                    LEFT_SHELF_OPEN_CMD
                else
                    RIGHT_SHELF_OPEN_CMD
-                        val openState = SerialPortManager.send(openCmd)
+                SerialPortManager.send(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,39 +358,14 @@ 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)
+            layoutManager = GridLayoutManager(this@HomeActivity, 2, GridLayoutManager.VERTICAL, false)
            adapter = shelfAdapter
-
            itemAnimator.let {
                if (it is DefaultItemAnimator) {
                    it.supportsChangeAnimations = false
@@ -685,10 +374,10 @@ class HomeActivity : BaseActivity() {
        }
    }

+    private val dateTimeFormatter by lazy { SimpleDateFormat(MM_DD_EEEE__HH_MM_SS, Locale.CHINA) }
+
    private fun updateDateTime() {
-        val sdf = SimpleDateFormat(MM_DD_EEEE__HH_MM_SS, Locale.CHINA)
-        val dateTime = sdf.format(Date())
-        updateRightStatus(dateTime)
+        updateRightStatus(dateTimeFormatter.format(Date()))
    }

    private val handler = Handler(Looper.getMainLooper())
@@ -703,24 +392,24 @@ class HomeActivity : BaseActivity() {
        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 +418,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 = ""
@@ -755,7 +439,7 @@ class HomeActivity : BaseActivity() {
     */
    private fun saveGoodsTask() {
        saveTaskJob = taskExecutor.startIntervalTaskWithInitialDelay(1 * 60 * 1000L, 5 * 60 * 1000L) {
-            saveShelfGoodsList()
+            syncShelfGoodsToServer()
        }
    }

@@ -771,8 +455,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,9 +472,11 @@ class HomeActivity : BaseActivity() {
            }
        }
    }
-    }

-    private fun saveShelfGoodsList() {
+    /**
+     * 构建 ShelfBody 并提交到服务端（被定时任务与 ShelfActivity 返回共用）
+     */
+    private fun syncShelfGoodsToServer() {
        log("performSync: list:${list.toJsonString()}")
        val submitList = list.sortedBy { it.deviceNo }
        submitList.forEach {
@@ -792,12 +484,8 @@ class HomeActivity : BaseActivity() {
                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
@@ -806,6 +494,4 @@ class HomeActivity : BaseActivity() {
        log("performSync: body:${body.toJsonString()}")
        viewModel.saveShelfGoodsList(body)
    }
-
-
 }
@@ -16,6 +16,7 @@ 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
@@ -63,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)
@@ -144,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>()
@@ -169,7 +175,7 @@ class InitActivity : BaseActivity() {
        if (config == null) {
            return false
        }
-        App.configUrl = config.appPackageUrl?:""
+        GlobalData.appBaseUrl = config.appPackageUrl?:""
        App.canteenId = config.canteenId?:""
        return true
    }
@@ -5,20 +5,24 @@ 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.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.activity.LogActivity
 import com.shuwei.intelligent.shelves.R
 import com.shuwei.intelligent.shelves.databinding.ActivityBaseBinding
+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.SerialPortManager
 import com.shuwei.intelligent.shelves.utils.FileLogger
 import com.shuwei.intelligent.shelves.utils.ext.clickWithDebounce
+import com.shuwei.intelligent.shelves.utils.ext.startActivity
 import kotlinx.coroutines.launch

 import androidx.core.view.WindowCompat
@@ -57,35 +61,19 @@ 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()
        }
+        binding.tvRightStatus.setOnDoubleClickListener {
+            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
-//
-//        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)
@@ -115,11 +103,15 @@ 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()
    }

+    /**
+     * 用户超时无操作时回调，默认空实现，子类按需覆写
+     */
+    open fun onUserInactive() {}
+
    override fun onUserInteraction() {
        super.onUserInteraction()
        //开灯
@@ -161,15 +153,27 @@ open class BaseActivity : AppCompatActivity() {
            val tag = binding.tvLeftStatus.tag?.toString()?.toBoolean() ?: true
            switchLight(tag.not())
        }
-        binding.tvRightStatus.clickWithDebounce {
-//            if (this is HomeActivity) {
-//                startActivity<LogActivity> {
-//                    putExtra(LogActivity.IS_LOG_DIR, true)
-//                }
-//                return@clickWithDebounce
-//            }
-//            startActivity<SettingActivity> { }
    }
+
+    private fun showRightStatusPopup(anchor: View) {
+        val menuBinding = PopupRightStatusMenuBinding.inflate(LayoutInflater.from(this))
+        val popup = PopupWindow(
+            menuBinding.root,
+            android.view.ViewGroup.LayoutParams.WRAP_CONTENT,
+            android.view.ViewGroup.LayoutParams.WRAP_CONTENT,
+            true
+        )
+        menuBinding.tvEnvSwitch.setOnClickListener {
+            popup.dismiss()
+            EnvSwitchDialog(this).show()
+        }
+        menuBinding.tvLog.setOnClickListener {
+            popup.dismiss()
+            startActivity<LogActivity> {
+                putExtra(LogActivity.IS_LOG_DIR, true)
+            }
+        }
+        popup.showAsDropDown(anchor)
    }


@@ -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()
+        }
+    }
+}
@@ -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()
@@ -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}")
            }
        }
-
    }
-
 }
@@ -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"

 }

@@ -0,0 +1,122 @@
+package com.shuwei.intelligent.shelves.serial
+
+/**
+ * 串口通信协议常量定义
+ * 统一管理所有协议头、协议尾、各类指令及帧解析偏移量
+ */
+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组） */
+    const val SHELF_SENSOR_COUNT = 12
+
+    /** 每组重量数据字节数（十六进制字符数） */
+    const val BYTES_PER_WEIGHT = 8
+
+    /** 温度字段字符长度 */
+    const val TEMPERATURE_FIELD_LEN = 2
+
+    /** 心跳帧最小有效长度 */
+    const val HEARTBEAT_MIN_LENGTH = 200
+
+    /** 心跳帧中温度字段起始偏移（经协议分析得出，前面含重量+其他传感器数据） */
+    const val HEARTBEAT_TEMPERATURE_START = 158
+
+    /** 激活请求体有效长度 */
+    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}"
+
+    /** 左货架开锁指令 */
+    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}"
+}
@@ -0,0 +1,80 @@
+package com.shuwei.intelligent.shelves.serial
+
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.FOOTER
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.HEADER
+
+/**
+ * 串口数据帧解析器
+ * 负责将串口原始分片数据拼装为完整协议帧
+ * 完整帧格式：[HEADER][CMD][BODY][FOOTER]
+ */
+class SerialFrameParser {
+
+    /** 数据帧缓冲区，用于跨分片拼装 */
+    private val buffer = StringBuilder()
+
+    /**
+     * 解析原始串口分片数据，尝试拼装为完整帧
+     * @param srcData 原始串口数据片段
+     * @return 完整数据帧字符串；帧不完整时返回 null
+     */
+    fun parse(srcData: String): String? {
+        val hasHeader = srcData.contains(HEADER)
+        val hasFooter = srcData.contains(FOOTER)
+
+        return when {
+            hasHeader && hasFooter -> parseCompleteInSingleChunk(srcData)
+            hasHeader && !hasFooter -> {
+                // 仅含帧头，等待后续分片
+                buffer.clear()
+                buffer.append(srcData.substring(srcData.lastIndexOf(HEADER))).append(",")
+                null
+            }
+            !hasHeader && !hasFooter -> {
+                // 中间分片，追加缓冲
+                buffer.append(srcData).append(",")
+                null
+            }
+            else -> {
+                // 仅含帧尾，与缓冲区拼接完整帧
+                val endIndex = srcData.indexOf(FOOTER) + FOOTER.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)
+        val endIndex = srcData.indexOf(FOOTER) + FOOTER.length
+
+        return if (endIndex < startIndex) {
+            // 帧尾在帧头之前，说明是上一帧的残留尾部 + 新帧的头部
+            // 例：31314FFFFFD6DADEDB01010C
+            val partial = srcData.substring(startIndex)
+            if (partial.contains(FOOTER)) {
+                // 当前片段中新帧已完整
+                val newEnd = partial.indexOf(FOOTER) + FOOTER.length
+                partial.substring(0, newEnd)
+            } else {
+                // 新帧不完整，缓存等待后续分片
+                buffer.append(partial).append(",")
+                null
+            }
+        } else {
+            // 帧头在帧尾之前，正常完整帧
+            srcData.substring(startIndex, endIndex)
+        }
+    }
+
+    /** 清空缓冲区 */
+    fun reset() {
+        buffer.clear()
+    }
+}
@@ -51,15 +51,13 @@ object SerialPortManager {
    }

    // 启动接收协程
-    @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()
+                        val data = buffer.toHexString2().uppercase(Locale.ROOT)
                        callback(data)
                    }
                } catch (e: Exception) {
@@ -71,7 +69,7 @@ object SerialPortManager {
    }

    // 关闭串口
-    suspend fun close() {
+    fun close() {
        scope.cancel()
        serialPort?.close()
    }
@@ -0,0 +1,244 @@
+package com.shuwei.intelligent.shelves.serial
+
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.ACTIVATE_BODY_LENGTH
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.ACTIVE_CMD
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.BYTES_PER_WEIGHT
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.CMD_ACTIVATE
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.CMD_CARD_UPLOAD
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.CMD_DEVICE_STATUS
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.CMD_HEARTBEAT
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.CMD_HEARTBEAT_TERMINAL
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.CMD_LOCK_FEEDBACK
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.CMD_OPERATION_RECORD
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.CMD_POSITION_REPORT
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.CMD_TEMP_REPORT
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.CMD_TEMP_RESPONSE
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.CMD_TEMP_RESPONSE_ALT
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.CMD_TIME_SYNC
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.DEVICE_STATUS_WEIGHT_OFFSET
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.FIX_BODY_LENGTH
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.FOOTER
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.HEADER
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.HEARTBEAT_MIN_LENGTH
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.HEARTBEAT_TEMPERATURE_START
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.HEARTBEAT_WEIGHT_OFFSET
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.SHELF_SENSOR_COUNT
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.TEMPERATURE_FIELD_LEN
+import com.shuwei.intelligent.shelves.utils.binaryToHex
+import com.shuwei.intelligent.shelves.utils.hexToBinary
+import java.util.TimeZone
+
+/**
+ * 串口协议解析处理器
+ *
+ * 负责将原始协议帧字符串解析为业务事件，通过 [Callback] 接口通知调用方。
+ * 设计为无状态（除 terminalId/terminalVersion 外），便于单元测试。
+ *
+ * @param callback 业务回调，由 Activity/ViewModel 实现
+ */
+class SerialProtocolHandler(private val callback: Callback) {
+
+    /** 终端 ID（15字节/30字符），由激活指令或心跳兜底填充 */
+    var terminalId: String = ""
+        private set
+
+    /** 固件版本（5字节/10字符），由激活指令或心跳兜底填充 */
+    var terminalVersion: String = ""
+        private set
+
+    /**
+     * 协议解析结果回调接口
+     */
+    interface Callback {
+        /** 需要向串口发送一条指令 */
+        fun onSendCmd(cmd: String)
+
+        /** 解析到一组重量数据：货架编号 → 重量（克） */
+        fun onWeightUpdated(shelfNo: Int, weight: Int)
+
+        /** 温控信息上报，附带完整帧日志用于显示/复制 */
+        fun onTempReport(logMsg: String)
+
+        /** 记录日志 */
+        fun onLog(message: String)
+    }
+
+    /**
+     * 处理一帧完整的协议数据
+     *
+     * @param data 经 SerialFrameParser 解析后的完整帧字符串
+     */
+    fun handle(data: String) {
+        if (data.isEmpty()) return
+
+        val cmd = data.substring(HEADER.length, HEADER.length + 4)
+        val cmdFlag = cmd.substring(0, 2)
+
+        when (cmd) {
+            CMD_ACTIVATE -> handleActivate(data, cmd, cmdFlag)
+            CMD_HEARTBEAT, CMD_HEARTBEAT_TERMINAL -> handleHeartbeat(data, cmd, cmdFlag)
+            CMD_LOCK_FEEDBACK -> handleLockFeedback(data, cmd, cmdFlag)
+            CMD_DEVICE_STATUS -> handleDeviceStatus(data, cmdFlag)
+            CMD_CARD_UPLOAD -> handleCardUpload(data, cmd, cmdFlag)
+            CMD_OPERATION_RECORD -> handleOperationRecord(data, cmd, cmdFlag)
+            CMD_TIME_SYNC -> handleTimeSync(data, cmd, cmdFlag)
+            CMD_POSITION_REPORT -> handlePositionReport(data, cmd, cmdFlag)
+            CMD_TEMP_REPORT -> handleTempReport(data, cmd, cmdFlag)
+            CMD_TEMP_RESPONSE -> callback.onLog("收到[温控信息应答]${CMD_TEMP_RESPONSE}数据：$data")
+            CMD_TEMP_RESPONSE_ALT -> callback.onLog("收到[温控信息应答]${CMD_TEMP_RESPONSE_ALT}数据：$data")
+            else -> {}
+        }
+    }
+
+    /** 处理终端激活指令 */
+    private fun handleActivate(data: String, cmd: String, cmdFlag: String) {
+        val reqBody = data.substring(HEADER.length + cmd.length, data.length - FOOTER.length)
+        if (reqBody.length == ACTIVATE_BODY_LENGTH) {
+            terminalId = reqBody.substring(2, 32)
+            terminalVersion = reqBody.substring(32, 42)
+            callback.onLog("收到[激活]${cmdFlag}指令:${data}，终端id:${terminalId},固件版本:${terminalVersion}，发送激活命令:$ACTIVE_CMD")
+            callback.onSendCmd(ACTIVE_CMD)
+        }
+    }
+
+    /** 处理心跳指令（0101 / 8101） */
+    private fun handleHeartbeat(data: String, cmd: String, cmdFlag: String) {
+        val respCmd = "${HEADER}01020506${terminalVersion}$FOOTER"
+        callback.onLog("收到[心跳]${cmdFlag}指令:${data}，发送应答指令:${respCmd}")
+        callback.onSendCmd(respCmd)
+        parseHeartbeatData(data)
+    }
+
+    /** 处理开关锁反馈 */
+    private fun handleLockFeedback(data: String, cmd: String, cmdFlag: String) {
+        val respCmd = "${HEADER}020200${terminalId}${terminalVersion}$FOOTER"
+        callback.onLog("收到[开锁]${cmdFlag}指令:${data}，发送应答指令:${respCmd}")
+        callback.onSendCmd(respCmd)
+    }
+
+    /** 处理获取设备状态（0302） */
+    private fun handleDeviceStatus(data: String, cmdFlag: String) {
+        callback.onLog("收到[获取设备状态]${cmdFlag}指令:${data}")
+        val weightStartIndex = DEVICE_STATUS_WEIGHT_OFFSET
+        val weightEndIndex = weightStartIndex + SHELF_SENSOR_COUNT * BYTES_PER_WEIGHT
+        val temperatureEndIndex = weightEndIndex + TEMPERATURE_FIELD_LEN
+        try {
+            parseWeightData(start = weightStartIndex, end = weightEndIndex, data = data)
+            parseFixDataBody(data, temperatureEndIndex)
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    /** 处理卡号上发 */
+    private fun handleCardUpload(data: String, cmd: String, cmdFlag: String) {
+        val respCmd = "${HEADER}050203$FOOTER"
+        callback.onLog("收到[卡号上发]${cmdFlag}指令:${data}，发送应答指令:${respCmd}")
+        callback.onSendCmd(respCmd)
+    }
+
+    /** 处理操作记录上传 */
+    private fun handleOperationRecord(data: String, cmd: String, cmdFlag: String) {
+        val respCmd = "${HEADER}0B0203$FOOTER"
+        callback.onLog("收到[操作记录上传]${cmdFlag}指令:${data}，发送应答指令:${respCmd}")
+        callback.onSendCmd(respCmd)
+    }
+
+    /** 处理对时请求 */
+    private fun handleTimeSync(data: String, cmd: String, cmdFlag: String) {
+        val nowMs = System.currentTimeMillis()
+        val timeLong = nowMs / 1000 + TimeZone.getDefault().getOffset(nowMs) / 1000
+        val timeStr = "0000000" + String.format("%X", timeLong)
+        val time = timeStr.substring(timeStr.length - 8).chunked(2).reversed().joinToString("")
+        val respCmd = "${HEADER}0B02${time}$FOOTER"
+        callback.onLog("收到[对时]${cmdFlag}指令:${data}，发送应答指令:${respCmd}")
+        callback.onSendCmd(respCmd)
+    }
+
+    /** 处理终端位置上报 */
+    private fun handlePositionReport(data: String, cmd: String, cmdFlag: String) {
+        val respCmd = "${HEADER}0E0200$FOOTER"
+        callback.onLog("收到[终端位置上报]${cmdFlag}指令:${data}，发送应答指令:${respCmd}")
+        callback.onSendCmd(respCmd)
+    }
+
+    /** 处理温控信息上报 */
+    private fun handleTempReport(data: String, cmd: String, cmdFlag: String) {
+        val respCmd = "${HEADER}100200$FOOTER"
+        val logMsg = "收到[温控信息上报]${cmdFlag}指令:${data}，发送应答指令:${respCmd}"
+        callback.onLog(logMsg)
+        callback.onSendCmd(respCmd)
+        callback.onTempReport(logMsg)
+    }
+
+    /**
+     * 解析心跳帧中的重量与固定数据体
+     */
+    private fun parseHeartbeatData(data: String) {
+        runCatching {
+            if (data.length < HEARTBEAT_MIN_LENGTH) return
+            val weightStartIndex = HEARTBEAT_WEIGHT_OFFSET
+            val weightEndIndex = weightStartIndex + SHELF_SENSOR_COUNT * BYTES_PER_WEIGHT
+            parseWeightData(start = weightStartIndex, end = weightEndIndex, data = data)
+            val temperatureEndIndex = HEARTBEAT_TEMPERATURE_START + TEMPERATURE_FIELD_LEN
+            parseFixDataBody(data, temperatureEndIndex)
+        }.onFailure { it.printStackTrace() }
+    }
+
+    /**
+     * 解析连续的重量数据段，每 [BYTES_PER_WEIGHT] 字符一组，依次对应货架 1..N
+     *
+     * @param start 数据段起始索引
+     * @param end   数据段结束索引（不含）
+     * @param data  完整帧字符串
+     */
+    fun parseWeightData(start: Int, end: Int, data: String) {
+        var index = 1
+        var count = start
+        while (count < end) {
+            val weightInfo = data.substring(count, count + BYTES_PER_WEIGHT)
+            // 小端字节序转换：将4字节按字节倒序拼接
+            var weightHex = weightInfo.run {
+                substring(6, 8) + substring(4, 6) + substring(2, 4) + substring(0, 2)
+            }
+            var firstByteBinary = hexToBinary(weightHex.substring(0, 2))
+            val realWeight = if (firstByteBinary.startsWith("0")) {
+                // 正数：使用 toLongOrNull(16) 转换，避免超出 Int 范围
+                weightHex.toLongOrNull(16)?.toInt() ?: 0
+            } else {
+                // 负数：清除符号位后计算绝对值，再取反
+                firstByteBinary = "0${firstByteBinary.substring(1)}"
+                val firstByteHex = binaryToHex(firstByteBinary)
+                weightHex = firstByteHex + weightHex.substring(2)
+                -1 * (weightHex.toLongOrNull(16)?.toInt() ?: 0)
+            }
+            callback.onWeightUpdated(index, realWeight)
+            count += BYTES_PER_WEIGHT
+            index++
+        }
+    }
+
+    /**
+     * 从心跳帧或设备状态帧中补充解析 terminalId / terminalVersion。
+     * 激活指令（CMD_ACTIVATE）是获取这两个字段的首选来源；
+     * 若激活指令尚未到来，则通过此方法从心跳/设备状态帧中兜底解析。
+     *
+     * @param data               完整协议帧字符串
+     * @param temperatureEndIndex 温度字段结束位置（固定数据体紧随其后）
+     */
+    private fun parseFixDataBody(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 == FIX_BODY_LENGTH) {
+                terminalId = fixDataBody.substring(0, 30)
+                terminalVersion = fixDataBody.substring(30, 40)
+                callback.onLog("从设备状态获取数据，终端id:${terminalId},固件版本:${terminalVersion}")
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+}
@@ -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)
+        }
 }
@@ -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>
@@ -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>
@@ -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>
@@ -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>
Author	SHA1	Message	Date
mazengfeiandClaude Sonnet 4.6	3e5c7c6caa	refactor(HomeActivity): 修复内存泄漏并优化错误处理 1. 修复内存泄漏问题 - 在 onDestroy 中清理所有 Handler 回调 - 在 onDestroy 中释放 Dialog 引用 2. 增强类型安全 - updateUI 中增加类型检查和日志 - updateOverdueState 中增加完整的类型检查 3. 优化串口异常处理 - 串口数据处理异常时向用户提示 4. 消除代码重复 - 删除冗余的 saveShelfGoodsList 方法 - 定时任务直接调用 syncShelfGoodsToServer Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-01 14:19:45 +08:00
mazengfeiandClaude Sonnet 4.6	04fe3ec2c1	refactor: 全面重构 HomeActivity 架构并修复多项 Bug - 新增 SerialProtocolHandler 类，将串口协议解析逻辑从 HomeActivity 剥离 - ProtocolConstants 补充命令码常量（CMD_*）及帧解析偏移常量 - 修复 NetViewModel.getDeviceConfig 更新错误 StateFlow 的 Bug - 修复 getWeightInfo 中 toInt() 整数溢出崩溃风险，改用 toLongOrNull(16) - 升级废弃的 getSerializableExtra，使用 Build.VERSION.SDK_INT 版本分支 - BaseActivity 提取 onUserInactive() 虚方法，消除对子类 HomeActivity 的直接引用 - 修复 BaseActivity 中错误的 LIGHT_OPEN/CLOSE 导入（改从 ProtocolConstants 导入） - repeatOnLifecycle 由 CREATED 改为 STARTED，避免 UI 不可见时无效更新 - updateOverdueState 从回调风格改为 StateFlow，与项目其他接口保持一致 - 提取 syncShelfGoodsToServer() 消除重复的 ShelfBody 构建逻辑 - 清理 NetViewModel 和 BaseActivity 中大段注释死代码 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-01 11:26:05 +08:00
lvmengandClaude Sonnet 4.6	9a795b9710	feat(HomeActivity): 新增串口无数据超时提示弹窗超过5分钟未收到串口数据时，自动弹窗提示用户考虑断电重启设备；收到新数据后自动关闭弹窗并重置计时。同步提交串口协议常量(ProtocolConstants)与帧解析器(SerialFrameParser)重构代码。 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-01 10:18:00 +08:00
mazengfei	fff6a2a3b3	配置生产域名	2026-03-31 19:16:56 +08:00
lvmeng	3b79f6d6aa	feat(config): 实现应用基础URL配置管理与环境切换功能 - 引入GlobalData对象统一管理应用基础URL配置 - 添加TEST/UAT/PROD三套环境切换弹窗功能 - 在BaseActivity中集成双击右上角状态栏显示环境切换对话框 - 将网络请求配置从App.configUrl迁移至GlobalData.appBaseUrl - 扩展SpTool工具类支持baseUrl本地存储 - 增加HTTP连接和写入超时时间至30秒 - 更新构建配置启用BuildConfig支持 - 添加环境切换相关UI资源文件和样式定义	2026-03-31 14:06:04 +08:00
lvmeng	76b67b545d	Merge remote-tracking branch 'origin/dev_优化_基于分支代码备份'	2026-03-31 10:58:32 +08:00
lvmeng	3bd60990b9	Revert "重构 HomeActivity：修复多项稳定性与架构问题" This reverts commit `85903eb646`.	2026-03-31 10:57:46 +08:00
lvmeng	a116c4fc6c	Revert "重构：拆分 HomeActivity 职责，分层解耦串口与业务逻辑" This reverts commit `e6cfc4dff2`.	2026-03-31 10:57:40 +08:00
lvmengandClaude Sonnet 4.6	e6cfc4dff2	重构：拆分 HomeActivity 职责，分层解耦串口与业务逻辑 - 新建 SerialEventListener：定义串口协议解析回调接口契约 - 新建 SerialProtocolParser：迁移全部协议解析逻辑（拼包、12种命令分发、重量解析），无 Android 依赖，可单元测试 - 新建 SerialViewModel：管理串口生命周期（open/close）、Channel 数据传递，暴露 weightFlow / tempCtrlEventFlow / deviceStatusRefreshFlow - 扩展 HomeViewModel：迁入定时任务（保存货架数据、刷新过期状态），改用 viewModelScope 管理，新增 deviceName 属性与 overdueUpdateFlow - 精简 HomeActivity：从 835 行削减至 255 行，仅保留 UI 协调职责，所有串口与业务逻辑由 ViewModel 层处理 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-03-11 13:41:01 +08:00
lvmengandClaude Sonnet 4.6	85903eb646	重构 HomeActivity：修复多项稳定性与架构问题架构优化： - 新增 HomeViewModel，将 companion object 中的共享状态（shelfItems、 weightMap、selectedShelfIndex、temperatureC、humidity）迁移至 ViewModel，消除 Activity 重建时的状态残留与全局状态污染问题协程修复： - repeatOnLifecycle(CREATED) 改为 STARTED，确保 Flow 收集与 UI 可见性生命周期对齐，进入后台时自动停止订阅 - 串口数据接收改用 Channel<String> + 单一消费协程，替代多 launch 并发模式，彻底消除 StringBuilder（serialReader）的并发竞争问题稳定性修复： - 修复 tipDialog 从未赋值导致 Dialog 功能失效及 onDestroy 窗口泄漏问题 - 修复 weightHex.toInt() 十进制解析错误，改为 toIntOrNull(16) 并添加兜底 - 修复 updateOverdueState 按索引访问接口数据导致的越界风险，改为按 deviceNo 精确匹配，同时修正交叉排列导致的状态串位问题 - 废弃 API getSerializableExtra 替换为版本分支兼容写法（minSdk 25+）依赖升级： - androidx.core-ktx 1.10.1 → 1.12.0 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-03-11 11:45:44 +08:00