032D大写，涂鸦功能处理，食谱详情的编号处理

BusinessAirFryer/src/main/assets/config_033.json

@@ -9,6 +9,23 @@
       "devMode": "SOUP",
       "listShow": false
     },
+    {
+      "type": "BROWN",
+      "name": "brown",
+      "bg": "cm_icon_roast",
+      "icon": "cm_icon_roast",
+      "devMode": "SOUP",
+      "listShow": false
+    },
+    {
+      "type": "ROAST",
+      "name": "roast",
+      "bg": "cm_icon_roast",
+      "icon": "cm_icon_roast",
+      "devMode": "SOUP",
+      "listShow": false
+    },
+
     {
       "type": "KNEAD_TOUGH",
       "name": "knead_dough",

BusinessAirFryer/src/main/assets/tuya_config.json

@@ -449,6 +449,10 @@
       "pid": "zqu9xyol98eirdqg",
       "uid": "uuidfb9425b618c727ea",
       "ak": "xlAFfJzBcZxb04wV8RwZGw2QA1rDTewv"
+    },"014A19050020123010190002": {
+      "pid": "bvuorstpnkfsh6fm",
+      "uid": "uuid758e6c5bea1239b3",
+      "ak": "ArxSJZf7ZeQ0nkl7x39hzSD7dSfTGhSs"
     }
   }
 }

BusinessCommon/src/main/java/com/develop/common/data_repo/db/DataFactory.kt

@@ -682,10 +682,10 @@ object DataFactory {
         R.string.Download_new_recipes
     )
     private var titleStrIds32 = mutableListOf<Int>(
-        R.string.Automatic_recipes,
-        R.string.Automatic_programmes,
-        R.string.Manual_cooking,
-        R.string.Download_new_recipes
+        R.string.Automatic_recipes_32,
+        R.string.Automatic_programmes_32,
+        R.string.Manual_cooking_32,
+        R.string.Download_new_recipes_32
     )
 
     private var typeList1 = mutableListOf<EntranceType>(

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

@@ -246,6 +246,12 @@ Nanfang plus client ist eine Online-Informationsplattform, die von Guangdong Nan
     <string name="login_faild">Falsche Kontonummer oder Passwort</string>
 
 
+    <string name="Automatic_recipes_32">AUTOMATISCHE REZEPTE</string>
+    <string name="Automatic_programmes_32">AUTOMATISCHEN PROGRAMME</string>
+    <string name="Manual_cooking_32">MANUELLER MODUS</string>
+    <string name="Download_new_recipes_32">SHALTFLÄCHE REZEPTE</string>
+
+
     <!-- 空炸模式 -->
     <string name="air_fryer">Luftfräse</string>
     <string name="meat">FLEISCH</string>

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

@@ -269,6 +269,11 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="account_or_pwd_error">Incorrect account number or password</string>
     <string name="login_faild">Incorrect account number or password</string>
 
+    <string name="Automatic_recipes_32">AUTOMATIC RECIPES</string>
+    <string name="Automatic_programmes_32">AUTOMATIC PROGRAMS</string>
+    <string name="Manual_cooking_32">MANUAL\nMODE</string>
+    <string name="Download_new_recipes_32">DOWNLOAD RECIPES</string>
+
 
     <!-- 空炸模式 -->
     <string name="air_fryer">AIR FRYER</string>

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

@@ -244,6 +244,13 @@ El cliente Southern plus es una plataforma de información en línea desarrollad
     <string name="login_faild">Falló el inicio de sesión</string>
 
 
+    <string name="Automatic_recipes_32">RECETAS AUTOMÁTICAS</string>
+    <string name="Automatic_programmes_32">PROGRAMAS AUTOMÁTICOS</string>
+    <string name="Manual_cooking_32">MODO\nMANUAL</string>
+    <string name="Download_new_recipes_32">DESCARGA RECETAS</string>
+
+
+
     <!-- 空炸模式 -->
     <string name="air_fryer">Freidora de aire</string>
     <string name="meat">Carne</string>

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

@@ -245,6 +245,13 @@ Nanfang plus client è una piattaforma di informazioni online sviluppata e gesti
     <string name="login_faild">Accesso non riuscito</string>
 
 
+    <string name="Automatic_recipes_32">RICETTE AUTOMATICHE</string>
+    <string name="Automatic_programmes_32">PROGRAMMI AUTOMATICI</string>
+    <string name="Manual_cooking_32">MODALITÀ MANUALE</string>
+    <string name="Download_new_recipes_32">SCARICA REICETTE</string>
+
+
+
     <!-- 空炸模式 -->
     <string name="air_fryer">Filtro dell’aria</string>
     <string name="meat">CARNI</string>

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

@@ -242,6 +242,13 @@ Nanfang mais cliente é uma plataforma de informação on-line desenvolvida e op
     <string name="login_faild">Número da conta ou senha incorretas</string>
 
 
+    <string name="Automatic_recipes_32">RECEITAS AUTOMÁTICAS</string>
+    <string name="Automatic_programmes_32">PROGRAMAS AUTOMATICOS</string>
+    <string name="Manual_cooking_32">MODO\nMANUAL</string>
+    <string name="Download_new_recipes_32">DOWNLOAD RECEITAS</string>
+
+
+
     <!-- Modo de explosão de ar-->
     <string name="air_fryer">AIR FRYER</string>
     <string name="meat">CARNE</string>

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

@@ -36,6 +36,7 @@ import com.develop.common.tag.ISTUYA
 import com.develop.common.tag.LANGUAGE_FROM_SETTING
 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.setting.R
 import com.develop.setting.databinding.ActivitySettingMainBinding
@@ -55,6 +56,9 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
     private var isTuya = false
     var exitTime: Long = 0 // 退出时间
     private var onIsResume = true
+    private var isNetwork = false
+
+
     override fun createViewBinding(inflater: LayoutInflater): ActivitySettingMainBinding {
         return ActivitySettingMainBinding.inflate(layoutInflater)
     }
@@ -68,14 +72,14 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
             DataFactory.genSetting010DModesList(resources)
         } else if (getGoneLogin()) {
             DataFactory.genSetting032DModesList(resources)
-        }  else {
+        } else {
             DataFactory.genSettingModesList(resources)
         }
 
