Merge branch 'master' of https://git.kuyuntech.com/developer/FoodCooking_LandScape

 Conflicts:

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

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

@@ -211,6 +211,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="running_block_tips">Please stop the running program and start new programs.</string>
     <string name="unset_target_time">Time has not been set.</string>
     <string name="empty_notice">Empty Notice</string>
+    <string name="network_error">network error</string>
 
 
 </resources>

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

@@ -253,4 +253,5 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="smoothie">SMOOTHIE</string>
     <string name="sovs_vide">SOVS VIDE</string>
     <string name="auto_clean">Nettoyage</string>
+    <string name="network_error">network error</string>
 </resources>

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

@@ -148,4 +148,5 @@
     <string name="Download_new_recipes">DOWNLOAD NEW RECIPES</string>
     <string name="press_the_button">Press the button</string>
     <string name="empty_notice">Empty Notice</string>
+    <string name="network_error">network error</string>
 </resources>

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

@@ -148,4 +148,5 @@
     <string name="Download_new_recipes">DOWNLOAD NEW RECIPES</string>
     <string name="press_the_button">Press the button</string>
     <string name="empty_notice">Empty Notice</string>
+    <string name="network_error">network error</string>
 </resources>

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

@@ -260,6 +260,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="smoothie">SMOOTHIE</string>
     <string name="sovs_vide">SOVS VIDE</string>
     <string name="auto_clean">AUTO CLEAN</string>
+    <string name="network_error">network error</string>
 
 
 </resources>

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

@@ -526,7 +526,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
                 loadingDialog.removeSelf()
             }
             errorCallback.observe(viewLifecycleOwner){
-                GlobalToast.showToast("network error")
+                GlobalToast.showToast(getString(com.develop.common.R.string.network_error))
                 loadingDialog.removeSelf()
             }
         }