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 { } + startActivity { } } } @@ -113,9 +112,7 @@ class SettingActivity : BaseActivity() { SpTool.canteenId = "0" // 通知所有已连接子设备同步清除数据 ScaleServiceManager.sendClearData() - startActivity { - flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK - } + startActivity() } } .show()