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

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

app/build.gradle.kts

@@ -44,6 +44,7 @@ android {
     }
     buildFeatures {
         viewBinding = true
+        buildConfig = true
     }
 
     ndkVersion = "29.0.13846066"
@@ -67,12 +68,13 @@ dependencies {
 
     implementation("io.github.jeadyx:kmp-serialport:1.0.0")
 
-    // 基础依赖包，必须要依赖
+//    // 基础依赖包，必须要依赖
-    implementation("com.geyifeng.immersionbar:immersionbar:3.2.2")
+//    implementation("com.geyifeng.immersionbar:immersionbar:3.2.2")
-    // kotlin扩展（可选）
+//    // kotlin扩展（可选）
-    implementation("com.geyifeng.immersionbar:immersionbar-ktx:3.2.2")
+//    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")
     implementation("com.google.code.gson:gson:2.10.1")
     implementation("com.squareup.retrofit2:retrofit:2.9.0")
     implementation("com.squareup.retrofit2:converter-gson:2.9.0")

app/src/main/AndroidManifest.xml

@@ -26,7 +26,7 @@
         android:theme="@style/Theme.IntelligentShelves"
         android:usesCleartextTraffic="true">
         <activity
-            android:name=".InitActivity"
+            android:name=".activity.InitActivity"
             android:exported="true"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity">
@@ -37,12 +37,14 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".HomeActivity"
+            android:name=".activity.HomeActivity"
             android:screenOrientation="portrait"/>
         <activity
-            android:name=".ShelfActivity"
+            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.LogActivity" />
 
         <receiver
             android:name=".utils.BootReceiver"

app/src/main/java/com/shuwei/intelligent/shelves/App.kt

@@ -6,6 +6,7 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.content.SharedPreferences
 import com.shuwei.intelligent.shelves.utils.BootReceiver
+import com.shuwei.intelligent.shelves.utils.CrashHandler
 
 /**
  * @author: star
@@ -17,6 +18,7 @@ class App : Application() {
     override fun onCreate() {
         super.onCreate()
         app = this
+        CrashHandler.init(this)
         val filter = IntentFilter(Intent.ACTION_BOOT_COMPLETED)
         registerReceiver(BootReceiver(), filter)
     }

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

@@ -1,506 +0,0 @@
-package com.shuwei.intelligent.shelves
-
-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.provider.Settings
-import android.util.Log
-import android.util.SparseArray
-import androidx.activity.viewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import androidx.recyclerview.widget.DefaultItemAnimator
-import androidx.recyclerview.widget.GridLayoutManager
-import com.chad.library.adapter4.util.setOnDebouncedItemClick
-import com.shuwei.intelligent.shelves.adapter.ShelfAdapter
-import com.shuwei.intelligent.shelves.base.BaseActivity
-import com.shuwei.intelligent.shelves.databinding.ActivityHomeBinding
-import com.shuwei.intelligent.shelves.model.SendWeightEvent
-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.serial.SerialPortManager
-import com.shuwei.intelligent.shelves.task.TaskManager
-import com.shuwei.intelligent.shelves.utils.binaryToHex
-import com.shuwei.intelligent.shelves.utils.ext.gone
-import com.shuwei.intelligent.shelves.utils.ext.toast
-import com.shuwei.intelligent.shelves.utils.ext.visible
-import com.shuwei.intelligent.shelves.utils.f2C
-import com.shuwei.intelligent.shelves.utils.hexToBinary
-import com.shuwei.intelligent.shelves.utils.hexToDec
-import kotlinx.coroutines.launch
-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 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}"
-
-        val list: MutableList<ShelfModel> = mutableListOf()
-        val weightArray = SparseArray<Double?>()
-        var shelfIndex = 0
-//        public fun getRealWeight():Double = weightArray[shelfIndex]?:0.0
-        // 温度
-        var showTemperatureC = "0"
-        // 湿度
-        var showHumidity = "0"
-    }
-
-    private lateinit var binding: ActivityHomeBinding
-
-    private val viewModel: NetViewModel by viewModels()
-
-
-    @SuppressLint("NotifyDataSetChanged", "HardwareIds")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityHomeBinding.inflate(layoutInflater)
-        EventBus.getDefault().register(this)
-        setBackground()
-        setContentView(binding.root)
-
-        updateLeftStatus("1-1冷藏柜  -°C / -%")
-
-        initRecyclerView()
-
-        lifecycleScope.launch {
-            val openState = SerialPortManager.open()
-            Log.d(TAG, "onCreate: openState=$openState")
-            if (openState) {
-                SerialPortManager.startReceive { data ->
-                    runOnUiThread {
-                        // 更新UI显示接收数据
-                        receiveSerialPortData(data)
-                    }
-                }
-                SerialPortManager.send(ACTIVE_CMD)
-
-                //SerialPortManager.send(DEVICE_INFO_CMD)
-            }
-            repeatOnLifecycle(Lifecycle.State.CREATED) {
-                launch {
-                    viewModel.getAccessTokenUiState.collect { state ->
-                        when (state) {
-                            is UiState.Loading -> {}
-                            is UiState.Success<*> -> getTokenSuccess(state.data)
-                            is UiState.Error -> toast(state.msg)
-                            else -> {}
-                        }
-                    }
-                }
-                launch {
-                    viewModel.getShelfListUiState.collect { state ->
-                        when (state) {
-                            is UiState.Loading -> showProgress()
-                            is UiState.Success<*> -> updateUI(state.data)
-                            is UiState.Error -> showError(state.msg)
-                            else -> {}
-                        }
-                    }
-                }
-            }
-        }
-        TaskManager.startTask()
-
-//        var androidId = Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID)
-////        androidId = "d0e7a2d5f25c775c"
-//        Log.d(TAG, "onCreate: androidId=${androidId}")
-//        if (androidId == "65e1012638f78260" || androidId == "40f89e91ee40611d") {
-//            androidId = "d0e7a2d5f25c775c"
-//        }
-//        App.deviceId = androidId
-//        //"53babf69-0d2f-3875-a649-f2e12f80ad4c1"
-//
-//        val swDpValue = resources?.configuration?.smallestScreenWidthDp
-//        Log.d(TAG, "onCreate: swDpValue=$swDpValue")
-
-
-        viewModel.getAccessToken(App.deviceId)
-
-//        repeat(100) {
-//           lifecycleScope.launch {
-//               val data = "D6DADEDB01010C6102000000000000010000000500008000000000060000000500000004000080060000000100000010190080701800800000000000000000000000000000000000000000000000005037414645333633333334333731373056322E313069FFFF"
-//               receiveSerialPortData(data)
-//               delay(500)
-//           }
-//        }
-
-//        lifecycleScope.launch {
-//            repeat(100) {
-//                val sb = StringBuilder().apply {
-////                    610200000000000001000000050000800000000006000000050000000400008006000000010000001019008070180080
-//                    repeat(12) {
-//                        val num = (0..99).random()
-//                        val num2 = (0..99).random()
-//                        val num3 = (0..99).random()
-//                        val num4 = (0..1).random()
-//                        val numStr = if (num <= 9) "0${num}" else "" + num
-//                        val numStr2 = if (num2 <= 9) "0${num2}" else "" + num2
-//                        val numStr3 = if (num3 <= 9) "0${num3}" else "" + num3
-//                        val numStr4 = if (num4 == 1) "80" else "00"
-//                        append(numStr).append(numStr2).append(numStr3).append(numStr4)
-//                    }
-//                }
-//                val data =
-//                    "${HEADER}0302000000000C${sb}5037414645333633333334333731373056322E313069${FOOTER}"
-//                receiveSerialPortData(data)
-//                delay(500)
-//            }
-//        }
-    }
-
-    private fun getTokenSuccess(data: RespData<*>) {
-        Log.d(TAG, "getTokenSuccess: $data")
-        data.result?.let {
-            App.accessToken = it.toString()
-            //UIUtils.toast(it.toString())
-            viewModel.getShelfList(deviceId = App.deviceId)
-        }
-    }
-
-    private fun showProgress() {
-        Loading.show(this)
-    }
-
-    @SuppressLint("NotifyDataSetChanged")
-    private fun updateUI(data: RespData<*>) {
-        binding.include?.root?.gone()
-        window?.decorView?.postDelayed({Loading.dismiss()},500)
-        if (data.result !is ShelfResult) {
-            loadEmptyView()
-            return
-        }
-        App.canteenId = data.result.canteenId
-        val tempList = data.result.containerGoodsList
-        if (tempList.isNullOrEmpty()) {
-            loadEmptyView()
-            return
-        }
-        if (tempList.size < 10) {
-            toast("数据错误")
-            return
-        }
-        list.clear()
-        val subList01 = tempList.subList(0, 5)
-        val subList02 = tempList.subList(5, 10)
-        repeat(5) { index ->
-            list.add(subList01[index].also { it.deviceId = App.deviceId })
-            list.add(subList02[index].also { it.deviceId = App.deviceId })
-        }
-        shelfAdapter.notifyDataSetChanged()
-    }
-
-    private fun showError(message: String) {
-        Loading.dismiss()
-        toast(message)
-        loadEmptyView()
-    }
-
-    private val serialReader by lazy { StringBuilder() }
-
-    private fun receiveSerialPortData(srcData: String) {
-        Log.d(TAG, "receiveSerialPortData: $srcData")
-        var data = ""
-        if (srcData.startsWith(HEADER) && srcData.contains(FOOTER)) {
-            serialReader.clear()
-            val endIndex = srcData.indexOf(FOOTER) + FOOTER.length
-            serialReader.append(srcData.substring(0, endIndex))
-            data = serialReader.toString()
-        } else if (srcData.startsWith(HEADER) && srcData.contains(FOOTER).not()) {
-            serialReader.clear()
-            serialReader.append(srcData).append(",")
-            return
-        } else if (srcData.startsWith(HEADER).not() && srcData.contains(FOOTER).not()) {
-            serialReader.append(srcData).append(",")
-            return
-        } else {
-            val endIndex = srcData.indexOf(FOOTER) + FOOTER.length
-            serialReader.append(srcData.substring(0, endIndex))
-            Log.d(TAG, "receiveSerialPortData:serialReader: $serialReader")
-            data = serialReader.toString().replace(",", "")
-        }
-
-        val cmd = data.substring(HEADER.length, HEADER.length + 4)
-        when (cmd) {
-            "0101" -> {
-                //心跳-01
-                Log.d(TAG, "receiveSerialPortData:心跳01: $data")
-                heartBeat(data)
-            }
-//            "8101" -> {
-//                //心跳-81
-//                Log.d(TAG, "receiveSerialPortData:心跳08: $data")
-//                heartBeat(data)
-//            }
-            "0202" -> {
-                //开关锁反馈
-                lockFeedback(data)
-            }
-            "0302" -> {
-                //获取设备状态
-                getDeviceInfo(data)
-            }
-
-            else -> {}
-        }
-    }
-
-    private var fixedDataBody = ""
-
-    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关
-                lifecycleScope.launch {
-                    SerialPortManager.send("${HEADER}0202${lockNo}${FOOTER}")
-                }
-            }
-            val lockTwoState = data.substring(HEADER.length + 6, HEADER.length + 8)
-            if (lockTwoState == "00") {
-                //锁2关
-                lifecycleScope.launch {
-                    SerialPortManager.send("${HEADER}0202${lockNo}${FOOTER}")
-                }
-            }
-        }.onFailure {
-            it.printStackTrace()
-        }
-    }
-
-    private fun heartBeat(data: String) {
-        runCatching {
-            if (data.length < 200) {
-                return
-            }
-            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("1-1冷藏柜  ${showTemperatureC}°C / ${percent}%")
-        }.onFailure {
-            it.printStackTrace()
-        }
-    }
-
-    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()
-            }
-            val realWeightDouble = realWeight / 1000.0
-            weightArray.put(index, realWeightDouble)
-
-            if (index <= 10) {
-                list.firstOrNull { it.deviceNo == index }?.let {
-                    it.weight = realWeightDouble
-                    val pos = list.indexOf(it)
-                    shelfAdapter.notifyItemChanged(pos)
-                    Log.d(TAG, "getWeightInfo: deviceNo=${it.deviceNo},realWeight=${realWeight}")
-                    EventBus.getDefault().post(SendWeightEvent(it.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.d(TAG, "getDeviceInfo: data=$data")
-        val weightStartIndex = HEADER.length + 14
-        val temperatureStartIndex = weightStartIndex + 12 * 8
-        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("1-1冷藏柜  ${showTemperatureC}°C / ${percent}%")
-
-        getWeightInfo(
-            start = weightStartIndex,
-            end = temperatureStartIndex,
-            data = data
-        )
-    }
-
-    override fun onDestroy() {
-        lifecycleScope.launch {
-            SerialPortManager.close()
-        }
-        TaskManager.cancelTask()
-        EventBus.getDefault().unregister(this)
-        super.onDestroy()
-    }
-
-    @Suppress("DEPRECATION")
-    private val shelfAdapter by lazy {
-        ShelfAdapter(list).apply {
-            setOnDebouncedItemClick { adapter, view, position ->
-                shelfIndex = position
-                lifecycleScope.launch {
-                    val openCmd = if (list[position].deviceNo in 1..5)
-                        LEFT_SHELF_OPEN_CMD
-                    else
-                        RIGHT_SHELF_OPEN_CMD
-                    val openState = SerialPortManager.send(openCmd)
-                    if (openState.not()) {
-                        toast("${list[position].goodsName}柜门开启失败")
-                        return@launch
-                    }
-                    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
-                            list[position].apply {
-                                goodsId = model.goodsId
-                                goodsName = model.goodsName
-                                weight = model.weight
-                                if (model.createTime.isNullOrBlank().not()) {
-                                    createTime = model.createTime
-                                }
-                            }
-                            notifyItemChanged(position)
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private fun initRecyclerView() {
-        binding.rvShelf.run {
-            layoutManager =
-                GridLayoutManager(this@HomeActivity, 2, GridLayoutManager.VERTICAL, false)
-            adapter = shelfAdapter
-
-            itemAnimator.let {
-                if (it is DefaultItemAnimator) {
-                    it.supportsChangeAnimations = false
-                }
-            }
-        }
-    }
-
-    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)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        handler.removeCallbacks(updateTask)
-    }
-
-    @SuppressLint("NotifyDataSetChanged")
-    private fun loadEmptyView() {
-        list.clear()
-        shelfAdapter.notifyDataSetChanged()
-
-        binding.include?.let {
-            it.root.visible()
-            it.root.setOnClickListener {
-                viewModel.getAccessToken(App.deviceId)
-            }
-            it.ivEmptyIcon.setImageResource(R.drawable.ic_empty_white)
-            it.tvEmptyContent.setTextColor(Color.WHITE)
-        }
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public fun weightEvent(event: WeightEvent) {
-
-    }
-}

app/src/main/java/com/shuwei/intelligent/shelves/InitActivity.kt

@@ -1,170 +0,0 @@
-package com.shuwei.intelligent.shelves
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.provider.Settings
-import android.util.Log
-import androidx.activity.viewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import com.shuwei.intelligent.shelves.base.BaseActivity
-import com.shuwei.intelligent.shelves.databinding.ActivityInitBinding
-import com.shuwei.intelligent.shelves.model.DeviceConfigInfo
-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.QRCodeUtil
-import com.shuwei.intelligent.shelves.utils.SpTool
-import com.shuwei.intelligent.shelves.utils.ext.dp
-import com.shuwei.intelligent.shelves.utils.ext.invisible
-import com.shuwei.intelligent.shelves.utils.ext.startActivity
-import com.shuwei.intelligent.shelves.utils.ext.toJsonString
-import com.shuwei.intelligent.shelves.utils.ext.toObject
-import com.shuwei.intelligent.shelves.utils.ext.toast
-import com.shuwei.intelligent.shelves.utils.ext.visible
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.FlowCollector
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.launch
-import kotlin.collections.forEach
-import kotlin.getValue
-import kotlin.jvm.java
-import kotlin.ranges.downTo
-import kotlin.text.isBlank
-import kotlin.to
-
-class InitActivity : BaseActivity() {
-    companion object {
-        const val TAG = "InitActivity"
-    }
-
-    private lateinit var binding: ActivityInitBinding
-
-    private val viewModel: NetViewModel by viewModels()
-
-    @SuppressLint("HardwareIds")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityInitBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        hideStatusBar()
-//        // 获取 ANDROID_ID
-//        val androidId =
-//            Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID)
-//        App.deviceId = androidId
-//        SpTool.put(SpTool.DEVICE_ID, androidId)
-//        App.configUrl = UrlConfig.BASE_URL
-//        App.canteenId = "0"
-
-        var deviceId = AppUtil.getUDID(this)
-        Log.d(TAG, "onCreate: deviceId=$deviceId")
-//        deviceId = "39a7abdd06b3c7ab"
-//        deviceId = "3ea47dc0-3cf0-3c2f-909c-265a9a65572e"
-        deviceId = "6ce7cd59-b875-38b2-b73d-88a570be3212"
-        App.deviceId = deviceId
-
-        SpTool.put(SpTool.DEVICE_ID, deviceId)
-        val deviceConfigCache = SpTool.getString(SpTool.DEVICE_CONFIG_CACHE)
-        val checkResult = checkConfigData(deviceConfigCache)
-        if (checkResult.not()) {
-            binding.ivQrCode.visible()
-            binding.btnInit.visible()
-            //进行初始化操作
-            initConfig()
-            return
-        }
-        binding.ivQrCode.invisible()
-        binding.btnInit.invisible()
-
-        countDown()
-    }
-
-    private fun countDown() {
-        lifecycleScope.launch {
-            flow {
-                (2 downTo 1).forEach {
-                    delay(1000)
-                    emit(it)
-                }
-            }.collect {
-                // 倒计时结束执行跳转
-                if (it == 1) {
-                    startActivity<HomeActivity>()
-                    finish()
-                }
-            }
-        }
-    }
-
-    private fun initConfig() {
-        binding.ivQrCode.setImageBitmap(
-            QRCodeUtil.generateQRCode(
-                content = App.deviceId,
-                size = 200.dp
-            )
-        )
-        binding.btnInit.setOnClickListener {
-            viewModel.getDeviceToken(App.deviceId)
-        }
-        lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.CREATED) {
-                launch {
-                    viewModel.getDeviceTokenUiState.collect { state ->
-                        when (state) {
-                            is UiState.Loading -> {}
-                            is UiState.Success<*> -> {
-                                state.data.result?.let { deviceToken ->
-                                    Log.d(TAG, "initConfig: $deviceToken")
-                                    viewModel.getDeviceConfig(
-                                        deviceId = App.deviceId,
-                                        deviceToken = deviceToken.toString()
-                                    )
-                                }
-                            }
-                            is UiState.Error -> toast(state.msg)
-                            else -> {}
-                        }
-                    }
-                }
-                launch {
-                    viewModel.getDeviceConfigUiState.collect { state ->
-                        when (state) {
-                            is UiState.Loading -> {}
-                            is UiState.Success<*> -> {
-                                state.data.result?.let {
-                                    if (it is DeviceConfigInfo) {
-                                        SpTool.put(SpTool.DEVICE_CONFIG_CACHE, it.toJsonString())
-                                        App.configUrl = it.appPackageUrl?:""
-                                        App.canteenId = it.canteenId?:""
-
-                                        startActivity<HomeActivity>()
-                                        finish()
-                                    }
-                                }
-                            }
-                            is UiState.Error -> toast(message = state.msg)
-                            else -> {}
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private fun checkConfigData(data: String): Boolean {
-        if (data.isBlank()) {
-            return false
-        }
-        val config = data.toObject<DeviceConfigInfo?>()
-        if (config == null) {
-            return false
-        }
-        App.configUrl = config.appPackageUrl?:""
-        App.canteenId = config.canteenId?:""
-        return true
-    }
-
-}

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

@@ -0,0 +1,498 @@
+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 androidx.activity.addCallback
+import androidx.activity.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.GridLayoutManager
+import com.shuwei.intelligent.shelves.App
+import com.shuwei.intelligent.shelves.R
+import com.shuwei.intelligent.shelves.adapter.ShelfAdapter
+import com.shuwei.intelligent.shelves.base.BaseActivity
+import com.shuwei.intelligent.shelves.databinding.ActivityHomeBinding
+import com.shuwei.intelligent.shelves.dialog.CommonDialog
+import com.shuwei.intelligent.shelves.model.ClearShelfEvent
+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.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.serial.ProtocolConstants.C_TEMP_CMD
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.FOOTER
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.HEADER
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.LEFT_SHELF_OPEN_CMD
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.RIGHT_SHELF_OPEN_CMD
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.START_TEMP_CTRL_CMD
+import com.shuwei.intelligent.shelves.serial.SerialFrameParser
+import com.shuwei.intelligent.shelves.serial.SerialPortManager
+import com.shuwei.intelligent.shelves.serial.SerialProtocolHandler
+import com.shuwei.intelligent.shelves.utils.GridLayoutTool
+import com.shuwei.intelligent.shelves.utils.IntervalExecutor
+import com.shuwei.intelligent.shelves.utils.ext.copyTextToClipboard
+import com.shuwei.intelligent.shelves.utils.ext.gone
+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 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
+
+class HomeActivity : BaseActivity() {
+
+    companion object {}
+
+    override val enableRightStatusMenu: Boolean = true
+
+    // 货架列表数据
+    private val list: MutableList<ShelfModel> = mutableListOf()
+
+    // 当前选中货架下标
+    private var shelfIndex = 0
+
+    // 当前温度（摄氏）
+    private var showTemperatureC = "0"
+
+    // 当前湿度
+    private var showHumidity = "0"
+
+    // 仅特定 deviceId 的部署点需要发送开锁指令
+    private fun isNeedOpenLock() = App.deviceId == "4787e213-90ab-3e32-88e0-ac271a937751"
+
+    private var deviceName = ""
+
+    private lateinit var binding: ActivityHomeBinding
+
+    private val viewModel: NetViewModel by viewModels()
+
+    // 串口协议解析器，通过回调通知本 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..list.size) {
+                    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)
+                log(logMsg)
+//            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)
+        EventBus.getDefault().register(this)
+        setBackground()
+        setContentView(binding.root)
+        onBackPressedDispatcher.addCallback(this) {
+
+        }
+        updateLeftStatus("")
+        initRecyclerView()
+
+        // 串口初始化，独立协程，不阻塞网络状态监听
+        lifecycleScope.launch {
+            val openState = SerialPortManager.open()
+            log("onCreate: openState=$openState")
+            if (openState) {
+                SerialPortManager.startReceive { data ->
+                    // 切换到主线程协程处理串口数据
+                    lifecycleScope.launch {
+                        runCatching { receiveSerialPortData(data) }
+                            .onFailure {
+                                it.printStackTrace()
+                                log("串口数据处理异常: ${it.message}")
+                                toast("串口数据处理异常，请检查设备连接")
+                            }
+                    }
+                }
+            }
+        }
+
+        // 网络状态监听，独立协程，与串口初始化并行执行
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                launch {
+                    viewModel.getAccessTokenUiState.collect { state ->
+                        when (state) {
+                            is UiState.Loading -> {}
+                            is UiState.Success<*> -> getTokenSuccess(state.data)
+                            is UiState.Error -> toast(state.msg)
+                            else -> {}
+                        }
+                    }
+                }
+                launch {
+                    viewModel.getShelfListUiState.collect { state ->
+                        when (state) {
+                            is UiState.Loading -> showProgress()
+                            is UiState.Success<*> -> updateUI(state.data)
+                            is UiState.Error -> showError(state.msg)
+                            else -> {}
+                        }
+                    }
+                }
+                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)
+                        }
+                    }
+                }
+            }
+        }
+
+        binding.root.postDelayed({
+            sendCmd(START_TEMP_CTRL_CMD)
+            sendCmd(C_TEMP_CMD)
+        }, 5000)
+
+        saveGoodsTask()
+        overdueTask()
+
+        viewModel.getShelfList(deviceId = App.deviceId)
+    }
+
+    private val defDeviceList = listOf(
+        //原410货柜
+        "7a991439-3a12-3ef7-809b-c0258b839473",
+        //原1楼餐厅货柜
+        "4787e213-90ab-3e32-88e0-ac271a937751"
+    )
+
+    private fun getTokenSuccess(data: RespData<*>) {
+        log("getTokenSuccess: $data")
+        data.data?.let {
+            App.accessToken = it.toString()
+            viewModel.getShelfList(deviceId = App.deviceId)
+        }
+    }
+
+    private fun showProgress() {
+        Loading.show(this)
+    }
+
+    @SuppressLint("NotifyDataSetChanged")
+    private fun updateUI(data: RespData<*>) {
+        binding.include?.root?.gone()
+        window?.decorView?.postDelayed({ Loading.dismiss() }, 500)
+        val shelfResult = data.data as? ShelfResult
+        if (shelfResult == null) {
+            log("updateUI: 数据类型错误，期望 ShelfResult，实际类型：${data.data?.javaClass?.simpleName}")
+            loadEmptyView()
+            return
+        }
+        deviceName = shelfResult.deviceName
+        updateLeftStatus(deviceName)
+
+        App.canteenId = shelfResult.placeId
+        var tempList = shelfResult.containerGoodsList
+        if (tempList.isNullOrEmpty()) {
+            loadEmptyView()
+            return
+        }
+        list.clear()
+        tempList = GridLayoutTool.initListSort(tempList)
+        list.addAll(tempList)
+        shelfAdapter.notifyDataSetChanged()
+    }
+
+    private fun showError(message: String) {
+        Loading.dismiss()
+        toast(message)
+        loadEmptyView()
+    }
+
+    private fun receiveSerialPortData(srcData: String) {
+        log("receiveSerialPortData: $srcData")
+        // 重置无数据计时，并关闭已显示的超时提示弹窗
+        lastDataReceivedTime = System.currentTimeMillis()
+        noDataWarningDialog?.takeIf { it.isShowing }?.dismiss()
+        val frame = serialFrameParser.parse(srcData) ?: return
+        serialProtocolHandler.handle(frame)
+    }
+
+    private var tipDialog: CommonDialog? = null
+
+    /** 最后一次成功收到串口数据的时间戳（毫秒） */
+    private var lastDataReceivedTime = System.currentTimeMillis()
+
+    /** 无数据超时提示弹窗 */
+    private var noDataWarningDialog: CommonDialog? = null
+
+    /**
+     * 无数据看门狗：每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 =
+                            "长时间未收到数据，若无法开门或秤重量不更新情况，请考虑断电重启设备"
+                    }
+                }
+                if (noDataWarningDialog?.isShowing == false) {
+                    noDataWarningDialog?.show()
+                }
+            }
+            handler.postDelayed(this, 30 * 1000L)
+        }
+    }
+
+    /**
+     * 用户超时无操作时关灯
+     */
+    override fun onUserInactive() {
+        switchLight(false)
+    }
+
+    override fun onDestroy() {
+        // 清理 Handler 所有回调，防止内存泄漏
+        handler.removeCallbacksAndMessages(null)
+
+        // 关闭并释放 Dialog 引用，防止内存泄漏
+        tipDialog?.dismiss()
+        tipDialog = null
+        noDataWarningDialog?.dismiss()
+        noDataWarningDialog = null
+
+        runBlocking { SerialPortManager.close() }
+        saveTaskJob?.cancel()
+        overdueTaskJob?.cancel()
+        EventBus.getDefault().unregister(this)
+        super.onDestroy()
+    }
+
+    private val shelfAdapter by lazy {
+        ShelfAdapter(list).apply {
+            setOnItemClickListener { _, _, position ->
+                onShelfItemClicked(position)
+            }
+        }
+    }
+
+    /**
+     * 处理货架格子点击事件：按需开锁，然后跳转 ShelfActivity
+     */
+    private fun onShelfItemClicked(position: Int) {
+        shelfIndex = position
+        lifecycleScope.launch {
+            if (isNeedOpenLock()) {
+                val openCmd = if (list[position].deviceNo in 1..5)
+                    LEFT_SHELF_OPEN_CMD
+                else
+                    RIGHT_SHELF_OPEN_CMD
+                SerialPortManager.send(openCmd)
+            }
+            launch(Intent(this@HomeActivity, ShelfActivity::class.java).also {
+                it.putExtra(ShelfActivity.SHELF_MODEL, list[position])
+            }) { 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
+            weight = model.weight
+            if (model.putCabinetDay.isNullOrBlank().not()) {
+                putCabinetDay = model.putCabinetDay
+            }
+        }
+        shelfAdapter.notifyItemChanged(position)
+        syncShelfGoodsToServer()
+    }
+
+    private fun initRecyclerView() {
+        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
+                }
+            }
+        }
+    }
+
+    private val handler = Handler(Looper.getMainLooper())
+
+    override fun onResume() {
+        super.onResume()
+        hideStatusBar()
+        // 启动无数据看门狗（每30秒检查一次）
+        handler.postDelayed(noDataWatchdogTask, 30 * 1000L)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        // 停止无数据看门狗
+        handler.removeCallbacks(noDataWatchdogTask)
+    }
+
+    @SuppressLint("NotifyDataSetChanged")
+    private fun loadEmptyView() {
+        list.clear()
+        shelfAdapter.notifyDataSetChanged()
+        binding.include?.let {
+            it.root.visible()
+            it.root.setOnClickListener {
+                viewModel.getShelfList(deviceId = App.deviceId)
+            }
+            it.ivEmptyIcon.setImageResource(R.drawable.ic_empty_white)
+            it.tvEmptyContent.setTextColor(Color.WHITE)
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun clearEmptyShelf(event: ClearShelfEvent) {
+        val item = list.firstOrNull { it.deviceNo == event.shelfNo }
+        item?.apply {
+            goodsId = ""
+            goodsName = null
+            weight = 0.0
+            weightBak = if (event.weight <= 0.0) 0.0 else -1 * event.weight.toDouble()
+            createTime = null
+            overdueDay = null
+        }
+        shelfAdapter.notifyItemChanged(list.indexOf(item))
+    }
+
+    private val taskExecutor by lazy { IntervalExecutor() }
+    private var saveTaskJob: Job? = null
+
+    /**
+     * 保存定时任务
+     */
+    private fun saveGoodsTask() {
+        saveTaskJob =
+            taskExecutor.startIntervalTaskWithInitialDelay(1 * 60 * 1000L, 5 * 60 * 1000L) {
+                syncShelfGoodsToServer()
+            }
+    }
+
+    private var overdueTaskJob: Job? = null
+
+    /**
+     * 过期时间定时任务
+     */
+    private fun overdueTask() {
+        overdueTaskJob = taskExecutor.startIntervalTaskWithInitialDelay(5 * 1000L, 5 * 60 * 1000L) {
+            updateOverdueState()
+        }
+    }
+
+    private fun 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) {
+                model.overdue = items[index].overdue
+                shelfAdapter.notifyItemChanged(index)
+                log("更新编号为${model.deviceNo}物品:${model.goodsName}的过期状态:${model.overdue}")
+            }
+        }
+    }
+
+    /**
+     * 构建 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
+            }
+        }
+        val body = ShelfBody().also {
+            it.deviceId = App.deviceId ?: ""
+            it.canteenId = App.canteenId
+            it.temperature = showTemperatureC
+            it.humidity = showHumidity
+            it.goodsList = submitList
+        }
+        log("performSync提交body:${body.toJsonString()}")
+        viewModel.saveShelfGoodsList(body)
+    }
+}

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

@@ -0,0 +1,321 @@
+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
+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
+import com.shuwei.intelligent.shelves.utils.ext.invisible
+import com.shuwei.intelligent.shelves.utils.ext.startActivity
+import com.shuwei.intelligent.shelves.utils.ext.toJsonString
+import com.shuwei.intelligent.shelves.utils.ext.toObject
+import com.shuwei.intelligent.shelves.utils.ext.toast
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.launch
+import kotlin.collections.forEach
+import kotlin.getValue
+import kotlin.ranges.downTo
+import kotlin.text.isBlank
+
+class InitActivity : BaseActivity() {
+    companion object {
+        const val TAG = "InitActivity"
+    }
+
+    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?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityInitBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+
+        App.deviceId = AppUtil.getUDID( this)
+//        App.deviceId = "4787e213-90ab-3e32-88e0-ac271a937751"
+        Log.d(TAG, "onCreate: deviceId = ${App.deviceId}")
+        SpTool.put(SpTool.DEVICE_ID, App.deviceId)
+        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)
+//        Log.d(TAG, "onCreate: deviceId=$deviceId")
+////        deviceId = "39a7abdd06b3c7ab"
+////        deviceId = "3ea47dc0-3cf0-3c2f-909c-265a9a65572e"
+//        App.deviceId = deviceId
+//
+//        SpTool.put(SpTool.DEVICE_ID, deviceId)
+//        val deviceConfigCache = SpTool.getString(SpTool.DEVICE_CONFIG_CACHE)
+//        val checkResult = checkConfigData(deviceConfigCache)
+//        if (checkResult.not()) {
+//            binding.ivQrCode.visible()
+//            binding.btnInit.visible()
+//            //进行初始化操作
+//            initConfig()
+//            return
+//        }
+        binding.ivQrCode.invisible()
+        binding.btnInit.invisible()
+
+//        countDown()
+        initViews()
+    }
+
+    private fun countDown() {
+        lifecycleScope.launch {
+            flow {
+                (2 downTo 1).forEach {
+                    delay(1000)
+                    emit(it)
+                }
+            }.collect {
+                // 倒计时结束执行跳转
+                if (it == 1) {
+                    startActivity<HomeActivity>()
+                    finish()
+                }
+            }
+        }
+    }
+
+    private fun initConfig() {
+        binding.ivQrCode.setImageBitmap(
+            QRCodeUtil.generateQRCode(
+                content = App.deviceId,
+                size = 200.dp
+            )
+        )
+        binding.btnInit.setOnClickListener {
+            viewModel.getDeviceToken(App.deviceId)
+        }
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                launch {
+                    viewModel.getDeviceTokenUiState.collect { state ->
+                        when (state) {
+                            is UiState.Loading -> {}
+                            is UiState.Success<*> -> {
+                                state.data.data?.let { deviceToken ->
+                                    Log.d(TAG, "initConfig: $deviceToken")
+                                    viewModel.getDeviceConfig(
+                                        deviceId = App.deviceId,
+                                        deviceToken = deviceToken.toString()
+                                    )
+                                }
+                            }
+                            is UiState.Error -> toast(state.msg)
+                            else -> {}
+                        }
+                    }
+                }
+                launch {
+                    viewModel.getDeviceConfigUiState.collect { state ->
+                        when (state) {
+                            is UiState.Loading -> {}
+                            is UiState.Success<*> -> {
+                                state.data.data?.let {
+                                    if (it is DeviceConfigInfo) {
+                                        SpTool.put(SpTool.DEVICE_CONFIG_CACHE, it.toJsonString())
+                                        GlobalData.appBaseUrl = it.appPackageUrl?:""
+                                        App.canteenId = it.canteenId?:""
+
+                                        startActivity<HomeActivity>()
+                                        finish()
+                                    }
+                                }
+                            }
+                            is UiState.Error -> toast(message = state.msg)
+                            else -> {}
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private fun checkConfigData(data: String): Boolean {
+        if (data.isBlank()) {
+            return false
+        }
+        val config = data.toObject<DeviceConfigInfo?>()
+        if (config == null) {
+            return false
+        }
+        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

@@ -0,0 +1,203 @@
+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 ->
+                if (isLogDir.not()) {
+                    showConfirmDialog(logList[position])
+                    return@setOnItemClickListener
+                }
+                startActivity<LogActivity> {
+                    putExtra(IS_LOG_DIR, false)
+                    putExtra(LOG_DATE, logList[position])
+                }
+            }
+        }
+    }
+
+    private fun showConfirmDialog(content:String) {
+        CommonDialog(this).apply {
+            dialogTitle = "温馨提示"
+            dialogContent = content
+            confirmBlock = {
+                content?.copyTextToClipboard(this@LogActivity)
+            }
+        }.show()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityLogListBinding.inflate(layoutInflater)
+        setBackground()
+        setContentView(binding.root)
+        isLogDir = intent.getBooleanExtra(IS_LOG_DIR, false)
+        logDate = intent.getStringExtra(LOG_DATE) ?: ""
+        binding.ivBack.setOnClickListener { finish() }
+        binding.tvTitle.text = if (isLogDir) "全部日志" else logDate
+        binding.tvTitle.setOnClickListener {
+            logList.reverse()
+            logAdapter.notifyDataSetChanged()
+        }
+
+        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("${ProtocolConstants.HEADER}${ProtocolConstants.CMD_TEMP_REPORT}") }
+            if (list.isEmpty()) {
+                toast("未找到到1001指令")
+                return@setOnClickListener
+            }
+            logList.clear()
+            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

@@ -0,0 +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)
+//    }
+//
+//}

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

@@ -1,10 +1,8 @@
-package com.shuwei.intelligent.shelves
+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
@@ -16,20 +14,20 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.GridLayoutManager
 import com.chad.library.adapter4.util.setOnDebouncedItemClick
 import com.scwang.smart.refresh.layout.constant.RefreshState
-import com.shuwei.intelligent.shelves.HomeActivity.Companion.DEVICE_INFO_CMD
+import com.shuwei.intelligent.shelves.App
+import com.shuwei.intelligent.shelves.R
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants
 import com.shuwei.intelligent.shelves.adapter.SearchAdapter
 import com.shuwei.intelligent.shelves.base.BaseActivity
 import com.shuwei.intelligent.shelves.databinding.ActivityShelfBinding
+import com.shuwei.intelligent.shelves.model.ClearShelfEvent
 import com.shuwei.intelligent.shelves.model.GoodsModel
-import com.shuwei.intelligent.shelves.model.GoodsRecord
 import com.shuwei.intelligent.shelves.model.SendWeightEvent
 import com.shuwei.intelligent.shelves.model.ShelfModel
 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.serial.SerialPortManager
-import com.shuwei.intelligent.shelves.task.TaskManager
 import com.shuwei.intelligent.shelves.utils.DateTimeUtil
 import com.shuwei.intelligent.shelves.utils.KeyboardUtil
 import com.shuwei.intelligent.shelves.utils.ext.addOnActionSearchListener
@@ -53,7 +51,7 @@ class ShelfActivity : BaseActivity() {
     companion object {
         private const val TAG = "ShelfActivity"
 
-        private const val YYYY_MM_DD__EEEE_HH_MM_SS = "yyyy年MM月dd日 EEEE***HH:mm:ss"
+        const val YYYY_MM_DD__EEEE_HH_MM_SS = "yyyy年MM月dd日 EEEE***HH:mm:ss"
         const val SHELF_MODEL = "shelfModel"
         const val RECEIVER_DEVICE_INFO = "receiverDeviceInfo"
         const val SHELF_WEIGHT = "shelfWeight"
@@ -89,9 +87,9 @@ class ShelfActivity : BaseActivity() {
         shelfModel?.let {
             binding.tvShelfName.text = it.shelfName
             binding.tvFoodName.text = if (it.goodsName.isNullOrBlank()) "-" else it.goodsName
-            realWeight = ((it.weight ?: 0.0) * 1000).toInt()
+            realWeight = it.weight?.toInt()?:0
-//            realWeight = (HomeActivity.getRealWeight() * 1000).toInt()
+            binding.tvFoodWeight.text = if(realWeight < 1000) "${realWeight}克" else "%.3f千克".format(realWeight/1000.0)
-            binding.tvFoodWeight.text = "${realWeight}克"
+            startTime = System.currentTimeMillis()
         }
 
         initRecyclerView()
@@ -124,10 +122,10 @@ class ShelfActivity : BaseActivity() {
                 shelfName = shelfModel?.shelfName,
                 goodsId = currentGoodsId,
                 goodsName = list[clickIndex].goodsName,
-                weight = realWeight / 1000.0,
+                weight = realWeight.toDouble(),
                 overdueDay = list[clickIndex].overdueDay,
 //                createTime = if (shelfModel?.goodsId == currentGoodsId) null else DateTimeUtil.formatDateTime(dateTime = Date())
-                createTime = DateTimeUtil.formatDateTime(dateTime = Date())
+                putCabinetDay = DateTimeUtil.formatDateTime(dateTime = Date())
             )
             val intent = Intent().apply {
                 putExtra(SHELF_MODEL, data)
@@ -136,30 +134,20 @@ class ShelfActivity : BaseActivity() {
             finish()
         }
         binding.root.setOnClickListener { v ->
-            KeyboardUtil.hideKeyboard(v.context, v)
+            KeyboardUtil.hideKeyboard(v)
         }
-        binding.btnClearZero.setOnClickListener { v ->
+        binding.btnClearZero.setOnClickListener {
+            clearZero()
+        }
+        binding.btnClearEmpty.setOnClickListener {
+            val tempWeight = shelfModel?.weight?.toInt()?:0
+            clearZero()
+            binding.tvFoodName.text = "-"
+            //binding.tvFoodWeight.text = "0克"
+            EventBus.getDefault().post(ClearShelfEvent(shelfModel!!.deviceNo, tempWeight))
+        }
+        sendCmd(ProtocolConstants.DEVICE_INFO_CMD)
         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}"
-                Log.d(TAG, "onCreate: zeroClearingCmd=$zeroClearingCmd")
-                SerialPortManager.send(zeroClearingCmd)
-                //清零
-                realWeight = 0
-//                binding.tvFoodWeight.text = "${realWeight}克"
-
-                SerialPortManager.send(DEVICE_INFO_CMD)
-                Loading.show(this@ShelfActivity)
-                v.postDelayed({ Loading.dismiss() }, 5000)
-            }
-            KeyboardUtil.hideKeyboard(v.context, v)
-        }
-
-        lifecycleScope.launch {
-            SerialPortManager.send(DEVICE_INFO_CMD)
-
             repeatOnLifecycle(Lifecycle.State.STARTED) {
                 viewModel.getGoodsListUiState.collect { state ->
                     when (state) {
@@ -185,7 +173,7 @@ class ShelfActivity : BaseActivity() {
         }
         getGoodsList()
 
-        TaskManager.startDeviceTask()
+//        TaskManager.startDeviceTask()
     }
 
     private fun finishRefresh() {
@@ -220,45 +208,44 @@ class ShelfActivity : BaseActivity() {
         finishRefresh()
         binding.root.postDelayed({ Loading.dismiss() }, 200)
         Log.d(TAG, "updateUI: ${data.toJsonString()}")
-        if (data.result !is GoodsRecord) {
+
+        val goodsList = data.data as MutableList<GoodsModel>
+        if (data.data.isNullOrEmpty()) {
             if (pageNo == 1) {
                 loadEmptyView()
             }
             return
         }
-        if (data.result.records.isNullOrEmpty()) {
+        if(pageNo == 1){
-            if (pageNo == 1) {
-                loadEmptyView()
-            }
-            return
-        }
-        var firstOne:GoodsModel?=null
-        if (pageNo == 1) {
-             if (shelfModel?.goodsId.isNullOrBlank().not()) {
-                 firstOne = list.firstOrNull { it.goodsId == shelfModel?.goodsId }
-                 if (firstOne == null) {
-                     firstOne = GoodsModel(
-                         goodsId = shelfModel?.goodsId,
-                         goodsName = shelfModel?.goodsName,
-                         isClicked = true
-                     )
-                 }
-             }
             list.clear()
         }
-        val records = data.result.records
+//        var firstOne:GoodsModel?=null
-        if (pageNo == 1) {
+//        if (pageNo == 1) {
-            firstOne?.let { one ->
+//             if (shelfModel?.goodsId.isNullOrBlank().not()) {
-                val filterResult = records.firstOrNull{one.goodsId == it.goodsId }
+//                 firstOne = list.firstOrNull { it.goodsId == shelfModel?.goodsId }
-                if (filterResult != null) {
+//                 if (firstOne == null) {
-                    records.remove(filterResult)
+//                     firstOne = GoodsModel(
-                }
+//                         goodsId = shelfModel?.goodsId,
-                clickIndex = 0
+//                         goodsName = shelfModel?.goodsName,
-                list.add(one)
+//                         isClicked = true
-            }
+//                     )
-        }
+//                 }
-        list.addAll(records)
+//             }
-        val enableLoadMore = records.size >= PAGE_SIZE
+//            list.clear()
+//        }
+//        val records = data.data.records
+//        if (pageNo == 1) {
+//            firstOne?.let { one ->
+//                val filterResult = records.firstOrNull{one.goodsId == it.goodsId }
+//                if (filterResult != null) {
+//                    records.remove(filterResult)
+//                }
+//                clickIndex = 0
+//                list.add(one)
+//            }
+//        }
+        list.addAll(goodsList)
+        val enableLoadMore = goodsList.size >= PAGE_SIZE
         binding.refreshLayout.setEnableLoadMore(enableLoadMore)
         if (enableLoadMore) {
             pageNo++
@@ -291,7 +278,7 @@ class ShelfActivity : BaseActivity() {
     override fun onDestroy() {
 //        unregisterReceiver(receiver)
         EventBus.getDefault().unregister(this)
-        TaskManager.cancelDeviceTask()
+//        TaskManager.cancelDeviceTask()
         super.onDestroy()
     }
 
@@ -316,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 = sdf.format(Date()).split("***")
-        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)
     }
 
     @SuppressLint("NotifyDataSetChanged")
@@ -368,8 +347,36 @@ class ShelfActivity : BaseActivity() {
     @Subscribe(threadMode = ThreadMode.MAIN)
     public fun receiveWeightEvent(event: SendWeightEvent) {
         if (event.shelfNo == (shelfModel?.deviceNo ?: 0)) {
-            binding.tvFoodWeight.text = "${event.weight}克"
+            val intervalTime = System.currentTimeMillis() - startTime
+            val weight = event.weight
+            log("编号${event.shelfNo}货架获取重量成功：${weight}克，数据获取间隔时间为：${intervalTime}")
+            binding.tvFoodWeight.text = if(weight < 1000) "${weight}克" else "%.3f千克".format(weight/1000.0)
+            startTime = System.currentTimeMillis()
+            window.decorView.postDelayed({ Loading.dismiss() }, 1000)
         }
     }
 
+    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 = "${ProtocolConstants.HEADER}0401${hex}${ProtocolConstants.FOOTER}"
+            log("编号${shelfNo}货架执行清零指令：${zeroClearingCmd}")
+            sendCmd(zeroClearingCmd)
+//            sendCmd(
+//                if (shelfNo in 1..5) ProtocolConstants.LEFT_SHELF_OPEN_CMD else ProtocolConstants.RIGHT_SHELF_OPEN_CMD
+//            )
+            //清零
+            realWeight = 0
+//                binding.tvFoodWeight.text = "${realWeight}克"
+
+            sendCmd(ProtocolConstants.DEVICE_INFO_CMD)
+            startTime = System.currentTimeMillis()
+            Loading.show(this@ShelfActivity)
+            window.decorView.postDelayed({ Loading.dismiss() }, 10000)
+        }
+        KeyboardUtil.hideKeyboard(window.decorView)
+    }
+    private var startTime = 0L
 }

app/src/main/java/com/shuwei/intelligent/shelves/adapter/LogAdapter.kt

@@ -0,0 +1,25 @@
+package com.shuwei.intelligent.shelves.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.chad.library.adapter4.BaseQuickAdapter
+import com.chad.library.adapter4.viewholder.QuickViewHolder
+import com.shuwei.intelligent.shelves.databinding.ListItemLogBinding
+
+class LogAdapter(list: MutableList<String>) :
+    BaseQuickAdapter<String, LogAdapter.VH>(list) {
+
+    inner class VH(var binding: ListItemLogBinding) : QuickViewHolder(binding.root)
+
+    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
+        val inflater = LayoutInflater.from(context)
+        val binding = ListItemLogBinding.inflate(inflater, parent, false)
+        return VH(binding)
+    }
+
+    override fun onBindViewHolder(holder: VH, position: Int, item: String?) {
+        holder.binding.tvLogName.text = item
+    }
+
+}

app/src/main/java/com/shuwei/intelligent/shelves/adapter/ShelfAdapter.kt

@@ -14,6 +14,7 @@ import com.shuwei.intelligent.shelves.utils.DateTimeUtil
 import com.shuwei.intelligent.shelves.utils.ext.gone
 import com.shuwei.intelligent.shelves.utils.ext.visible
 import java.util.Date
+import kotlin.math.abs
 
 class ShelfAdapter(list: MutableList<ShelfModel>) :
     BaseQuickAdapter<ShelfModel, ShelfAdapter.VH>(list) {
@@ -35,25 +36,29 @@ class ShelfAdapter(list: MutableList<ShelfModel>) :
 
     override fun onBindViewHolder(holder: VH, position: Int, item: ShelfModel?) {
         val shelfNo = item!!.deviceNo
-        item.shelfName = "货架-${if (shelfNo < 10) "0${shelfNo}" else "$shelfNo"}"
+        //货架-
-        val weight = item.weight ?: 0.toDouble()
+        item.shelfName = "${if (shelfNo < 10) "0${shelfNo}" else "$shelfNo"}"
+        val weight = item.weight ?: 0.0
         val binding = holder.binding
         if (item.overdueDay.isNullOrBlank()) {
             binding.ivStaleFood.gone()
         } else {
             runCatching {
-                val shelfDate = stringToDate(item.createTime)
+//                val shelfDate = stringToDate(item.putCabinetDay)
-                if (shelfDate == null) {
+                binding.ivStaleFood.run {
-                    binding.ivStaleFood.gone()
+                    if (item.overdue == true) visible() else gone()
-                } else {
-                    val days = item.overdueDay!!.toInt()
-                    val resultDate = DateTimeUtil.addDays(shelfDate, days)
-                    if (resultDate.before(Date())) {
-                        binding.ivStaleFood.visible()
-                    } else {
-                        binding.ivStaleFood.gone()
-                    }
                 }
+//                if (shelfDate == null) {
+//                    binding.ivStaleFood.gone()
+//                } else {
+//                    val days = item.overdueDay!!.toInt()
+//                    val resultDate = DateTimeUtil.addDays(shelfDate, days)
+//                    if (resultDate.before(Date())) {
+//                        binding.ivStaleFood.visible()
+//                    } else {
+//                        binding.ivStaleFood.gone()
+//                    }
+//                }
             }.onFailure {
                 binding.ivStaleFood.gone()
             }
@@ -61,8 +66,9 @@ class ShelfAdapter(list: MutableList<ShelfModel>) :
         //?.setImageResource()
         binding.tvFoodWeight.run {
             setTextColor(getColor(R.color.food_weight_orange))
-            val showWeight = if (weight == 0.toDouble()) "0" else "%.3f".format(weight)
+            //val showWeight = if (weight == 0.toDouble()) "0克" else "%.3f千克".format(weight)
-            text = "${showWeight}千克"
+            text = if(abs(weight) < 1000) "${weight.toInt()}克" else "%.3f千克".format(weight/1000.0)
+            //"${(weight*1000).roundToInt()}克"
         }
         //val isBlankShelf = weight <= 0
         val isBlankShelf = item.goodsName.isNullOrBlank()
@@ -102,7 +108,7 @@ class ShelfAdapter(list: MutableList<ShelfModel>) :
 //        }
         binding.tvStoreDate.run {
             setTextColor(getColor(R.color.black999))
-            text = item.createTime
+            text = item.putCabinetDay
         }
     }
 

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

@@ -1,24 +1,42 @@
 package com.shuwei.intelligent.shelves.base
 
 import android.content.Intent
-import android.os.Build
 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.view.WindowInsets
+import android.widget.PopupWindow
-import android.view.WindowInsetsController
-import android.widget.TextView
-import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
-import com.gyf.immersionbar.BarHide
+import androidx.lifecycle.lifecycleScope
-import com.gyf.immersionbar.ImmersionBar
+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.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
 
     private lateinit var binding: ActivityBaseBinding
     private var launcher: ActivityResultLauncher<Intent>? = null
@@ -36,6 +54,7 @@ open class BaseActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        hideSystemBars()
         binding = ActivityBaseBinding.inflate(layoutInflater)
         setContentView(binding.root)
         statusBarDarkFont()
@@ -46,37 +65,35 @@ open class BaseActivity : AppCompatActivity() {
                 }
             }
 
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        lightSwitchClick()
-//            window.setDecorFitsSystemWindows(false)
+
-//            window.insetsController?.apply {
+        binding.tvLeftStatus.setOnDoubleClickListener {
-//                hide(WindowInsets.Type.statusBars()) // 隐藏状态栏
+            //finish()
-//                systemBarsBehavior =
+            val intent = Intent(Intent.ACTION_MAIN).apply {
-//                    WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE // 滑动时临时显示
+                addCategory(Intent.CATEGORY_HOME)
-//            }
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK
-//        }
+            }
+            startActivity(intent)
 
         }
-
+        binding.tvRightStatus.setOnDoubleClickListener {
-    fun hideStatusBar() {
+            if (enableRightStatusMenu) showRightStatusPopup(binding.tvRightStatus)
-//        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()
         }
+    }
+
+    /** 是否允许右侧状态栏双击弹出菜单，默认关闭，仅 HomeActivity 开启 */
+    protected open val enableRightStatusMenu: Boolean = false
+
+    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)
     }
 
     fun setBackground() {
-        binding.root.setBackgroundColor(ContextCompat.getColor(this,R.color.bg_page))
+        binding.root.setBackgroundColor(ContextCompat.getColor(this, R.color.bg_page))
     }
 
     override fun setContentView(view: View?) {
@@ -88,12 +105,156 @@ open class BaseActivity : AppCompatActivity() {
     }
 
     fun updateLeftStatus(data: String) {
-        binding.tvLeftStatus.text = data
+        binding.tvLeftStatus.text = data.ifBlank { "                  " }
     }
 
     fun updateRightStatus(data: String) {
         binding.tvRightStatus.text = data
     }
 
+    // 5分钟
+    private val TIME_OUT: Long = (5 * 60 * 1000).toLong()
+    private val mHandler by lazy { Handler(Looper.getMainLooper()) }
+    private val mTimeoutRunnable = Runnable {
+        // 用户长时间无操作时回调，子类可覆写实现具体逻辑（如关灯）
+        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()
+        //开灯
+        if (System.currentTimeMillis() - lastTouchTime >= TIME_OUT) {
+            this.switchLight(true)
+        }
+        // 重置定时器
+        mHandler.removeCallbacks(mTimeoutRunnable)
+        mHandler.postDelayed(mTimeoutRunnable, TIME_OUT)
+        lastTouchTime = System.currentTimeMillis()
+    }
+
+    private var lastTouchTime = 0L
+
+    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) {
+        val tag = binding.tvLeftStatus.tag?.toString()?.toBoolean() ?: true
+        if (tag == isOpen) {
+            return
+        }
+        sendCmd(if (isOpen) LIGHT_OPEN else LIGHT_CLOSE)
+        binding.tvLeftStatus.tag = isOpen
+    }
+
+    private fun lightSwitchClick() {
+        switchLight(true)
+        binding.tvLeftStatus.clickWithDebounce {
+            val tag = binding.tvLeftStatus.tag?.toString()?.toBoolean() ?: true
+            switchLight(tag.not())
+        }
+    }
+
+    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)
+            }
+        }
+        popup.showAsDropDown(anchor)
+    }
+
+
+    fun sendCmd(cmd:String) {
+        lifecycleScope.launch {
+            val result = SerialPortManager.send(cmd)
+            log("发送命令${cmd}结果:${result}")
+        }
+    }
+
+    val fileLogger by lazy { FileLogger(this) }
+    fun log(message:String) {
+        Log.d(TAG, message)
+        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/BaseDialog.kt

@@ -0,0 +1,38 @@
+package com.shuwei.intelligent.shelves.base
+
+import android.app.Dialog
+import android.content.Context
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.view.Gravity
+import android.view.View
+import com.shuwei.intelligent.shelves.R
+import com.shuwei.intelligent.shelves.utils.ext.dp
+import com.shuwei.intelligent.shelves.utils.ext.hideKeyboard
+
+abstract class BaseDialog(
+    context: Context,
+    var defWidth: Int = 400.dp,
+    var defHeight: Int = 300.dp
+) : Dialog(context, R.style.DialogTheme) {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val rootView = getRootView()
+        setContentView(rootView)
+        setCancelable(false)
+        setCanceledOnTouchOutside(false)
+        window?.apply {
+            setLayout(defWidth, defHeight)
+            setBackgroundDrawable(ColorDrawable())
+            setGravity(Gravity.CENTER)
+        }
+        rootView.setOnClickListener { it.hideKeyboard() }
+        initView()
+    }
+
+    abstract fun getRootView(): View
+
+    abstract fun initView()
+
+}

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/dialog/CommonDialog.kt

