恢复

BusinessSetting/src/main/java/com/develop/setting/ui/AboutActivity.kt

@@ -174,7 +174,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
                 pwdDialog.onDialogClickListener = object :PwdDialog.OnDialogClickListener{
 
                     override fun onConfirm(pwd:String) {
-                         if("cofar888".equals(pwd)){
+                         if("12345678".equals(pwd)){
                              pwdDialog.removeSelf()
                              cancelConfirmDialog.title = getString(com.develop.common.R.string.change_lang_tips)
                              cancelConfirmDialog.showCancel = false
@@ -289,7 +289,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
                 pwdDialog.onDialogClickListener = object :PwdDialog.OnDialogClickListener{
 
                     override fun onConfirm(pwd:String) {
-                        if("cofar888".equals(pwd)){
+                        if("12345678".equals(pwd)){
                             if (isAdbDebuggingEnabled(ctx)) {
                                 Toast.makeText(ctx, "adb disable", Toast.LENGTH_SHORT).show()
                                 toggleAdbDebugging(ctx, false)
@@ -326,7 +326,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
                 pwdDialog.onDialogClickListener = object :PwdDialog.OnDialogClickListener{
 
                     override fun onConfirm(pwd:String) {
-                        if("cofar888".equals(pwd)){
+                        if("12345678".equals(pwd)){
                             togglePointerLocation(ctx)
                         }else{
                             GlobalToast.showToast(getString(com.develop.common.R.string.password_uncorrect))
@@ -357,7 +357,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
                 pwdDialog.onDialogClickListener = object :PwdDialog.OnDialogClickListener{
 
                     override fun onConfirm(pwd:String) {
-                        if("cofar888".equals(pwd)){
+                        if("12345678".equals(pwd)){
                             // 创建启动目标活动的Intent
                             val intent = Intent()
                             intent.component = ComponentName(

BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepActivity.kt

@@ -196,7 +196,22 @@ class CookStepActivity : CookStepBaseActivity() {
 
         binding.viewWeightClose.setOnClickListener {
             CofarSDK.stoptWeight()
-            viewModel.setDisplayStep(viewModel.stepIndex, force = true)
+            //viewModel.setDisplayStep(viewModel.stepIndex, force = true)
+
+            if (viewModel.displayStep()?.isWeightMode() == true) {
+                changeWeightPanel()
+                CofarSDK.stoptWeight()
+                CofarSDK.startWeight()
+            } else if (viewModel.displayStep()?.isTurboMode() == true) {
+                CofarSDK.stoptWeight()
+                changeTurboPanel()
+            } else if (viewModel.displayStep()?.isDescription() == true) {
+                CofarSDK.stoptWeight()
+                changeDescription()
+            } else {
+                CofarSDK.stoptWeight()
+                changeTempSettingPanel()
+            }
             binding.viewWeightClose.setGone()
             binding.viewChangeCrush.setVisible()
         }
@@ -221,10 +236,10 @@ class CookStepActivity : CookStepBaseActivity() {
                         binding.ivPrevStep.setGone()
                         binding.ivNextStep.setGone()
                     }
-                    CofarSDK.changeMode(
-                        "$recipeNumber:${viewModel.stepIndex}",
-                        CofarSDK.devMode("WEIGHT")
-                    )
+//                    CofarSDK.changeMode(
+//                        "$recipeNumber:${viewModel.stepIndex}",
+//                        CofarSDK.devMode("WEIGHT")
+//                    )
                     changeWeightPanel()
                     CofarSDK.stoptWeight()
                     CofarSDK.startWeight()