010 OTA更新代码

BusinessCommon/src/main/java/com/develop/common/data_repo/net/model/request/DeviceInfoBody.kt

@@ -17,7 +17,7 @@ object DeviceInfoBody {
 
         val times = MMkvUtils.getString("appTime") ?: "0"
         val appTime: Long = times.toLong()
-
+        //特殊处理010 食谱升级问题
         var time = if (sn.startsWith("010")) {
             if (appTime > recipeUpdateTime) {
                 appTime.toString()

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

@@ -126,6 +126,12 @@ neshromažďujeme žádné vaše osobní údaje.</string>
     <string name="About">O stránkách</string>
     <string name="are_you_sure_to_restore_factory_settings">Určitě chcete obnovit tovární nastavení?</string>
     <string name="yes">ANO</string>
+
+
+    <string name="easy">easy</string>
+    <string name="medium">medium</string>
+    <string name="hard">hard</string>
+
     <string name="restore_factory_settings">Obnovení továrního nastavení</string>
     <string name="network_wifi_status_connected_no_internet">Připojeno, ale nelze přistupovat k Internetu</string>
     <string name="network_wifi_status_saved">Uloženo</string>

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

@@ -113,6 +113,10 @@ Nanfang plus client ist eine Online-Informationsplattform, die von Guangdong Nan
     <string name="are_you_sure_to_restore_factory_settings">Sind Sie sicher, dass Sie die Werkseinstellungen wiederherstellen möchten?
 </string>
     <string name="yes">JA</string>
+    <string name="easy">easy</string>
+    <string name="medium">medium</string>
+    <string name="hard">hard</string>
+
     <string name="restore_factory_settings">Werkseinstellungen wiederherstellen</string>
     <string name="network_wifi_status_connected_no_internet">Verbunden, aber nicht in der Lage, auf das Internet zuzugreifen</string>
     <string name="network_wifi_status_saved">Gespeichert</string>

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

@@ -112,6 +112,9 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="About">À propos</string>
     <string name="are_you_sure_to_restore_factory_settings">Êtes - vous sûr de vouloir restaurer les paramètres d’usine?</string>
     <string name="yes">Oui</string>
+    <string name="easy">easy</string>
+    <string name="medium">medium</string>
+    <string name="hard">hard</string>
     <string name="restore_factory_settings">Restaurer les paramètres d’usine</string>
     <string name="network_wifi_status_connected_no_internet">Connecté, mais ne peut pas accéder à Internet</string>
     <string name="network_wifi_status_saved">Sauvegardé</string>

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

@@ -96,6 +96,10 @@
     <string name="About">A webhelyről</string>
     <string name="are_you_sure_to_restore_factory_settings">Biztos, hogy vissza szeretné állítani a gyári beállításokat?</string>
     <string name="yes">IGEN</string>
+    <string name="easy">easy</string>
+    <string name="medium">medium</string>
+    <string name="hard">hard</string>
+
     <string name="restore_factory_settings">Gyári beállítások visszaállítása</string>
     <string name="network_wifi_status_connected_no_internet">Csatlakoztatva van, de nem tud hozzáférni az internethez</string>
     <string name="network_wifi_status_saved">Mentette</string>

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

@@ -104,6 +104,10 @@ Nanfang plus client è una piattaforma di informazioni online sviluppata e gesti
     <string name="About">Circa</string>
     <string name="are_you_sure_to_restore_factory_settings">Sei sicuro di ripristinare le impostazioni di fabbrica?</string>
     <string name="yes">SÌ</string>
+    <string name="easy">easy</string>
+    <string name="medium">medium</string>
+    <string name="hard">hard</string>
+
     <string name="restore_factory_settings">Ripristina impostazioni di fabbrica</string>
     <string name="network_wifi_status_connected_no_internet">Collegato, ma non in grado di accedere a Internet</string>
     <string name="network_wifi_status_saved">Salvato</string>

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

@@ -88,6 +88,10 @@
     <string name="About">About</string>
     <string name="are_you_sure_to_restore_factory_settings">Are you sure to restore factory settings?</string>
     <string name="yes">YES</string>
+    <string name="easy">easy</string>
+    <string name="medium">medium</string>
+    <string name="hard">hard</string>
+
     <string name="restore_factory_settings">Restore factory settings</string>
     <string name="delete_old_recipes">Do you want to delete the old recipes?</string>
     <string name="network_wifi_status_connected_no_internet">已连接，但无法访问互联网</string>

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

@@ -93,8 +93,11 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="About">About</string>
     <string name="are_you_sure_to_restore_factory_settings">Are you sure to restore factory settings?</string>
     <string name="yes">YES</string>
-    <string name="restore_factory_settings">Restore factory settings</string>
+    <string name="easy">easy</string>
+    <string name="medium">medium</string>
+    <string name="hard">hard</string>
 
+    <string name="restore_factory_settings">Restore factory settings</string>
     <string name="network_wifi_status_connected_no_internet">Connected， but unable to access the Internet</string>
     <string name="network_wifi_status_saved">Saved</string>
     <string name="network_wifi_status_idle" />

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

@@ -93,6 +93,10 @@
     <string name="About">O urządzeniu</string>
     <string name="are_you_sure_to_restore_factory_settings">Czy na pewno przywrócić ustawienia fabryczne?</string>
     <string name="yes">TAK</string>
+    <string name="easy">easy</string>
+    <string name="medium">medium</string>
+    <string name="hard">hard</string>
+
     <string name="restore_factory_settings">Przywracanie ustawień fabrycznych</string>
     <string name="network_wifi_status_connected_no_internet">Połączono, ale nie można uzyskać dostępu do Internetu</string>
     <string name="network_wifi_status_saved">Zapisano</string>

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

@@ -93,6 +93,10 @@ Nanfang mais cliente é uma plataforma de informação on-line desenvolvida e op
     <string name="About">Sobre</string>
     <string name="are_you_sure_to_restore_factory_settings">Tem a certeza de restaurar as configurações de fábrica?</string>
     <string name="yes">SIM</string>
+    <string name="easy">easy</string>
+    <string name="medium">medium</string>
+    <string name="hard">hard</string>
+
     <string name="restore_factory_settings">Restaurar as configurações de fábrica</string>
     <string name="network_wifi_status_connected_no_internet">Ligado, mas incapaz de aceder à Internet</string>
     <string name="network_wifi_status_saved">Gravado</string>

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

@@ -93,6 +93,11 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="About">About</string>
     <string name="are_you_sure_to_restore_factory_settings">Are you sure to restore factory settings?</string>
     <string name="yes">YES</string>
+
+    <string name="easy">easy</string>
+    <string name="medium">medium</string>
+    <string name="hard">hard</string>
+
     <string name="restore_factory_settings">Restore factory settings</string>
 
     <string name="network_wifi_status_connected_no_internet">Connected， but unable to access the Internet</string>

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

@@ -99,6 +99,10 @@
     <string name="About">O stránke</string>
     <string name="are_you_sure_to_restore_factory_settings">Ste si istí, že chcete obnoviť výrobné nastavenia?</string>
     <string name="yes">ÁNO</string>
+    <string name="easy">easy</string>
+    <string name="medium">medium</string>
+    <string name="hard">hard</string>
+
     <string name="restore_factory_settings">Obnovenie továrenských nastavení</string>
     <string name="network_wifi_status_connected_no_internet">Pripojený, ale bez prístupu na internet</string>
     <string name="network_wifi_status_saved">Uložené</string>

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

@@ -92,6 +92,10 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="About">About</string>
     <string name="are_you_sure_to_restore_factory_settings">Are you sure to restore factory settings?</string>
     <string name="yes">YES</string>
+    <string name="easy">easy</string>
+    <string name="medium">medium</string>
+    <string name="hard">hard</string>
+
     <string name="restore_factory_settings">Restore factory settings</string>
 
     <string name="network_wifi_status_connected_no_internet">Connected， but unable to access the Internet</string>

BusinessCommon/src/main/res/values-zh-rCN/strings.xml

@@ -93,6 +93,9 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="About">About</string>
     <string name="are_you_sure_to_restore_factory_settings">Are you sure to restore factory settings?</string>
     <string name="yes">YES</string>
+    <string name="easy">easy</string>
+    <string name="medium">medium</string>
+    <string name="hard">hard</string>
     <string name="restore_factory_settings">Restore factory settings</string>
     <string name="network_wifi_status_connected_no_internet">Connected， but unable to access the Internet</string>
     <string name="network_wifi_status_saved">Saved</string>

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

@@ -26,6 +26,7 @@ import com.develop.base.ext.setGone
 import com.develop.base.ext.setVisible
 import com.develop.base.ext.updateText
 import com.develop.base.mvvm.BaseBindingActivity
+import com.develop.base.util.AppActivityManager
 import com.develop.base.util.MMkvUtils
 import com.develop.base.util.SerialportUtils
 import com.develop.common.data_repo.db.DataFactory
@@ -157,10 +158,11 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
                             val pm = getSystemService(Context.POWER_SERVICE) as PowerManager
                             pm.reboot("")
                         } else if (isFromSetting) {
-                            //由于食谱问题，这边优化了重启 010D的
-                            val pm = getSystemService(Context.POWER_SERVICE) as PowerManager
-                            pm.reboot("")
-//                            finish()
+                            //由于不可以重启，估把Activity管理器里面的activity全部finish，重新打开首页
+                            AppActivityManager.getInstance().activityList().forEach {
+                                it.finish()
+                            }
+                            navigateTo(Screens.Main.ENTRANCE_CHOSEN)
                         }
                     }
                 }

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

