011 涂鸦兼容代码上传

BusinessCommon/src/main/java/com/develop/common/event/CommonEvent.kt

@@ -23,4 +23,6 @@ data class CookStepEvent(
     var modeType: String = "",
     var detailJson: String = "",
     var sizelJson: String = "",
+    var tuyaStepJson :String = "",
+    var tuyaRecipeJson : String = ""
 ) {}

BusinessCommon/src/main/java/com/develop/common/food_sdk/FloatWindowManager.kt

@@ -125,6 +125,8 @@ object FloatWindowManager {
                             withString("number", recipeNumber)
                             withString("cook_step_detail", event.detailJson)
                             withString("portionSizelJson", event.sizelJson)
+                            withString("tuya_step",event.tuyaStepJson)
+                            withString("tuya_recipe",event.tuyaRecipeJson)
                             withInt("stepIndex", step)
                             withBoolean("keep",true)
                         }

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

@@ -168,6 +168,7 @@ object CommonUtils {
 
             var str  =  TuyaUtilsSo.getInstance().getPointer(url, apiVersion, json)
             if ("" == str || str ==null){
+                ToastUtils.showShort(globalApp().getString(R.string.connect_tuya))
                 tuyaHttp.fail()
             }
             withContext(Dispatchers.Main){
@@ -225,6 +226,7 @@ object CommonUtils {
             Log.e("tuya","url :"+url +"   json:"+json)
             var str  =  TuyaUtilsSo.getInstance().getPointer(url, apiVersion, json)
             if ("" == str || str ==null){
+                ToastUtils.showShort(globalApp().getString(R.string.connect_tuya))
                 tuyaHttpList.fail()
             }
             withContext(Dispatchers.Main) {

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

@@ -121,7 +121,9 @@ class  ModesFragment : CommonBVMFragment<FragmentModesBinding, HomeViewModel>()
 //        }
 
         devMode = CofarSDK.devInfo().devMode
-
+        if (devMode==""){
+            devMode = "SOUP"
+        }
         val configJson = ConfigUtils.loadConfig()
 
 

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

@@ -15,10 +15,12 @@ import androidx.appcompat.widget.AppCompatTextView
 import androidx.recyclerview.widget.RecyclerView
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.blankj.utilcode.util.ToastUtils
+import com.develop.base.ext.appGlobalScope
 import com.develop.base.ext.getCobotmix
 import com.develop.base.ext.getGoneLogin
 import com.develop.base.ext.getGoneTuYa
 import com.develop.base.ext.getSN
+import com.develop.base.ext.globalApp
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
 import com.develop.base.ext.setVisible
@@ -45,6 +47,7 @@ import com.develop.common.tag.WIFI_FROM_MAIN_SETTING
 import com.develop.common.ui.CommonBindingActivity
 import com.develop.common.utils.ConfigUtils
 import com.develop.common.utils.TuyaUtils
+import com.develop.common.utils.TuyaUtilsSo
 import com.develop.setting.R
 import com.develop.setting.databinding.ActivitySettingMainBinding
 import com.drake.brv.utils.bindingAdapter
@@ -56,6 +59,8 @@ import com.drake.net.utils.scopeNetLife
 import com.google.gson.Gson
 import com.kuyuntech.cofarcooking.device.sdk.constant.core.DevStatus
 import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 
 @Route(path = Screens.Setting.MAIN_SETTING)
@@ -230,10 +235,10 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
                                     if (isNetWordLoading) {
                                         Log.e("TAG isTuya", "isNetWordLoadingisNetWordLoading")
                                         showTuyaRequestDialog()
-                                    } else if (isTuya && TuyaUtils.qrcodeUrl == "") {
+                                    } else if (isTuya && TuyaUtilsSo.getInstance().shorturl == "") {
                                         Log.e("TAG isTuya", "isTuyaisTuyaisTuyaisTuya")
                                         //由于涂鸦初始化后，有绑定的话重启设备qrcodeUrl是不返回的，估在这在判断TuyaUtils.init
-                                        if (TuyaUtils.init) {
+                                        if (TuyaUtilsSo.getInstance().tuyaInitSuccess) {
                                             startTuya()
                                         } else {
                                             showTuyaRequestDialog()
@@ -386,8 +391,6 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
 
     //从wifi功能回来方法
     private fun getDevNetwork(num: Int) {
-        //先处理本地配置涂鸦
-        return
 
         //无需获取涂鸦功能，估不网络请求涂鸦
         if (getGoneTuYa()) {
@@ -453,10 +456,20 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
 
         if (result.tuyaLicense != null) {
             result.tuyaLicense?.let {
-                TuyaUtils.mAk = it.ak.toString().trim()
-                TuyaUtils.mPid = it.pid.toString().trim()
-                TuyaUtils.mUid = it.uuid.toString().trim()
-                TuyaUtils.initSDK(this@SettingMainActivity, "1.0.0")
+
+
+                TuyaUtilsSo.getInstance().setmAk(it.ak.toString().trim())
+                TuyaUtilsSo.getInstance().setmPid(it.pid.toString().trim())
+                TuyaUtilsSo.getInstance().setmUid(it.uuid.toString().trim())
+                appGlobalScope.launch(Dispatchers.IO) {
+                    TuyaUtilsSo.getInstance().initSDK(globalApp(),"1.0.0")
+                }
+
+
+//                TuyaUtils.mAk = it.ak.toString().trim()
+//                TuyaUtils.mPid = it.pid.toString().trim()
+//                TuyaUtils.mUid = it.uuid.toString().trim()
+//                TuyaUtils.initSDK(this@SettingMainActivity, "1.0.0")
                 isTuya = true
                 isNetWordLoading = false
                 //涂鸦存值判断有涂鸦功能
@@ -472,10 +485,18 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
     fun getAppTuya(isCatch: Boolean) {
         var tuyaConfig = ConfigUtils.loadTuyaConfig()
         if (tuyaConfig != null) {
-            TuyaUtils.mAk = tuyaConfig.get("ak")
-            TuyaUtils.mPid = tuyaConfig.get("pid")
-            TuyaUtils.mUid = tuyaConfig.get("uid")
-            TuyaUtils.initSDK(this, "1.0.0")
+
+            TuyaUtilsSo.getInstance().setmAk(tuyaConfig.get("ak"))
+            TuyaUtilsSo.getInstance().setmPid(tuyaConfig.get("pid"))
+            TuyaUtilsSo.getInstance().setmUid(tuyaConfig.get("uid"))
+            appGlobalScope.launch(Dispatchers.IO) {
+                TuyaUtilsSo.getInstance().initSDK(globalApp(),"1.0.0")
+            }
+
+//            TuyaUtils.mAk = tuyaConfig.get("ak")
+//            TuyaUtils.mPid = tuyaConfig.get("pid")
+//            TuyaUtils.mUid = tuyaConfig.get("uid")
+//            TuyaUtils.initSDK(this, "1.0.0")
             isTuya = true
             //涂鸦存值判断有涂鸦功能
             MMkvUtils.save(ISTUYA, true)

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

@@ -66,7 +66,7 @@ class TuyaActivity : CommonBindingActivity<ActivityTuyaBinding>() {
             binding.tvContent.updateText(getString(com.develop.common.R.string.tuya_app_content))
 
             //  TuyaUtils.qrcodeUrl != "" && !TuyaUtils.init 以前图标
-            if(TuyaUtilsSo.getInstance().shorturl != "" && TuyaUtilsSo.getInstance().tuyaInitSuccess){
+            if(TuyaUtilsSo.getInstance().shorturl != "" && !TuyaUtilsSo.getInstance().tuyaNetwork){
                 //init关乎是否有其他手机连接
                 //有设备连接需要显示cancelBtn按钮
 

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

@@ -607,7 +607,10 @@ class CookStepActivity : CookStepBaseActivity() {
                         isMode = false,
                         modeName = this@CookStepActivity.binding.tvTitleStep.text.toString(),
                         detailJson = cookStepDetail ?: "",
-                        sizelJson = portionSizelJson ?: ""
+                        sizelJson = portionSizelJson ?: "",
+                        tuyaStepJson =  tuyaStep?:"",
+                        tuyaRecipeJson = tuyaRecipe?:""
+
                     )
                     FloatWindowManager.showStepFlowWindow(cookStepEvent)
                     recordRecipes()

app/src/main/java/com/develop/foodcooking/MainActivity.kt

@@ -106,9 +106,9 @@ class MainActivity : CommonBindingActivity<ActivityMainBinding>() {
 
 //        getAppTuya(true)
 //
-//        getDevInfo()
+        getDevInfo()
 
-        getTuyaSo()
+//        getTuyaSo()
 
     }
 
@@ -150,10 +150,17 @@ class MainActivity : CommonBindingActivity<ActivityMainBinding>() {
     fun  getAppTuya(isCatch :Boolean){
         var tuyaConfig = ConfigUtils.loadTuyaConfig()
         if (tuyaConfig != null) {
-            TuyaUtils.mAk = tuyaConfig.get("ak")
-            TuyaUtils.mPid = tuyaConfig.get("pid")
-            TuyaUtils.mUid = tuyaConfig.get("uid")
-            TuyaUtils.initSDK(this, "1.0.0")
+            TuyaUtilsSo.getInstance().setmAk(tuyaConfig.get("ak"))
+            TuyaUtilsSo.getInstance().setmPid(tuyaConfig.get("pid"))
+            TuyaUtilsSo.getInstance().setmUid(tuyaConfig.get("uid"))
+            appGlobalScope.launch(Dispatchers.IO) {
+                TuyaUtilsSo.getInstance().initSDK(globalApp(),"1.0.0")
+            }
+
+//            TuyaUtils.mAk = tuyaConfig.get("ak")
+//            TuyaUtils.mPid = tuyaConfig.get("pid")
+//            TuyaUtils.mUid = tuyaConfig.get("uid")
+//            TuyaUtils.initSDK(this, "1.0.0")
             //涂鸦存值判断有涂鸦功能
             MMkvUtils.save(ISTUYA, true)
         } else {
@@ -176,12 +183,22 @@ class MainActivity : CommonBindingActivity<ActivityMainBinding>() {
         println("涂鸦请求3 ： $json")
         if (result.tuyaLicense != null) {
             result.tuyaLicense?.let {
-                TuyaUtils.mAk = it.ak.toString().trim()
-                TuyaUtils.mPid = it.pid.toString().trim()
-                TuyaUtils.mUid = it.uuid.toString().trim()
-                TuyaUtils.initSDK(this, "1.0.0")
+
+                TuyaUtilsSo.getInstance().setmAk(it.ak.toString().trim())
+                TuyaUtilsSo.getInstance().setmPid(it.pid.toString().trim())
+                TuyaUtilsSo.getInstance().setmUid(it.uuid.toString().trim())
+                appGlobalScope.launch(Dispatchers.IO) {
+                    TuyaUtilsSo.getInstance().initSDK(globalApp(),"1.0.0")
+                }
                 //涂鸦存值判断有涂鸦功能
                 MMkvUtils.save(ISTUYA, true)
+//
+//                TuyaUtils.mAk = it.ak.toString().trim()
+//                TuyaUtils.mPid = it.pid.toString().trim()
+//                TuyaUtils.mUid = it.uuid.toString().trim()
+//                TuyaUtils.initSDK(this, "1.0.0")
+//                //涂鸦存值判断有涂鸦功能
+//                MMkvUtils.save(ISTUYA, true)
             }
         } else {
             //如果线上没有涂鸦，再获取本地的