|
@@ -203,7 +203,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
|
|
|
|
if (CofarSDK.devInfo().devMode == DevModes.SOUP) {
|
|
if (CofarSDK.devInfo().devMode == DevModes.SOUP) {
|
|
|
|
|
|
- //隐藏点击
|
|
|
|
|
|
+// //隐藏点击
|
|
binding.clCookTemp.visibility = View.VISIBLE
|
|
binding.clCookTemp.visibility = View.VISIBLE
|
|
binding.clCookTime.visibility = View.VISIBLE
|
|
binding.clCookTime.visibility = View.VISIBLE
|
|
binding.clCookDirection.visibility = View.VISIBLE;
|
|
binding.clCookDirection.visibility = View.VISIBLE;
|
|
@@ -212,6 +212,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
// binding.ivTurbo.visibility = View.VISIBLE
|
|
// binding.ivTurbo.visibility = View.VISIBLE
|
|
binding.clCookWater.visibility = View.GONE
|
|
binding.clCookWater.visibility = View.GONE
|
|
binding.clTextView.visibility = View.GONE
|
|
binding.clTextView.visibility = View.GONE
|
|
|
|
+
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
if (CofarSDK.devInfo().devMode == DevModes.STAND_MIXER) {
|
|
if (CofarSDK.devInfo().devMode == DevModes.STAND_MIXER) {
|
|
@@ -219,19 +221,12 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
//隐藏点击
|
|
//隐藏点击
|
|
binding.clCookTemp.visibility = View.GONE
|
|
binding.clCookTemp.visibility = View.GONE
|
|
binding.clCookTime.visibility = View.VISIBLE
|
|
binding.clCookTime.visibility = View.VISIBLE
|
|
-
|
|
|
|
- //隐藏点击
|
|
|
|
binding.clCookDirection.visibility = View.GONE;
|
|
binding.clCookDirection.visibility = View.GONE;
|
|
binding.clCookSpeed.visibility = View.VISIBLE;
|
|
binding.clCookSpeed.visibility = View.VISIBLE;
|
|
- /**
|
|
|
|
- * 2023.11.21 空炸部分把喷水功能隐藏
|
|
|
|
- * */
|
|
|
|
binding.clCookWater.visibility = View.GONE
|
|
binding.clCookWater.visibility = View.GONE
|
|
-// binding.clCookWater.visibility = View.VISIBLE
|
|
|
|
- binding.ivTurbo.visibility = View.GONE
|
|
|
|
-
|
|
|
|
- //中间要有个占位
|
|
|
|
- binding.clTextView.visibility = View.INVISIBLE
|
|
|
|
|
|
+ // binding.ivTurbo.visibility = View.VISIBLE
|
|
|
|
+ binding.clCookWater.visibility = View.GONE
|
|
|
|
+ binding.clTextView.visibility = View.GONE
|
|
}
|
|
}
|
|
|
|
|
|
// if (CofarSDK.devInfo().devMode=="AF_AIR_FRYER"){
|
|
// if (CofarSDK.devInfo().devMode=="AF_AIR_FRYER"){
|
|
@@ -471,7 +466,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
* 当后台点进来模式页面,currentTemp为0故在这重新set值
|
|
* 当后台点进来模式页面,currentTemp为0故在这重新set值
|
|
* */
|
|
* */
|
|
|
|
|
|
- if (currentTemp == 0 && keep&&keepIsTemp) {
|
|
|
|
|
|
+ if (currentTemp == 0 && keep && keepIsTemp) {
|
|
// temp 当前温度 目标温度 targetTemp
|
|
// temp 当前温度 目标温度 targetTemp
|
|
currentTemp = if (CofarSDK.devInfo().temp > baseMode.minTemp) {
|
|
currentTemp = if (CofarSDK.devInfo().temp > baseMode.minTemp) {
|
|
CofarSDK.devInfo().temp.toInt()
|
|
CofarSDK.devInfo().temp.toInt()
|
|
@@ -484,7 +479,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
|
|
|
|
|
|
|
|
//当前调节温度
|
|
//当前调节温度
|
|
- if (currentTemp>35){
|
|
|
|
|
|
+ if (currentTemp > 35) {
|
|
currentTemp -= CofarSDK.getTempInterval()
|
|
currentTemp -= CofarSDK.getTempInterval()
|
|
}
|
|
}
|
|
if (currentTemp < minTemp) {
|
|
if (currentTemp < minTemp) {
|
|
@@ -822,11 +817,11 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
resources.getString(com.develop.common.R.string.adapted_cooking)
|
|
resources.getString(com.develop.common.R.string.adapted_cooking)
|
|
)
|
|
)
|
|
with(bundle)
|
|
with(bundle)
|
|
- } else if (DevModes.STAND_MIXER == CofarSDK.devInfo().devMode){
|
|
|
|
|
|
+ } else if (DevModes.STAND_MIXER == CofarSDK.devInfo().devMode) {
|
|
val bundle = Bundle()
|
|
val bundle = Bundle()
|
|
bundle.putString(MODE_TYPE, WorkModes.SM_DIY)
|
|
bundle.putString(MODE_TYPE, WorkModes.SM_DIY)
|
|
with(bundle)
|
|
with(bundle)
|
|
- }else {
|
|
|
|
|
|
+ } else {
|
|
val bundle = Bundle()
|
|
val bundle = Bundle()
|
|
bundle.putString(MODE_TYPE, WorkModes.AF_DIY)
|
|
bundle.putString(MODE_TYPE, WorkModes.AF_DIY)
|
|
with(bundle)
|
|
with(bundle)
|
|
@@ -1181,7 +1176,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
changeCommonStep()
|
|
changeCommonStep()
|
|
|
|
|
|
//运行情况初始化需要设置转速 ,不然以后会导致设置是0速度,设置后台回来以后会是currentMotorGer,在设置时间上面的话,会导致错误
|
|
//运行情况初始化需要设置转速 ,不然以后会导致设置是0速度,设置后台回来以后会是currentMotorGer,在设置时间上面的话,会导致错误
|
|
- if (CofarSDK.devInfo().status == DevStatus.RUNNING.toInt()){
|
|
|
|
|
|
+ if (CofarSDK.devInfo().status == DevStatus.RUNNING.toInt()) {
|
|
currentMotorGer = CofarSDK.devInfo().motorGear.toInt()
|
|
currentMotorGer = CofarSDK.devInfo().motorGear.toInt()
|
|
}
|
|
}
|
|
|
|
|