@@ -491,7 +491,9 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         }
 
         binding.tvFoodTime.text = timeDescBuilder.toString()
-        binding.tvEasy.text = resources.getString(resources.getIdentifier(detail.recipe.difficultyLevel, "easy", this.packageName))
+        detail.recipe.difficultyLevel?.let {
+            binding.tvEasy.text = resources.getString(resources.getIdentifier(detail.recipe.difficultyLevel?:"easy", "string", this.packageName))
+        }
         binding.startLayout.setCommentNumber(detail.recipe.useNum.toString())
         FoodDataProvider.getUserDatabase().runInTransaction {
             val result = FoodDataProvider.getUserDatabase().userInfoDao()

app/build.gradle

@@ -78,6 +78,7 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
         }
 
         brand000A5067Tuya {
@@ -90,6 +91,7 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
         }
 
         brand045ATuya {
@@ -101,6 +103,7 @@ android {
             buildConfigField("String", "brandCode", "\"045A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
         }
 
 //        brand011ATuya {
@@ -120,6 +123,7 @@ android {
             buildConfigField("String", "brandCode", "\"011A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
 
         }
         brand011A5037Tuya {
@@ -129,6 +133,10 @@ android {
             resValue("string", "app_theme", "@style/Splash011A5037Theme")
             buildConfigField("String", "model", "\"5037\"")
             buildConfigField("String", "brandCode", "\"011A\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+//            buildConfigField("String", "appCode", "\"2.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
         }
         brand014ATuya {
             dimension "platform"
@@ -140,6 +148,8 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+
         }
 
         brand017ATuya {
@@ -147,7 +157,10 @@ android {
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
             resValue("string", "app_theme", "@style/Splash017Theme")
-
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+//            buildConfigField("String", "appCode", "\"2.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
         }
 
         brand030ATuya {
@@ -160,6 +173,8 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+
 
         }
 
@@ -168,7 +183,9 @@ android {
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
             resValue("string", "app_theme", "@style/Splash029CTheme")
-
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
         }
 
 
@@ -177,6 +194,9 @@ android {
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"036I\"")
             resValue("string", "app_theme", "@style/Splash036IDTheme")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
 
         }
 
@@ -189,6 +209,7 @@ android {
             buildConfigField("String", "brandCode", "\"036I\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
         }
 
 
@@ -202,6 +223,7 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
         }
         brand033GTuya {
             dimension "platform"
@@ -213,6 +235,7 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
         }
 
         brand000A {
@@ -224,6 +247,7 @@ android {
             buildConfigField("String", "brandCode", "\"000A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
         }
 
         brand010D {
@@ -235,6 +259,7 @@ android {
             buildConfigField("String", "brandCode", "\"010D\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
         }
         brand010F {
             dimension "platform"
@@ -281,6 +306,7 @@ android {
             buildConfigField("String", "brandCode", "\"030A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
         }
 
         brand032DTuya {
@@ -293,6 +319,7 @@ android {
             buildConfigField("String", "brandCode", "\"032D\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
 
         }
         brand032D {
@@ -300,18 +327,28 @@ android {
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
             resValue("string", "app_theme", "@style/Splash032DTheme")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+
         }
         brand002DTuya {
             dimension "platform"
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
             resValue("string", "app_theme", "@style/Splash002DTheme")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
         }
         brand007DTuya {
             dimension "platform"
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
             resValue("string", "app_theme", "@style/Splash007DTheme")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
         }
 
         brand054ATuya {
@@ -319,6 +356,9 @@ android {
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"054A\"")
             resValue("string", "app_theme", "@style/Splash054ATheme")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
         }
 
         brand062ATuya {
@@ -330,6 +370,7 @@ android {
             buildConfigField("String", "brandCode", "\"062A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
 //            buildConfigField("String", "appCode", "\"2.01\"")
         }
         brand063ATuya {
@@ -341,6 +382,7 @@ android {
             buildConfigField("String", "brandCode", "\"063A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
 //            buildConfigField("String", "appCode", "\"2.01\"")
         }
     }

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

@@ -96,6 +96,8 @@ class FoodCookingApp : BaseApp() {
 
 
         WindowManager.getInstance().init(this, OptionFactory())
+
+
         setAppCode(BuildConfig.appCode)
         val isNight = BuildConfig.UpdatePlatform.equals("night")
         val is062 = BuildConfig.UpdatePlatform.equals("062A")
@@ -104,11 +106,9 @@ class FoodCookingApp : BaseApp() {
         setIsBrand054A(BuildConfig.UpdatePlatform.equals("054A"))
         setIsBrand011A(is011)
         setIsBrand062(is062)
-//        if (BuildConfig.brandCode.startsWith("010")){
-//            MMkvUtils.save("appTime", BuildConfig.time)
-//        }
-
-
+        if (BuildConfig.brandCode.startsWith("010")) {
+            MMkvUtils.save("appTime", BuildConfig.time)
+        }
         if (is062) {
             ResourceUtils.copyFileFromAssets(
                 ASSETS_BLUE_SKIN_PACK,
@@ -138,6 +138,31 @@ class FoodCookingApp : BaseApp() {
         CofarSDK.register(this)
         CofarSDK.stopNative()
 
+
+        //开个子线程处理事务
+        Thread {
+            val md5 = getOtaFileMd5()
+            val sn = getSN()
+            val zipMd5 = StringUtils.getFileMD5("system/media/cofa_cooking.zip")
+            //处理ota食谱更新问题
+            if (sn.startsWith("010") && (md5.isEmpty() || md5 != zipMd5)) {
+                /**
+                 *  如果MD5的值不存在，重新解压
+                 *  如果MD5的值不一样的，就代表食谱包已经重新更新
+                 *  需要先删除sd卡目录下的cofa文件，再重新解压
+                 * */
+                FileUtils.delete(File(Environment.getExternalStorageDirectory(), "cofa_cooking"))
+                FileUtils.delete(File(Environment.getExternalStorageDirectory(), "success.lock"))
+
+                FoodDataProvider.prepareData(this)
+            } else {
+                FoodDataProvider.prepareData(this)
+            }
+            //010 每一次都把md5的值set进去
+            if (sn.startsWith("010")) {
+                setOtaFileMd5(StringUtils.getFileMD5("system/media/cofa_cooking.zip"))
+            }
+        }.start()
 //        val powerManager = getSystemService(POWER_SERVICE) as PowerManager
 //        val wakeLock: PowerManager.WakeLock =
 //            powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "motionDetection:keepAwake")
@@ -169,28 +194,7 @@ class FoodCookingApp : BaseApp() {
             )
         }.start()
 
-        var md5 = getOtaFileMd5()
-        var sn  = getSN()
-        var zipMd5 = StringUtils.getFileMD5("system/media/cofa_cooking.zip")
-        //处理ota食谱更新问题
-        if (sn.startsWith("010")
-            && md5.isNotEmpty()
-            && md5 != zipMd5
-            ){
-            /**
-             *  如果MD5的值不一样的，就代表食谱包已经重新更新
-             *  需要先删除sd卡目录下的cofa文件，再重新解压
-             * */
-            FileUtils.delete(File(Environment.getExternalStorageDirectory(),"cofa_cooking"))
-
-            FoodDataProvider.prepareData(this)
-        }else{
-            FoodDataProvider.prepareData(this)
-        }
-        //010 每一次都把md5的值set进去
-        if (sn.startsWith("010")){
-            setOtaFileMd5(StringUtils.getFileMD5("system/media/cofa_cooking.zip"))
-        }
+
     }
 
 
@@ -253,7 +257,7 @@ class FoodCookingApp : BaseApp() {
     override fun attachBaseContext(base: Context?) {
         super.attachBaseContext(base)
         //把这个方法放到onCreate 处理ota问题
-        FoodDataProvider.prepareData(this)
+//        FoodDataProvider.prepareData(this)
     }