合并文件上传

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

@@ -910,17 +910,27 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                             }
 
                             EntranceType.download_new_recipes -> {
-                                if (FoodDataProvider.checkDataExit()) {
-                                    val bundle = Bundle()
-                                    bundle.putInt(MODE_ENTRANCE, Recipes)
-                                    bundle.putInt(RECIPES_TYPE, NetFood)
-                                    bundle.putString(HOME_TITLE, title)
-                                    navigateTo(Screens.Main.HOME) {
-                                        with(bundle)
+
+                                if (NetworkUtils.isWifiConnected()) {
+                                    if (!AppVersionUtil.dialogRecipeUpdate.isShow) {
+                                        AppVersionUtil.checkAboutRecipeUpdate(true)
                                     }
                                 } else {
-                                    showLoading()
+                                    GlobalToast.showToast(getString(com.develop.common.R.string.network_error))
+
                                 }
+
+//                                if (FoodDataProvider.checkDataExit()) {
+//                                    val bundle = Bundle()
+//                                    bundle.putInt(MODE_ENTRANCE, Recipes)
+//                                    bundle.putInt(RECIPES_TYPE, NetFood)
+//                                    bundle.putString(HOME_TITLE, title)
+//                                    navigateTo(Screens.Main.HOME) {
+//                                        with(bundle)
+//                                    }
+//                                } else {
+//                                    showLoading()
+//                                }
                             }
                         }
                     }

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

@@ -59,7 +59,9 @@ class TuyaActivity : CommonBindingActivity<ActivityTuyaBinding>() {
         binding.ivTuyaClose.setOnClickListener {
             finish()
         }
-
+        if (baseSn.startsWith("011F")){
+            binding.tuyaBg.background = resources.getDrawable(com.develop.common.R.drawable.home_bg_011_f)
+        }
         var isTuya = MMkvUtils.getBool(ISTUYA, false)
         if (isTuya){
             binding.tvTitle.updateText(getString(com.develop.common.R.string.tuya_app_title))

BusinessSetting/src/main/res/layout/activity_tuya.xml

@@ -5,6 +5,7 @@
     android:background="@color/bg_color"
     android:layout_height="match_parent"
     android:layoutDirection="ltr"
+    android:id="@+id/tuya_bg"
     >
 
     <ImageView

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

@@ -302,6 +302,9 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             binding.viewHide.visibility = View.INVISIBLE
             binding.tvEasy.visibility = View.VISIBLE
         }
+        if (sn.startsWith("011F")){
+            binding.cookLayout.background = resources.getDrawable(com.develop.common.R.drawable.home_bg_011_f)
+        }
         if (sn.startsWith("017A") || sn.startsWith("062A") || sn.startsWith("029")) {
             if (sn.startsWith("029")) {
                 binding.viewIcon3.visibility = View.VISIBLE