Merge branch 'master' of https://git.kuyuntech.com/developer/FoodCooking_LandScape

BusinessAuth/src/main/AndroidManifest.xml

@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.develop.auth">
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <application>
         <activity
             android:launchMode="singleTask"

BusinessAuth/src/main/java/com/develop/auth/ui/MemberAuthActivity.kt

@@ -55,13 +55,17 @@ class MemberAuthActivity : CommonBVMActivity<ActivityMemberAuthBinding, MemberVi
         }
         if (isBrand036I()) {
             //binding.ivLogo.setVisible()
-             binding.ivBanner.setImageResource(com.develop.common.R.drawable.guide_bg_036i)
+            binding.ivBanner.setImageResource(com.develop.common.R.drawable.guide_bg_036i)
         }
         initFragmentList()
         viewModel.enterFromHome = enterFromHome
         binding.tvSkip.setOnClickListener {
-            navigateTo(Screens.Main.ENTRANCE_CHOSEN)
-            finish()
+            if (enterFromHome) {
+                finish()
+            } else {
+                navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+                finish()
+            }
         }
         viewModel.fragmentChangeLiveData.observe(this) {
             fragmentMap[it]?.apply {

BusinessAuth/src/main/java/com/develop/auth/ui/MemberLaunchFragment.kt

@@ -41,7 +41,12 @@ class MemberLaunchFragment: CommonBVMFragment<FragmentMemberLaunchBinding, Membe
             viewModel.fragmentChangeLiveData.postValue(FragmentTag.MEMBER_LOGIN)
         }
         binding.tvSkipForNow.setOnClickListener {
-            navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+            if (viewModel.enterFromHome){
+                hostActivity.finish()
+            } else {
+                navigateTo(Screens.Main.ENTRANCE_CHOSEN)
+                hostActivity.finish()
+            }
         }
     }
 

BusinessAuth/src/main/java/com/develop/auth/ui/MemberLoginFragment.kt

@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.blankj.utilcode.util.KeyboardUtils
+import com.blankj.utilcode.util.NetworkUtils
 import com.develop.auth.R
 import com.develop.auth.databinding.FragmentMemberLoginBinding
 import com.develop.auth.viewmodel.FragmentTag
@@ -13,6 +14,7 @@ import com.develop.auth.viewmodel.MemberViewModel
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
 import com.develop.base.mvvm.BaseBVMFragment
+import com.develop.base.util.GlobalToast
 import com.develop.common.router.Screens
 import com.develop.common.ui.CommonBVMFragment
 
