完善空炸功能

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

@@ -96,14 +96,15 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         return ActivityModeDetailBinding.inflate(inflater)
     }
 
-    fun turnDevModeUI(){
+    private fun turnDevModeUI(){
 
         if(CofarSDK.devInfo().devMode == DevModes.AIR_FRYER){
             //隐藏点击
             binding.clCookDirection.visibility = View.GONE;
             binding.clCookSpeed.visibility = View.GONE;
             binding.clCookWater.visibility = View.VISIBLE
-            binding.ivTurboView.visibility = View.VISIBLE
+            binding.ivTurbo.visibility = View.GONE
+
 
         }
 
@@ -112,7 +113,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             binding.clCookDirection.visibility = View.VISIBLE;
             binding.clCookSpeed.visibility = View.VISIBLE;
             binding.clCookWater.visibility = View.GONE
-            binding.ivTurboView.visibility = View.GONE
+            binding.ivTurbo.visibility = View.VISIBLE
+
         }
 
     }
@@ -788,6 +790,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             binding.ivWeight.visibility = View.VISIBLE
             binding.ivTurbo.visibility = View.VISIBLE
         }
+        turnDevModeUI()
         changeTempSettingStep()
     }
 
@@ -1245,6 +1248,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
             }
         }
+
+        turnDevModeUI()
     }
 
     /**

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

@@ -37,10 +37,7 @@ import com.develop.common.utils.CofarUtils
 import com.develop.common.utils.TimeUtil
 import com.develop.step.ui.cook_step.model.CookStepStatus
 import com.develop.step.ui.cook_step.model.CookStepUiData
-import com.kuyuntech.cofarcooking.device.sdk.constant.core.CommonEventTypes
-import com.kuyuntech.cofarcooking.device.sdk.constant.core.DevStatus
-import com.kuyuntech.cofarcooking.device.sdk.constant.core.HeatModes
-import com.kuyuntech.cofarcooking.device.sdk.constant.core.MotorDirections
+import com.kuyuntech.cofarcooking.device.sdk.constant.core.*
 import com.kuyuntech.cofarcooking.device.sdk.eventbus.core.DevInfo
 import com.kuyuntech.cofarcooking.device.sdk.eventbus.event.DevCommonEvent
 import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK
@@ -60,6 +57,26 @@ class CookStepActivity : CookStepBaseActivity() {
     private var coverPath: Any? = null
     private var isFromOverWrite = false
 
+
+    private fun turnDevModeUI(){
+
+        if(CofarSDK.devInfo().devMode == DevModes.AIR_FRYER){
+            //隐藏点击
+            binding.controller.clCookDirection.visibility = View.GONE;
+            binding.controller.clCookSpeed.visibility = View.GONE;
+            binding.controller.clCookWater.visibility = View.VISIBLE
+        }
+
+        if(CofarSDK.devInfo().devMode == DevModes.SOUP){
+            //隐藏点击
+            binding.controller.clCookDirection.visibility = View.VISIBLE;
+            binding.controller.clCookSpeed.visibility = View.VISIBLE;
+            binding.controller.clCookWater.visibility = View.GONE
+
+        }
+
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -155,6 +172,7 @@ class CookStepActivity : CookStepBaseActivity() {
         }
         initData()
         initStepData()
+        turnDevModeUI()
     }
 
     private fun initData() {
@@ -510,6 +528,13 @@ class CookStepActivity : CookStepBaseActivity() {
         checkShowConfirm()
     }
 
+    override fun onUserWaterGear(value: Int) {
+        CofarSDK.cfgWaterBear(value);
+        binding.controller.waterSprayShow.updateGear(value)                               // 圆环设置-当前运行速度
+        binding.controller.clCookWater.binding.waterSprayShow.updateGear(value)
+        checkShowConfirm()
+    }
+
     override fun onSettingDirection(value: Int) {
         viewModel.displayStep()?.uiData?.direction = value
         if (value == 0) {
@@ -712,7 +737,27 @@ class CookStepActivity : CookStepBaseActivity() {
                 binding.controller.speedRingView.updateProgress(it.currentSpeed)
                 onUserChangeSpeed(it.currentSpeed)
             }
-        } else if (tabType == CookSettingType.TIME_SETTING) {
+        } else if(tabType == CookSettingType.WATER_SPRY){
+            cookStep?.uiData?.let {
+                if (!it.isWaterGearChange) {
+                    return
+                }
+                if (increase) {
+                    it.currentWaterGear++
+                    if (it.currentWaterGear > it.limitMaxWaterGear) {
+                        it.currentWaterGear = it.limitMaxWaterGear
+                    }
+                } else {
+                    it.currentWaterGear--
+                    if (it.currentWaterGear < it.limitMinWaterGear) {
+                        it.currentWaterGear = it.limitMinWaterGear
+                    }
+                }
+                viewModel.stepUiData.doingModify = true
+                binding.controller.waterRingView.updateProgress(it.currentWaterGear)
+                onUserWaterGear(it.currentWaterGear)
+            }
+        }else if (tabType == CookSettingType.TIME_SETTING) {
             cookStep?.uiData?.let {
                 if (!it.isTimeChange) {
                     return
@@ -1013,6 +1058,13 @@ class CookStepActivity : CookStepBaseActivity() {
             binding.controller.tvSetSpeed.updateText(uiData.currentSpeed.toString())                           // 下面的TAB-当前运行速度
         }
 
+        // 喷水设置
+        if (!viewModel.stepUiData.doingModify || focusUpdate) {
+            binding.controller.waterRingView.updateProgress(CofarSDK.devInfo().waterGear?:0)                               // 圆环设置-当前运行速度
+            binding.controller.waterSprayShow.updateGear(CofarSDK.devInfo().waterGear?:0)                               // 圆环设置-当前运行速度
+            binding.controller.clCookWater.binding.waterSprayShow.updateGear(CofarSDK.devInfo().waterGear?:0)                               // 圆环设置-当前运行速度
+        }
+
         // 方向设置
         if (!viewModel.stepUiData.doingModify || focusUpdate) {
             updateDirection(uiData.direction)

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

@@ -77,6 +77,8 @@ abstract class CookStepBaseActivity :
 
     abstract fun onUserChangeSpeed(value: Int)
 
+    abstract fun onUserWaterGear(value: Int)
+
     abstract fun onDevStateChange(devInfo: DevInfo)
 
     /**
@@ -165,6 +167,9 @@ abstract class CookStepBaseActivity :
         binding.controller.clCookDirection.setOnClickListener {
             changeDirectionSettingStep()
         }
+        binding.controller.clCookWater.setOnClickListener{
+            changeWaterGearSettingStep()
+        }
         binding.viewBack.setOnClickListener {
             val run = recipeNumber?.let { it1 -> CofarSDK.devInfo().runningInstId.startsWith(it1) }
             if (runningState != 0 && run == true) {
@@ -202,6 +207,16 @@ abstract class CookStepBaseActivity :
                     onUserChangeSpeed(progress)
                 }
             }
+
+            waterRingView.setRange(0f, 2f)
+            speedRingView.updateProgress(0)
+            waterRingView.onRingViewListener = object : RingControlView.OnRingViewListener {
+                override fun onProgressChange(progress: Int) {
+                    viewModel.stepUiData.doingModify = true
+                    onUserWaterGear(progress)
+                }
+            }
+
         }
         binding.ivTurboView.setOnTouchListener { view, motionEvent ->
             when (motionEvent.action) {
@@ -276,6 +291,8 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeTempSettingPanel() {
+        binding.controller.waterRingView.visibility = View.GONE
+        binding.controller.waterSprayShow.visibility = View.GONE
         binding.llWeightView.visibility = View.GONE
         binding.controller.root.visibility = View.VISIBLE
         binding.controller.tempRingView.visibility = View.VISIBLE
@@ -291,6 +308,8 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeTimeSettingPanel() {
+        binding.controller.waterRingView.visibility = View.GONE
+        binding.controller.waterSprayShow.visibility = View.GONE
         binding.llWeightView.visibility = View.GONE
         binding.controller.root.visibility = View.VISIBLE
         binding.controller.tempRingView.visibility = View.INVISIBLE
@@ -306,6 +325,8 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeSpeedSettingStep() {
+        binding.controller.waterRingView.visibility = View.GONE
+        binding.controller.waterSprayShow.visibility = View.GONE
         binding.llWeightView.visibility = View.GONE
         binding.controller.root.visibility = View.VISIBLE
         binding.controller.tempRingView.visibility = View.INVISIBLE
@@ -314,13 +335,35 @@ abstract class CookStepBaseActivity :
         binding.controller.tvSpeedText.visibility = View.VISIBLE
         binding.controller.clSetTime.visibility = View.GONE
         binding.controller.flDirection.visibility = View.GONE
+
         if (viewModel.displayStep()?.isTurboMode() != true) {
             binding.ivTurboView.visibility = View.GONE
         }
         setPanelViewProperty(CookSettingType.SPEED_SETTING)
     }
 
+    fun changeWaterGearSettingStep() {
+        binding.llWeightView.visibility = View.GONE
+        binding.controller.root.visibility = View.VISIBLE
+        binding.controller.tempRingView.visibility = View.INVISIBLE
+        binding.controller.tvRingTempText.visibility = View.GONE
+        binding.controller.speedRingView.visibility = View.GONE
+        binding.controller.tvSpeedText.visibility = View.GONE
+        binding.controller.clSetTime.visibility = View.GONE
+        binding.controller.flDirection.visibility = View.GONE
+
+        binding.controller.waterRingView.visibility = View.VISIBLE
+        binding.controller.waterSprayShow.visibility = View.VISIBLE
+
+        if (viewModel.displayStep()?.isTurboMode() != true) {
+            binding.ivTurboView.visibility = View.GONE
+        }
+        setPanelViewProperty(CookSettingType.WATER_SPRY)
+    }
+
     fun changeDirectionSettingStep() {
+        binding.controller.waterRingView.visibility = View.GONE
+        binding.controller.waterSprayShow.visibility = View.GONE
         binding.llWeightView.visibility = View.GONE
         binding.controller.root.visibility = View.VISIBLE
         binding.controller.tempRingView.visibility = View.INVISIBLE
@@ -356,6 +399,7 @@ abstract class CookStepBaseActivity :
             viewIconDirection.isSelected = false
             tvCookingTempTarget.isSelected = false
             tvCookingTimeTarget.isSelected = false
+            clCookWater.upSelectedView(false)
             when (selectStep) {
                 CookSettingType.TEMP_SETTING -> {
                     tvCookingTempTarget.isSelected = true
@@ -383,6 +427,9 @@ abstract class CookStepBaseActivity :
                     viewBackgroundDirection.isSelected = true
                     viewIconDirection.isSelected = true
                 }
+                CookSettingType.WATER_SPRY -> {
+                clCookWater.upSelectedView(true)
+             }
                 else -> {}
             }
         }

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

@@ -28,6 +28,9 @@ class CookStepUiData {
     // 当前转速
     var currentSpeed = 0
 
+    var currentWaterGear = 0
+
+
     // 限制时间调整范围
     var limitMinTime = 0
     var limitMaxTime = 0
@@ -40,10 +43,16 @@ class CookStepUiData {
     var limitMinSpeed = 0
     var limitMaxSpeed = 0
 
+    // 限制转速调整范围
+    var limitMinWaterGear = 0
+    var limitMaxWaterGear = 0
+
     //是否可以修改参数
     var isTempChange = false
     var isTimeChange = false
     var isMotorGearChange = false
+    var isWaterGearChange = false
+
     var isMotorDirectionChange = false
 
     fun applyRecipeSetting(data: DevRecipeCookingStep) {
@@ -64,6 +73,9 @@ class CookStepUiData {
             isTempChange = it.isTempChange
             isTimeChange = it.isTimeChange
             isMotorGearChange = it.isMotorGearChange
+            isWaterGearChange = it.isWaterGearChange
+            limitMinWaterGear = it.minWaterGear
+            limitMaxWaterGear = it.maxWaterGear
             isMotorDirectionChange = it.isMotorDirectionChange
         }
         targetTime = getFixedValue(targetTime, limitMinTime, limitMaxTime)

BusinessStep/src/main/java/com/develop/step/ui/recipes_detail/CookDetailActivity.kt

@@ -28,6 +28,8 @@ import com.develop.step.viewmodel.CookDetailViewModel
 import java.util.*
 import com.develop.step.R
 import com.develop.step.ui.recipes_detail.model.CookDetailInfo
+import com.kuyuntech.cofarcooking.device.sdk.constant.core.DevModes
+import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK
 import org.greenrobot.eventbus.EventBus
 
 @Route(path = Screens.Cook.COOK_DETAIL)
@@ -72,6 +74,9 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         return ActivityCookDetailBinding.inflate(inflater)
     }
 
+
+
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         ARouter.getInstance().inject(this)

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

@@ -90,6 +90,33 @@
         app:layout_constraintVertical_bias="0.45"
         tools:visibility="gone"/>
 
+
+    <com.develop.common.widget.RingControlView
+        android:id="@+id/water_ring_view"
+        android:layout_width="@dimen/convert_270px"
+        android:layout_height="@dimen/convert_270px"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.32" />
+
+    <com.develop.airfryer.ui.WaterSprayStatusView
+        android:id="@+id/water_spray_show"
+        android:scaleX="2"
+        android:scaleY="2"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/water_ring_view"
+        app:layout_constraintEnd_toEndOf="@+id/water_ring_view"
+        app:layout_constraintStart_toStartOf="@+id/water_ring_view"
+        app:layout_constraintTop_toTopOf="@+id/water_ring_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+    </com.develop.airfryer.ui.WaterSprayStatusView>
+
+
     <com.develop.common.widget.TimePickerView
         android:id="@+id/cl_set_time"
         android:layout_width="match_parent"
@@ -150,245 +177,259 @@
 
     </FrameLayout>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_cook_temp"
-        android:layout_width="@dimen/convert_280px"
-        android:layout_height="@dimen/convert_140px"
-        android:layout_marginBottom="@dimen/convert_190px"
-        app:layout_constraintBottom_toBottomOf="parent"
+    <com.develop.common.ui.AdaptLinearLayout
+        android:id="@+id/card_wrapper"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/cl_cook_time">
-
-        <View
-            android:id="@+id/view_background_temp"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/bg_cook_item_selected" />
-
-        <TextView
-            android:id="@+id/tv_temp_value"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/convert_21px"
-            android:layout_marginBottom="@dimen/convert_8px"
-            android:includeFontPadding="false"
-            android:text="80°C"
-            android:textColor="@color/cook_panel_text"
-            android:textSize="@dimen/convert_40px"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-        <ImageView
-            android:id="@+id/view_icon_temp"
-            android:layout_width="@dimen/convert_42px"
-            android:layout_height="@dimen/convert_42px"
-            android:layout_marginStart="@dimen/convert_11px"
-            android:layout_marginTop="@dimen/convert_17px"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_cook_temp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:tint="@color/cook_panel_text" />
-
-        <TextView
-            android:id="@+id/tv_title_temp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/convert_47px"
-            android:text="@string/temperature"
-            android:textColor="@color/cook_panel_text"
-            android:textSize="@dimen/convert_26px"
-            app:layout_constraintBottom_toBottomOf="@+id/view_icon_temp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/view_icon_temp" />
-
-        <TextView
-            android:id="@+id/tv_cooking_temp_target"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/convert_25px"
-            android:layout_marginTop="@dimen/convert_16px"
-            android:layout_marginBottom="@dimen/convert_11px"
-            android:text="--80°C--"
-            android:textColor="@color/cook_panel_text"
-            android:textSize="@dimen/convert_24px"
-            android:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_cook_time"
-        android:layout_width="@dimen/convert_280px"
-        android:layout_height="@dimen/convert_140px"
-        app:layout_constraintEnd_toStartOf="@+id/cl_cook_speed"
-        app:layout_constraintStart_toEndOf="@+id/cl_cook_temp"
-        app:layout_constraintTop_toTopOf="@+id/cl_cook_temp">
-
-        <View
-            android:id="@+id/view_background_time"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/bg_cook_item_selected" />
-
-        <TextView
-            android:id="@+id/tv_set_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/convert_21px"
-            android:layout_marginBottom="@dimen/convert_8px"
-            android:includeFontPadding="false"
-            android:text="00:60"
-            android:textColor="@color/cook_panel_text"
-            android:textSize="@dimen/convert_40px"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-        <ImageView
-            android:id="@+id/view_icon_time"
-            android:layout_width="@dimen/convert_42px"
-            android:layout_height="@dimen/convert_42px"
-            android:layout_marginStart="@dimen/convert_20px"
-            android:layout_marginTop="@dimen/convert_17px"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_cook_time"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:tint="@color/cook_panel_text" />
+        app:layout_constraintTop_toBottomOf="@id/temp_ring_view"
+        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        >
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_cook_temp"
+            android:layout_width="@dimen/convert_280px"
+            android:layout_height="@dimen/convert_140px"
+            android:layout_marginEnd="@dimen/convert_24px">
+
+            <View
+                android:id="@+id/view_background_temp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/bg_cook_item_selected" />
 
-        <TextView
-            android:id="@+id/tv_title_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/convert_70px"
-            android:text="@string/time"
-            android:textColor="@color/cook_panel_text"
-            android:textSize="@dimen/convert_26px"
-            app:layout_constraintBottom_toBottomOf="@+id/view_icon_time"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/view_icon_time" />
+            <TextView
+                android:id="@+id/tv_temp_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/convert_21px"
+                android:layout_marginBottom="@dimen/convert_8px"
+                android:includeFontPadding="false"
+                android:text="80°C"
+                android:textColor="@color/cook_panel_text"
+                android:textSize="@dimen/convert_40px"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+            <ImageView
+                android:id="@+id/view_icon_temp"
+                android:layout_width="@dimen/convert_42px"
+                android:layout_height="@dimen/convert_42px"
+                android:layout_marginStart="@dimen/convert_11px"
+                android:layout_marginTop="@dimen/convert_17px"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_cook_temp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:tint="@color/cook_panel_text" />
 
-        <TextView
-            android:id="@+id/tv_cooking_time_target"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/convert_25px"
-            android:layout_marginTop="@dimen/convert_16px"
-            android:layout_marginBottom="@dimen/convert_11px"
-            android:text="--05:00--"
-            android:textColor="@color/cook_panel_text"
-            android:textSize="@dimen/convert_24px"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            <TextView
+                android:id="@+id/tv_title_temp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/convert_47px"
+                android:text="@string/temperature"
+                android:textColor="@color/cook_panel_text"
+                android:textSize="@dimen/convert_26px"
+                app:layout_constraintBottom_toBottomOf="@+id/view_icon_temp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/view_icon_temp" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            <TextView
+                android:id="@+id/tv_cooking_temp_target"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/convert_25px"
+                android:layout_marginTop="@dimen/convert_16px"
+                android:layout_marginBottom="@dimen/convert_11px"
+                android:text="--80°C--"
+                android:textColor="@color/cook_panel_text"
+                android:textSize="@dimen/convert_24px"
+                android:visibility="visible"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_cook_time"
+            android:layout_width="@dimen/convert_280px"
+            android:layout_height="@dimen/convert_140px"
+            android:layout_marginEnd="@dimen/convert_24px">
+
+            <View
+                android:id="@+id/view_background_time"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/bg_cook_item_selected" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_cook_speed"
-        android:layout_width="@dimen/convert_280px"
-        android:layout_height="@dimen/convert_140px"
-        app:layout_constraintEnd_toStartOf="@+id/cl_cook_direction"
-        app:layout_constraintStart_toEndOf="@+id/cl_cook_time"
-        app:layout_constraintTop_toTopOf="@+id/cl_cook_temp">
+            <TextView
+                android:id="@+id/tv_set_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/convert_21px"
+                android:layout_marginBottom="@dimen/convert_8px"
+                android:includeFontPadding="false"
+                android:text="00:60"
+                android:textColor="@color/cook_panel_text"
+                android:textSize="@dimen/convert_40px"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+            <ImageView
+                android:id="@+id/view_icon_time"
+                android:layout_width="@dimen/convert_42px"
+                android:layout_height="@dimen/convert_42px"
+                android:layout_marginStart="@dimen/convert_20px"
+                android:layout_marginTop="@dimen/convert_17px"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_cook_time"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:tint="@color/cook_panel_text" />
 
-        <View
-            android:id="@+id/view_background_speed"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/bg_cook_item_selected" />
+            <TextView
+                android:id="@+id/tv_title_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/convert_70px"
+                android:text="@string/time"
+                android:textColor="@color/cook_panel_text"
+                android:textSize="@dimen/convert_26px"
+                app:layout_constraintBottom_toBottomOf="@+id/view_icon_time"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/view_icon_time" />
 
-        <TextView
-            android:id="@+id/tv_set_speed"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/convert_21px"
-            android:layout_marginBottom="@dimen/convert_8px"
-            android:includeFontPadding="false"
-            android:text="2"
-            android:textColor="@color/cook_panel_text"
-            android:textSize="@dimen/convert_40px"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            <TextView
+                android:id="@+id/tv_cooking_time_target"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/convert_25px"
+                android:layout_marginTop="@dimen/convert_16px"
+                android:layout_marginBottom="@dimen/convert_11px"
+                android:text="--05:00--"
+                android:textColor="@color/cook_panel_text"
+                android:textSize="@dimen/convert_24px"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_cook_speed"
+            android:layout_width="@dimen/convert_280px"
+            android:layout_height="@dimen/convert_140px"
+            android:layout_marginEnd="@dimen/convert_24px">
+
+            <View
+                android:id="@+id/view_background_speed"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/bg_cook_item_selected" />
 
-        <ImageView
-            android:id="@+id/view_icon_speed"
-            android:layout_width="@dimen/convert_46px"
-            android:layout_height="@dimen/convert_46px"
-            android:layout_marginStart="@dimen/convert_20px"
-            android:layout_marginTop="@dimen/convert_13px"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_cook_quick"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:tint="@color/cook_panel_text" />
+            <TextView
+                android:id="@+id/tv_set_speed"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/convert_21px"
+                android:layout_marginBottom="@dimen/convert_8px"
+                android:includeFontPadding="false"
+                android:text="2"
+                android:textColor="@color/cook_panel_text"
+                android:textSize="@dimen/convert_40px"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+            <ImageView
+                android:id="@+id/view_icon_speed"
+                android:layout_width="@dimen/convert_46px"
+                android:layout_height="@dimen/convert_46px"
+                android:layout_marginStart="@dimen/convert_20px"
+                android:layout_marginTop="@dimen/convert_13px"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_cook_quick"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:tint="@color/cook_panel_text" />
 
-        <TextView
-            android:id="@+id/tv_title_speed"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/convert_70px"
-            android:text="@string/speed"
-            android:textColor="@color/cook_panel_text"
-            android:textSize="@dimen/convert_26px"
-            app:layout_constraintBottom_toBottomOf="@+id/view_icon_speed"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/view_icon_speed" />
+            <TextView
+                android:id="@+id/tv_title_speed"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/convert_70px"
+                android:text="@string/speed"
+                android:textColor="@color/cook_panel_text"
+                android:textSize="@dimen/convert_26px"
+                app:layout_constraintBottom_toBottomOf="@+id/view_icon_speed"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/view_icon_speed" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_cook_direction"
+            android:layout_width="@dimen/convert_280px"
+            android:layout_height="@dimen/convert_140px"
+            android:layout_marginEnd="@dimen/convert_24px">
+
+            <View
+                android:id="@+id/view_background_direction"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/bg_cook_item_selected" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            <TextView
+                android:id="@+id/tv_set_direction"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:includeFontPadding="false"
+                android:text="@string/turn_right"
+                android:textColor="@color/cook_panel_text"
+                android:textSize="@dimen/convert_30px"
+                android:layout_marginEnd="@dimen/convert_24px"
+                android:layout_marginBottom="@dimen/convert_8px"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"/>
+
+            <ImageView
+                android:id="@+id/view_icon_direction"
+                android:layout_width="@dimen/convert_42px"
+                android:layout_height="@dimen/convert_42px"
+                android:layout_marginStart="@dimen/convert_22px"
+                android:layout_marginTop="@dimen/convert_17px"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_cook_rotate"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:tint="@color/cook_panel_text" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_cook_direction"
-        android:layout_width="@dimen/convert_280px"
-        android:layout_height="@dimen/convert_140px"
-        app:layout_constraintStart_toEndOf="@+id/cl_cook_speed"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/cl_cook_temp">
+            <TextView
+                android:id="@+id/tv_title_direction"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/convert_70px"
+                android:text="@string/direction"
+                android:textColor="@color/cook_panel_text"
+                android:textSize="@dimen/convert_26px"
+                app:layout_constraintBottom_toBottomOf="@+id/view_icon_direction"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/view_icon_direction" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <com.develop.common.widget.CookCardView
+            android:id="@+id/cl_cook_water"
+            android:layout_width="@dimen/convert_280px"
+            android:layout_height="@dimen/convert_140px"
+            app:cardType="WATER_SPARY"
+            android:layout_marginEnd="@dimen/convert_24px"
+            />
 
-        <View
-            android:id="@+id/view_background_direction"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/bg_cook_item_selected" />
+    </com.develop.common.ui.AdaptLinearLayout>
 
-        <TextView
-            android:id="@+id/tv_set_direction"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:includeFontPadding="false"
-            android:text="@string/turn_right"
-            android:textColor="@color/cook_panel_text"
-            android:textSize="@dimen/convert_30px"
-            android:layout_marginEnd="@dimen/convert_24px"
-            android:layout_marginBottom="@dimen/convert_8px"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"/>
 
-        <ImageView
-            android:id="@+id/view_icon_direction"
-            android:layout_width="@dimen/convert_42px"
-            android:layout_height="@dimen/convert_42px"
-            android:layout_marginStart="@dimen/convert_22px"
-            android:layout_marginTop="@dimen/convert_17px"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_cook_rotate"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:tint="@color/cook_panel_text" />
 
-        <TextView
-            android:id="@+id/tv_title_direction"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/convert_70px"
-            android:text="@string/direction"
-            android:textColor="@color/cook_panel_text"
-            android:textSize="@dimen/convert_26px"
-            app:layout_constraintBottom_toBottomOf="@+id/view_icon_direction"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/view_icon_direction" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <TextView
         android:id="@+id/btn_start"

app/build.gradle

@@ -10,7 +10,7 @@ ext{
     versionCode=230330200
     brandCode="010A"
     brandVersionCode=versionCode
-    model="1037"
+    model="5037"
 }