|
@@ -68,6 +68,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.HeatModes
|
|
import com.kuyuntech.cofarcooking.device.sdk.constant.core.MotorDirections
|
|
import com.kuyuntech.cofarcooking.device.sdk.constant.core.MotorDirections
|
|
import com.kuyuntech.cofarcooking.device.sdk.constant.core.WorkModes
|
|
import com.kuyuntech.cofarcooking.device.sdk.constant.core.WorkModes
|
|
|
|
+import com.kuyuntech.cofarcooking.device.sdk.devmode.core.BaseDevMode
|
|
import com.kuyuntech.cofarcooking.device.sdk.devmode.core.Kettle
|
|
import com.kuyuntech.cofarcooking.device.sdk.devmode.core.Kettle
|
|
import com.kuyuntech.cofarcooking.device.sdk.devmode.core.Knead
|
|
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.core.DevInfo
|
|
@@ -133,7 +134,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
private var is011 = false
|
|
private var is011 = false
|
|
private var isResetZero = -1 //初始扭橙的值
|
|
private var isResetZero = -1 //初始扭橙的值
|
|
private var sn = getSN()
|
|
private var sn = getSN()
|
|
-
|
|
|
|
|
|
+ private var keep:Boolean =false
|
|
|
|
+ private lateinit var baseMode :BaseDevMode
|
|
private val deviceStateDialog by lazy {
|
|
private val deviceStateDialog by lazy {
|
|
CancelConfirmDialog()
|
|
CancelConfirmDialog()
|
|
}
|
|
}
|
|
@@ -256,6 +258,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
viewModel.modeType = intent.extras?.getString(MODE_TYPE, ModesType.CHOP.name) ?: ""
|
|
viewModel.modeType = intent.extras?.getString(MODE_TYPE, ModesType.CHOP.name) ?: ""
|
|
modeName = intent.extras?.getString("mode_name", "") ?: ""
|
|
modeName = intent.extras?.getString("mode_name", "") ?: ""
|
|
opMode = intent.extras?.getString("OP_MODE", "HAND") ?: "HAND"
|
|
opMode = intent.extras?.getString("OP_MODE", "HAND") ?: "HAND"
|
|
|
|
+ keep = intent.extras?.getBoolean("keep",false) ?:false
|
|
viewModel.lastModeType = viewModel.modeType
|
|
viewModel.lastModeType = viewModel.modeType
|
|
lastModeType = viewModel.modeType
|
|
lastModeType = viewModel.modeType
|
|
modeType = lastModeType
|
|
modeType = lastModeType
|
|
@@ -344,6 +347,17 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
when (currentStep) {
|
|
when (currentStep) {
|
|
CookSettingType.TEMP_SETTING -> {
|
|
CookSettingType.TEMP_SETTING -> {
|
|
if (isTempChange) {
|
|
if (isTempChange) {
|
|
|
|
+ /**
|
|
|
|
+ * 当后台点进来模式页面,currentTemp为0故在这重新set值
|
|
|
|
+ * */
|
|
|
|
+ if (currentTemp==0){
|
|
|
|
+ // temp 当前温度 目标温度 targetTemp
|
|
|
|
+ currentTemp = if (CofarSDK.devInfo().temp>baseMode.minTemp){
|
|
|
|
+ CofarSDK.devInfo().temp.toInt()
|
|
|
|
+ }else{
|
|
|
|
+ baseMode.minTemp
|
|
|
|
+ }
|
|
|
|
+ }
|
|
//当前调节温度
|
|
//当前调节温度
|
|
currentTemp += CofarSDK.getTempInterval()
|
|
currentTemp += CofarSDK.getTempInterval()
|
|
if (currentTemp > maxTemp) {
|
|
if (currentTemp > maxTemp) {
|
|
@@ -403,6 +417,20 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
when (currentStep) {
|
|
when (currentStep) {
|
|
CookSettingType.TEMP_SETTING -> {
|
|
CookSettingType.TEMP_SETTING -> {
|
|
if (isTempChange) {
|
|
if (isTempChange) {
|
|
|
|
+ /**
|
|
|
|
+ * 当后台点进来模式页面,currentTemp为0故在这重新set值
|
|
|
|
+ * */
|
|
|
|
+
|
|
|
|
+ if (currentTemp==0){
|
|
|
|
+ // temp 当前温度 目标温度 targetTemp
|
|
|
|
+ currentTemp = if (CofarSDK.devInfo().temp>baseMode.minTemp){
|
|
|
|
+ CofarSDK.devInfo().temp.toInt()
|
|
|
|
+ }else{
|
|
|
|
+ baseMode.minTemp+CofarSDK.getTempInterval()
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
//当前调节温度
|
|
//当前调节温度
|
|
currentTemp -= CofarSDK.getTempInterval()
|
|
currentTemp -= CofarSDK.getTempInterval()
|
|
if (currentTemp < minTemp) {
|
|
if (currentTemp < minTemp) {
|
|
@@ -968,11 +996,11 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
var configLock = false;
|
|
var configLock = false;
|
|
|
|
|
|
|
|
|
|
- private fun initModeData(type: String, keep: Boolean = false) {
|
|
|
|
|
|
+ private fun initModeData(type: String, keep: Boolean?= false) {
|
|
|
|
|
|
- Log.d("TAG initModeData", "viewModel.modeType:" + viewModel.modeType)
|
|
|
|
|
|
+ Log.d("TAG initModeData", "viewModel.modeType:" + viewModel.modeType+ " keep:"+keep)
|
|
viewModel.modeType.apply {
|
|
viewModel.modeType.apply {
|
|
- val baseMode = CofarSDK.devMode(this)
|
|
|
|
|
|
+ baseMode = CofarSDK.devMode(this)
|
|
//处理5/7/10寸屏,默认转速不同
|
|
//处理5/7/10寸屏,默认转速不同
|
|
if (baseMode is Knead && !sn.startsWith("011")){
|
|
if (baseMode is Knead && !sn.startsWith("011")){
|
|
var defMotorGear = when(StringUtils.getScreenSize(this@ModesDetailActivity)){
|
|
var defMotorGear = when(StringUtils.getScreenSize(this@ModesDetailActivity)){
|
|
@@ -1020,7 +1048,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
var motorGear = baseMode.defaultMotorGear.toByte()
|
|
var motorGear = baseMode.defaultMotorGear.toByte()
|
|
var targetTime = baseMode.defaultTime.toInt()
|
|
var targetTime = baseMode.defaultTime.toInt()
|
|
|
|
|
|
- if (keep) {
|
|
|
|
|
|
+ if (keep == true) {
|
|
var restoreConfig: DevInfo? = null
|
|
var restoreConfig: DevInfo? = null
|
|
configLock = true;
|
|
configLock = true;
|
|
restoreConfig = CofarSDK.changeMode(type, baseMode, true)
|
|
restoreConfig = CofarSDK.changeMode(type, baseMode, true)
|
|
@@ -1032,6 +1060,11 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
motorDirection = restoreConfig.motorDirection;
|
|
motorDirection = restoreConfig.motorDirection;
|
|
motorGear = restoreConfig.motorGear;
|
|
motorGear = restoreConfig.motorGear;
|
|
targetTime = restoreConfig.targetTime;
|
|
targetTime = restoreConfig.targetTime;
|
|
|
|
+ }else{
|
|
|
|
+ targetTemp = baseMode.defaultTemp.toShort()
|
|
|
|
+ motorDirection = baseMode.motorDirection.toByte()
|
|
|
|
+ motorGear = baseMode.defaultMotorGear.toByte()
|
|
|
|
+ targetTime = baseMode.defaultTime.toInt()
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
CofarSDK.changeMode(type, baseMode)
|
|
CofarSDK.changeMode(type, baseMode)
|
|
@@ -1047,6 +1080,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
|
|
|
|
baseMode.apply {
|
|
baseMode.apply {
|
|
currentTemp = targetTemp.toInt()
|
|
currentTemp = targetTemp.toInt()
|
|
|
|
+ Log.d("TAG currentTemp","currentTemp:"+currentTemp)
|
|
updateTempUI(
|
|
updateTempUI(
|
|
minTemp.toFloat(),
|
|
minTemp.toFloat(),
|
|
maxTemp.toFloat(),
|
|
maxTemp.toFloat(),
|
|
@@ -1685,6 +1719,13 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
this.isTempChange = isTempChange
|
|
this.isTempChange = isTempChange
|
|
binding.apply {
|
|
binding.apply {
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ clCookTemp.updateChangeValue("${FoodSdkUtils.parseTemp(currDevInfo.temp)}°C")
|
|
|
|
+ tempRingView.setRange(minTemp, maxTemp)
|
|
|
|
+ tempRingView.setCanTouch(isTempChange)
|
|
|
|
+
|
|
|
|
+
|
|
if (targetTemp.toInt() > maxTemp) {
|
|
if (targetTemp.toInt() > maxTemp) {
|
|
CofarSDK.cfgHeat(maxTemp.toInt().toShort(), HeatModes.PU_TONG);
|
|
CofarSDK.cfgHeat(maxTemp.toInt().toShort(), HeatModes.PU_TONG);
|
|
clCookTemp.setConfigValue(
|
|
clCookTemp.setConfigValue(
|
|
@@ -1699,9 +1740,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- clCookTemp.updateChangeValue("${FoodSdkUtils.parseTemp(currDevInfo.temp)}°C")
|
|
|
|
- tempRingView.setRange(minTemp, maxTemp)
|
|
|
|
- tempRingView.setCanTouch(isTempChange)
|
|
|
|
|
|
+
|
|
|
|
|
|
var tempBuffer = CofarSDK.devInfo().targetTempBuffer
|
|
var tempBuffer = CofarSDK.devInfo().targetTempBuffer
|
|
steamFire.configNum(
|
|
steamFire.configNum(
|