@@ -0,0 +1,33 @@
+package com.shuwei.intelligent.shelves.dialog
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import com.shuwei.intelligent.shelves.base.BaseDialog
+import com.shuwei.intelligent.shelves.databinding.DialogLayoutBinding
+
+class CommonDialog(context: Context):BaseDialog(context) {
+
+    private lateinit var binding:DialogLayoutBinding
+
+    override fun getRootView(): View {
+        binding = DialogLayoutBinding.inflate(LayoutInflater.from(context))
+        return binding.root
+    }
+
+    var dialogTitle:String?=null
+    var dialogContent:String?=null
+    var confirmBlock:(()->Unit)?=null
+    override fun initView() {
+        binding.btnConfirm.setOnClickListener {
+            confirmBlock?.invoke()
+            dismiss()
+        }
+    }
+
+    override fun show() {
+        super.show()
+        binding.tvDialogTitle.text = dialogTitle
+        binding.tvDialogContent.text = dialogContent
+    }
+}

app/src/main/java/com/shuwei/intelligent/shelves/model/SendWeightEvent.kt

@@ -6,3 +6,5 @@ data class SendWeightEvent(
 )
 
 data class WeightEvent(var weight: Int)
+
+data class ClearShelfEvent(var shelfNo: Int, var weight: Int)

