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