From c46264a4cf4bd6cb4d314b41f45efa0794343231 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Fri, 8 May 2026 11:50:22 +0800
Subject: [PATCH] =?UTF-8?q?feat(activity):=20=E6=96=B0=E5=A2=9E=20canteenI?=
 =?UTF-8?q?d=20=E6=8C=81=E4=B9=85=E5=8C=96=E5=AD=98=E5=82=A8=EF=BC=8CHomeA?=
 =?UTF-8?q?ctivity=20=E5=88=87=E6=8D=A2=E9=A3=9F=E5=A0=82=E6=97=B6?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=86=99=E5=85=A5=20SpTool=20=E5=B9=B6?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8D=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/shuwei/dish/match/ui/HomeActivity.kt    | 12 +++++++-----
 .../java/com/shuwei/dish/match/ui/InitActivity.kt    |  2 +-
 .../main/java/com/shuwei/dish/match/utils/SpTool.kt  |  9 +++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt
index be21239..e6b3b8f 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt
@@ -42,12 +42,14 @@ class HomeActivity : BaseActivity() {
         binding = ActivityHomeBinding.inflate(layoutInflater)
         setContentView(binding.root)
         setHeaderBackground(isHomePage = true)
+        // 根据当前 canteenId 恢复 RadioButton 选中状态
+        binding.radioGroup.check(
+            if (BaseApp.canteenId == "1678234139391512577") R.id.radioSw else R.id.radioZk
+        )
         binding.radioGroup.setOnCheckedChangeListener { group, checkedId ->
-            if (checkedId == R.id.radioSw) {
-                BaseApp.canteenId = "1678234139391512577"
-            } else {
-                BaseApp.canteenId = "0"
-            }
+            val id = if (checkedId == R.id.radioSw) "1678234139391512577" else "0"
+            SpTool.canteenId = id
+            BaseApp.canteenId = id
         }
         onBackPressedDispatcher.addCallback(this) {}
 //        binding.radioGroup.check(R.id.radioZk)
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt
index 5b77cb3..fc7e601 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt
@@ -80,7 +80,7 @@ class InitActivity : BaseActivity() {
         setHeaderBgVisible(false)
         BaseApp.appVersion = AppUtil.getAppVersionCode(this).toString()
 
-        BaseApp.canteenId = "0"
+        BaseApp.canteenId = SpTool.canteenId
 
         WeightUtil.init()
         WeightUtil.getWeight()
diff --git a/app/src/main/java/com/shuwei/dish/match/utils/SpTool.kt b/app/src/main/java/com/shuwei/dish/match/utils/SpTool.kt
index f3d855f..68447c7 100644
--- a/app/src/main/java/com/shuwei/dish/match/utils/SpTool.kt
+++ b/app/src/main/java/com/shuwei/dish/match/utils/SpTool.kt
@@ -13,6 +13,8 @@ object SpTool {
     const val DEVICE_ROLE = "deviceRole"
     /** 秤串口路径，默认 /dev/ttyS7，子设备可能需要配置为其他值 */
     const val SCALE_DEVICE_PORT = "scaleDevicePort"
+    /** 食堂 ID，默认 "0" */
+    const val CANTEEN_ID = "canteenId"
 
     val pref = BaseApp.getSharedPref()!!
 
@@ -37,4 +39,11 @@ object SpTool {
         set(value) {
             put(LAUNCH_PAGE_TYPE, value)
         }
+
+    /** 食堂 ID，持久化存储，默认 "0" */
+    var canteenId: String
+        get() = getString(CANTEEN_ID, "0")
+        set(value) {
+            put(CANTEEN_ID, value)
+        }
 }
\ No newline at end of file