|
@@ -67,6 +67,7 @@ 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.WorkModes
|
|
|
+import com.kuyuntech.cofarcooking.device.sdk.devmode.core.Knead
|
|
|
import com.kuyuntech.cofarcooking.device.sdk.eventbus.core.DevInfo
|
|
|
import com.kuyuntech.cofarcooking.device.sdk.eventbus.event.DevCommonEvent
|
|
|
import com.kuyuntech.cofarcooking.device.sdk.eventbus.event.DevStatusEvent
|
|
@@ -963,13 +964,11 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
|
//显示对应模式UI
|
|
|
if (this == ModesType.WIGHT.name || this == ModesType.SM_WIGHT.name) {
|
|
|
CofarSDK.recordConfig()
|
|
|
-
|
|
|
//称重模式
|
|
|
viewModel.changeStep(CookSettingType.WEIGHT)
|
|
|
//CofarSDK.changeMode(baseMode)
|
|
|
} else if (this == ModesType.TURBO.name || this == ModesType.SM_TURBO.name) {
|
|
|
CofarSDK.recordConfig()
|
|
|
-
|
|
|
viewModel.changeStep(CookSettingType.TURBO)
|
|
|
CofarSDK.changeMode(baseMode)
|
|
|
} else {
|
|
@@ -1208,7 +1207,14 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
|
ModesType.TURBO.name -> {
|
|
|
CofarSDK.stop(false)
|
|
|
}
|
|
|
+ ModesType.SM_WIGHT.name -> {
|
|
|
+ CofarSDK.stop(false)
|
|
|
+ CofarSDK.startWeight()
|
|
|
+ }
|
|
|
|
|
|
+ ModesType.SM_TURBO.name -> {
|
|
|
+ CofarSDK.stop(false)
|
|
|
+ }
|
|
|
else -> {
|
|
|
userChanging = false
|
|
|
CofarSDK.startRunning(viewModel.modeType)
|
|
@@ -1803,6 +1809,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
|
clCookSpeed.updateChangeValue(currentMotorGer.toString())
|
|
|
speedRingView.setRange(minMotorGear, maxMotorGear)
|
|
|
speedRingView.setCanTouch(isMotorGearChange)
|
|
|
+ speedRingText.text = currentMotorGer.toString()
|
|
|
+
|
|
|
if (!userChanging || focusUpdate) {
|
|
|
speedRingView.updateProgress(currentMotorGer)
|
|
|
speedRingText.text = currentMotorGer.toString()
|
|
@@ -1865,7 +1873,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
|
//当前用户正在修改不更新按钮状态
|
|
|
if (userChanging) return
|
|
|
//切碎功能隐藏按钮
|
|
|
- if (viewModel.modeType == ModesType.TURBO.name) {
|
|
|
+ if (viewModel.modeType == ModesType.TURBO.name||viewModel.modeType == ModesType.SM_TURBO.name) {
|
|
|
binding.apply {
|
|
|
btnStart.visibility = View.GONE
|
|
|
btnResume.visibility = View.GONE
|
|
@@ -1877,7 +1885,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- if (viewModel.modeType == ModesType.WIGHT.name) {
|
|
|
+ if (viewModel.modeType == ModesType.WIGHT.name||viewModel.modeType == ModesType.SM_WIGHT.name) {
|
|
|
binding.apply {
|
|
|
btnStart.visibility = View.GONE
|
|
|
btnResume.visibility = View.GONE
|
|
@@ -1885,6 +1893,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
|
btnStop.visibility = View.GONE
|
|
|
btnCancel.visibility = View.GONE
|
|
|
btnConfirm.visibility = View.GONE
|
|
|
+
|
|
|
}
|
|
|
return
|
|
|
}
|
|
@@ -1934,7 +1943,12 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
|
if (viewModel.modeType == ModesType.CITRUS_JUICER.name){
|
|
|
binding.ivTurbo.visibility = View.GONE
|
|
|
}else{
|
|
|
- ivTurbo.visibility = View.VISIBLE
|
|
|
+ if (isModelNum == "5067"&&viewModel.modeType == ModesType.SM_WIGHT.name){
|
|
|
+ ivWeight.visibility = View.GONE
|
|
|
+ ivTurbo.visibility = View.GONE
|
|
|
+ }else{
|
|
|
+ ivTurbo.visibility = View.VISIBLE
|
|
|
+ }
|
|
|
}
|
|
|
visibilityEgg(View.VISIBLE)
|
|
|
btnStop.visibility = View.INVISIBLE
|
|
@@ -2002,8 +2016,6 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
|
showMsgDialog(resources.getString(com.develop.common.R.string.dev_remove_orange_parts))
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
if (CofarSDK.devInfo().potStatus.toInt() == 1) {
|
|
|
showErrMsgDialog("mei_fang_guo_yi_chan")
|
|
|
} else if (CofarSDK.devInfo().potStatus.toInt() == 0 && CofarSDK.devInfo().potCloverStatus.toInt() == 1) {
|
|
@@ -2170,7 +2182,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
|
*/
|
|
|
private fun backClick() {
|
|
|
if (modeChange) {
|
|
|
- if (modeType == ModesType.TURBO.name) { //TURBO未停止之前不能退出
|
|
|
+ if (modeType == ModesType.TURBO.name||modeType == ModesType.SM_TURBO.name) { //TURBO未停止之前不能退出
|
|
|
CofarSDK.stop(false)
|
|
|
if (DevStatus.STOP != CofarSDK.devInfo().status.toByte()) {
|
|
|
return
|