app/src/main/java/com/shuwei/intelligent/shelves/model/ShelfModel.kt

@@ -6,12 +6,16 @@ data class ShelfModel(
     var id: String? = null,
     var deviceNo: Int = 0,
     var shelfName: String? = null,
-    var goodsId: String = "",
+    var goodsId: String? = "",
     var goodsName: String? = null,
     var deviceId: String? = null,
-    var weight: Double? = null,
+    var weight: Double = 0.0,
+    var weightBak: Double = 0.0,
     var createTime: String? = null,
+    var putCabinetDay: String? = null,
+    var updateTime: String? = null,
     var overdueDay: String? = null,
     var temperature: String? = null,
     var humidity: String = "0",
+    var overdue:Boolean ?= false
 ) : Serializable

app/src/main/java/com/shuwei/intelligent/shelves/model/ShelfResult.kt

@@ -1,7 +1,8 @@
 package com.shuwei.intelligent.shelves.model
 
 data class ShelfResult(
-    val canteenId: String = "",
+    val placeId: String = "",
     val canteenName: String = "",
+    val deviceName: String = "",
     val containerGoodsList: List<ShelfModel>? = null
 )

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

@@ -2,7 +2,7 @@ package com.shuwei.intelligent.shelves.net
 
 import com.shuwei.intelligent.shelves.App
 import com.shuwei.intelligent.shelves.model.DeviceConfigInfo
