From 795deae228e56fc7e956bba6dbd1ed04557eb133 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Mon, 9 Feb 2026 16:28:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dish/match/ui/DeviceConfigActivity.kt     |  7 ++--
 .../dish/match/ui/SamplingListActivity.kt     | 11 +++++--
 .../dish/match/ui/SelectDishActivity.kt       | 33 +++++++++++--------
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/shuwei/dish/match/ui/DeviceConfigActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/DeviceConfigActivity.kt
index 2cc38c7..27d24f9 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/DeviceConfigActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/DeviceConfigActivity.kt
@@ -120,7 +120,9 @@ class DeviceConfigActivity : BaseActivity() {
             binding.rbModeSampling.isChecked = false
             loadCookSpan(isClicked = true)
             loadSamplingSpan()
-            startActivity<SelectDishActivity> { }
+            startActivity<SelectDishActivity> {
+                putExtra(SelectDishActivity.IS_CONFIG_PAGE, true)
+            }
             finish()
         }
         binding.rbModeSampling.setOnClickListener {
@@ -129,7 +131,8 @@ class DeviceConfigActivity : BaseActivity() {
             binding.rbModeSampling.isChecked = true
             loadCookSpan()
             loadSamplingSpan(isClicked = true)
-            startActivity<SamplingListActivity> { }
+            startActivity<SamplingListActivity> {
+                putExtra(SamplingListActivity.IS_CONFIG_PAGE, true) }
             finish()
         }
         addWeighListener()
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/SamplingListActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/SamplingListActivity.kt
index b97c23e..d1d1cae 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/SamplingListActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/SamplingListActivity.kt
@@ -34,6 +34,7 @@ class SamplingListActivity : BaseActivity() {
     companion object {
         private const val TAG = "SamplingListActivity"
         const val IS_COOKING = "isCooking"
+        const val IS_CONFIG_PAGE = "isConfigPage"
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -87,9 +88,13 @@ class SamplingListActivity : BaseActivity() {
 
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
-//        val isCooking = intent?.getBooleanExtra(IS_COOKING, false) ?: false
-//        //toast("isCooking=$isCooking")
-//        refreshPage(isCooking)
+        val isConfigPage = intent?.getBooleanExtra(IS_CONFIG_PAGE, false) ?: false
+        if (isConfigPage) {
+            return
+        }
+        val isCooking = intent?.getBooleanExtra(IS_COOKING, false) ?: false
+        //toast("isCooking=$isCooking")
+        refreshPage(isCooking)
     }
 
     @Deprecated("Deprecated in Java")
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/SelectDishActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/SelectDishActivity.kt
index 84cb1f7..5a412bb 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/SelectDishActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/SelectDishActivity.kt
@@ -31,6 +31,7 @@ class SelectDishActivity : BaseActivity() {
     companion object {
         const val IS_COOKING = "isCooking"
         const val DINNER_TYPE = "dinnerType"
+        const val IS_CONFIG_PAGE = "isConfigPage"
     }
 
     private lateinit var binding: ActivitySelectDishBinding
@@ -168,20 +169,24 @@ class SelectDishActivity : BaseActivity() {
 
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
-//        runCatching {
-//            val isCooking = intent?.getBooleanExtra(IS_COOKING, false) ?: false
-//            val lastDinnerType = intent?.getStringExtra(DINNER_TYPE) ?: "0"
-//            if (lastDinnerType == "1" || lastDinnerType == "2" || lastDinnerType == "3") {
-//                fragmentList[lastDinnerType.toInt() - 1].getDishList(1, lastDinnerType)
-//            }
-//            when (lastDinnerType) {
-//                "1" -> binding.dishRadioGroup.check(R.id.rbBreakfast)
-//                "2" -> binding.dishRadioGroup.check(R.id.rbLunch)
-//                "3" -> binding.dishRadioGroup.check(R.id.rbDinner)
-//            }
-//        }.onFailure {
-//            it.printStackTrace()
-//        }
+        runCatching {
+            val isConfigPage = intent?.getBooleanExtra(IS_CONFIG_PAGE, false) ?: false
+            if (isConfigPage) {
+                return
+            }
+            val isCooking = intent?.getBooleanExtra(IS_COOKING, false) ?: false
+            val lastDinnerType = intent?.getStringExtra(DINNER_TYPE) ?: "0"
+            if (lastDinnerType == "1" || lastDinnerType == "2" || lastDinnerType == "3") {
+                fragmentList[lastDinnerType.toInt() - 1].getDishList(1, lastDinnerType)
+            }
+            when (lastDinnerType) {
+                "1" -> binding.dishRadioGroup.check(R.id.rbBreakfast)
+                "2" -> binding.dishRadioGroup.check(R.id.rbLunch)
+                "3" -> binding.dishRadioGroup.check(R.id.rbDinner)
+            }
+        }.onFailure {
+            it.printStackTrace()
+        }
     }
 
     @Deprecated("Deprecated in Java")