处理涂鸦弹窗问题

BusinessAirFryer/src/main/assets/config_063.json

@@ -1,6 +1,15 @@
 {
   "baseQrUrl": "https://icook.cofarcn.com/h5/index.html",
   "workModes": [
+    {
+      "type": "ADAPTED_COOKING_HEAT",
+      "name": "adapted_cooking_heat",
+      "bg": "ic_mode_diy",
+      "icon": "ic_grid_adapted_cooking",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+
     {
       "type": "ADAPTED_COOKING",
       "name": "adapted_cooking",

BusinessAirFryer/src/main/assets/lang_config.json

@@ -7,6 +7,10 @@
       "showName": "Polski",
       "show": false
     },
+
+
+
+
     {
       "name": "German(德语)",
       "value": "DE",

BusinessCommon/src/main/java/com/develop/common/ui/CommonBindingActivity.kt

@@ -13,6 +13,9 @@ import android.view.View
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import android.widget.Toast
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
 import androidx.viewbinding.ViewBinding
 import com.develop.base.ext.getModelNum
 import com.develop.base.ext.getSN
@@ -36,17 +39,14 @@ import com.develop.common.food_sdk.GlobalDevEvent
 import com.develop.common.router.Screens
 import com.develop.common.tag.CURRENT_USER_ID
 import com.develop.common.tag.SCREENSAVER
-import com.develop.common.tag.TURN_UP_KEY_CODE
 import com.develop.common.utils.NoScreenEvent
 import com.develop.common.utils.TimeDownUtil
-import com.develop.common.utils.TuyaSoEvent
 import com.kuyuntech.cofarcooking.device.sdk.constant.core.DevStatus
 import com.kuyuntech.cofarcooking.device.sdk.eventbus.event.DevPromptEvent
 import com.kuyuntech.cofarcooking.device.sdk.eventbus.event.DevStatusEvent
 import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
-import org.greenrobot.eventbus.ThreadMode
 
 
 /**
@@ -345,7 +345,7 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
         }
 
         // E7报错 5037 设备不显示
-        if ( CofarSDK.devInfo().errCode.toInt() == 7 && isModelNum == "5037" ) {
+        if (CofarSDK.devInfo().errCode.toInt() == 7 && isModelNum == "5037") {
             return
         }
 
@@ -522,7 +522,7 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
 
     @Subscribe
     fun onBaseDevStateEvent(event: DevStatusEvent) {
-        if (baseSn.startsWith("063") &&  event.devInfo.status == DevStatus.RUNNING.toInt() ) {
+        if (baseSn.startsWith("063") && event.devInfo.status == DevStatus.RUNNING.toInt()) {
 //            if (event.devInfo.potCloverEleStatus.toInt() == 0 && basePotCloverEleStatus != 0){
 //                basePotCloverEleStatus = 0
 //            }else if (event.devInfo.potCloverEleStatus.toInt() == 1 && basePotCloverEleStatus != 1){
@@ -534,7 +534,7 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
         }
 
 //        Log.d("TAG Base DevStateEvent", "event:" + event.devInfo.toString())
-        if (baseSn.startsWith("063") && (event.devInfo.potCloverEleStatus.toInt() == 0 && (event.devInfo.status == DevStatus.STOP.toInt()||event.devInfo.status == DevStatus.PAUSE.toInt()))&& isRunning && !isShowSolenoidDilaog) {
+        if (baseSn.startsWith("063") && (event.devInfo.potCloverEleStatus.toInt() == 0 && (event.devInfo.status == DevStatus.STOP.toInt() || event.devInfo.status == DevStatus.PAUSE.toInt())) && isRunning && !isShowSolenoidDilaog) {
             showSolenoidValveDialog()
         }
     }
@@ -762,4 +762,16 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
         isKeyLong = false
 
     }
+
+
+    open fun isDialogFragmentVisible(fragmentManager: FragmentManager, tag: String): Boolean {
+        val fragments: List<Fragment> = fragmentManager.getFragments()
+        for (fragment in fragments) {
+            if (fragment is DialogFragment && fragment.isVisible() && tag == fragment.getTag()) {
+                (fragment as DialogFragment).dismissAllowingStateLoss()
+                return true
+            }
+        }
+        return false
+    }
 }

BusinessCommon/src/main/res/values/strings.xml

@@ -45,6 +45,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="grid_view">Grid view</string>
     <string name="list_view">List view</string>
     <string name="adapted_cooking">ADAPTED COOKING</string>
+    <string name="adapted_cooking_heat">ADAPTED COOKING HEAT</string>
     <string name="scales">SCALES</string>
     <string name="boil_water">BOIL WATER</string>
     <string name="chop">CHOP</string>

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

@@ -671,6 +671,11 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     fun onTuyaEvent(event: TuyaEvent) {
 
         if ("start" == event.type) {
+
+            //开始的时候需要把弹窗关闭
+            isDialogFragmentVisible(supportFragmentManager,"confirmCancelDialog")
+            isDialogFragmentVisible(supportFragmentManager,"errCodeCancelDialog")
+
             if (DevStatus.PAUSE.toInt() == CofarSDK.devInfo().status) {
                 CofarSDK.confirm()
                 resumeClick()
@@ -2483,7 +2488,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
     private fun showPotCloverDialog() {
         val warnDialog = PotCoverUnlockedDialog()
-        warnDialog.showDialog(supportFragmentManager, "PotCloverDialog")
+        warnDialog.showDialog(supportFragmentManager, "errCodeCancelDialog")
     }
 
     /**

libBase/src/main/java/com/develop/base/ext/GlobaExt.kt

@@ -225,11 +225,11 @@ fun getSN(): String {
 //        return "011D10390020123010190001"
 //        return "011A10390020123010190002"
 //        return "011A10390020123010190002"
-//        return  "011D10390020123010190021"
+        return  "011D10390020123010190021"
 //        return  "011D10390020123010190088"
 
 
-        return  "011D10390020123010190019"
+//        return  "011D10390020123010190019"
 //        return  "011D10390020123010190003"
 //        return  "011A10390020123010190188"
 //        returffn "011A10390020123010190099"