-import com.shuwei.intelligent.shelves.model.GoodsRecord
+import com.shuwei.intelligent.shelves.model.GoodsModel
 import com.shuwei.intelligent.shelves.model.ShelfBody
 import com.shuwei.intelligent.shelves.model.ShelfResult
 import retrofit2.http.Body
@@ -28,22 +28,19 @@ interface ApiService {
     @GET("/equipment/stEquipment/queryByEquipmentCode")
     suspend fun getDeviceInfo(
         @Query("equipmentCode") equipmentCode: String,
-        @Query("appVersion") appVersion: String = App.appVersion,
+        @Query("appVersion") appVersion: String = App.appVersion
-        @Header("X-Access-Token") token: String
     ): RespData<DeviceConfigInfo>
 
     @GET
     suspend fun getAccessToken(
         @Url url: String = UrlConfig.GET_ACCESS_TOKEN,
-        @Query("qrcodeId") qrcodeId: String,
+        @Query("qrcodeId") qrcodeId: String
-        @Header("x-access-token") token: String = App.accessToken
     ): RespData<String?>
 
     @GET
     suspend fun getShelfList(
         @Url url: String = UrlConfig.GET_SHELF_LIST,
-        @Query("deviceId") deviceId: String,
+        @Query("deviceId") deviceId: String
-        @Header("x-access-token") token: String = App.accessToken
     ): RespData<ShelfResult>
 
     @GET
@@ -52,15 +49,13 @@ interface ApiService {
         @Query("canteenId") canteenId: String = "0",
         @Query("goodsName") goodsName: String? = null,
         @Query("pageNo") pageNo: Int = 1,
-        @Query("pageSize") pageSize: Int = 50,
+        @Query("pageSize") pageSize: Int = 50
-        @Header("x-access-token") token: String = App.accessToken
+    ): RespData<MutableList<GoodsModel>?>
-    ): RespData<GoodsRecord>
 
     @POST
     suspend fun saveShelfGoodsList(
         @Url url: String = UrlConfig.SAVE_SHELF_GOODS_LIST,
-        @Body body: ShelfBody,
+        @Body body: ShelfBody
-        @Header("x-access-token") token: String = App.accessToken
     ): RespData<Any?>
 
 }

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

@@ -2,10 +2,12 @@ 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
+import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import java.util.concurrent.TimeUnit
@@ -17,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()
@@ -27,18 +29,29 @@ 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())
+//                addInterceptor(LoggingInterceptor())
+                addNetworkInterceptor(HttpLoggingInterceptor(logger = {
+                    Log.d("HttpManager","okhttp logger ==>${it}")
+                }).apply {
+                    level =
+                        if (BuildConfig.DEBUG) {
+                        HttpLoggingInterceptor.Level.BODY
+                    } else {
+                        HttpLoggingInterceptor.Level.NONE
+                    }
+                })
 //                addInterceptor { chain ->
 //                    val request = chain.request().newBuilder()
 //                        .header("x-access-token", App.accessToken)
 //                        .build()
 //                    chain.proceed(request)
 //                }
+                addInterceptor(RequestInterceptor())
             }
             .build()
     }