-        if (!getNetwork()){
+        if (!getNetwork()) {
             dataList.forEach { settingModel ->
-                if (settingModel.type== SettingType.TUYA){
-                    settingModel.resId= com.develop.common.R.drawable.ic_setting_tuya_no
+                if (settingModel.type == SettingType.TUYA) {
+                    settingModel.resId = com.develop.common.R.drawable.ic_setting_tuya_no
                 }
             }
         }
@@ -207,21 +211,25 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
 
 
     private fun getDevTuya() {
-        if (!isTuya && getNetwork()) {
+        if (getNetwork()) {
             tuyaList(0)
         }
     }
-    private  fun  getDevNetwork(num: Int){
+
+    private fun getDevNetwork(num: Int) {
+        println("TAG 涂鸦请求 : $num")
         //处理wifi点击回来
-        if (getNetwork()){
+        if (getNetwork()) {
             //连接上wifi就调用涂鸦接口
             getDevTuya()
-        }else{
+        } else {
             //没有连接wifi处理轮询
-            if (num<10){
+            if (num < 10) {
+                //判断是否有网的时候
                 var nums = num + 1
-                Handler().postDelayed({ getDevNetwork( nums) }, 500)
+                Handler().postDelayed({ getDevNetwork(nums) }, 500)
                 return
+
             }
         }
 
@@ -231,8 +239,10 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
     fun tuyaList(num: Int) {
         //代码重连
         if (num > 3) {
+
             return
         }
+        println("TAG 涂鸦请求1111111111111")
         this.apply {
             scopeNetLife {
                 val result = Post<DevInfoResult>(Api.DEV_INFO) {
@@ -241,6 +251,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
                 getInitTuya(result)
             }.catch {
                 var nums = num + 1
+                println("TAG 涂鸦请求5555555555555")
                 Handler().postDelayed({ tuyaList(nums) }, 1000)
 
             }
@@ -248,6 +259,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
     }
 
     fun getInitTuya(result: DevInfoResult) {
+        println("TAG 涂鸦请求成功")
         if (result.tuyaLicense != null) {
             result.tuyaLicense?.let {
                 TuyaUtils.mAk = it.ak
@@ -259,7 +271,27 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
                 MMkvUtils.save(ISTUYA, true)
                 tuyaEvent()
             }
+        } else {
+            println("TAG 本地配置")
+            getAppTuya(true)
+            tuyaEvent()
+        }
+    }
+
+    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")
+            //涂鸦存值判断有涂鸦功能
+            MMkvUtils.save(ISTUYA, true)
+        } else {
+            //涂鸦存值判断没有涂鸦功能
+            MMkvUtils.save(ISTUYA, false)
         }
+
     }
 
     @SuppressLint("NotifyDataSetChanged")
@@ -276,10 +308,10 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
             DataFactory.genSettingModesList(resources)
         }
 
-        if (!getNetwork()){
+        if (!getNetwork()) {
             dataList.forEach { settingModel ->
-                if (settingModel.type== SettingType.TUYA){
-                    settingModel.resId= com.develop.common.R.drawable.ic_setting_tuya_no
+                if (settingModel.type == SettingType.TUYA) {
+                    settingModel.resId = com.develop.common.R.drawable.ic_setting_tuya_no
                 }
             }
         }
@@ -294,7 +326,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
     override fun onResume() {
         super.onResume()
         //避免涂鸦功能不出现估做这个判断
-        if (onIsResume){
+        if (onIsResume&&!isTuya) {
             getDevTuya()
         }
     }

BusinessStep/src/main/AndroidManifest.xml

@@ -8,9 +8,11 @@
             android:screenOrientation="landscape" />
         <activity
             android:name=".ui.ModesDetailActivity"
+            android:launchMode="singleTask"
             android:screenOrientation="landscape" />
         <activity
             android:name=".ui.recipes_detail.CookDetailActivity"
+            android:launchMode="singleTask"
             android:screenOrientation="landscape" />
         <activity
             android:name=".ui.recipes_detail.CookEvaluateActivity"

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

@@ -216,11 +216,12 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         super.onCreate(savedInstanceState)
         hasShowScreenSaver = true
         configLock = true
+
+
         is062 = isBrand062()
         is011 = isBrand011A()
         devMode = CofarSDK.devInfo().devMode
         isModelNum = getModelNum()
-
         if (!isNightTheme()) {
             var color =
                 if (is062) com.develop.common.R.color.white else if(is011) com.develop.common.R.color.view_change_011 else com.develop.common.R.color.view_change

BusinessStep/src/main/java/com/develop/step/ui/recipes_detail/CookDetailActivity.kt

@@ -14,6 +14,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.launcher.ARouter
 import com.blankj.utilcode.util.ToastUtils
 import com.develop.base.ext.*
+import com.develop.base.util.MMkvUtils
 import com.develop.base.util.ThreadUtils
 import com.develop.common.data_repo.FoodDataProvider
 import com.develop.common.data_repo.db.entity.UserFavoriteRecipes
@@ -27,6 +28,7 @@ import com.develop.common.dialog.DownloadFailedDialog
 import com.develop.common.dialog.ShareQRCodeDialog
 import com.develop.common.event.RefreshDataEvent
 import com.develop.common.event.RefreshLikeDataEvent
+import com.develop.common.tag.CURRENT_LANGUAGE
 import com.develop.common.utils.setLeftDrawable
 import com.develop.step.databinding.ActivityCookDetailBinding
 import com.develop.step.viewmodel.CookDetailViewModel
@@ -130,6 +132,21 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
     }
 
     private fun initView() {
+//        处理涂鸦扫码后 APP事件过来给的recipeNumber 是 030000030@EN 带了@估食谱查询不到
+        recipeNumber?.let {
+            if (it.contains("@")){
+                var (number, language) = it.split("@")
+                recipeNumber = number
+                var appLanger  = MMkvUtils.getString(CURRENT_LANGUAGE)
+                if (!appLanger.equals(language)){
+                    ToastUtils.showShort("Please switch to the corresponding language to open this recipe")
+                    finish()
+                }
+            }
+
+        }
+
+
         if (is062){
             binding.tvEasy.visibility = View.VISIBLE
         }

app/build.gradle

@@ -12,8 +12,8 @@ ext {
 
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
-    brandCode="014A"
-//    brandCode = "000A"
+//    brandCode="033F"
+    brandCode = "032D"
     model = "1039"
 
 }
@@ -364,12 +364,12 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
 
-//             resValue("string", "app_theme", "@style/SplashTheme")
-//            buildConfigField("String", "UpdatePlatform", "\"normal\"")
-//            buildConfigField("String", "model", "\"5037\"")
-//            buildConfigField("String", "brandCode", "\"000A\"")
-//            //appCode 1.01 指向bug修复，2.01指向功能变更
-//            buildConfigField("String", "appCode", "\"1.01\"")
+             resValue("string", "app_theme", "@style/SplashTheme")
+            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+            buildConfigField("String", "model", "\"5037\"")
+            buildConfigField("String", "brandCode", "\"000A\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
 
 //             buildConfigField("String", "UpdatePlatform", "\"011A\"")
 //            resValue("string", "app_theme", "@style/Splash011A5037Theme")
@@ -409,16 +409,24 @@ android {
 //            //appCode 1.01 指向bug修复，2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
-
-
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
-            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
+            resValue("string", "app_theme", "@style/SplashTheme")
             buildConfigField("String", "model", "\"1039\"")
-            buildConfigField("String", "brandCode", "\"014A\"")
+            buildConfigField("String", "brandCode", "\"030A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 
 
+
+
+//            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+//            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
+//            buildConfigField("String", "model", "\"1039\"")
+//            buildConfigField("String", "brandCode", "\"014A\"")
+//            //appCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
+
+
 //            buildConfigField("String", "UpdatePlatform", "\"normal\"")
 //            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
 //            buildConfigField("String", "model", "\"2002\"")

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

@@ -59,7 +59,6 @@ class MainActivity : CommonBindingActivity<ActivityMainBinding>() {
 
 
         getDevInfo()
-
     }
 
     //获取是否有涂鸦功能

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

@@ -217,7 +217,7 @@ fun getSN(): String {
 //        return "011A50370020123010190004"
 //    return "007D20020020123010190001"
 //        return "036I21060020123010190007"
-//        return "030A10390020123010190001"
+        return "030A10390020123010190004"
 //    return  "017A20060020123010190001"
 //        return  "017A10390020123010190001"
 //    return "010D10390020123010190001"
@@ -226,13 +226,14 @@ fun getSN(): String {
 //        return "000A50370020123010190011"
 //         return  "030A10390020123010190002"
 //        return  "033F20020020123010190001"
-        return  "014A19050020123010190001"
+//        return  "014A19050020123010190002"
 
 //        return "029C21010020123010190001"
 //        return  "062A10390020123010190001"
 //        return "062A20030020123010190001"
 //        return  "063A10390020123010190001"
-//        return "000A50370020123010190018"
+//        return "000A50370020123010190017"
+
 //        return  "000A10390020123010190023"
     } else {
         //通过反射获取sn号