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"

app/src/main/AndroidManifest.xml

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

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

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

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

@@ -16,6 +16,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.shuwei.intelligent.shelves.App
+import com.shuwei.intelligent.shelves.GlobalData
 import com.shuwei.intelligent.shelves.base.BaseActivity
 import com.shuwei.intelligent.shelves.databinding.ActivityInitBinding
 import com.shuwei.intelligent.shelves.model.DeviceConfigInfo
@@ -63,7 +64,12 @@ class InitActivity : BaseActivity() {
 //        App.deviceId = "4787e213-90ab-3e32-88e0-ac271a937751"
         Log.d(TAG, "onCreate: deviceId = ${App.deviceId}")
         SpTool.put(SpTool.DEVICE_ID, App.deviceId)
-        App.configUrl = UrlConfig.BASE_URL
+        val appBaseUrl = SpTool.baseUrl
+        if (!appBaseUrl.isBlank()) {
+            GlobalData.appBaseUrl = appBaseUrl
+        } else {
+            GlobalData.appBaseUrl = GlobalData.PROD_BASE_URL
+        }
         App.canteenId = "0"
 
 //        var deviceId = AppUtil.getUDID(this)
@@ -144,7 +150,7 @@ class InitActivity : BaseActivity() {
                                 state.data.data?.let {
                                     if (it is DeviceConfigInfo) {
                                         SpTool.put(SpTool.DEVICE_CONFIG_CACHE, it.toJsonString())
-                                        App.configUrl = it.appPackageUrl?:""
+                                        GlobalData.appBaseUrl = it.appPackageUrl?:""
                                         App.canteenId = it.canteenId?:""
 
                                         startActivity<HomeActivity>()
@@ -169,7 +175,7 @@ class InitActivity : BaseActivity() {
         if (config == null) {
             return false
         }
-        App.configUrl = config.appPackageUrl?:""
+        GlobalData.appBaseUrl = config.appPackageUrl?:""
         App.canteenId = config.canteenId?:""
         return true
     }

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

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

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

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

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

@@ -5,26 +5,34 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
+import android.view.LayoutInflater
 import android.view.View
+import android.widget.PopupWindow
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
-import com.shuwei.intelligent.shelves.activity.HomeActivity
+import com.shuwei.intelligent.shelves.activity.LogActivity
-import com.shuwei.intelligent.shelves.activity.HomeActivity.Companion.LIGHT_CLOSE
-import com.shuwei.intelligent.shelves.activity.HomeActivity.Companion.LIGHT_OPEN
 import com.shuwei.intelligent.shelves.R
 import com.shuwei.intelligent.shelves.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() {
@@ -57,35 +65,28 @@ open class BaseActivity : AppCompatActivity() {
                 }
             }
 
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-//            window.setDecorFitsSystemWindows(false)
-//            window.insetsController?.apply {
-//                hide(WindowInsets.Type.statusBars()) // 隐藏状态栏
-//                systemBarsBehavior =
-//                    WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE // 滑动时临时显示
-//            }
-//        }
-
         lightSwitchClick()
 
         binding.tvLeftStatus.setOnDoubleClickListener {
-            finish()
+            //finish()
+            val intent = Intent(Intent.ACTION_MAIN).apply {
+                addCategory(Intent.CATEGORY_HOME)
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            }
+            startActivity(intent)
+
+        }
+        binding.tvRightStatus.setOnDoubleClickListener {
+            if (enableRightStatusMenu) showRightStatusPopup(binding.tvRightStatus)
         }
     }
 
-    fun hideStatusBar() {
+    /** 是否允许右侧状态栏双击弹出菜单，默认关闭，仅 HomeActivity 开启 */
-////        enableEdgeToEdge()
+    protected open val enableRightStatusMenu: Boolean = false
-////        val uiOptions = (View.SYSTEM_UI_FLAG_FULLSCREEN // 隐藏状态栏
+
-////                or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) // 隐藏导航栏（可选）
+    fun hideStatusBar() {}
-////        window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN
-//
-//        ImmersionBar.with(this)
-//            .hideBar(BarHide.FLAG_HIDE_STATUS_BAR)
-//            .init()
-    }
 
     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)
@@ -104,7 +105,7 @@ open class BaseActivity : AppCompatActivity() {
     }
 
     fun updateLeftStatus(data: String) {
-        binding.tvLeftStatus.text = data
+        binding.tvLeftStatus.text = data.ifBlank { "                  " }
     }
 
     fun updateRightStatus(data: String) {
@@ -115,11 +116,35 @@ open class BaseActivity : AppCompatActivity() {
     private val TIME_OUT: Long = (5 * 60 * 1000).toLong()
     private val mHandler by lazy { Handler(Looper.getMainLooper()) }
     private val mTimeoutRunnable = Runnable {
-        if (this is HomeActivity) {
+        // 用户长时间无操作时回调，子类可覆写实现具体逻辑（如关灯）
-            this.switchLight(false)
+        onUserInactive()
+    }
+
+    // ---- 右侧状态栏时钟 ----
+    // 默认时间格式：月日星期 时:分:秒
+    private val CLOCK_FORMAT = "MM月dd日 EEEE  HH:mm:ss"
+    private val clockFormatter by lazy { SimpleDateFormat(CLOCK_FORMAT, Locale.CHINA) }
+
+    /**
+     * 每秒时钟回调，默认将当前时间显示在右侧状态栏。
+     * 子类可覆写以自定义格式或同时更新左侧状态栏。
+     */
+    open fun onClockTick() {
+        updateRightStatus(clockFormatter.format(Date()))
+    }
+
+    private val clockTask = object : Runnable {
+        override fun run() {
+            onClockTick()
+            mHandler.postDelayed(this, 1000)
         }
     }
 
+    /**
+     * 用户超时无操作时回调，默认空实现，子类按需覆写
+     */
+    open fun onUserInactive() {}
+
     override fun onUserInteraction() {
         super.onUserInteraction()
         //开灯
@@ -136,14 +161,18 @@ open class BaseActivity : AppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
-        // 启动定时器
+        // 启动超时定时器
         mHandler.postDelayed(mTimeoutRunnable, TIME_OUT)
+        // 启动右侧状态栏时钟
+        mHandler.post(clockTask)
     }
 
     override fun onPause() {
         super.onPause()
-        // 取消定时器
+        // 取消超时定时器
         mHandler.removeCallbacks(mTimeoutRunnable)
+        // 停止右侧状态栏时钟
+        mHandler.removeCallbacks(clockTask)
     }
 
     fun switchLight(isOpen: Boolean) {
@@ -161,15 +190,27 @@ open class BaseActivity : AppCompatActivity() {
             val tag = binding.tvLeftStatus.tag?.toString()?.toBoolean() ?: true
             switchLight(tag.not())
         }
-        binding.tvRightStatus.clickWithDebounce {
+    }
-//            if (this is HomeActivity) {
+
-//                startActivity<LogActivity> {
+    private fun showRightStatusPopup(anchor: View) {
-//                    putExtra(LogActivity.IS_LOG_DIR, true)
+        val menuBinding = PopupRightStatusMenuBinding.inflate(LayoutInflater.from(this))
-//                }
+        val popup = PopupWindow(
-//                return@clickWithDebounce
+            menuBinding.root,
-//            }
+            120.dp,
-//            startActivity<SettingActivity> { }
+            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)
     }
 
 

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

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

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

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

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

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

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

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

app/src/main/java/com/shuwei/intelligent/shelves/serial/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

@@ -13,8 +13,9 @@ import java.nio.charset.Charset
 import java.util.Locale
 
 object SerialPortManager {
-    private const val portName: String = "/dev/ttyS1"
+
-    private const val baudRate: Int = 115200
+    private const val PORT_NAME: String = "/dev/ttyS1"
+    private const val BAUD_RATE: Int = 115200
     private var serialPort: AndroidSerialPort? = null
 
     //    private var serialPort: SerialPort? = null
@@ -25,8 +26,8 @@ object SerialPortManager {
         return try {
             serialPort = SerialPortFactory.create().apply {
                 open(
-                    portName = portName,
+                    portName = PORT_NAME,
-                    baudRate = baudRate,
+                    baudRate = BAUD_RATE,
                     dataBits = 8,
                     stopBits = 1,
                     parity = SerialPort.PARITY_NONE
@@ -51,15 +52,13 @@ object SerialPortManager {
     }
 
     // 启动接收协程
-    @Suppress("DEPRECATION")
-    @SuppressLint("DefaultLocale")
     fun startReceive(callback: (String) -> Unit) {
         scope.launch {
             while (isActive) {
                 try {
                     val flow = serialPort?.read()
                     flow?.collect { buffer ->
-                        val data = buffer.toHexString2().toUpperCase()
+                        val data = buffer.toHexString2().uppercase(Locale.ROOT)
                         callback(data)
                     }
                 } catch (e: Exception) {

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/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/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/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/loading.xml

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

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

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

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

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

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

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+<LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -39,8 +44,55 @@
             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/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/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>