@@ -49,19 +62,18 @@ class HttpManager private constructor() {
 
 //    fun newCall(request: Request): Call = client.newCall(request)
 
-    inner class LoggingInterceptor : Interceptor {
+//    inner class LoggingInterceptor : Interceptor {
-        override fun intercept(chain: Interceptor.Chain): Response {
+//        override fun intercept(chain: Interceptor.Chain): Response {
-            val request = chain.request()
+//            val request = chain.request()
-            // 打印请求日志
+//            // 打印请求日志
-            Log.d("OkHttp", "--> ${request.method},${request.url}")
+//            Log.d("HttpManager", "--> ${request.method},${request.url},${request.body}")
-
+//
-            val response = chain.proceed(request)
+//            val response = chain.proceed(request)
-            // 打印响应日志
+//            // 打印响应日志
-            Log.d("OkHttp", "<-- ${response.code},${response.request.url}")
+//            Log.d("HttpManager", "<-- ${response.body}")
-
+//            return response
-            return response
+//        }
-        }
+//    }
-    }
 
     // 信任所有证书的TrustManager实现
     @SuppressLint("CustomX509TrustManager")

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

@@ -1,5 +1,6 @@
 package com.shuwei.intelligent.shelves.net
 
+import android.app.Activity
 import android.app.Dialog
 import android.content.Context
 import android.graphics.Color
@@ -15,24 +16,34 @@ object Loading {
 
     private var dialog: LoadingDialog? = null
 
-    fun show(context: Context) {
+    fun show(activity: Activity) {
+        try {
+            if (activity.isFinishing || activity.isDestroyed) {
+                return
+            }
             if (dialog?.isShowing == true) {
                 dialog?.dismiss()
             }
-
             if (dialog == null) {
-            dialog = LoadingDialog(context)
+                dialog = LoadingDialog(activity)
             }
             dialog?.show()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
     }
 
     fun dismiss() {
+        try {
             dialog?.let {
                 if (it.isShowing) {
                     it.dismiss()
                 }
             }
             dialog = null
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
     }
 
 }
@@ -47,12 +58,13 @@ class LoadingDialog(
         binding.tvMessage.text = message
         setContentView(binding.root)
         setCancelable(true)
+        setCanceledOnTouchOutside(true)
         window?.run {
             setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
-            setFlags(
+//            setFlags(
-                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
+//                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
-                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+//                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
-            );
+//            )
         }
         setOnDismissListener {
             onDismiss()

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

@@ -1,31 +1,20 @@
 package com.shuwei.intelligent.shelves.net
 
+import android.util.Log
 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.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
 
@@ -38,16 +27,18 @@ 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 {
             _getDeviceTokenUiState.value = UiState.Loading
             runCatching {
                 val response = apiService.getDeviceToken(qrcodeId = deviceId)
-                if (response.success) {
+                if (response.isSuccess()) {
                     _getDeviceTokenUiState.value = UiState.Success(response)
                 } else {
-                    _getDeviceTokenUiState.value = UiState.Error(response.message ?: "请求失败")
+                    _getDeviceTokenUiState.value = UiState.Error(response.msg ?: "请求失败")
                 }
             }.onFailure {
                 _getDeviceTokenUiState.value = UiState.Error(it.message ?: "请求异常")
@@ -59,11 +50,11 @@ class NetViewModel : ViewModel() {
         viewModelScope.launch {
             _getDeviceConfigUiState.value = UiState.Loading
             runCatching {
-                val response = apiService.getDeviceInfo(equipmentCode = deviceId, token = deviceToken)
+                val response = apiService.getDeviceInfo(equipmentCode = deviceId)
-                if (response.success) {
+                if (response.isSuccess()) {
                     _getDeviceConfigUiState.value = UiState.Success(response)
                 } else {
-                    _getDeviceConfigUiState.value = UiState.Error(response.message ?: "请求失败")
+                    _getDeviceConfigUiState.value = UiState.Error(response.msg ?: "请求失败")
                 }
             }.onFailure {
                 _getDeviceConfigUiState.value = UiState.Error(it.message ?: "请求异常")
@@ -76,10 +67,10 @@ class NetViewModel : ViewModel() {
             _getAccessTokenUiState.value = UiState.Loading
             runCatching {
                 val response = apiService.getAccessToken(qrcodeId = deviceId)
-                if (response.success) {
+                if (response.isSuccess()) {
                     _getAccessTokenUiState.value = UiState.Success(response)
                 } else {
-                    _getAccessTokenUiState.value = UiState.Error(response.message ?: "请求失败")
+                    _getAccessTokenUiState.value = UiState.Error(response.msg ?: "请求失败")
                 }
             }.onFailure {
                 _getAccessTokenUiState.value = UiState.Error(it.message ?: "请求异常")
@@ -92,10 +83,10 @@ class NetViewModel : ViewModel() {
             _getShelfListUiState.value = UiState.Loading
             runCatching {
                 val response = apiService.getShelfList(deviceId = deviceId)
-                if (response.success) {
+                if (response.isSuccess()) {
                     _getShelfListUiState.value = UiState.Success(response)
                 } else {
-                    _getShelfListUiState.value = UiState.Error(response.message ?: "请求失败")
+                    _getShelfListUiState.value = UiState.Error(response.msg ?: "请求失败")
                 }
             }.onFailure {
                 _getShelfListUiState.value = UiState.Error(it.message ?: "请求异常")
@@ -103,21 +94,20 @@ class NetViewModel : ViewModel() {
         }
     }
 
-//    fun saveShelfGoodsList(body: ShelfBody) {
+    fun updateOverdueState() {
-//        viewModelScope.launch {
+        viewModelScope.launch {
-//            _saveShelfGoodsListUiState.value = UiState.Loading
+            runCatching {
-//            runCatching {
+                val response = apiService.getShelfList(deviceId = App.deviceId)
-//                val response = apiService.saveShelfGoodsList(body)
+                if (response.isSuccess()) {
-//                if (response.success) {
+                    _updateOverdueStateUiState.value = UiState.Success(response)
-//                    _saveShelfGoodsListUiState.value = UiState.Success(response)
+                } else {
-//                } else {
+                    _updateOverdueStateUiState.value = UiState.Error(response.msg ?: "请求失败")
-//                    _saveShelfGoodsListUiState.value = UiState.Error(response.message ?: "请求失败")
+                }
-//                }
+            }.onFailure {
-//            }.onFailure {
+                _updateOverdueStateUiState.value = UiState.Error(it.message ?: "请求异常")
-//                _saveShelfGoodsListUiState.value = UiState.Error(it.message ?: "请求异常")
+            }
-//            }
+        }
-//        }
+    }
-//    }
 
     fun getGoodsList(
         canteenId: String = "",
@@ -134,10 +124,10 @@ class NetViewModel : ViewModel() {
                     pageNo = pageNo,
                     pageSize = pageSize
                 )
-                if (response.success) {
+                if (response.isSuccess()) {
                     _getGoodsListUiState.value = UiState.Success(response)
                 } else {
-                    _getGoodsListUiState.value = UiState.Error(response.message ?: "请求失败")
+                    _getGoodsListUiState.value = UiState.Error(response.msg ?: "请求失败")
                 }
             }.onFailure {
                 _getGoodsListUiState.value = UiState.Error(it.message ?: "请求异常")
@@ -145,4 +135,15 @@ class NetViewModel : ViewModel() {
         }
     }
 
+    fun saveShelfGoodsList(body: ShelfBody) {
+        viewModelScope.launch {
+            runCatching {
+                val resp = apiService.saveShelfGoodsList(body = body)
+                Log.d("NetViewModel", "saveShelfGoodsList,performSync: resp:${resp.toJsonString()}")
+            }.onFailure {
+                it.printStackTrace()
+                Log.d("NetViewModel", "saveShelfGoodsList异常：${it.message}")
+            }
+        }
+    }
 }

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

@@ -0,0 +1,35 @@
+package com.shuwei.intelligent.shelves.net
+
+import android.text.TextUtils
+import com.shuwei.intelligent.shelves.App
+import okhttp3.Interceptor
+import okhttp3.Request
+import okhttp3.Response
+
+/**
+ * 请求拦截器
+ */
+class RequestInterceptor : Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val originalRequest = chain.request()
+        val requestBuilder = originalRequest.newBuilder()
+            .header("Content-Type", "application/json")
+            .header("Accept", "application/json")
+            .header("X-Access-Token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjYW50ZWVuSWQiOiJiZTE1NDgzMS0zNDY2LTNiYTItYTJlYS01NzY1MmM5MTlmZWQiLCJ0eXBlIjoiNCIsInVzZXJJZCI6IjAwMDAwMDAwMDAwMDAwMDAwMDEifQ.sN40cOC-O5WQFrF4IDUs8fFlkNdUKLbJt_rHyTsgYYM")
+            .header("X-DEVICE-CODE", App.deviceId)
+            .header("authorization", "57ee87183f2a4fa59683ec9ef41c8f5d")
+
+        val newRequest = requestBuilder.build()
+
+        return chain.proceed(newRequest)
+    }
+
+//    private fun getToken(originRequest: Request): String {
+//        val tokenParam = originRequest.header("X-Access-Token")
+//        if (!TextUtils.isEmpty(tokenParam)) return tokenParam!!
+//        // 从本地获取token的逻辑
+//        val spUtil = SPUtil.getInstance(context = App.getContext())
+//        return spUtil.get(GlobalKey.KEY_TOKEN, "") as String
+////        return "eyJhbGciOiJIUzUxMiJ9.eyJpZCI6MTQ2LCJ1c2VyTmFtZSI6IjEzNjgxNDQ4ODU2IiwibmFtZSI6IuW-kOejiiIsInBhc3N3b3JkIjoiOTllOTQ1ZmVjZmZjNWIzNDI4MmUwNDRlODYyMzdjM2UxZjU5OWY5OCIsInNhbHQiOiI0NmEzMzUzYWU4OTA0MDYxYjMzODU5ZWNlYTBlMGE2NyIsInBob25lIjoiMTM2ODE0NDg4NTYiLCJzdGF0dXMiOjEsInVzZXJUeXBlIjoyLCJjcmVhdGVVc2VyTm8iOiIxNDEiLCJjcmVhdGVUaW1lIjoxNjI2OTQzNDE2MDAwLCJ1cGRhdGVVc2VyTm8iOiIxNDEiLCJ1cGRhdGVUaW1lIjoxNjI2OTQzNDE2MDAwLCJpc0RlbCI6ZmFsc2UsImVhSWQiOjk5LCJlYUlkTGlzdCI6Ijk5IiwiaXNTaG9wTWFuYWdlciI6dHJ1ZSwidXNlck5vIjoiMWY5Nzk5ZWMtODlkYi00MWYyLTk1YTEtY2UzNTA3Y2QyMTU2In0.f7wImPgBOYMV0AqRchnXGPkUWZN9dFJ9gLPsaB8uNldd21IfXLjJl8y-FiWVuVUvlwUvGpgqGDFR1JKj5H7amw"
+//    }
+}

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

@@ -1,8 +1,11 @@
 package com.shuwei.intelligent.shelves.net
 
 data class RespData<T>(
-    val success: Boolean = false,
+//    val success: Boolean = false,
-    val message: String? = null,
+    val msg: String? = null,
-    val code: Int = 0,
+    val code: String? = null,
-    val result: T? = null
+    val data: T? = null,
-)
+//    val total: Int
+) {
+    fun isSuccess() = code == "00000"
+}

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

@@ -1,9 +1,10 @@
 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"
+//    const val DEVICE_BASE_URL = "http://device.shuziweidao.com:8889"
 //    /**
 //     * device获取token
 //     */
@@ -13,12 +14,18 @@ object UrlConfig {
 //     */
 //    const val DEVICE_CONFIG = "${DEVICE_BASE_URL}/equipment/stEquipment/queryByEquipmentCode"
 
-//    const val BASE_URL = "http://192.168.1.3:9002"
+//    const val BASE_URL = "https://dev.yixiong-tech.com:8081"
-    const val BASE_URL = "https://yyjk.shuziweidao.com/gateway"
+////        const val BASE_URL = "https://yyjk.shuziweidao.com/gateway"
-    var GET_ACCESS_TOKEN = "${App.configUrl}/restaurant/equipment/stEquipment/getEquipmentToken"
+////        const val BASE_URL = "http://192.168.1.201:14801"
-    var GET_SHELF_LIST = "${App.configUrl}/inventory/smartShelves/app/getShelvesListByDeviceId"
+//    const val DEVICE_BASE_URL = BASE_URL
-    var GET_GOODS_LIST = "${App.configUrl}/inventory/smartShelves/app/getGoodsPageList"
+
-    var SAVE_SHELF_GOODS_LIST = "${App.configUrl}/inventory/smartShelves/app/saveShelvesGoodsList"
+    var GET_ACCESS_TOKEN = "${GlobalData.appBaseUrl}/restaurant/equipment/stEquipment/getEquipmentToken"
+    var GET_SHELF_LIST =
+        "${GlobalData.appBaseUrl}/terminal/neglect/smartShelves/app/smartShelves/app/getShelvesListByDeviceId"
+    var GET_GOODS_LIST =
+        "${GlobalData.appBaseUrl}/terminal/neglect/smartShelves/app/smartShelves/app/getGoodsPageList"
+    var SAVE_SHELF_GOODS_LIST =
+        "${GlobalData.appBaseUrl}/terminal/neglect/smartShelves/app/smartShelves/app/saveShelvesGoodsList"
 
 }
 

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

@@ -0,0 +1,180 @@
+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"
+    )
+
+    /**
+     * 设备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/SerialFrameParser.kt

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

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

@@ -1,20 +1,24 @@
 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 const val PORT_NAME: String = "/dev/ttyS1"
+    private const val BAUD_RATE: Int = 115200
     private var serialPort: AndroidSerialPort? = null
-//    private var serialPort: SerialPort? = null
+
+    //    private var serialPort: SerialPort? = null
     private val scope = CoroutineScope(Dispatchers.IO)
 
     // 打开串口
@@ -22,8 +26,8 @@ object SerialPortManager {
         return try {
             serialPort = SerialPortFactory.create().apply {
                 open(
-                    portName = portName,
+                    portName = PORT_NAME,
-                    baudRate = baudRate,
+                    baudRate = BAUD_RATE,
                     dataBits = 8,
                     stopBits = 1,
                     parity = SerialPort.PARITY_NONE
@@ -48,15 +52,18 @@ object SerialPortManager {
     }
 
     // 启动接收协程
-    @Suppress("DEPRECATION")
-    @SuppressLint("DefaultLocale")
     fun startReceive(callback: (String) -> Unit) {
         scope.launch {
             while (isActive) {
-                serialPort?.read()?.collect { buffer ->
+                try {
-                    val data = buffer.toHexString2().toUpperCase()
+                    val flow = serialPort?.read()
+                    flow?.collect { buffer ->
+                        val data = buffer.toHexString2().uppercase(Locale.ROOT)
                         callback(data)
                     }
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
                 delay(50)
             }
         }

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

@@ -0,0 +1,247 @@
+package com.shuwei.intelligent.shelves.serial
+
+import com.shuwei.intelligent.shelves.App
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.ACTIVATE_BODY_LENGTH
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.ACTIVE_MAP
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.BYTES_PER_WEIGHT
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.CMD_ACTIVATE
+import com.shuwei.intelligent.shelves.serial.ProtocolConstants.CMD_CARD_UPLOAD
+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_WEIGHT_OFFSET
+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)
+            val activeCode = ACTIVE_MAP[App.deviceId]?:""
+            callback.onLog("收到[激活]${cmdFlag}指令:${data}，终端id:${terminalId},固件版本:${terminalVersion}，发送激活命令:$activeCode")
+            callback.onSendCmd(activeCode)
+        }
+    }
+
+    /** 处理心跳指令（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 + ProtocolConstants.shelfSensorCount() * 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 < ProtocolConstants.heartbeatMinLength()) return
+            val weightStartIndex = HEARTBEAT_WEIGHT_OFFSET
+            val weightEndIndex = weightStartIndex + ProtocolConstants.shelfSensorCount() * BYTES_PER_WEIGHT
+            parseWeightData(start = weightStartIndex, end = weightEndIndex, data = data)
+            val temperatureEndIndex = ProtocolConstants.heartbeatTemperatureStart() + 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)
+                // 直接用 Long 解析，然后减去 2^32 得到有符号值
+                val unsigned = weightHex.toLongOrNull(16) ?: 0L
+                val signed = if (unsigned >= 0x80000000L) unsigned - 0x100000000L else unsigned
+                signed.toInt()
+            }
+            callback.onWeightUpdated(index, realWeight)
+            count += BYTES_PER_WEIGHT
+            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()
+        }
+    }
+}

app/src/main/java/com/shuwei/intelligent/shelves/task/SyncDeviceTask.kt

@@ -1,32 +1,32 @@
-package com.shuwei.intelligent.shelves.task
+//package com.shuwei.intelligent.shelves.task
-
+//
-import android.content.Context
+//import android.content.Context
-import android.util.Log
+//import android.util.Log
-import androidx.work.CoroutineWorker
+//import androidx.work.CoroutineWorker
-import androidx.work.WorkerParameters
+//import androidx.work.WorkerParameters
-import com.shuwei.intelligent.shelves.HomeActivity
+//import com.shuwei.intelligent.shelves.activity.HomeActivity
-import com.shuwei.intelligent.shelves.serial.SerialPortManager
+//import com.shuwei.intelligent.shelves.serial.SerialPortManager
-
+//
-class SyncDeviceTask(appContext: Context, workerParams: WorkerParameters) :
+//class SyncDeviceTask(appContext: Context, workerParams: WorkerParameters) :
-    CoroutineWorker(appContext, workerParams) {
+//    CoroutineWorker(appContext, workerParams) {
-
+//
-    companion object {
+//    companion object {
-        private const val TAG = "SyncDeviceTask"
+//        private const val TAG = "SyncDeviceTask"
-    }
+//    }
-
+//
-    override suspend fun doWork(): Result {
+//    override suspend fun doWork(): Result {
-        return try {
+//        return try {
-            // 执行后台任务逻辑
+//            // 执行后台任务逻辑
-            Log.d(TAG, "doWork: ----------SyncDeviceTask----------")
+//            Log.d(TAG, "doWork: ----------SyncDeviceTask----------")
-            SerialPortManager.send(HomeActivity.DEVICE_INFO_CMD)
+//            SerialPortManager.send(HomeActivity.DEVICE_INFO_CMD)
-
+//
-            TaskManager.startDeviceTask()
+//            TaskManager.startDeviceTask()
-
+//
-            Result.success()
+//            Result.success()
-        } catch (e: Exception) {
+//        } catch (e: Exception) {
-            e.printStackTrace()
+//            e.printStackTrace()
-            Result.retry()
+//            Result.retry()
-        }
+//        }
-    }
+//    }
-
+//
-}
+//}

app/src/main/java/com/shuwei/intelligent/shelves/task/SyncTask.kt

@@ -1,58 +1,67 @@
-package com.shuwei.intelligent.shelves.task
+//package com.shuwei.intelligent.shelves.task
-
+//
-import android.content.Context
+//import android.content.Context
-import android.util.Log
+//import android.util.Log
-import androidx.work.CoroutineWorker
+//import androidx.work.CoroutineWorker
-import androidx.work.WorkerParameters
+//import androidx.work.WorkerParameters
-import com.shuwei.intelligent.shelves.App
+//import com.shuwei.intelligent.shelves.App
-import com.shuwei.intelligent.shelves.HomeActivity
+//import com.shuwei.intelligent.shelves.activity.HomeActivity
-import com.shuwei.intelligent.shelves.model.ShelfBody
+//import com.shuwei.intelligent.shelves.model.ShelfBody
-import com.shuwei.intelligent.shelves.net.apiService
+//import com.shuwei.intelligent.shelves.net.apiService
-import com.shuwei.intelligent.shelves.utils.ext.toJsonString
+//import com.shuwei.intelligent.shelves.utils.ext.toJsonString
-import kotlinx.coroutines.Dispatchers
+//import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
+//import kotlinx.coroutines.withContext
-
+//
-class SyncTask(appContext: Context, workerParams: WorkerParameters) :
+//class SyncTask(appContext: Context, workerParams: WorkerParameters) :
-    CoroutineWorker(appContext, workerParams) {
+//    CoroutineWorker(appContext, workerParams) {
-
+//
-    companion object {
+//    companion object {
-        private const val TAG = "SyncTask"
+//        private const val TAG = "SyncTask"
-    }
+//    }
-
+//
-    override suspend fun doWork(): Result {
+//    override suspend fun doWork(): Result {
-        return try {
+//        return try {
-            // 执行后台任务逻辑
+//            // 执行后台任务逻辑
-            performSync()
+//            performSync()
-
+//
-            TaskManager.startTask()
+//            TaskManager.startTask()
-
+//
-            Result.success()
+//            Result.success()
-        } catch (e: Exception) {
+//        } catch (e: Exception) {
-            e.printStackTrace()
+//            e.printStackTrace()
-            Result.retry()
+//            Result.retry()
-        }
+//        }
-    }
+//    }
-
+//
-    private suspend fun performSync() {
+//    private suspend fun performSync() {
-        withContext(Dispatchers.IO) {
+//        withContext(Dispatchers.IO) {
-            val list = HomeActivity.list
+//            val list = HomeActivity.list
-            Log.d(TAG, "performSync: list:${list.toJsonString()}")
+//            Log.d(TAG, "performSync: list:${list.toJsonString()}")
-            val submitList = list.sortedBy { it.deviceNo }
+//            val submitList = list.sortedBy { it.deviceNo }
-            submitList.forEach {
+//            submitList.forEach {
-                it.temperature = HomeActivity.showTemperatureC
+//                if (it.goodsId.isNullOrBlank()) {
-                it.humidity = HomeActivity.showHumidity
+//                    it.weight = it.weightBak
-            }
+//                }
-            val body = ShelfBody().also {
+//            }
-                it.deviceId = App.deviceId ?: ""
+////            submitList.forEach {
-                it.canteenId = App.canteenId
+////                it.temperature = HomeActivity.showTemperatureC
-                it.temperature = HomeActivity.showTemperatureC
+////                it.humidity = HomeActivity.showHumidity
-                it.humidity = HomeActivity.showHumidity
+////            }
-                it.goodsList = submitList
+//            val body = ShelfBody().also {
-            }
+//                it.deviceId = App.deviceId
-            val resp = apiService.saveShelfGoodsList(body = body)
+//                it.canteenId = App.canteenId
-            Log.d(TAG, "performSync: body:${body.toJsonString()}")
+//                it.temperature = HomeActivity.showTemperatureC
-            Log.d(TAG, "performSync: resp:${resp.toJsonString()}")
+//                it.humidity = HomeActivity.showHumidity
-        }
+//                it.goodsList = submitList
-    }
+//            }
-
+//            Log.d(TAG, "performSync: body:${body.toJsonString()}")
-}
+//            try {
+//                val resp = apiService.saveShelfGoodsList(body = body)
+//                Log.d(TAG, "performSync: resp:${resp.toJsonString()}")
+//            } catch (e: Exception) {
+//                e.printStackTrace()
+//            }
+//        }
+//    }
+//
+//}

app/src/main/java/com/shuwei/intelligent/shelves/task/TaskManager.kt

@@ -1,58 +1,59 @@
-package com.shuwei.intelligent.shelves.task
+//package com.shuwei.intelligent.shelves.task
-
+//
-import androidx.work.ExistingWorkPolicy
+//import androidx.work.ExistingWorkPolicy
-import androidx.work.OneTimeWorkRequestBuilder
+//import androidx.work.OneTimeWorkRequestBuilder
-import androidx.work.WorkManager
+//import androidx.work.WorkManager
-import com.shuwei.intelligent.shelves.App
+//import com.shuwei.intelligent.shelves.App
-import java.util.concurrent.TimeUnit
+//import java.util.concurrent.TimeUnit
-
+//
-object TaskManager {
+//object TaskManager {
-    const val TASK_NAME = "IntelligentShelvesSyncTask"
+//    const val TASK_NAME = "IntelligentShelvesSyncTask"
-    const val DEVICE_TASK_NAME = "IntelligentShelvesDeviceTask"
+//    const val DEVICE_TASK_NAME = "IntelligentShelvesDeviceTask"
-
+//
-    fun startTask() {
+//    fun startTask() {
-        val nextRequest = OneTimeWorkRequestBuilder<SyncTask>()
+//        val nextRequest = OneTimeWorkRequestBuilder<SyncTask>()
-            .setInitialDelay(3, TimeUnit.MINUTES)
+//            .setInitialDelay(2, TimeUnit.MINUTES)
-//            .setInitialDelay(30, TimeUnit.SECONDS)
+////            .setInitialDelay(30, TimeUnit.SECONDS)
-//            .setInputData(inputData)
+////            .setInitialDelay(10, TimeUnit.MINUTES)
-            .build()
+////            .setInputData(inputData)
-        WorkManager.getInstance(App.getInstance())
-            .enqueueUniqueWork(TASK_NAME, ExistingWorkPolicy.REPLACE, nextRequest)
-
-//        val constraints = Constraints.Builder()
-//            .setRequiredNetworkType(NetworkType.CONNECTED)
-//            .setRequiresBatteryNotLow(true)
 //            .build()
-//        val syncRequest = PeriodicWorkRequestBuilder<SyncTask>(
+//        WorkManager.getInstance(App.getInstance())
-//            3L, TimeUnit.MINUTES, // 最小间隔15分钟
+//            .enqueueUniqueWork(TASK_NAME, ExistingWorkPolicy.REPLACE, nextRequest)
-//            3L, TimeUnit.MINUTES   // 弹性时间窗口
+//
-//        )
+////        val constraints = Constraints.Builder()
-//            .setConstraints(constraints)
+////            .setRequiredNetworkType(NetworkType.CONNECTED)
+////            .setRequiresBatteryNotLow(true)
+////            .build()
+////        val syncRequest = PeriodicWorkRequestBuilder<SyncTask>(
+////            3L, TimeUnit.MINUTES, // 最小间隔15分钟
+////            3L, TimeUnit.MINUTES   // 弹性时间窗口
+////        )
+////            .setConstraints(constraints)
+////            .build()
+////        WorkManager.getInstance(App.get())
+////            .enqueueUniquePeriodicWork(
+////                TASK_NAME,
+////                ExistingPeriodicWorkPolicy.KEEP,
+////                syncRequest
+////            )
+//    }
+//
+//    fun cancelTask() {
+//        WorkManager.getInstance(App.getInstance())
+//            .cancelUniqueWork(TASK_NAME)
+//    }
+//
+//    fun startDeviceTask() {
+//        val nextRequest = OneTimeWorkRequestBuilder<SyncDeviceTask>()
+//            .setInitialDelay(2, TimeUnit.MINUTES)
 //            .build()
-//        WorkManager.getInstance(App.get())
+//        WorkManager.getInstance(App.getInstance())
-//            .enqueueUniquePeriodicWork(
+//            .enqueueUniqueWork(DEVICE_TASK_NAME, ExistingWorkPolicy.REPLACE, nextRequest)
-//                TASK_NAME,
+//    }
-//                ExistingPeriodicWorkPolicy.KEEP,
+//
-//                syncRequest
+//    fun cancelDeviceTask() {
-//            )
+//        WorkManager.getInstance(App.getInstance())
-    }
+//            .cancelUniqueWork(DEVICE_TASK_NAME)
-
+//    }
-    fun cancelTask() {
+//
-        WorkManager.getInstance(App.getInstance())
+//}
-            .cancelUniqueWork(TASK_NAME)
-    }
-
-    fun startDeviceTask() {
-        val nextRequest = OneTimeWorkRequestBuilder<SyncDeviceTask>()
-            .setInitialDelay(3, TimeUnit.SECONDS)
-            .build()
-        WorkManager.getInstance(App.getInstance())
-            .enqueueUniqueWork(DEVICE_TASK_NAME, ExistingWorkPolicy.REPLACE, nextRequest)
-    }
-
-    fun cancelDeviceTask() {
-        WorkManager.getInstance(App.getInstance())
-            .cancelUniqueWork(DEVICE_TASK_NAME)
-    }
-
-}

app/src/main/java/com/shuwei/intelligent/shelves/utils/AppUtil.java

@@ -406,9 +406,8 @@ public class AppUtil {
      */
     @SuppressLint("MissingPermission")
     public static String getUDID(Context context) {
-//        String androidID = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
+//        return "SWZC-HG-001";
-//        L.e("androidID===" + androidID);
+////                //"test111";
-//        return androidID;
         String androidID = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
         if (!androidID.equals("")) {
             try {

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

@@ -3,7 +3,7 @@ package com.shuwei.intelligent.shelves.utils
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.shuwei.intelligent.shelves.InitActivity
+import com.shuwei.intelligent.shelves.activity.InitActivity
 import kotlin.jvm.java
 
 class BootReceiver : BroadcastReceiver() {

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

@@ -0,0 +1,251 @@
+package com.shuwei.intelligent.shelves.utils
+
+import android.app.ActivityManager
+import android.app.AlarmManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.os.Handler
+import android.os.Looper
+import android.os.Process
+import android.util.Log
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
+import java.io.PrintWriter
+import java.io.StringWriter
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import kotlin.system.exitProcess
+
+/**
+ * 崩溃处理
+ */
+class CrashHandler private constructor(private val context: Context) :
+    Thread.UncaughtExceptionHandler {
+
+    companion object {
+        private const val TAG = "CrashHandler"
+        const val CRASH_REPORTS_DIR = "crash_reports"
+        private const val LOG_LINES = 500 // 收集最近500行日志
+
+        @Volatile
+        private var instance: CrashHandler? = null
+
+        fun init(context: Context) {
+            if (instance == null) {
+                synchronized(CrashHandler::class.java) {
+                    if (instance == null) {
+                        instance = CrashHandler(context.applicationContext)
+                    }
+                }
+            }
+        }
+
+        //fun getCrashReportFiles(context: Context): Array<File> {
+        //    val crashDir = getCrashDir()
+        //    return if (crashDir.exists() && crashDir.isDirectory) {
+        //        crashDir.listFiles { _, name -> name.endsWith(".log") } ?: emptyArray()
+        //    } else {
+        //        emptyArray()
+        //    }
+        //}
+        //
+        //fun clearCrashReports(context: Context) {
+        //    getCrashReportFiles(context).forEach { it.delete() }
+        //}
+    }
+
+    private val defaultHandler = Thread.getDefaultUncaughtExceptionHandler()
+
+    init {
+        Thread.setDefaultUncaughtExceptionHandler(this)
+    }
+
+    override fun uncaughtException(thread: Thread, ex: Throwable) {
+        handleException(thread, ex)
+
+        try {
+            Thread.sleep(3000)
+        } catch (e: InterruptedException) {
+            e.printStackTrace()
+        }
+        // 如果系统提供了默认的异常处理器，则交给系统去结束程序
+        // 否则自己结束程序
+        defaultHandler?.uncaughtException(thread, ex) ?: run {
+            Process.killProcess(Process.myPid())
+            exitProcess(1)
+        }
+    }
+
+    /**
+     * 自动重启app
+     */
+//    private fun restartApp() {
+//        // 延迟1秒后重启应用
+//        Handler(Looper.getMainLooper()).postDelayed({
+//            val intent = Intent(context, MainActivity::class.java).apply {
+//                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+//            }
+//
+//            val pendingIntent = PendingIntent.getActivity(
+//                context, 0, intent,
+//                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
+//            )
+//
+//            val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+//            alarmManager.set(AlarmManager.RTC, System.currentTimeMillis() + 100, pendingIntent)
+//
+//            Process.killProcess(Process.myPid())
+//            exitProcess(1)
+//        }, 1000)
+//    }
+
+    private fun handleException(thread: Thread, ex: Throwable) {
+        // 收集设备信息和异常信息
+        val crashInfo = collectCrashInfo(thread, ex)
+
+        // 保存日志文件
+        saveCrashInfoToFile(crashInfo)
+
+        // 这里可以添加其他处理逻辑，比如上传到服务器等
+    }
+
+    private fun collectCrashInfo(thread: Thread, ex: Throwable): String {
+        return buildString {
+            // 收集设备信息
+            collectDeviceInfo(this)
+
+            // 收集应用日志
+            append("\n\n").append(collectLogs())
+
+            // 收集线程和异常信息
+            append("\n\n========== Thread & Exception Info ==========\n")
+            append("Thread: ${thread.name}\n")
+            append("Stack Trace:\n")
+
+            val sw = StringWriter()
+            val pw = PrintWriter(sw)
+            ex.printStackTrace(pw)
+            var cause: Throwable? = ex.cause
+            while (cause != null) {
+                cause.printStackTrace(pw)
+                cause = cause.cause
+            }
+            pw.close()
+            append(sw.toString())
+        }
+    }
+
+    private fun collectDeviceInfo(sb: StringBuilder) {
+        sb.append("========== Device Info ==========\n")
+        try {
+            // 应用信息
+            val pm = context.packageManager
+            val pi = pm.getPackageInfo(context.packageName, 0)
+
+            sb.append("App Version: ${pi.versionName}_${pi.versionCode}\n")
+
+            // Android 版本信息
+            sb.append("OS Version: ${Build.VERSION.RELEASE}_${Build.VERSION.SDK_INT}\n")
+
+            // 设备信息
+            sb.append("Vendor: ${Build.MANUFACTURER}\n")
+            sb.append("Model: ${Build.MODEL}\n")
+            sb.append("CPU ABI: ${Build.SUPPORTED_ABIS[0]}\n")
+
+            // 其他信息
+            sb.append("Locale: ${Locale.getDefault()}\n")
+            sb.append(
+                "Current Time: ${
+                    SimpleDateFormat(
+                        "yyyy-MM-dd HH:mm:ss",
+                        Locale.getDefault()
+                    ).format(Date())
+                }\n"
+            )
+
+            // 内存信息
+            val memoryInfo = ActivityManager.MemoryInfo()
+            val activityManager =
+                context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+            activityManager.getMemoryInfo(memoryInfo)
+            sb.append("Available Memory: ${memoryInfo.availMem / (1024 * 1024)}MB\n")
+            sb.append("Total Memory: ${memoryInfo.totalMem / (1024 * 1024)}MB\n")
+            sb.append("Low Memory: ${memoryInfo.lowMemory}\n")
+
+        } catch (e: Exception) {
+            Log.e("","Error while collecting device info")
+            sb.append("Error while collecting device info: ${e.message}\n")
+        }
+    }
+
+    private fun collectLogs(): String {
+        return buildString {
+            append("========== Application Logs ==========\n")
+            try {
+                val process = Runtime.getRuntime().exec("logcat -d -v threadtime")
+                val reader = process.inputStream.bufferedReader()
+
+                val logLines = reader.readLines()
+                val start = maxOf(0, logLines.size - LOG_LINES)
+
+                logLines.subList(start, logLines.size).forEach {
+                    append(it).append("\n")
+                }
+            } catch (e: IOException) {
+                Log.e(TAG, "Error collecting logs")
+                append("Error collecting logs: ${e.message}\n")
+            }
+        }
+    }
+
+    private fun saveCrashInfoToFile(crashInfo: String) {
+        try {
+            val time = SimpleDateFormat("yyyy-MM-dd_HH-mm-ss", Locale.getDefault()).format(Date())
+            val fileName = "crash_$time.log"
+
+            val crashDir = getCrashDir()
+
+            val crashFile = File(crashDir, fileName)
+            FileOutputStream(crashFile).use { it.write(crashInfo.toByteArray()) }
+
+            Log.d(TAG,"Crash info saved to: ${crashFile.absolutePath}")
+        } catch (e: Exception) {
+            Log.e(TAG, "Error saving crash info to file")
+        }
+    }
+
+    /**
+     * 清理旧的崩溃日志
+     */
+    fun cleanupOldCrashReports(maxAgeDays: Int = 7) {
+        val crashDir = getCrashDir()
+        if (!crashDir.exists() || !crashDir.isDirectory) return
+
+        val now = System.currentTimeMillis()
+        val maxAgeMillis = maxAgeDays * 24 * 60 * 60 * 1000L
+
+        crashDir.listFiles()?.forEach { file ->
+            if (file.lastModified() < now - maxAgeMillis) {
+                file.delete()
+            }
+        }
+    }
+
+    private fun getCrashDir():File {
+        //val crashDir = File(context.getExternalFilesDir(null), CRASH_REPORTS_DIR)
+        var crashDir = File(context.filesDir, CRASH_REPORTS_DIR)
+        if (!crashDir.exists()) {
+            crashDir.mkdirs()
+        }
+
+        if (!(crashDir.exists())) {
+            crashDir = File(context.cacheDir, CRASH_REPORTS_DIR)
+        }
+        return crashDir
+    }
+
+}

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

@@ -0,0 +1,131 @@
+package com.shuwei.intelligent.shelves.utils
+
+import android.content.Context
+import com.shuwei.intelligent.shelves.utils.CrashHandler.Companion.CRASH_REPORTS_DIR
+import java.io.*
+import java.text.SimpleDateFormat
+import java.util.*
+
+
+/**
+ * 文件日志记录器
+ * 功能：保存日志到本地文件，每条数据一行，每天生成新文件
+ */
+class FileLogger(private val context: Context) {
+
+    companion object {
+        private const val LOG_DIR = "logs"
+        private const val FILE_PREFIX = "log_"
+        private const val FILE_EXTENSION = ".txt"
+        private val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
+        private val timeFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
+    }
+
+    /**
+     * 记录日志
+     * @param message 日志消息
+     * @param level 日志级别
+     */
+    fun log(message: String, level: LogLevel = LogLevel.INFO) {
+        try {
+            val logEntry = formatLogEntry(message, level)
+            writeToFile(logEntry)
+        } catch (e: IOException) {
+            e.printStackTrace()
+        }
+    }
+
+    /**
+     * 格式化日志条目
+     */
+    private fun formatLogEntry(message: String, level: LogLevel): String {
+        val timestamp = timeFormat.format(Date())
+        return "[$timestamp] [$level] $message\n"
+    }
+
+    /**
+     * 写入文件
+     */
+    private fun writeToFile(logEntry: String) {
+//        val path = File(context.filesDir, LOG_DIR)
+//        if (path.exists().not()) {
+//            path.mkdirs()
+//        }
+        val fileName = getCurrentDateFileName()
+//        val file = File(path, fileName)
+//        if (file.exists().not()) {
+//            file.createNewFile()
+//        }
+        val output = context.openFileOutput(fileName, Context.MODE_APPEND)
+
+        val writer = BufferedWriter(OutputStreamWriter(output))
+        writer.use {
+            it.write(logEntry)
+        }
+    }
+
+    /**
+     * 获取当前日期对应的文件名
+     */
+    private fun getCurrentDateFileName(): String {
+        val date = dateFormat.format(Date())
+        return "${FILE_PREFIX}${date}${FILE_EXTENSION}"
+    }
+
+    /**
+     * 读取指定日期的日志文件
+     * @param date 日期字符串，格式：yyyy-MM-dd
+     */
+    fun readLogsByDate(date: String): List<String> {
+        val fileName = "${FILE_PREFIX}${date}${FILE_EXTENSION}"
+        return readLogsByName(fileName)
+    }
+    fun readLogsByName(fileName: String): List<String> {
+        try {
+            val input = context.openFileInput(fileName)
+            val reader = BufferedReader(InputStreamReader(input))
+            val list: MutableList<String> = reader.useLines { lines ->
+                lines.toList().toMutableList()
+            }
+
+//            val input2 = FileInputStream(getCrashDir(context))
+//            val reader2 = BufferedReader(InputStreamReader(input2))
+//            val list2: MutableList<String> = reader2.useLines {lines ->
+//                lines.toList().toMutableList()
+//            }
+//            list.addAll(list2)
+            return list
+        } catch (e: FileNotFoundException) {
+            return emptyList()
+        }
+    }
+
+    public fun getCrashDir(context: Context):File {
+        //val crashDir = File(context.getExternalFilesDir(null), CRASH_REPORTS_DIR)
+        var crashDir = File(context.filesDir, CRASH_REPORTS_DIR)
+        if (!crashDir.exists()) {
+            crashDir.mkdirs()
+        }
+
+        if (!(crashDir.exists())) {
+            crashDir = File(context.cacheDir, CRASH_REPORTS_DIR)
+        }
+        return crashDir
+    }
+
+    /**
+     * 获取所有日志文件列表
+     */
+    fun getLogFiles(): List<String> {
+        return context.fileList()
+            .filter { it.startsWith(FILE_PREFIX) && it.endsWith(FILE_EXTENSION) }
+            //.map { it.replace(FILE_EXTENSION, "") }
+    }
+
+    /**
+     * 日志级别枚举
+     */
+    enum class LogLevel {
+        DEBUG, INFO, WARN, ERROR
+    }
+}

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/HexUtils.java

@@ -0,0 +1,64 @@
+package com.shuwei.intelligent.shelves.utils;
+
+
+public class HexUtils {
+
+    /**
+     * 将有符号十六进制字符串转换为十进制整数
+     * @param hex 十六进制字符串（支持负数补码表示）
+     * @return 对应的十进制整数
+     */
+    public static int signedHexToDec(String hex) {
+        // 验证输入格式
+        if (hex == null || hex.isEmpty()) {
+            throw new IllegalArgumentException("输入不能为空");
+        }
+
+        if (!hex.matches("[0-9A-Fa-f]+")) {
+            throw new IllegalArgumentException("无效的十六进制格式: " + hex);
+        }
+
+        // 转换为无符号长整型
+        long unsignedValue = Long.parseLong(hex, 16);
+
+        // 判断是否为负数（最高位为1）
+        int bitLength = hex.length() * 4; // 每个十六进制字符对应4位
+        long signBitMask = 1L << (bitLength - 1);
+
+        if ((unsignedValue & signBitMask) != 0) {
+            // 负数：计算补码
+            long maxValue = (1L << bitLength) - 1;
+            return (int) (unsignedValue - (maxValue + 1));
+        } else {
+            // 正数：直接转换
+            return (int) unsignedValue;
+        }
+    }
+
+    /**
+     * 测试方法
+     */
+    public static void main(String[] args) {
+        // 测试用例
+        String[] testCases = {
+                "FF",    // -1 (8位)
+                "FFFE",  // -2 (16位)
+                "FFFFFFFE", // -2 (32位)
+                "7F",    // 127
+                "80",    // -128
+                "7FFF",  // 32767
+                "8000"   // -32768
+        };
+
+        System.out.println("有符号十六进制转换测试:");
+        for (String hex : testCases) {
+            try {
+                int result = signedHexToDec(hex);
+                System.out.println(hex + " -> " + result);
+            } catch (Exception e) {
+                System.out.println(hex + " -> 错误: " + e.getMessage());
+            }
+        }
+    }
+}
+

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

@@ -0,0 +1,64 @@
+package com.shuwei.intelligent.shelves.utils
+
+import kotlinx.coroutines.*
+
+class IntervalExecutor {
+
+    /**
+     * 启动定时任务
+     * @param delayMillis 延迟时间（毫秒）
+     * @param action 要执行的方法
+     * @return Job 可用于取消任务
+     */
+    fun startIntervalTask(delayMillis: Long, action: suspend () -> Unit): Job {
+        return CoroutineScope(Dispatchers.Default).launch {
+            while (isActive) {
+                action()
+                delay(delayMillis)
+            }
+        }
+    }
+
+    /**
+     * 启动定时任务（带初始延迟）
+     * @param initialDelay 初始延迟时间（毫秒）
+     * @param delayMillis 后续执行间隔（毫秒）
+     * @param action 要执行的方法
+     * @return Job 可用于取消任务
+     */
+    fun startIntervalTaskWithInitialDelay(
+        initialDelay: Long,
+        delayMillis: Long,
+        action: suspend () -> Unit
+    ): Job {
+        return CoroutineScope(Dispatchers.Default).launch {
+            delay(initialDelay)
+            while (isActive) {
+                action()
+                delay(delayMillis)
+            }
+        }
+    }
+}
+
+// 使用示例
+fun main() = runBlocking {
+    val executor = IntervalExecutor()
+
+    // 示例1：每隔10秒执行一次
+    val job1 = executor.startIntervalTask(10000) {
+        println("定时任务执行: ${System.currentTimeMillis()}")
+        // 这里可以执行你的业务逻辑
+    }
+
+    // 示例2：先延迟5秒，然后每隔3秒执行一次
+    val job2 = executor.startIntervalTaskWithInitialDelay(5000, 3000) {
+        println("带初始延迟的定时任务: ${System.currentTimeMillis()}")
+    }
+
+    // 运行30秒后取消任务
+    delay(30000)
+    job1.cancel()
+    job2.cancel()
+    println("所有定时任务已取消")
+}

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

@@ -13,5 +13,9 @@ object KeyboardUtil {
         view.clearFocus() // 清除焦点避免键盘再次弹出
     }
 
-
+    fun hideKeyboard(view: View) {
+        val imm = view.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        imm.hideSoftInputFromWindow(view.windowToken, 0)
+        view.clearFocus() // 清除焦点避免键盘再次弹出
+    }
 }

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

@@ -0,0 +1,36 @@
+package com.shuwei.intelligent.shelves.utils
+
+import android.util.SparseArray
+import androidx.core.util.containsKey
+import com.shuwei.intelligent.shelves.model.ShelfModel
+
+object StaleFoodRule {
+
+    private val shelfMap = SparseArray<ShelfModel>()
+
+//    fun load(list: MutableList<ShelfModel>) {
+//        if (list.isEmpty()) {
+//            return
+//        }
+//        list.forEach {
+//            shelfMap.put(it.deviceNo, it)
+//        }
+//    }
+
+    fun judge(item: ShelfModel, block:(Boolean)-> Unit = {}) {
+        val deviceNo = item.deviceNo
+        if (!shelfMap.containsKey(deviceNo)) {
+            //首次设置数据
+            shelfMap.put(deviceNo, item)
+            return
+        }
+        val lastItem = shelfMap.get(deviceNo)
+        if (lastItem.goodsId != item.goodsId) {
+            //柜子商品更换
+            shelfMap.put(deviceNo, item)
+            return
+        }
+        //同一产品
+    }
+
+}

app/src/main/java/com/shuwei/intelligent/shelves/utils/TemperatureInfoHK70MsgBodyUnpack.java

@@ -0,0 +1,282 @@
+package com.shuwei.intelligent.shelves.utils;
+
+//import cn.hutool.core.util.HexUtil;
+//import cn.hutool.core.util.StrUtil;
+//import com.chengyi.framework.utils.HexUtils;
+//import lombok.Data;
+//import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @Author: NThink
+ * @Date: 2021/12/10
+ * @Description: 鸿科HK70温控器信息消息解包
+ */
+public class TemperatureInfoHK70MsgBodyUnpack {
+
+    // 柜温探头温度
+    private Double gwttTemp;
+
+    // 蒸发探头温度
+    private Double zfttTemp;
+
+    // 冷凝探头温度
+    private Double lnttTemp;
+
+    // 停机温度
+    private Double tjTemp;
+
+    // 开机温度回差
+    private Double kjTempRange;
+
+    // 压缩机启动延时
+    private Integer ysjStartDelay;
+
+    // 首次通电压缩机启动延时
+    private Integer ysjStartDelayFirst;
+
+    // 柜温探头补偿
+    private Double gwttbcTemp;
+
+    // 停机温度可设置的最小值
+    private Double tjTempMin;
+
+    // 停机温度可设置的最大值
+    private Double tjTempMax;
+
+    // 压缩机最大待机时间
+    private Integer ysjMaxWait;
+
+    // 压缩机最短运行时间
+    private Integer ysjMinWork;
+
+    // 蒸发器探头状态
+    private Integer zfttStatus;
+
+    // 自动除霜周期
+    private Integer zdcszq;
+
+    // 除霜过程显示
+    private Integer csWorkShow;
+
+    // 除霜最长时间
+    private Integer cszcsj;
+
+    // 除霜中止温度
+    private Double cszzTemp;
+
+    // 除霜类型
+    private Integer csType;
+
+    // 风机运行模式
+    private Integer fanWorkType;
+
+    // 风机首次启动延时
+    private Integer fanFirstStartDelay;
+
+    // 滴水后风机启动延时
+    private Integer fanStartDelayAfterDrip;
+
+    // 开关机状态
+    private String powerStatus;
+
+    // 制冷状态
+    private String coolStatus;
+
+    // 除霜状态
+    private String csStatus;
+
+    // 滴水状态
+    private String dsStatus;
+
+    // 柜温探头报警
+    private String gwttAlarm;
+
+    // 除霜探头报警
+    private String csttAlarm;
+
+    // 冷凝探头报警
+    private String lnttAlarm;
+
+    // 终端ID
+    private String imei;
+
+    // 固件版本
+    private String version;
+
+    // 命令次数
+    private Integer cmdCount;
+
+    public TemperatureInfoHK70MsgBodyUnpack(String body) {
+        // ===================== 寄存器内容：110字节 =====================
+        String jcqContent = body.substring(0, 220);
+        // 柜温探头温度 [0, 4]
+        double gwttTemp = Double.parseDouble(String.format("%.1f", HexUtils.signedHexToDec(jcqContent.substring(0, 4)) * 0.1));
+//        setGwttTemp(gwttTemp);
+//        // 蒸发探头温度 [4, 8]
+//        double zfttTemp = Double.parseDouble(String.format("%.1f", HexUtils.signedHexToDec(jcqContent.substring(4, 8)) * 0.1));
+//        setZfttTemp(zfttTemp);
+//        // 冷凝探头温度 [8, 12]
+//        double lnttTemp = Double.parseDouble(String.format("%.1f", HexUtils.signedHexToDec(jcqContent.substring(8, 12)) * 0.1));
+//        setLnttTemp(lnttTemp);
+//        // 停机温度 [12, 16]
+//        double tjTemp = Double.parseDouble(String.format("%.1f", HexUtils.signedHexToDec(jcqContent.substring(12, 16)) * 1.0));
+//        setTjTemp(tjTemp);
+//        // 开机温度回差 [16, 20]
+//        double kjwdhc = Double.parseDouble(String.format("%.1f", HexUtils.signedHexToDec(jcqContent.substring(16, 20)) * 0.1));
+//        setKjTempRange(kjwdhc);
+//        // 压缩机启动延时 [20, 24]
+//        int ysjqdys = Integer.parseInt(jcqContent.substring(20, 24), 16);
+//        setYsjStartDelay(ysjqdys);
+//        // 首次通电压缩机启动延时 [24, 28]
+//        int ysjqdysFirst = Integer.parseInt(jcqContent.substring(24, 28), 16);
+//        setYsjStartDelayFirst(ysjqdysFirst);
+//        // 柜温探头补偿 [28, 32]
+//        double gwttbc = Double.parseDouble(String.format("%.1f", HexUtils.signedHexToDec(jcqContent.substring(28, 32)) * 0.1));
+//        setGwttbcTemp(gwttbc);
+//        // 停机温度可设置的最小值 [32, 36]
+//        double tjTempMin = Double.parseDouble(String.format("%.1f", HexUtils.signedHexToDec(jcqContent.substring(32, 36)) * 1.0));
+//        setTjTempMin(tjTempMin);
+//        // 停机温度可设置的最大值 [36, 40]
+//        double tjTempMax = Double.parseDouble(String.format("%.1f", HexUtils.signedHexToDec(jcqContent.substring(36, 40)) * 1.0));
+//        setTjTempMin(tjTempMax);
+//        // 压缩机最大待机时间 [40, 44]
+//        int ysjzddjsj = Integer.parseInt(jcqContent.substring(40, 44), 16);
+//        setYsjMaxWait(ysjzddjsj);
+//        // 压缩机最短运行时间 [44, 48]
+//        int ysjzdyxsj = Integer.parseInt(jcqContent.substring(44, 48), 16);
+//        setYsjMinWork(ysjzdyxsj);
+//        // 蒸发器探头选择 [48, 52]
+//        int zfqtt = Integer.parseInt(jcqContent.substring(48, 52), 16);
+//        setZfttStatus(zfqtt);
+//        // TODO 蒸发器探头补偿 [52, 56]
+//        // TODO 自动除霜周期计算方式 [56, 60]
+//        // 自动除霜周期 [60, 64]
+//        int zdcszq = Integer.parseInt(jcqContent.substring(60, 64), 16);
+//        setZdcszq(zdcszq);
+//        // 除霜过程显示选择 [64, 68]
+//        int csgcxx = Integer.parseInt(jcqContent.substring(64, 68), 16);
+//        setCsWorkShow(csgcxx);
+//        // 除霜最长时间 [68, 72]
+//        int cszcsj = Integer.parseInt(jcqContent.substring(68, 72), 16);
+//        setCszcsj(cszcsj);
+//        // 除霜终止温度 [72, 76]
+//        double cszzwd = Double.parseDouble(String.format("%.1f", HexUtils.signedHexToDec(jcqContent.substring(72, 76)) * 1.0));
+//        setCszzTemp(cszzwd);
+//        // TODO 除霜滴水时间 [76, 80]
+//        // TODO 除霜后柜温显示延时 [80, 84]
+//        // TODO 除霜启动延迟 [84, 88]
+//        // 除霜类型选择 [88, 92]
+//        int cslx = Integer.parseInt(jcqContent.substring(88, 92), 16);
+//        setCsType(cslx);
+//        // TODO 辅热提前启动时间 [92, 96]
+//        // TODO 强制除霜温度 [96, 100]
+//        // 风机运行模式 [100, 104]
+//        int fjyxms = Integer.parseInt(jcqContent.substring(100, 104), 16);
+//        setFanWorkType(fjyxms);
+//        // 风机首次启动延时 [104, 108]
+//        int fjscqdys = Integer.parseInt(jcqContent.substring(104, 108), 16);
+//        setFanFirstStartDelay(fjscqdys);
+//        // 滴水后风机启动延时 [108, 112]
+//        int dshfjqdys = Integer.parseInt(jcqContent.substring(108, 112), 16);
+//        setFanStartDelayAfterDrip(dshfjqdys);
+//        // TODO 风机工作最低温度 [112, 116]
+//        // TODO 风机工作最高温度 [116, 120]
+//        // TODO 风机循环开启时间 [120, 124]
+//        // TODO 风机循环关闭时间 [124, 128]
+//        // TODO 比例制冷压缩机停止时间 [128, 132]
+//        // TODO 比例制冷压缩机运行时间 [132, 136]
+//        // TODO 蜂鸣音报警 [136, 140]
+//        // TODO 柜温低温报警(绝对温度) [140, 144]
+//        // TODO 柜温高温报警(绝对温度) [144, 148]
+//        // TODO 柜温报警延时 [148, 152]
+//        // TODO 上电首次柜温报警延时 [152, 156]
+//        // TODO 辅助继电器功能选择 [156, 160]
+//        // TODO 门开关控制输出选择 [160, 164]
+//        // TODO 开门时蜂鸣器响应延时 [164, 168]
+//        // TODO 第三探头功能选择 [168, 172]
+//        // TODO 冷凝器高温报警启动值 [172, 176]
+//        // TODO 冷凝器高温报警下回差 [176, 180]
+//        // TODO 冷凝器高温保护启动值 [180, 184]
+//        // TODO 实时时钟功能开关 [不上报]
+//        // TODO 非营业模式开启时间 [不上报]
+//        // TODO 非营业模式关闭时间 [不上报]
+//        // TODO 非营业模式温度增量 [不上报]
+//        // TODO 非营业模式灯光开启时间 [不上报]
+//        // TODO 节假日设置 [不上报]
+//        // TODO 节假日非营业模式开启时间 [不上报]
+//        // TODO 除雾自动控制模式 [184, 188]
+//        // TODO 除雾自动开启时间 [188, 192]
+//        // TODO 除雾自动关闭时间 [192, 196]
+//        // TODO 开关机自动控制模式 [不上报]
+//        // TODO 自动开机时间 [不上报]
+//        // TODO 自动关机时间 [不上报]
+//        // TODO 单位选择 [196, 200]
+//        // TODO 柜温每升高 1℃显示延时 [204, 208]
+//        // TODO 显示分辨率选择 [208, 212]
+//        // TODO 机器地址 [212, 216]
+//        // TODO 管理员密码设定 [216, 220]
+//
+//        // ===================== 状态位解析：4字节 =====================
+//        // 1.状态信息
+//        String statusHexStr = body.substring(220, 224);
+//        statusHexStr = HexUtils.reverse(statusHexStr);
+//        String statusBitStr = HexUtils.hexString2binaryString(statusHexStr);
+//        statusBitStr = StrUtil.reverse(statusBitStr);
+//        // 机组运行状态 0:停止 1:运行 [0, 1]
+//        String powerStatus = "0".equals(statusBitStr.substring(0, 1)) ? "close" : "open";
+//        setPowerStatus(powerStatus);
+//        // TODO 自检状态 0:停止 1:运行 [1, 2]
+//        // 压缩机运行状态 0:停止 1:运行 [2, 3]
+//        String coolStatus = "0".equals(statusBitStr.substring(3, 4)) ? "close" : "open";
+//        setCoolStatus(coolStatus);
+//        // 除霜状态 0:停止 1:运行 [3, 4]
+//        String csStatus = "0".equals(statusBitStr.substring(10, 11)) ? "close" : "open";
+//        setCsStatus(csStatus);
+//        // 滴水状态 0:关闭 1:运行中 [4, 5]
+//        String dsStatus = "0".equals(statusBitStr.substring(12, 13)) ? "close" : "open";
+//        setDsStatus(dsStatus);
+//        // TODO 风机状态 0:停止 1:运行 [5, 6]
+//        // TODO 除露状态 0:停止 1:运行 [6, 7]
+//        // TODO 灯光状态 0:停止 1:运行 [7, 8]
+//        // TODO 除霜加热或电磁阀状态 0:停止 1:运行 [8, 9]
+//        // TODO 辅助加热状态 0:停止 1:运行 [9, 10]
+//        // TODO 报警状态 0:停止 1:运行 [10, 11]
+//        // TODO 开门状态 0:停止 1:运行 [11, 12]
+//        // TODO 非营业（节能）状态 0:停止 1:运行 [12, 13]
+//        // TODO 节假日状态 0:停止 1:运行 [13, 14]
+//        // TODO 保留 0:停止 1:运行 [14, 15]
+//        // TODO 保留 0:停止 1:运行 [15, 16]
+//
+//        // 2.报警信息
+//        String alarmHexStr = body.substring(224, 228);
+//        String alarmBitStr = HexUtils.hexString2binaryString(alarmHexStr);
+//        alarmBitStr = StrUtil.reverse(alarmBitStr);
+//        // 柜温探头故障 0:无报警 1:报警
+//        String gwttAlarm = "0".equals(alarmBitStr.substring(0, 1)) ? "normal" : "alarm";
+//        setGwttAlarm(gwttAlarm);
+//        // 除霜探头故障 0:无报警 1:报警
+//        String csAlarm = "0".equals(alarmBitStr.substring(1, 2)) ? "normal" : "alarm";
+//        setCsttAlarm(csAlarm);
+//        // 冷凝探头故障 0:无报警 1:报警
+//        String lnttAlarm = "0".equals(alarmBitStr.substring(2, 3)) ? "normal" : "alarm";
+//        setLnttAlarm(lnttAlarm);
+//        // TODO 柜温高温报警 0:无报警 1:报警
+//        // TODO 柜温低温报警 0:无报警 1:报警
+//        // TODO 冷凝高温报警 0:无报警 1:报警
+//        // TODO 冷凝保护报警 0:无报警 1:报警
+//        // TODO 门打开报警 0:无报警 1:报警
+//        // TODO 时钟故障报警 0:无报警 1:报警
+//
+//        // 终端ID 15字节
+//        setImei(HexUtil.decodeHexStr(body.substring(228, 258)));
+//        // 固件版本 5字节
+//        setVersion(HexUtil.decodeHexStr(body.substring(258, 268)));
+//        // 命令次数
+//        setCmdCount(Integer.parseInt(body.substring(268, 270), 16));
+    }
+
+    public static void main(String[] args) {
+//        String reverse = HexUtils.reverse("8000");
+//        System.out.println(reverse);
+    }
+}

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

@@ -10,6 +10,7 @@ import android.os.Bundle
 import android.util.TypedValue
 import android.view.View
 import android.view.inputmethod.EditorInfo
+import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import android.widget.Toast
 import androidx.core.app.ActivityOptionsCompat
@@ -22,6 +23,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 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?,
@@ -151,3 +155,43 @@ fun View.clickWithDebounce(delay: Long = 500, action: () -> Unit) {
         }
     }
 }
+
+fun View.hideKeyboard() {
+    val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+    imm.hideSoftInputFromWindow(this.windowToken, 0)
+    this.clearFocus() // 清除焦点避免键盘再次弹出
+}
+
+fun String.copyTextToClipboard(context: Context) {
+    // 获取系统服务中的ClipboardManager
+    val clipboard: ClipboardManager = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+
+    // 创建一个ClipData对象，包含要复制的文本
+    val clip = ClipData.newPlainText("label", this)
+
+    // 将ClipData对象设置到剪贴板
+    clipboard.setPrimaryClip(clip)
+
+    // 显示一个简单的Toast提示用户文本已复制
+    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/drawable/ripple_effect.xml

@@ -0,0 +1,7 @@
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <color android:color="@android:color/white" />
+    </item>
+</ripple>

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_shelf.xml

@@ -1,240 +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:gravity="center"
-                    android:textColor="@color/bg_page"
-                    android:textSize="30sp"
-                    android:fontFamily="sans-serif-medium"
-                    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:insetTop="0dp"
-                android:insetBottom="0dp"
-                android:maxLines="1"
-                android:text="清零"
-                android:fontFamily="sans-serif-medium"
-                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_marginTop="24dp"
-                android:layout_marginStart="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:hint="输入食材名称"
-                    android:maxLines="1"
-                    android:inputType="text"
-                    android:text=""
-                    android:imeOptions="actionSearch"
-                    android:textColor="@color/food_name_black"
-                    android:paddingStart="1dp"
-                    android:paddingEnd="1dp"
-                    android:textColorHint="#B4BEC8"
-                    android:fontFamily="sans-serif-medium"
-                    android:textSize="30sp"
-                    tools:ignore="Autofill,HardcodedText,TextFields" />
-            </LinearLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:layout_marginTop="24dp">
-
-                <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:paddingStart="36dp"
-                        android:paddingBottom="12dp"
-                        android:paddingTop="12dp"
-                        android:paddingEnd="36dp"
-                        android:clipToPadding="false"
-                        android:overScrollMode="never"
-                        tools:listitem="@layout/list_item_search"
-                        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-                        app:spanCount="2"
-                        tools:itemCount="10"/>
-
-                    <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"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    layout="@layout/layout_empty_view"
-                    android:visibility="gone"/>
-
-            </FrameLayout>
-
-<!--            android:layout_marginTop="48dp"-->
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btnConfirm"
-                android:layout_width="match_parent"
-                android:layout_height="80dp"
-                android:layout_marginTop="24dp"
-                android:layout_marginEnd="48dp"
-                android:layout_marginStart="48dp"
-                android:layout_marginBottom="24dp"
-                android:backgroundTint="@color/bg_page"
-                android:ellipsize="end"
-                android:insetTop="0dp"
-                android:insetBottom="0dp"
-                android:maxLines="1"
-                android:text="确定"
-                android:textStyle="bold"
-                android:textColor="@color/white"
-                android:textSize="30sp"
-                app:cornerRadius="12dp"
-                app:elevation="0dp"
-                tools:ignore="HardcodedText" />
-
-        </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="270dp"
-        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="60dp"
-        android:textSize="60sp"
-        android:text="暂无数据"
-        tools:ignore="HardcodedText" />
-</LinearLayout>

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="5dp"
-    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,16 +5,15 @@
     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:layout_height="68dp"
-        android:paddingStart="12dp"
+        android:paddingStart="25dp"
-        android:paddingEnd="12dp"
+        android:paddingEnd="25dp"
-        android:paddingTop="9dp">
+        android:paddingTop="25dp">
 
         <TextView
             android:id="@+id/tv_left_status"
@@ -22,9 +21,9 @@
             android:layout_height="wrap_content"
             android:textColor="@color/white"
             android:layout_gravity="start"
-            android:textSize="12sp"
+            android:textSize="24sp"
             android:fontFamily="sans-serif-medium"
-            tools:text="1-1冷藏柜  -2°C / 87%" />
+            android:text="            " />
 
         <TextView
             android:id="@+id/tv_right_status"
@@ -33,7 +32,7 @@
             android:textColor="@color/white"
             android:layout_gravity="end"
             android:fontFamily="sans-serif-medium"
-            android:textSize="12sp"
+            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_marginStart="12dp"
-        android:layout_marginEnd="6dp"
+        android:layout_marginEnd="12dp"
         tools:listitem="@layout/list_item_shelf"/>
 
 
@@ -24,5 +24,4 @@
         android:layout_height="match_parent"
         layout="@layout/layout_empty_view"
         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_width="450dp"
-        android:layout_height="215dp"
+            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_width="200dp"
-        android:layout_height="100dp"
+            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>
+
+    <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

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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">
+
+    <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>
+
+    <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_shelf.xml

@@ -9,12 +9,12 @@
 
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
-        android:layout_height="190dp"
+        android:layout_height="376dp"
-        android:layout_marginStart="12dp"
+        android:layout_marginStart="24dp"
-        android:layout_marginTop="6dp"
+        android:layout_marginTop="12dp"
-        android:layout_marginEnd="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_marginStart="24dp"
-                android:layout_marginEnd="12dp"
+                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_height="60dp"
-                    android:layout_marginTop="12dp"
+                    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_width="120dp"
-                android:layout_height="30dp"
+                android:layout_height="60dp"
                 android:layout_gravity="top|end"
-                android:layout_marginTop="12dp"
+                android:layout_marginTop="24dp"
-                android:layout_marginEnd="12dp"
+                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"
+                android:textSize="30sp"
-                app:cornerRadius="6dp"
+                app:cornerRadius="12dp"
                 app:elevation="0dp"
                 tools:ignore="HardcodedText" />
 
             <ImageView
                 android:id="@+id/ivBack"
-                android:layout_width="30dp"
+                android:layout_width="60dp"
-                android:layout_height="30dp"
+                android:layout_height="60dp"
                 android:layout_gravity="top|start"
-                android:layout_marginTop="12dp"
+                android:layout_marginStart="24dp"
-                android:layout_marginStart="12dp"
+                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_marginStart="24dp"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="24dp"
-        android:layout_marginEnd="12dp"
+        android:layout_marginEnd="24dp"
-        android:layout_marginBottom="12dp"
+        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_height="80dp"
-                android:layout_marginStart="16dp"
+                android:layout_marginStart="48dp"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="48dp"
-                android:layout_marginEnd="16dp"
+                android:layout_marginEnd="48dp"
                 android:background="@drawable/shape_search"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
                 <ImageView
-                    android:layout_width="16dp"
+                    android:layout_width="32dp"
-                    android:layout_height="16dp"
+                    android:layout_height="32dp"
-                    android:layout_marginStart="12dp"
+                    android:layout_marginStart="24dp"
-                    android:layout_marginEnd="12dp"
+                    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_height="60dp"
-                    android:layout_marginEnd="12dp"
+                    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:paddingStart="36dp"
-                        android:paddingTop="4dp"
+                        android:paddingTop="12dp"
-                        android:paddingEnd="12dp"
+                        android:paddingEnd="36dp"
-                        android:paddingBottom="4dp"
+                        android:paddingBottom="12dp"
                         app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
                         app:spanCount="2"
                         tools:itemCount="10"
@@ -209,17 +208,46 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:visibility="gone" />
+
             </FrameLayout>
 
-            <!--            android:layout_marginTop="48dp"-->
+            <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="match_parent"
+                    android:layout_width="0dp"
-                android:layout_height="40dp"
+                    android:layout_height="80dp"
                     android:layout_marginStart="24dp"
-                android:layout_marginTop="12dp"
+                    android:layout_marginTop="24dp"
-                android:layout_marginEnd="24dp"
+                    android:layout_marginEnd="48dp"
-                android:layout_marginBottom="12dp"
+                    android:layout_marginBottom="24dp"
+                    android:layout_weight="1"
                     android:backgroundTint="@color/bg_page"
                     android:ellipsize="end"
                     android:insetTop="0dp"
@@ -227,13 +255,15 @@
                     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>
+
     </com.google.android.material.card.MaterialCardView>
 </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:paddingStart="25dp"
-        android:paddingTop="6dp"
+        android:paddingTop="13dp"
-        android:paddingBottom="6dp"
+        android:paddingBottom="13dp"
-        android:paddingEnd="12dp"
+        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_layout.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="300dp"
+    app:cardCornerRadius="10dp"
+    app:cardElevation="0dp"
+    xmlns:tools="http://schemas.android.com/tools"
+    app:cardBackgroundColor="@color/white">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginVertical="30dp"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tvDialogTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:textColor="@color/black"
+            android:textSize="22sp"
+            tools:text="标题"/>
+
+        <TextView
+            android:id="@+id/tvDialogContent"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_gravity="center_horizontal"
+            android:textColor="@color/black"
+            android:gravity="center"
+            android:layout_marginHorizontal="50dp"
+            android:textSize="16sp"
+            tools:text="内容"/>
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btnConfirm"
+            android:layout_width="120dp"
+            android:layout_height="50dp"
+            android:text="确定"
+            android:background="@color/bg_card_blue"
+            android:textColor="@color/white"
+            android:textSize="20sp"
+            android:layout_gravity="center_horizontal"/>
+
+    </LinearLayout>
+
+</androidx.cardview.widget.CardView>

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:paddingStart="20dp"
-    android:paddingTop="5dp"
+    android:paddingTop="10dp"
-    android:paddingEnd="10dp"
+    android:paddingEnd="20dp"
-    android:paddingBottom="5dp"
+    android:paddingBottom="10dp"
-    android:background="@drawable/shape_dialog_small"
+    android:background="@drawable/shape_dialog"
     tools:ignore="MissingDefaultResource">
 
     <ProgressBar
-        android:layout_width="26dp"
+        android:layout_width="60dp"
-        android:layout_height="26dp"
+        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:layout_marginTop="50dp"
-        android:textSize="20sp"
+        android:textSize="50sp"
         android:text="暂无数据"
         tools:ignore="HardcodedText" />
 </LinearLayout>

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

@@ -0,0 +1,26 @@
+<?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/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_height="80dp"
-    android:layout_margin="6dp"
+    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"
+    android:textSize="30sp"
-    app:cornerRadius="6dp"
+    app:cornerRadius="12dp"
-    app:strokeWidth="1dp"
+    app:strokeWidth="2dp"
-    tools:text="土豆丝土豆丝土豆丝土豆丝土豆丝土豆丝" />
+    tools:text="土豆丝土豆丝土豆丝土豆丝土豆丝土豆丝"
-    <!--    android:paddingHorizontal="2dp"-->
+    />
-    <!--    android:paddingLeft="5dp"-->
-    <!--    android:paddingRight="5dp"-->
 

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_height="216dp"
-    android:layout_margin="6dp"
+    android:layout_margin="12dp"
     app:cardBackgroundColor="@color/bg_card_blue"
-    app:cardCornerRadius="6dp"
+    app:cardCornerRadius="12dp"
-    app:cardElevation="2dp"
+    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_width="100dp"
-        android:layout_height="60dp"
+        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/main/res/values/themes.xml

@@ -19,4 +19,24 @@
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
     </style>
+
+
+
+    <style name="DialogTheme" parent="@android:style/Theme.Dialog">
+        <!-- 边框 -->
+        <item name="android:windowFrame">@null</item>
+        <!-- 是否浮现在activity之上 -->
+        <item name="android:windowIsFloating">true</item>
+        <!-- 半透明 -->
+        <item name="android:windowIsTranslucent">true</item>
+        <!-- 无标题 -->
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:background">@android:color/transparent</item>
+        <!-- 背景透明 -->
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <!-- 模糊 -->
+        <item name="android:backgroundDimEnabled">true</item>
+        <!-- 遮罩层 -->
+        <item name="android:backgroundDimAmount">0.5</item>
+    </style>
 </resources>

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #Thu Jul 17 15:32:57 CST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
-#distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.13-bin.zip
+distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

local.properties

@@ -1,10 +1,8 @@
-## This file is automatically generated by Android Studio.
+## This file must *NOT* be checked into Version Control Systems,
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file should *NOT* be checked into Version Control Systems,
 # as it contains information specific to your local configuration.
 #
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-sdk.dir=D\:\\Android\\sdk
+#Tue Jan 13 10:38:32 CST 2026
+sdk.dir=C\:\\Users\\HUAWEI\\AppData\\Local\\Android\\Sdk