Merge branch 'master' of https://git.kuyuntech.com/developer/FoodCooking_LandScape

 Conflicts:

	BusinessStep/src/main/java/com/develop/step/ui/ModesDetailActivity.kt

BusinessStep/src/main/java/com/develop/step/ui/ModesDetailActivity.kt

@@ -125,7 +125,6 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        CofarSDK.stoptWeight()
         super.onCreate(savedInstanceState)
         hasShowScreenSaver = true
         configLock = true
@@ -143,8 +142,6 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
     override fun onDestroy() {
         super.onDestroy()
-        CofarSDK.stoptWeight()
-
         viewModel.stopTurbo()
         viewModel.cancelAnimator()
         hasShowScreenSaver = false
@@ -1462,9 +1459,11 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                 supportFragmentManager, "backRequestDialog"
             )
             else {
+                CofarSDK.stoptWeight()
                 finish()
             }
         } else {
+            CofarSDK.stoptWeight()
             finish()
         }
     }