处理涂鸦暂停返回问题

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

@@ -1,11 +1,11 @@
 package com.develop.common.utils
 
 import android.os.Bundle
-import android.util.Log
 import com.develop.base.ext.navigateTo
 import com.develop.base.util.AppActivityManager
 import com.develop.base.util.TopResumedAtyHolder
 import com.develop.base.util.TuyaEventEntity
+import com.develop.common.bean.TuyaEvent
 import com.develop.common.food_sdk.FloatWindowManager
 import com.develop.common.router.Screens
 import com.develop.common.tag.MODE_TYPE
@@ -129,10 +129,19 @@ object CommonTuyaSoUtils {
         var str = AppActivityManager.getInstance().topActivity.localClassName
         var isShow = FloatWindowManager.isModeDiyShow()
         if (AppActivityManager.getInstance().topActivity.localClassName.contains("ModesDetailActivity")) {
-            if (CofarSDK.devInfo().runningStatus != DevStatus.STOP&&!FloatWindowManager.isModeDiyShow()) {
+            if (CofarSDK.devInfo().runningStatus != DevStatus.STOP){
+                AppActivityManager.getInstance().topActivity.apply {
+                    val tuya = TuyaEvent()
+                    tuya.type = "finish_activity"
+                    EventBus.getDefault().post(tuya)
+                }
+            }else{
                 CofarSDK.stop(true)
+                AppActivityManager.getInstance().topActivity.finish()
             }
-            AppActivityManager.getInstance().topActivity.finish()
+
+
+
         }
 
     }

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

@@ -668,7 +668,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     }
 
 
-    @Subscribe
+    @Subscribe(threadMode = ThreadMode.MAIN)
     fun onTuyaEvent(event: TuyaEvent) {
 
         if ("start" == event.type) {
@@ -871,7 +871,12 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             }
         }
 
-
+        if ("finish_activity"==event.type){
+            onClickBack()
+        }
+    }
+    private  fun  onClickBack(){
+        binding.ivBack.performClick()
     }
 
     //======================================烹饪设备回调监听==================================\\

BusinessStep/src/main/java/com/develop/step/viewmodel/FoodListViewModel.kt

@@ -109,6 +109,7 @@ class FoodListViewModel : BaseViewModel() {
         var lang = MMkvUtils.getString(CURRENT_LANGUAGE) ?: "en"
         var titleMap = HashMap<String, Any>()
         var map = HashMap<String, Any>()
+//        map["lang"] = "zh-CN"
         map["lang"] = lang
         map["pageNo"] = 0
         map["pageSize"] = 500
@@ -148,7 +149,7 @@ class FoodListViewModel : BaseViewModel() {
                 }
 
                 override fun fail() {
-//                        recipesOnFail.postValue(1)
+        //      recipesOnFail.postValue(1)
                 }
 
             }, 0

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" //app用
 //        return  "011D10390020123010190088"
 
 
-//        return  "011D10390020123010190019"
+        return  "011D10390020123010190019"
 //        return  "011D10390020123010190003"
 //        return  "011A10390020123010190188"
 //        returffn "011A10390020123010190099"