Sfoglia il codice sorgente

010Dapk问题点:
1、点击煲汤程序的时间框1小时会自动跳转为10min显示。
2、酸奶程序运行到第2阶段至结束时立马进入第3阶段启动运行才是正确的。现设备的酸奶程序第2阶段运行至结束进入第3阶段只启动运行1秒便弹窗结束完成框了。
3、所有能切换正反转的方向的程序在运行一段时间 后在后台运行再返回当前正在运行的程序界面时,不能自由切换正反转方向了。比如:煲汤程序1速正转运行一段时间后在后台运行再返回到煲汤程序界面时,该程序本来可以在运行过程中切换反转的,此时不能切换反转运行了。
4、在平台同时发布两个增量包(各10个食谱),机器收到10个更新包通知只需点击一次更新按键即可把20个食谱更新,但更新包没有做区分提示,会让用户认为更新的是同一个增量包的食谱。
5、食谱分享,安卓和ios版本扫食谱的二维码分享发现步骤过长的文案会有遮挡的情况。
6、食谱步骤中有运用蒸汽程序的步骤,大小火的图标不显示。

wbspool 1 anno fa
parent
commit
04e1bc931b

+ 9 - 3
BusinessCommon/src/main/java/com/develop/common/widget/TimePickerView.kt

@@ -32,6 +32,9 @@ class TimePickerView : ConstraintLayout {
     private var maxTime = 8 * 60 * 60
     private var minTime = 0
 
+    private var firstUnit:String? = null
+    private var secondUnit:String? = null
+
     var onTimePickerCallback: OnTimePickerCallback? = null
     private var firstManager: ScrollLinearManager
     private var secondManager: ScrollLinearManager
@@ -160,6 +163,9 @@ class TimePickerView : ConstraintLayout {
         if (secondUnit != binding.tvSecondBottom.text) {
             binding.tvSecondBottom.text = secondUnit
         }
+
+        this.firstUnit = firstUnit;
+        this.secondUnit =  secondUnit;
     }
 
     private fun updateDisplayTime() {
@@ -251,10 +257,10 @@ class TimePickerView : ConstraintLayout {
         val maxMinutes = (maxTime / 60 % 60)
         val maxHours = (maxTime / 3600)
         val maxSeconds = maxTime % 60
-        val currentSeconds: Int = if (firstTimePos >= 60) {
-            val hours = firstTimePos - 60 + 1
+        val currentSeconds: Int =  if(firstUnit === "hour"){
+            val hours = firstTimePos
             hours * 60 * 60 + secondTimePos * 60
-        } else {
+        }else{
             firstTimePos * 60 + secondTimePos
         }
         if (currentSeconds < minTime) {

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

@@ -725,7 +725,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
 
                 viewModel.changeStep(CookSettingType.TEMP_SETTING)
-
+                this@ModesDetailActivity.isMotorDirectionGearChange =
+                    baseMode.isMotorDirectionChange
                 if (CofarSDK.devInfo().status != DevStatus.PAUSE.toInt() && CofarSDK.devInfo().status != DevStatus.RUNNING.toInt()) {
 
                     var targetTemp = baseMode.defaultTemp.toShort()
@@ -787,8 +788,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                             isMotorGearChange,
                             focusUpdate = true
                         )
-                        this@ModesDetailActivity.isMotorDirectionGearChange =
-                            isMotorDirectionChange
+
                         updateMotorDirectionUI(motorDirection.toInt(), isMotorDirectionChange)
 
                         updateWeightUI(currDevInfo.weight.toFloat())

+ 7 - 4
BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepBaseActivity.kt

@@ -402,7 +402,7 @@ abstract class CookStepBaseActivity :
         binding.controller.jianhao.setVisible()
         binding.controller.jiahao.setVisible()
         binding.controller.steamFire.visibility = View.GONE;
-        binding.controller.steamFireSmall.visibility = View.GONE;
+//        binding.controller.steamFireSmall.visibility = View.GONE;
         binding.controller.waterRingView.visibility = View.GONE
         binding.controller.waterSprayShow.visibility = View.GONE
         binding.llWeightView.visibility = View.GONE
@@ -424,7 +424,7 @@ abstract class CookStepBaseActivity :
         binding.controller.jianhao.setVisible()
         binding.controller.jiahao.setVisible()
         binding.controller.steamFire.visibility = View.GONE;
-        binding.controller.steamFireSmall.visibility = View.GONE;
+//        binding.controller.steamFireSmall.visibility = View.GONE;
         binding.controller.waterRingView.visibility = View.GONE
         binding.controller.waterSprayShow.visibility = View.GONE
         binding.llWeightView.visibility = View.GONE
@@ -447,7 +447,7 @@ abstract class CookStepBaseActivity :
         binding.controller.jianhao.setVisible()
         binding.controller.jiahao.setVisible()
         binding.controller.steamFire.visibility = View.GONE;
-        binding.controller.steamFireSmall.visibility = View.GONE;
+//        binding.controller.steamFireSmall.visibility = View.GONE;
         binding.llWeightView.visibility = View.GONE
         isWidget = false
         binding.controller.root.visibility = View.VISIBLE
@@ -471,7 +471,7 @@ abstract class CookStepBaseActivity :
         binding.controller.jianhao.setGone()
         binding.controller.jiahao.setGone()
         binding.controller.steamFire.visibility = View.GONE;
-        binding.controller.steamFireSmall.visibility = View.GONE;
+//        binding.controller.steamFireSmall.visibility = View.GONE;
         binding.controller.waterRingView.visibility = View.GONE
         binding.controller.waterSprayShow.visibility = View.GONE
         binding.llWeightView.visibility = View.GONE
@@ -496,6 +496,7 @@ abstract class CookStepBaseActivity :
             tvTitleTemp.text_color = R.color.panel_unselected
             tvSetTime.text_color = R.color.panel_unselected
             tvTitleTime.text_color = R.color.panel_unselected
+            tvCookingTimeTarget.text_color = R.color.panel_unselected
             tvSetSpeed.text_color = R.color.panel_unselected
             tvTitleSpeed.text_color = R.color.panel_unselected
             tvSetDirection.text_color = R.color.panel_unselected
@@ -524,6 +525,8 @@ abstract class CookStepBaseActivity :
                     tvCookingTimeTarget.text_color = R.color.panel_selected
                     tvSetTime.text_color = R.color.panel_selected
                     tvTitleTime.text_color = R.color.panel_selected
+                    tvCookingTimeTarget.text_color = R.color.panel_selected
+
                     viewBackgroundTime.isSelected = true
                     viewIconTime.isSelected = true
                 }