Browse Source

在线食谱下载问题

zhangshenjie 1 year ago
parent
commit
f2e4e20034

+ 2 - 6
BusinessStep/src/main/java/com/develop/step/viewmodel/CookDetailViewModel.kt

@@ -226,14 +226,10 @@ class CookDetailViewModel : BaseViewModel() {
                      * **/
                     contentData.devRecipes.forEach {
                         var number = it.number ?: ""
-                        var devRecipe =
-                            FoodDataProvider.getDatabase().recipeDao().queryRecipe(number)
-                        if (devRecipe != null) {
-                            deleteRecipe(devRecipe)
-                        }
+                        var lang = it.lang ?:"EN"
+                        deleteNumAndLangRecipe(number,lang)
                     }
 //                    deleteRecipe(recipeNumber)
-
                     insertDevAccessorys(contentData.devAccessorys)
                     insertHotTags(contentData.devHotTags)
                     insertDevPortraits(contentData.devPortraits)

+ 2 - 2
app/build.gradle

@@ -287,10 +287,10 @@ android {
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
             resValue("string", "app_theme", "@style/SplashTheme")
             buildConfigField("String", "model", "\"1039\"")
-            buildConfigField("String", "brandCode", "\"032D\"")
+            buildConfigField("String", "brandCode", "\"017A\"")
             //versionCode 1.01 指向bug修复,2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "appCode", "\"2.01\"")
+//            buildConfigField("String", "appCode", "\"2.01\"")
 
 
 //            resValue("string", "app_theme", "@style/SplashTheme")

+ 2 - 1
libBase/src/main/java/com/develop/base/ext/GlobaExt.kt

@@ -214,9 +214,10 @@ fun getSN(): String {
 //    return "036I21060020123010190003"
 //    return  "030A10390020123010190001"
 //    return  "017A20060020123010190001"
+        return  "017A10390020123010190001"
 //    return "010D10390020123010190001"
 //    return "000A10390020123010190009"
-    return  "032D21060020123010190001"
+//    return  "032D21060020123010190001"
 //        return "000A50370020123010190011"
 //    return  "030A10390020123010190002"
 //        return "029C21010020123010190001"