@@ -49,7 +51,7 @@ class MemberLoginFragment : CommonBVMFragment<FragmentMemberLoginBinding, Member
         viewModel.loginLiveData.observe(this) {
             dismissPlainDialog()
             it.msg?.apply {
-                if("账号或密码错误".equals(this)){
+                if ("账号或密码错误".equals(this)) {
                     showToast(getString(com.develop.common.R.string.account_or_pwd_error))
                 }
 
@@ -86,6 +88,10 @@ class MemberLoginFragment : CommonBVMFragment<FragmentMemberLoginBinding, Member
     }
 
     private fun executeLogin(emailId: String, password: String) {
+        if (!NetworkUtils.isConnected()) {
+            GlobalToast.showToast(getString(com.develop.common.R.string.network_error))
+            return
+        }
         showPlainDialog()
         viewModel.login(
             emailId, password

BusinessAuth/src/main/java/com/develop/auth/ui/MemberRegisterFragment.kt

@@ -1,15 +1,13 @@
 package com.develop.auth.ui
 
-import android.os.Bundle
 import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import com.develop.auth.R
 import com.develop.auth.databinding.FragmentMemberRegisterBinding
 import com.develop.auth.viewmodel.FragmentTag
 import com.develop.auth.viewmodel.MemberViewModel
-import com.develop.base.mvvm.BaseBVMFragment
 import com.develop.common.ui.CommonBVMFragment
+import java.util.regex.Pattern
 
 class MemberRegisterFragment : CommonBVMFragment<FragmentMemberRegisterBinding, MemberViewModel>() {
 
@@ -55,6 +53,12 @@ class MemberRegisterFragment : CommonBVMFragment<FragmentMemberRegisterBinding,
             showToast(getString(com.develop.common.R.string.Password_is_not_the_same))
             return false
         }
+        if (inputPsd.length < 8) {
+            return false
+        }
+        if (!isNumeric(inputPsd)) {
+            return false
+        }
         return true
     }
 
@@ -67,4 +71,10 @@ class MemberRegisterFragment : CommonBVMFragment<FragmentMemberRegisterBinding,
         return getViewModelOfActivity(MemberViewModel::class.java)
     }
 
+    private fun isNumeric(str: String): Boolean {
+        val pattern: Pattern = Pattern.compile("[a-zA-Z0-9]")
+        return pattern.matcher(str).matches()
+    }
+
+
 }

BusinessCommon/src/main/java/com/develop/common/dialog/NoteEditDialog.kt

@@ -7,19 +7,20 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import com.blankj.utilcode.util.KeyboardUtils
+import com.develop.base.ext.src
 import com.develop.base.mvvm.FullScreenTransparentDialog
 import com.develop.base.util.MMkvUtils
 import com.develop.common.R
 import com.develop.common.databinding.ItemNoteDialogBinding
 
 
-class NoteEditDialog: FullScreenTransparentDialog() {
+class NoteEditDialog : FullScreenTransparentDialog() {
 
     private lateinit var binding: ItemNoteDialogBinding
 
-    var listener:OnDialogClickListener?=null;
+    var listener: OnDialogClickListener? = null;
 
-    var text:String?="";
+    var text: String? = "";
 
     @SuppressLint("ClickableViewAccessibility")
     override fun onCreateView(
@@ -32,25 +33,25 @@ class NoteEditDialog: FullScreenTransparentDialog() {
             inflater, container, false
         )
 
+        binding.ivClose.setImageResource( R.drawable.ic_close)
+        binding.root.setOnTouchListener { v, event ->
+            when (event.action) {
+                MotionEvent.ACTION_DOWN -> {
+                    val x = event.x.toInt()
+                    val y = event.y.toInt()
 
-
-       binding.root.setOnTouchListener { v, event ->
-           when (event.action) {
-               MotionEvent.ACTION_DOWN -> {
-                   val x = event.x.toInt()
-                   val y = event.y.toInt()
-
-                   // 在这里使用 x 和 y 进行相应的操作
-                   // ...
-                    if(x != 0 && y != 0){
+                    // 在这里使用 x 和 y 进行相应的操作
+                    // ...
+                    if (x != 0 && y != 0) {
                         KeyboardUtils.hideSoftInput(binding.etNote)
                     }
-                   true
-               }
-               else -> false
-           }
+                    true
+                }
 
-       }
+                else -> false
+            }
+
+        }
 
         binding.ivClose.setOnClickListener {
             removeSelf()
@@ -64,19 +65,19 @@ class NoteEditDialog: FullScreenTransparentDialog() {
             binding.etNote.text.clear();
             listener?.onClear();
         }
-        if(text != null){
-            binding.etNote.text.insert(0,text)
+        if (text != null) {
+            binding.etNote.text.insert(0, text)
 
         }
         return binding.root
     }
 
-    fun configListener(listener:OnDialogClickListener){
+    fun configListener(listener: OnDialogClickListener) {
         this.listener = listener;
     }
 
     interface OnDialogClickListener {
-        fun onComplete(remark:String)
+        fun onComplete(remark: String)
         fun onClear()
     }
 

BusinessCommon/src/main/java/com/develop/common/utils/ConfigUtils.kt

@@ -1,6 +1,8 @@
 package com.develop.common.utils
 
 import android.content.Context
+import android.util.Log
+import com.azhon.appupdate.util.LogUtil
 import com.develop.base.ext.GlobalApp
 import com.develop.base.ext.getSN
 import com.develop.common.bean.CfConfig
@@ -57,7 +59,7 @@ object ConfigUtils {
 
             val fileList = GlobalApp().assets.list("") ?: arrayOf()
             var inputStream: InputStream? = null
-            if(fileList.contains("config_${brandNum}.json")){
+            if(fileList.contains("lang_config_${brandNum}.json")){
                 inputStream = GlobalApp().assets.open("lang_config_${brandNum}.json")
             }else{
                 inputStream = GlobalApp().assets.open("lang_config.json")

BusinessMain/src/main/java/com/develop/main/ui/RecipesFragment.kt

@@ -666,7 +666,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
             }
 
             errorCallback.observe(viewLifecycleOwner) {
-             if (NetworkUtils.isConnected()){
+             if (!NetworkUtils.isWifiConnected()){
                  GlobalToast.showToast(getString(com.develop.common.R.string.network_error))
              } else {
                  GlobalToast.showToast(it)

BusinessMain/src/main/java/com/develop/main/viewmodel/HomeViewModel.kt

@@ -532,7 +532,7 @@ class HomeViewModel : BaseViewModel() {
             onlineCategoryLiveData.postValue(result)
 
         }.catch {
-            errorCallback.postValue(it.message)
+            errorCallback.postValue(it.message?:"")
         }
     }
 
@@ -544,7 +544,7 @@ class HomeViewModel : BaseViewModel() {
                 addQuery("lang", MMkvUtils.getString(CURRENT_LANGUAGE) ?: "EN")
             }.await().hotTags.toMutableList()
         }.catch {
-            errorCallback.postValue(it.message)
+            errorCallback.postValue(it.message?:"")
         }
     }
 
@@ -588,7 +588,7 @@ class HomeViewModel : BaseViewModel() {
                 )
             }
         }.catch {
-            errorCallback.postValue(it.message)
+            errorCallback.postValue(it.message?:"")
         }
     }
 
@@ -650,7 +650,7 @@ class HomeViewModel : BaseViewModel() {
                     moreLocalRecipeLiveData.postValue(foodList)
                 }
             }.catch {
-                errorCallback.postValue(it.message)
+                errorCallback.postValue(it.message?:"")
             }
         } else {
             return false
@@ -714,7 +714,7 @@ class HomeViewModel : BaseViewModel() {
             onlineHotWordSearchRecipesLiveData.postValue(result)
 
         }.catch {
-            errorCallback.postValue(it.message)
+            errorCallback.postValue(it.message?:"")
         }
     }
 
@@ -765,7 +765,7 @@ class HomeViewModel : BaseViewModel() {
                 }
                 moreSearchOnlineRecipeLiveData.postValue(foodContentList)
             }.catch {
-                errorCallback.postValue(it.message)
+                errorCallback.postValue(it.message?:"")
             }
         } else {
             return false
@@ -782,7 +782,7 @@ class HomeViewModel : BaseViewModel() {
                 addQuery("lang", MMkvUtils.getString(CURRENT_LANGUAGE) ?: "EN")
             }.await().informs.toMutableList()
         }.catch {
-            errorCallback.postValue(it.message)
+            errorCallback.postValue(it.message?:"")
         }
     }
 

BusinessSetting/src/main/java/com/develop/setting/ui/SettingMainActivity.kt

@@ -42,6 +42,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
         super.onCreate(savedInstanceState)
         dataList = DataFactory.genSettingModesList(resources)
         binding.tvTitle.updateText(getString(com.develop.common.R.string.settings))
+        binding.ivClose.setImageResource( com.develop.common.R.drawable.ic_close)
         binding.ivClose.setOnClickListener {
             finish()
         }
@@ -68,9 +69,11 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
                         SettingType.BRIGHTNESS -> {
                             navigateTo(Screens.Setting.BRIGHTNESS)
                         }
+
                         SettingType.SOUND -> {
                             navigateTo(Screens.Setting.SOUND)
                         }
+
                         SettingType.WIFI -> {
                             navigateTo(Screens.Setting.WIFI) {
                                 val bundle = Bundle()
@@ -78,6 +81,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
                                 with(bundle)
                             }
                         }
+
                         SettingType.USER_ACCOUNT -> {
                             navigateTo(Screens.Auth.MEMBER) {
                                 withBoolean("enter_from_home", true)
@@ -91,14 +95,17 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
                                 with(bundle)
                             }
                         }
+
                         SettingType.ABOUT -> {
                             navigateTo(Screens.Setting.ABOUT)
                         }
+
                         SettingType.RESTORE_FACTORY_SETTINGS -> {
                             navigateTo(Screens.Setting.RESTORE)
                         }
+
                         SettingType.STORAGE -> {
-                           openFileManager()
+                            openFileManager()
                         }
                     }
                 }

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

