From fee9598689b8d8ad9ea92e7eaa518d1d502fa79c Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Thu, 14 May 2026 15:32:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(ui):=20=E4=BF=AE=E5=A4=8D=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E9=A1=B5=E9=9D=A2=E5=AF=BC=E8=88=AA=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=92=8C=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在InitActivity中重写onNewIntent方法以重置导航状态
- 移除SettingActivity中的无用toast导入
- 简化SubmitFoodActivity启动语法
- 将设置页面清除数据后的跳转目标从HomeActivity改为InitActivity
---
 app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt | 4 ++++
 .../main/java/com/shuwei/dish/match/ui/SettingActivity.kt  | 7 ++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

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 4a3cb53..55d4e55 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
@@ -252,4 +252,8 @@ class InitActivity : BaseActivity() {
         }
     }
 
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        hasNavigated = false
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/SettingActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/SettingActivity.kt
index d3293db..0164b5c 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/SettingActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/SettingActivity.kt
@@ -17,7 +17,6 @@ import com.shuwei.dish.match.scale.ScaleServiceManager
 import com.shuwei.dish.match.utils.SpTool
 import com.shuwei.dish.match.utils.ext.clickWithDebounce
 import com.shuwei.dish.match.utils.ext.startActivity
-import com.shuwei.dish.match.utils.ext.toast
 import com.shuwei.dish.match.utils.ext.visible
 
 /**
@@ -95,7 +94,7 @@ class SettingActivity : BaseActivity() {
             EnvSwitchDialog(this).show()
         }
         binding.llTestSeasoning.clickWithDebounce {
-            startActivity<SubmitFoodActivity> {  }
+            startActivity<SubmitFoodActivity> { }
         }
     }
 
@@ -113,9 +112,7 @@ class SettingActivity : BaseActivity() {
                     SpTool.canteenId = "0"
                     // 通知所有已连接子设备同步清除数据
                     ScaleServiceManager.sendClearData()
-                    startActivity<HomeActivity> {
-                        flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-                    }
+                    startActivity<InitActivity>()
                 }
             }
             .show()