Browse Source

提交人:jtm
提交内容:bug fixed

江天明 1 year ago
parent
commit
e873e2b802

+ 13 - 6
BusinessStep/src/main/java/com/develop/step/ui/ModesDetailActivity.kt

@@ -226,7 +226,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                             if (isTimeChange) {
                                 //当前调节时间
                                 //dealWithTimeByOperation(true)
-                                handleRotateTimeChange(rotateStep())
+                                handleRotateTimeChange(true)
                             }
                         }
 
@@ -291,7 +291,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                             if (isTimeChange) {
                                 //当前调节时间
                                 //dealWithTimeByOperation(false)
-                                handleRotateTimeChange(-rotateStep())
+                                handleRotateTimeChange(false)
                             }
                         }
 
@@ -839,8 +839,9 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             ) {
                 if (setByUser) {
                     //  currTime = time.toLong()
+                    rollTimeEvent(hours, minute, second, time, setByUser)
                 }
-                rollTimeEvent(hours, minute, second, time, setByUser)
+
             }
 
             override fun onTimePickerTouchFirst(where: Int) {
@@ -1088,7 +1089,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     }
 
     /**旋转按钮切换时间*/
-    private fun handleRotateTimeChange(c: Int) {
+    private fun handleRotateTimeChange(increase: Boolean) {
         ThreadUtils.runOnMainThread {
             //当前调节时间
             var targetTime = currDevInfo.targetTime
@@ -1102,10 +1103,16 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             if (whereIndex == 1) {
                 step += 60
             } else {
-                step = c
+                step = rotateStep()
+            }
+            if (increase){
+                targetTime += step
+            } else {
+                targetTime -= step
             }
-            targetTime += step
 
+
+            Log.d("kkkkkkk","$whereIndex===$step===$targetTime")
             if (targetTime < 0) {
                 targetTime = 0;
             }

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

@@ -942,9 +942,9 @@ class CookStepActivity : CookStepBaseActivity() {
             }
         } else if (tabType == CookSettingType.TIME_SETTING) {
             cookStep?.uiData?.let {
-                if (!it.isTimeChange) {
-                    return
-                }
+//                if (!it.isTimeChange) {
+//                    return
+//                }
                 dealWithTimeByOperation(it, increase)
             }
         } else if (tabType == CookSettingType.DIRECTION_SETTING) {