011 调试涂鸦食谱代码上传

BusinessAirFryer/src/main/assets/tuya_config.json

@@ -1,5 +1,12 @@
 {
   "licences": {
+
+    "011A10390020123010190111": {
+      "pid": "xkt4eqycakmkofec",
+      "uid": "uuid1bb4c5b06b8f612d",
+      "ak": "xxcENweozy7c16PcMXN1oQWxQVHgRMIb"
+    },
+
     "010D10390020123010100032": {
       "pid": "dquk8axtyy72c1ap",
       "uid": "uuid50e9e0c707553116",

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

@@ -332,6 +332,12 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
             return
         }
 
+        // E7报错 5037 设备不显示
+        if ( CofarSDK.devInfo().errCode.toInt() == 7 && isModelNum == "5037" ) {
+            return
+        }
+
+
         //所有模式程序运行结束时没有响三声蜂鸣声提示结果程序
         if (event.msg == "dev_end_of_run_tips") {
             onDevStop()

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

@@ -3,6 +3,7 @@ package com.develop.common.utils
 import android.os.Bundle
 import android.util.Log
 import com.blankj.utilcode.util.ToastUtils
+import com.develop.base.ext.appGlobalScope
 import com.develop.base.ext.navigateTo
 import com.develop.base.util.AppActivityManager
 import com.develop.base.util.MMkvUtils
@@ -15,14 +16,18 @@ import com.develop.common.tag.CURRENT_LANGUAGE
 import com.develop.common.tag.MODE_TYPE
 import com.develop.common.tag.NUMBER_TAG
 import com.develop.common.tag.SOURCE_TAG
+import com.google.gson.Gson
 import com.kuyuntech.cofarcooking.device.sdk.constant.core.DevModes
 import com.kuyuntech.cofarcooking.device.sdk.constant.core.DevStatus
 import com.kuyuntech.cofarcooking.device.sdk.constant.core.WorkModes
 import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.greenrobot.eventbus.EventBus
 
 object CommonUtils {
-
+    var gson = Gson()
     fun navigateToRemoteRecipe(number: String) {
 
         if (CofarSDK.devInfo().runningStatus != DevStatus.STOP) {
@@ -85,13 +90,17 @@ object CommonUtils {
         //当时测试有个BUG，料理机点击diy以后，手机没识别，然后手机点击diy模式，会导致程序崩溃，具体日志没看到什么东西，估在这多一个判断
         //当前模式是diy，且当前页面是ModesDetailActivity的时候，return方法
         if ((CofarSDK.devInfo().runningInstId == "ADAPTED_COOKING" || CofarSDK.devInfo().runningInstId == "AF_DIY")
-            && AppActivityManager.getInstance().topActivity.localClassName.contains("ModesDetailActivity")) {
+            && AppActivityManager.getInstance().topActivity.localClassName.contains("ModesDetailActivity")
+        ) {
             return
         }
 
         //需要关闭的页面
         for (activity in AppActivityManager.getInstance().activityList()) {
-            if (activity.localClassName.contains("CookDetailActivity") || activity.localClassName.contains("CookStepActivity") || activity.localClassName.contains("ModesDetailActivity")) {
+            if (activity.localClassName.contains("CookDetailActivity") || activity.localClassName.contains(
+                    "CookStepActivity"
+                ) || activity.localClassName.contains("ModesDetailActivity")
+            ) {
                 if (devReady()) {
                     return
                 } else {
@@ -134,5 +143,23 @@ object CommonUtils {
         return false
     }
 
+     inline fun  <reified T: Any>getApplog(url: String, apiVersion: String, json: String): T? {
+        var any: T? = null
+        appGlobalScope.launch(Dispatchers.IO) {
+            var httpResponse = TuyaUtils.ioTSDKManager.httpRequest(url, apiVersion, json)
+            var str = ""
+            if (httpResponse.errorCode==0){
+                str  = httpResponse.result
+            }else{
+                return@launch
+            }
+            withContext(Dispatchers.Main) {
+               any = gson.fromJson(str,T::class.java)
+            }
+        }
+         return  any
+
+    }
+
 
 }

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

@@ -24,6 +24,7 @@ import androidx.databinding.ViewDataBinding
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.azhon.appupdate.listener.OnDownloadListener
 import com.blankj.utilcode.util.AppUtils
+import com.develop.base.ext.appGlobalScope
 import com.develop.base.ext.dimenRes
 import com.develop.base.ext.getSN
 import com.develop.base.ext.isBrand036I
@@ -34,6 +35,7 @@ import com.develop.base.ext.setVisible
 import com.develop.base.ext.updateText
 import com.develop.base.util.GlobalToast
 import com.develop.base.widgets.CommonPopupWindow
+import com.develop.common.bean.TuyaEvent
 import com.develop.common.data_repo.FoodDataProvider
 import com.develop.common.dialog.CancelConfirmDialog
 import com.develop.common.dialog.CommonDialog
@@ -42,20 +44,26 @@ import com.develop.common.food_sdk.GlobalDevEvent
 import com.develop.common.router.Screens
 import com.develop.common.ui.CommonBVMActivity
 import com.develop.common.utils.AppVersionUtil
+import com.develop.common.utils.CommonUtils
 import com.develop.common.utils.StringUtils
 import com.develop.common.utils.TuyaUtils
 import com.develop.common.utils.UpdateUtil
 import com.develop.common.widget.PwdLayout
 import com.develop.setting.databinding.ActivityAboutBinding
 import com.develop.setting.ui.viewmodel.AboutViewModel
+import com.google.gson.Gson
 import com.kuyuntech.cofarcooking.device.sdk.constant.core.DevStatus
 import com.kuyuntech.cofarcooking.device.sdk.eventbus.event.DevStatusEvent
 import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK
 import com.tuya.smartai.iot_sdk.Log
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.greenrobot.eventbus.Subscribe
 import java.io.File
 import java.util.Calendar
 import java.util.Date
+import java.util.Objects
 
 
 @Route(path = Screens.Setting.ABOUT)
@@ -447,6 +455,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         }
 
         binding.tvAppVersion.setOnClickListener {
+//            getappLog()
             adbCount++
             if (adbCount >= 7) {
                 adbCount = 0
@@ -529,6 +538,23 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 
     }
 
+    fun getappLog(){
+        var map = HashMap<String,Any>()
+        map["lang"] = "es"
+        var gson = Gson()
+        var json = gson.toJson(map)
+        appGlobalScope.launch (Dispatchers.IO){
+            var httpResponse =  TuyaUtils.ioTSDKManager.httpRequest("tuya.device.menu.category.lists","1.0",json)
+            var str = httpResponse.result
+            withContext(Dispatchers.Main){
+                Log.d("TAG", "json：$str")
+            }
+
+        }
+
+//      var tuya =   CommonUtils.getApplog<TuyaEvent>("tuya.device.menu.category.list","1.0",json)
+
+    }
 
     fun installPackage(context: Context, apk: File) {
         try {
@@ -555,6 +581,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
     }
 
 
+
     private fun addApkToSession(file: File, session: PackageInstaller.Session) {
         file.inputStream().use { inputStream ->
             session.openWrite("COSU", 0, -1).use { outputStream ->

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

@@ -105,6 +105,9 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
          *
          * ps:修改了的话，记得同步下面tuya代码
          * 也要修改GlobaExt 中的 getGoneTuYa
+         *
+         * 由于011 食谱调试需要把涂鸦不隐藏
+         *
          * */
 
         dataList.clear()
@@ -114,6 +117,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
             DataFactory.genSetting032DModesList(resources)
         } else if (sn.startsWith("011")) {
             DataFactory.genSetting011AModesList(resources)
+//            DataFactory.genSetting030AModesList(resources)
         } else if (sn.startsWith("030A")||sn.startsWith("032E")) {
             DataFactory.genSetting030AModesList(resources)
         } else if (sn.startsWith("036I")|| sn.startsWith("058A") || sn.startsWith("058B")) {
@@ -492,6 +496,8 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
          *
          * ps:修改了的话，记得同步下面tuya代码
          * 也要修改GlobaExt 中的 getGoneTuYa
+         *
+         * 由于011 食谱调试需要把涂鸦不隐藏
          * */
 
 
@@ -500,7 +506,9 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
         } else if (sn.startsWith("032D") || sn.startsWith("010F") || sn.startsWith("033")) {
             DataFactory.genSetting032DModesList(resources)
         } else if (sn.startsWith("011")) {
+//            DataFactory.genSetting030AModesList(resources)
             DataFactory.genSetting011AModesList(resources)
+
         } else if (sn.startsWith("030A")||sn.startsWith("032E")) {
             DataFactory.genSetting030AModesList(resources)
         } else if (sn.startsWith("036I")|| sn.startsWith("058A") || sn.startsWith("058B")) {

app/build.gradle

@@ -12,6 +12,7 @@ plugins {
     id 'kotlinx-serialization'
 
     id 'com.alibaba.arouter'
+
 }
 
 
@@ -20,10 +21,10 @@ ext {
 
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
-//    brandCode="054A"
-    brandCode = "077A"
-//    model = "5037"
-    model = "1039"
+//    brandCode="053A"
+    brandCode = "011E"
+    model = "5037"
+//    model = "1039"
 
 }
 

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

@@ -156,9 +156,9 @@ class FoodCookingApp : BaseApp() {
             }
             AppVersionUtil.endRecord("ThemeSkinService")
 
+        CofarSDK.register(this)
         CofarSDK.init(getBrandNum())
         SerialPortUtils.init()
-        CofarSDK.register(this)
         //MainActvity 加了这个代码，在这注释
 //        CofarSDK.stopNative()
 

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

@@ -100,6 +100,7 @@ class MainActivity : CommonBindingActivity<ActivityMainBinding>() {
 //            getAppTuya(true)
 //        }
 
+//        getAppTuya(true)
 
         getDevInfo()
 

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

@@ -223,7 +223,8 @@ fun getSN(): String {
 //        return "010D10390020123010190001"
 //        return "010F10390020123010190001"
 //        return "011D10390020123010190001"
-        return "011A10390020123010190001"
+//        return "011A10390020123010190001"
+        return "011A10390020123010190111"
 //        return "011A10390020123010190009"
 //        return "000A50370020123010190004"
 //        return "011A50370020123010190003"
@@ -300,7 +301,8 @@ fun getGoneTuYa(): Boolean {
     var sn = getSN()
     return sn.startsWith("010D") || sn.startsWith("010F")
             || sn.startsWith("032D") || sn.startsWith("033")
-            || sn.startsWith("011A") || sn.startsWith("036I")
+//            || sn.startsWith("011A")
+            || sn.startsWith("036I")
             || sn.startsWith("053A")
             || sn.startsWith("058A") || sn.startsWith("058B")
 }