restaurant/DishMatch
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
lvmeng
2026-02-09 16:28:30 +08:00
parent 873ae95c0b
commit 795deae228
3 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/shuwei/dish/match/ui/DeviceConfigActivity.kt
+5 -2
View File
@@ -120,7 +120,9 @@ class DeviceConfigActivity : BaseActivity() {
binding.rbModeSampling.isChecked = false binding.rbModeSampling.isChecked = false
loadCookSpan(isClicked = true) loadCookSpan(isClicked = true)
loadSamplingSpan() loadSamplingSpan()
startActivity<SelectDishActivity> { } startActivity<SelectDishActivity> {
putExtra(SelectDishActivity.IS_CONFIG_PAGE, true)
}
finish() finish()
} }
binding.rbModeSampling.setOnClickListener { binding.rbModeSampling.setOnClickListener {
@@ -129,7 +131,8 @@ class DeviceConfigActivity : BaseActivity() {
binding.rbModeSampling.isChecked = true binding.rbModeSampling.isChecked = true
loadCookSpan() loadCookSpan()
loadSamplingSpan(isClicked = true) loadSamplingSpan(isClicked = true)
startActivity<SamplingListActivity> { } startActivity<SamplingListActivity> {
putExtra(SamplingListActivity.IS_CONFIG_PAGE, true) }
finish() finish()
} }
addWeighListener() addWeighListener()
app/src/main/java/com/shuwei/dish/match/ui/SamplingListActivity.kt
+8 -3
View File
@@ -34,6 +34,7 @@ class SamplingListActivity : BaseActivity() {
companion object { companion object {
private const val TAG = "SamplingListActivity" private const val TAG = "SamplingListActivity"
const val IS_COOKING = "isCooking" const val IS_COOKING = "isCooking"
const val IS_CONFIG_PAGE = "isConfigPage"
} }
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
@@ -87,9 +88,13 @@ class SamplingListActivity : BaseActivity() {
override fun onNewIntent(intent: Intent?) { override fun onNewIntent(intent: Intent?) {
super.onNewIntent(intent) super.onNewIntent(intent)
// val isCooking = intent?.getBooleanExtra(IS_COOKING, false) ?: false val isConfigPage = intent?.getBooleanExtra(IS_CONFIG_PAGE, false) ?: false
// //toast("isCooking=$isCooking") if (isConfigPage) {
// refreshPage(isCooking) return
}
val isCooking = intent?.getBooleanExtra(IS_COOKING, false) ?: false
//toast("isCooking=$isCooking")
refreshPage(isCooking)
} }
@Deprecated("Deprecated in Java") @Deprecated("Deprecated in Java")
app/src/main/java/com/shuwei/dish/match/ui/SelectDishActivity.kt
+19 -14
View File
@@ -31,6 +31,7 @@ class SelectDishActivity : BaseActivity() {
companion object { companion object {
const val IS_COOKING = "isCooking" const val IS_COOKING = "isCooking"
const val DINNER_TYPE = "dinnerType" const val DINNER_TYPE = "dinnerType"
const val IS_CONFIG_PAGE = "isConfigPage"
} }
private lateinit var binding: ActivitySelectDishBinding private lateinit var binding: ActivitySelectDishBinding
@@ -168,20 +169,24 @@ class SelectDishActivity : BaseActivity() {
override fun onNewIntent(intent: Intent?) { override fun onNewIntent(intent: Intent?) {
super.onNewIntent(intent) super.onNewIntent(intent)
// runCatching { runCatching {
// val isCooking = intent?.getBooleanExtra(IS_COOKING, false) ?: false val isConfigPage = intent?.getBooleanExtra(IS_CONFIG_PAGE, false) ?: false
// val lastDinnerType = intent?.getStringExtra(DINNER_TYPE) ?: "0" if (isConfigPage) {
// if (lastDinnerType == "1" || lastDinnerType == "2" || lastDinnerType == "3") { return
// fragmentList[lastDinnerType.toInt() - 1].getDishList(1, lastDinnerType) }
// } val isCooking = intent?.getBooleanExtra(IS_COOKING, false) ?: false
// when (lastDinnerType) { val lastDinnerType = intent?.getStringExtra(DINNER_TYPE) ?: "0"
// "1" -> binding.dishRadioGroup.check(R.id.rbBreakfast) if (lastDinnerType == "1" || lastDinnerType == "2" || lastDinnerType == "3") {
// "2" -> binding.dishRadioGroup.check(R.id.rbLunch) fragmentList[lastDinnerType.toInt() - 1].getDishList(1, lastDinnerType)
// "3" -> binding.dishRadioGroup.check(R.id.rbDinner) }
// } when (lastDinnerType) {
// }.onFailure { "1" -> binding.dishRadioGroup.check(R.id.rbBreakfast)
// it.printStackTrace() "2" -> binding.dishRadioGroup.check(R.id.rbLunch)
// } "3" -> binding.dishRadioGroup.check(R.id.rbDinner)
}
}.onFailure {
it.printStackTrace()
}
} }
@Deprecated("Deprecated in Java") @Deprecated("Deprecated in Java")