@@ -11,6 +11,7 @@ import androidx.core.view.isInvisible
 import com.alibaba.android.arouter.facade.annotation.Autowired
 import com.develop.base.ext.load
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.blankj.utilcode.util.LogUtils
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.develop.base.ext.background_drawable
 import com.develop.base.ext.isNightTheme
@@ -18,6 +19,7 @@ import com.develop.base.ext.navigateTo
 import com.develop.base.ext.setGone
 import com.develop.base.ext.setVisible
 import com.develop.base.ext.src
+import com.develop.base.ext.toJson
 import com.develop.base.ext.updateText
 import com.develop.base.util.MusicBackPlayerUtil
 import com.develop.base.util.ThreadUtils
@@ -48,6 +50,8 @@ 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
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import java.io.File
@@ -77,6 +81,11 @@ class CookStepActivity : CookStepBaseActivity() {
     private var titleName = ""
     private var currModes = ""
 
+    private var currentTemp = 0
+    private var currentMotorGer = 0
+    private var currentWaterGear = 0
+    private var currTime = 0
+
 
     private fun turnDevModeUI() {
 
@@ -133,6 +142,7 @@ class CookStepActivity : CookStepBaseActivity() {
                         val totalTime = second + (minute + hours * 60) * 60
                         viewModel.displayStep()?.uiData?.targetTime = totalTime
                         binding.controller.tvCookingTimeTarget.updateText("--${time}--")
+                        currTime = totalTime
                         CofarSDK.cfgTime(totalTime)
                     }
                 }
@@ -483,7 +493,10 @@ class CookStepActivity : CookStepBaseActivity() {
                         binding.llStepFinish.setGone()
                     }
                     it.uiData.applyRecipeSetting(it.source)
-
+                    currentTemp = it.uiData.targetTemp
+                    currentMotorGer = it.uiData.currentSpeed
+                    currentWaterGear = it.uiData.currentWaterGear
+                    currTime = it.uiData.targetTime
                     if (!it.isWeightMode() && !it.isDescription()) {
                         //设置初始参数
                         CofarSDK.cfgMotorGear(0)
@@ -609,6 +622,11 @@ class CookStepActivity : CookStepBaseActivity() {
             }
         } else if (tag == BUTTON_TAG_CANCEL) {
             CofarSDK.cancel()
+            val uiData = viewModel.displayStep()?.uiData
+            currTime = uiData?.targetTime ?: 0
+            currentMotorGer = uiData?.currentSpeed ?: 0
+            currentWaterGear = uiData?.currentWaterGear ?: 0
+            currentTemp = uiData?.targetTemp ?: 0
             binding.controller.btnStart.setGone()
             binding.controller.btnReset.setGone()
         } else if (tag == BUTTON_TAG_NEXT_STEP) {
@@ -631,8 +649,10 @@ class CookStepActivity : CookStepBaseActivity() {
     }
 
     override fun onUserChangeTemp(value: Int) {
+        currentTemp = value
         val v = FoodSdkUtils.parseTemp(value.toShort())
         viewModel.displayStep()?.uiData?.targetTemp = v.toInt()
+        LogUtils.d("保存的目标温度：${v.toInt()}")
         binding.controller.tvCookingTempTarget.updateText("--${v}°C--")
         binding.controller.tvRingTempText.updateText("${v}°C")
         CofarSDK.cfgHeat(value.toShort(), HeatModes.PU_TONG)
@@ -640,6 +660,7 @@ class CookStepActivity : CookStepBaseActivity() {
     }
 
     override fun onUserChangeSpeed(value: Int) {
+        currentMotorGer = value
         viewModel.displayStep()?.uiData?.currentSpeed = value
         binding.controller.tvSetSpeed.updateText(value.toString())
         binding.controller.tvSpeedText.updateText(value.toString())
@@ -648,6 +669,7 @@ class CookStepActivity : CookStepBaseActivity() {
     }
 
     override fun onUserWaterGear(value: Int) {
+        currentWaterGear = value
         CofarSDK.cfgWaterBear(value);
         binding.controller.waterSprayShow.updateGear(value)                               // 圆环设置-当前运行速度
         binding.controller.clCookWater.binding.waterSprayShow.updateGear(value)
@@ -686,9 +708,13 @@ class CookStepActivity : CookStepBaseActivity() {
                 it.uiData.currentTemp = FoodSdkUtils.parseTemp(devInfo.temp).toInt()
                 it.uiData.remainTime = devInfo.remainTime
                 it.uiData.targetTimeBuffer = devInfo.targetTimeBuffer
+                it.uiData.targetTempBuffer = devInfo.targetTempBuffer.toInt()
                 it.uiData.isTimeChange = devInfo.mode.isTimeChange
                 it.uiData.isTempChange = devInfo.mode.isTempChange
                 it.uiData.isMotorDirectionChange = devInfo.mode.isMotorDirectionChange
+                it.uiData.motorGearBuffer = devInfo.motorGearBuffer.toInt()
+                it.uiData.motorDirectionBuffer = devInfo.motorDirectionBuffer.toInt()
+                it.uiData.waterGearBuffer = devInfo.waterGearBuffer.toInt()
                 it.uiData.isMotorGearChange = devInfo.mode.isMotorGearChange
                 it.uiData.limitMaxSpeed = devInfo.mode.maxMotorGear
                 it.uiData.limitMinSpeed = devInfo.mode.minMotorGear
@@ -821,67 +847,77 @@ class CookStepActivity : CookStepBaseActivity() {
         if (tabType == CookSettingType.TEMP_SETTING) {
             cookStep?.uiData?.let {
                 if (!it.isTempChange) {
+                    LogUtils.d("========")
                     return
                 }
+                LogUtils.d("调节前温度：${currentTemp}")
                 if (increase) {
-                    it.targetTemp += CofarSDK.getTempInterval()
-                    if (it.targetTemp > it.limitMaxTemp) {
-                        it.targetTemp = it.limitMaxTemp
+                    currentTemp += CofarSDK.getTempInterval()
+                    if (currentTemp > it.limitMaxTemp) {
+                        currentTemp = it.limitMaxTemp
+                    }
+                    if (currentTemp < 35) {
+                        currentTemp = 35
                     }
                 } else {
-                    it.targetTemp -= CofarSDK.getTempInterval()
-                    if (it.targetTemp < it.limitMinTemp) {
-                        it.targetTemp = it.limitMinTemp
+                    currentTemp -= CofarSDK.getTempInterval()
+                    if (currentTemp < it.limitMinTemp) {
+                        currentTemp = it.limitMinTemp
                     }
 
-                    if (it.targetTemp < 35) {
-                        it.targetTemp = 0
+                    if (currentTemp < 35) {
+                        currentTemp = 0
                     }
 
                 }
                 viewModel.stepUiData.doingModify = true
-                binding.controller.tempRingView.updateProgress(it.targetTemp)
-                onUserChangeTemp(it.targetTemp)
+                binding.controller.tempRingView.updateProgress(currentTemp)
+                LogUtils.d("调节后温度：${currentTemp}")
+                onUserChangeTemp(currentTemp)
             }
         } else if (tabType == CookSettingType.SPEED_SETTING) {
             cookStep?.uiData?.let {
                 if (!it.isMotorGearChange) {
                     return
                 }
+
+                LogUtils.d("调节前转速：${currentMotorGer}")
                 if (increase) {
-                    it.currentSpeed++
-                    if (it.currentSpeed > it.limitMaxSpeed) {
-                        it.currentSpeed = it.limitMaxSpeed
+                    currentMotorGer++
+                    if (currentMotorGer > it.limitMaxSpeed) {
+                        currentMotorGer = it.limitMaxSpeed
                     }
                 } else {
-                    it.currentSpeed--
-                    if (it.currentSpeed < it.limitMinSpeed) {
-                        it.currentSpeed = it.limitMinSpeed
+                    currentMotorGer--
+                    if (currentMotorGer < it.limitMinSpeed) {
+                        currentMotorGer = it.limitMinSpeed
                     }
                 }
                 viewModel.stepUiData.doingModify = true
-                binding.controller.speedRingView.updateProgress(it.currentSpeed)
-                onUserChangeSpeed(it.currentSpeed)
+                binding.controller.speedRingView.updateProgress(currentMotorGer)
+                LogUtils.d("调节后转速：${currentMotorGer}")
+                onUserChangeSpeed(currentMotorGer)
             }
         } 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
+                    currentWaterGear++
+                    if (currentWaterGear > it.limitMaxWaterGear) {
+                        currentWaterGear = it.limitMaxWaterGear
                     }
                 } else {
-                    it.currentWaterGear--
-                    if (it.currentWaterGear < it.limitMinWaterGear) {
-                        it.currentWaterGear = it.limitMinWaterGear
+                    currentWaterGear--
+                    if (currentWaterGear < it.limitMinWaterGear) {
+                        currentWaterGear = it.limitMinWaterGear
                     }
                 }
                 viewModel.stepUiData.doingModify = true
-                binding.controller.waterRingView.updateProgress(it.currentWaterGear)
-                onUserWaterGear(it.currentWaterGear)
+                binding.controller.waterRingView.updateProgress(currentWaterGear)
+                onUserWaterGear(currentWaterGear)
             }
         } else if (tabType == CookSettingType.TIME_SETTING) {
             cookStep?.uiData?.let {
@@ -903,13 +939,13 @@ class CookStepActivity : CookStepBaseActivity() {
 
     private fun dealWithTimeByOperation(uiData: CookStepUiData, increase: Boolean) {
         //当前调节时间
-        var targetTime = if (uiData.runningStatus != DevStatus.RUNNING.toInt()) {
-            uiData.targetTime
-        } else if (uiData.targetTimeBuffer > 0) {
-            uiData.targetTimeBuffer
-        } else {
-            uiData.targetTime
-        }
+//        var targetTime = uiData.targetTime
+//        if (uiData.remainTime != 0) {
+//            targetTime = uiData.remainTime
+//        }
+//        if (uiData.targetTimeBuffer != -1) {
+//            targetTime = uiData.targetTimeBuffer
+//        }
         var step = 0
         if (whereIndex == 1) {
             step += 60
@@ -917,19 +953,19 @@ class CookStepActivity : CookStepBaseActivity() {
             step = rotateStep()
         }
         if (increase) {
-            targetTime += step
+            currTime += step
         } else {
-            targetTime -= step
+            currTime -= step
         }
-        if (targetTime > uiData.limitMaxTime) {
-            targetTime = uiData.limitMaxTime
+        if (currTime > uiData.limitMaxTime) {
+            currTime = uiData.limitMaxTime
         }
-        if (targetTime < uiData.limitMinTime) {
-            targetTime = uiData.limitMinTime
+        if (currTime < uiData.limitMinTime) {
+            currTime = uiData.limitMinTime
         }
-        val sec = targetTime % 60
-        val min = ((targetTime / 60) % 60)
-        val hour = (targetTime / 3600)
+        val sec = currTime % 60
+        val min = ((currTime / 60) % 60)
+        val hour = (currTime / 3600)
         var time = ""
         if (hour > 0) {
             time += if (hour < 10) {
@@ -957,11 +993,13 @@ class CookStepActivity : CookStepBaseActivity() {
             }
         }
         uiData.isTimeChange = true
-        Log.d("eeeeeee", "${uiData.targetTime} == ${targetTime} === $step")
-        uiData.targetTime = targetTime
+        Log.d("eeeeeee", "${uiData.targetTime} == ${currTime} === $step")
+        uiData.targetTime = currTime
+        LogUtils.d("调节时间：${currTime}")
         binding.controller.clSetTime.isTimeCanChange(true)
         // 回调到上面那个地方来设置时间
-        TimeUtil.getTimes(targetTime, timeArray)
+        TimeUtil.getTimes(currTime, timeArray)
+        CofarSDK.cfgTime(currTime)
         binding.controller.clSetTime.setTimeInternal(
             timeArray[0],
             timeArray[1],
@@ -1174,41 +1212,47 @@ class CookStepActivity : CookStepBaseActivity() {
         }
 
         // 时间设置
-        if (runningState == DevStatus.STOP.toInt()) {
-            TimeUtil.getTimes(uiData.targetTime, timeArray)
+        val time = if (uiData.targetTimeBuffer != -1) {
+            uiData.targetTimeBuffer
         } else {
-            TimeUtil.getTimes(uiData.remainTime, timeArray)
-        }
-        if (!viewModel.stepUiData.doingModify || focusUpdate) {
-            binding.controller.clSetTime.setTimeInternal(
-                timeArray[0],
-                timeArray[1],
-                timeArray[2],
-                true
-            ) // 表盘时间设置-当前剩余时间
-            TimeUtil.getTimes(uiData.targetTime, timeArray)
-            binding.controller.tvCookingTimeTarget.updateText("--${TimeUtil.formatTime(timeArray)}--") // 下面的TAB-目标运行时间
+            uiData.targetTime
         }
+        TimeUtil.getTimes(time, timeArray)
+        binding.controller.clSetTime.setTimeInternal(
+            timeArray[0],
+            timeArray[1],
+            timeArray[2],
+            true
+        ) // 表盘时间设置-当前剩余时间
+        TimeUtil.getTimes(time, timeArray)
+        binding.controller.tvCookingTimeTarget.updateText("--${TimeUtil.formatTime(timeArray)}--") // 下面的TAB-目标运行时间
+
         TimeUtil.getTimes(uiData.remainTime, timeArray)
         binding.controller.tvSetTime.updateText(TimeUtil.formatTime(timeArray))                            // 下面的TAB-当前剩余时间
 
         // 温度
-        val showTemp =
-            if (runningState == DevStatus.STOP.toInt()) uiData.targetTemp else uiData.currentTemp;
-        if (!viewModel.stepUiData.doingModify || focusUpdate) {
-            binding.controller.tvCookingTempTarget.updateText("--${uiData.targetTemp}°C--")            // 下面的TAB-目标运行温度
-            binding.controller.tempRingView.updateProgress(showTemp)                                 // 圆环设置-当前运行温度
-            binding.controller.tvRingTempText.updateText("${showTemp}°C")                     // 圆环内的数字-当前运行温度
-        }
+//        val showTemp = if (uiData.targetTempBuffer != -1) {
+//            uiData.targetTempBuffer
+//        } else {
+//            uiData.targetTemp
+//        }
+        binding.controller.tvCookingTempTarget.updateText("--${FoodSdkUtils.parseTemp(currentTemp.toShort())}°C--")            // 下面的TAB-目标运行温度
+        binding.controller.tempRingView.updateProgress(
+            FoodSdkUtils.parseTemp(currentTemp.toShort()).toInt()
+        )                                 // 圆环设置-当前运行温度
+        binding.controller.tvRingTempText.updateText("${FoodSdkUtils.parseTemp(currentTemp.toShort())}°C")                     // 圆环内的数字-当前运行温度
         binding.controller.tvTempValue.updateText("${uiData.currentTemp}°C")                       // 下面的TAB-当前运行温度
 
         // 速度设置
-        if (!viewModel.stepUiData.doingModify || focusUpdate) {
 
-            binding.controller.speedRingView.updateProgress(uiData.currentSpeed)                               // 圆环设置-当前运行速度
-            binding.controller.tvSpeedText.updateText(uiData.currentSpeed.toString())                          // 圆环内的数字-当前运行速度
-            binding.controller.tvSetSpeed.updateText(uiData.currentSpeed.toString())                           // 下面的TAB-当前运行速度
+        val speed = if (uiData.motorGearBuffer != -1) {
+            uiData.motorGearBuffer
+        } else {
+            uiData.currentSpeed
         }
+        binding.controller.speedRingView.updateProgress(currentMotorGer)                               // 圆环设置-当前运行速度
+        binding.controller.tvSpeedText.updateText(currentMotorGer.toString())                          // 圆环内的数字-当前运行速度
+        binding.controller.tvSetSpeed.updateText(currentMotorGer.toString())                           // 下面的TAB-当前运行速度
 
         // 喷水设置
         if (!viewModel.stepUiData.doingModify || focusUpdate) {
@@ -1224,8 +1268,13 @@ class CookStepActivity : CookStepBaseActivity() {
         }
 
         // 方向设置
+        val direction = if (uiData.motorDirectionBuffer != -1) {
+            uiData.motorDirectionBuffer
+        } else {
+            uiData.direction
+        }
         if (!viewModel.stepUiData.doingModify || focusUpdate) {
-            updateDirection(uiData.direction)
+            updateDirection(direction)
         }
     }
 

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

@@ -3,6 +3,7 @@ package com.develop.step.ui.cook_step.model
 import com.develop.common.data_repo.db.entity.DevRecipeCookingStep
 import com.kuyuntech.cofarcooking.device.sdk.constant.core.DevStatus
 import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK
+import kotlinx.serialization.Serializable
 
 class CookStepUiData {
     var doingModify = false
@@ -10,26 +11,40 @@ class CookStepUiData {
 
     // 设置目标温度
     var targetTemp = 0
+
     // 设置目标时间
     var targetTime = 0
 
+    var targetTempBuffer = -1
+
     // 当前温度
     var currentTemp = 0
+
     // 当前时间
     var currentTime = 0
+
     // 当前剩余时间
     var remainTime = 0
+
     // targetTimeBuffer
-    var targetTimeBuffer = 0
+    var targetTimeBuffer = -1
+
     // 称重数
     var weightNum = 0
+
     // 当前方向
     var direction = 0
+
     // 当前转速
     var currentSpeed = 0
 
-    var currentWaterGear = 0
+    var currentWaterGear = -1
+
+    var motorGearBuffer = -1
 
+    var waterGearBuffer = -1
+
+    var motorDirectionBuffer = -1
 
     // 限制时间调整范围
     var limitMinTime = 0
@@ -83,7 +98,6 @@ class CookStepUiData {
         currentSpeed = getFixedValue(currentSpeed, limitMinSpeed, limitMaxSpeed)
 
 
-
     }
 
     private fun getFixedValue(source: Int, min: Int, max: Int): Int {
@@ -116,11 +130,16 @@ class CookStepUiData {
             it.isTempChange = isTempChange
             it.isTimeChange = isTimeChange
             it.isMotorGearChange = isMotorGearChange
+            it.targetTimeBuffer = targetTimeBuffer
+            it.targetTempBuffer = targetTempBuffer
+            it.motorDirectionBuffer = motorDirectionBuffer
+            it.motorGearBuffer = motorGearBuffer
+            it.waterGearBuffer = waterGearBuffer
             it.isMotorDirectionChange = isMotorDirectionChange
         }
         return uiData
     }
-    
+
     fun copyFrom(uiData: CookStepUiData): CookStepUiData {
         uiData.let {
             targetTemp = it.targetTemp
@@ -141,6 +160,11 @@ class CookStepUiData {
             isTimeChange = it.isTimeChange
             isMotorGearChange = it.isMotorGearChange
             isMotorDirectionChange = it.isMotorDirectionChange
+            targetTimeBuffer = it.targetTimeBuffer
+            targetTempBuffer = it.targetTempBuffer
+            waterGearBuffer = it.waterGearBuffer
+            motorDirectionBuffer = it.motorDirectionBuffer
+            motorGearBuffer = it.waterGearBuffer
         }
         return uiData
     }

app/build.gradle

@@ -12,7 +12,7 @@ ext{
 
     versionCode=Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
-    brandCode="036I"
+    brandCode="030A"
     model="1039"
 }
 
@@ -58,7 +58,7 @@ android {
             dimension "platform"
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"night\"")
-            resValue("string", "app_theme", "@style/SplashNightTheme")
+            resValue("string", "app_theme", "@style/Splash010DTheme")
         }
 
         brand030A {