提交人：jtm

提交内容:优化

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

@@ -7,6 +7,7 @@ import com.develop.base.ext.fromJson
 import com.develop.base.util.FileKit
 import com.develop.base.util.TopResumedAtyHolder
 import com.develop.common.data_repo.FoodDataProvider
+import com.develop.common.data_repo.db.entity.DevVersion
 import com.develop.common.data_repo.net.Api
 import com.develop.common.data_repo.net.model.request.DeviceInfoBody
 import com.develop.common.data_repo.net.model.response.DevInfoResult
@@ -45,7 +46,8 @@ object AppVersionUtil {
                         }
                     dialog.showNoUpdateTips(supportFragmentManager, "RECIPE_UPDATE_DIALOG")
 
-                } else {
+                }
+                if (newRecipes.isNotEmpty()) {
                     val dialog = RecipeUpdateDialog()
                     dialog.onDialogClickListener =
                         object : RecipeUpdateDialog.OnDialogClickListener {
@@ -68,7 +70,6 @@ object AppVersionUtil {
                         supportFragmentManager, "RECIPE_UPDATE_DIALOG", newRecipes.size.toLong()
                     )
                 }
-
             }
 
         }
@@ -178,10 +179,9 @@ object AppVersionUtil {
                 onDialogClickListener = object : RecipeUpdateDialog.OnDialogClickListener {
                     override fun onConfirm() {
                         val v = FoodDataProvider.getUserDatabase().devConfigDao().recipeVersion()
-                        v?.apply {
-                            v.recipeUpdateTime = recipeUpdateTime
-                            FoodDataProvider.getUserDatabase().devConfigDao().saveDevVersion(v)
-                        }
+                            ?: DevVersion(0, 0)
+                        v.recipeUpdateTime = recipeUpdateTime
+                        FoodDataProvider.getUserDatabase().devConfigDao().saveDevVersion(v)
                         removeSelf()
                     }
 

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

@@ -13,6 +13,7 @@ import com.develop.common.dialog.LoadingDialog
 import com.develop.common.router.Screens
 import com.develop.common.tag.*
 import com.develop.common.ui.CommonBindingActivity
+import com.develop.common.utils.AppVersionUtil
 import com.develop.common.widget.EntranceData
 import com.develop.common.widget.EntranceItemView
 import com.develop.common.widget.EntranceType
@@ -107,6 +108,11 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
         }.models = DataFactory.getEntranceData()
     }
 
+    override fun onResume() {
+        super.onResume()
+        AppVersionUtil.checkRecipeUpdate(false)
+    }
+
 
     override fun onDestroy() {
         super.onDestroy()

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

@@ -21,7 +21,6 @@ class FoodCookingApp : BaseApp() {
         super.onCreate()
         CofarSDK.register(this)
         SerialPortUtils.init()
-        AppVersionUtil.checkRecipeUpdate()
     }
 
     override fun createHostUrl(): String {