慢炖和揉面逻辑上传

BusinessCommon/src/main/java/com/develop/common/data_repo/db/ModelKit.kt

@@ -57,6 +57,7 @@ enum class ModesType {
     CHOP,
     SLOW_COOK,
     KNEAD_TOUGH,
+    KNEAD,
     STEAM,
     FOOD_PROCESSOR,
     TURBO,AUTO_CLEAN,

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

@@ -139,6 +139,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     private var sn = getSN()
     private var keep: Boolean = false
     private var mWeightTime: Long = 0  //防止客户重复点击称重
+
+
     private var isWeightNum: Float = -50F
     private lateinit var baseMode: BaseDevMode
 
@@ -273,6 +275,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         keep = intent.extras?.getBoolean("keep", false) ?: false
         if (keep){
             startMotorGer = intent.extras?.getInt("startMotorGer", 0) ?: 0
+            currentMotorGer = startMotorGer
         }
         viewModel.lastModeType = viewModel.modeType
         lastModeType = viewModel.modeType
@@ -1949,9 +1952,9 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         focusUpdate: Boolean = false
     ) {
 
-        if (CofarSDK.devInfo().devMode != DevModes.SOUP) {
-            return
-        }
+//        if (CofarSDK.devInfo().devMode != DevModes.SOUP) {
+//            return
+//        }
 
         this.minMotorGear = minMotorGear.toInt()
         this.maxMotorGear = maxMotorGear.toInt()
@@ -1965,7 +1968,13 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
              * 处理慢炖开5停25逻辑，因为SDK 停的时候 设置挡速为0，客户那边说不能显示0挡速估在这UI处理
              *
              * */
-            if ((sn.startsWith("010") || sn.startsWith("033")) && (modeType == WorkModes.SLOW_COOKING || modeType == WorkModes.SLOW_COOK) && currentMotorGer == 0) {
+
+            /**
+             * 各个平台的揉面 需要处理
+             *
+             * */
+            if (((modeType == WorkModes.KNEAD || modeType == WorkModes.KNEAD_TOUGH)&& currentMotorGer == 0)
+                ||((sn.startsWith("010") || sn.startsWith("033")) && (modeType == WorkModes.SLOW_COOKING || modeType == WorkModes.SLOW_COOK)&& currentMotorGer == 0) ) {
                 /**
                  * 后台运行，点击回来，会导致挡速度，因为开5停25 的原因 currentMotorGer 是0
                  * 客户那边说不能显示0挡速估在这UI处理，估另外处理后台运行，点击回来挡速
@@ -1981,6 +1990,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                         speedRingView.updateProgress(current)
                         speedRingText.text = current.toString()
                     }
+
                     return@apply
                 }
                 return@apply
@@ -2257,7 +2267,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                 CofarSDK.cancel()
                 CofarSDK.devInfo().runningRecipeId = null
                 //处理010 033 后台后回来的显示转速问题
-                startMotorGer = if (CofarSDK.devInfo().motorGearBuffer.toInt()!=-1) CofarSDK.devInfo().motorGearBuffer.toInt() else CofarSDK.devInfo().motorGear.toInt()
+                startMotorGer = if (CofarSDK.devInfo().motorGearBuffer.toInt()!=-1) CofarSDK.devInfo().motorGearBuffer.toInt() else if (CofarSDK.devInfo().motorGear.toInt()!=0) CofarSDK.devInfo().motorGear.toInt() else currentMotorGer
                 var startConfig = HashMap<String, Any>()
                 startConfig.put("stopTips", showStopTips)
                 CofarSDK.startWithConfig(viewModel.modeType, startConfig)
@@ -2350,7 +2360,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         userChanging = false
 
         //处理010 033 后台后回来的显示转速问题
-        startMotorGer = if (CofarSDK.devInfo().motorGearBuffer.toInt()!=-1) CofarSDK.devInfo().motorGearBuffer.toInt() else CofarSDK.devInfo().motorGear.toInt()
+        startMotorGer = if (CofarSDK.devInfo().motorGearBuffer.toInt()!=-1) CofarSDK.devInfo().motorGearBuffer.toInt() else if (CofarSDK.devInfo().motorGear.toInt()!=0) CofarSDK.devInfo().motorGear.toInt() else currentMotorGer
         //配置
         CofarSDK.confirm()
         binding.btnCancel.visibility = View.GONE
@@ -2914,7 +2924,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
     private fun setKneadMotorGear(isStop: Boolean) {
         //处理5/7/10寸屏，默认转速不同
-        if (baseMode is Knead && !sn.startsWith("011")) {
+        if (modeType == WorkModes.KNEAD || modeType == WorkModes.KNEAD_TOUGH ) {
             var defMotorGear = when (StringUtils.getWindowsScreen(this@ModesDetailActivity)) {
                 5 -> {
                     1
@@ -2948,8 +2958,6 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     //程序运行完以后回调
     override fun onDevStop() {
         setKneadMotorGear(true)
-
-
     }
 
     private fun getRecipe(number: String) {

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

@@ -149,6 +149,7 @@ class CookStepActivity : CookStepBaseActivity() {
         keep = intent.extras?.getBoolean("keep", false) ?: false
         if (keep) {
             startMotorGer = intent.extras?.getInt("startMotorGer", 0) ?: 0
+            currentMotorGer = startMotorGer
         }
 
         if (baseSn.startsWith("011")) {
@@ -830,9 +831,8 @@ class CookStepActivity : CookStepBaseActivity() {
             CofarSDK.resume()
         } else if (tag == BUTTON_TAG_CONFIRM) {
             //处理010 033 后台后回来的显示转速问题
-            startMotorGer =
-                if (CofarSDK.devInfo().motorGearBuffer.toInt() != -1) CofarSDK.devInfo().motorGearBuffer.toInt() else CofarSDK.devInfo().motorGear.toInt()
-            CofarSDK.confirm()
+            startMotorGer = if (CofarSDK.devInfo().motorGearBuffer.toInt()!=-1) CofarSDK.devInfo().motorGearBuffer.toInt() else if (CofarSDK.devInfo().motorGear.toInt()!=0) CofarSDK.devInfo().motorGear.toInt() else currentMotorGer
+           CofarSDK.confirm()
             binding.controller.btnStart.setGone()
             binding.controller.btnReset.setGone()
         } else if (tag == BUTTON_TAG_STOP) {
@@ -1585,7 +1585,18 @@ class CookStepActivity : CookStepBaseActivity() {
         /**
          * 慢炖速度兼容 010 033
          * */
-        if ((baseSn.startsWith("010") || baseSn.startsWith("033")) && viewModel.displayStep()?.workMode == ModesType.SLOW_COOK.name && keep) {
+        /**
+         * 010D 033F
+         * 处理慢炖开5停25逻辑，因为SDK 停的时候 设置挡速为0，客户那边说不能显示0挡速估在这UI处理
+         *
+         * */
+
+        /**
+         * 各个平台的揉面 需要处理
+         *
+         * */
+        if (((viewModel.displayStep()?.workMode == ModesType.KNEAD_TOUGH.name || viewModel.displayStep()?.workMode == ModesType.KNEAD.name)
+                    ||((baseSn.startsWith("010") || baseSn.startsWith("033")) && viewModel.displayStep()?.workMode == ModesType.SLOW_COOK.name)) && keep) {
             if (CofarSDK.devInfo().runningStatus == DevStatus.PAUSE){
                 return
             }
@@ -1602,7 +1613,8 @@ class CookStepActivity : CookStepBaseActivity() {
             }
             // 速度设置
             val speed =
-                if ((baseSn.startsWith("010") || baseSn.startsWith("033")) && viewModel.displayStep()?.workMode == ModesType.SLOW_COOK.name) {
+                if ((viewModel.displayStep()?.workMode == ModesType.KNEAD_TOUGH.name || viewModel.displayStep()?.workMode == ModesType.KNEAD.name)
+                            ||((baseSn.startsWith("010") || baseSn.startsWith("033")) && viewModel.displayStep()?.workMode == ModesType.SLOW_COOK.name))  {
                     if (startMotorGer == -1) {
                         if (uiData.motorGearBuffer != -1) {
                             uiData.motorGearBuffer

BusinessStep/src/main/res/layout/activity_mode_detail.xml

@@ -217,7 +217,7 @@
             android:id="@+id/speed_ring_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="2"
+            android:text="1"
             android:textColor="@color/speed_ring"
             android:textSize="@dimen/convert_90px"
             android:visibility="gone"
@@ -231,7 +231,7 @@
             android:id="@+id/temp_ring_text_cooking"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="80°C"
+            android:text="0°C"
             android:textColor="@color/temp_ring_cooking"
             android:textSize="@dimen/convert_30px"
             android:visibility="gone"
@@ -256,7 +256,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/convert_6px"
-            android:text="--05:00--"
+            android:text="--00:00--"
             android:textColor="#ffffff"
             android:textSize="@dimen/convert_54px"
             android:visibility="gone"

app/build.gradle

@@ -18,8 +18,8 @@ ext {
 
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
-//    brandCode="010D"
-    brandCode = "063B"
+    brandCode="033F"
+//    brandCode = "063B"
     model = "1039"
 
 }