011 029 问题优化

BusinessAuth/src/main/java/com/develop/auth/ui/MemberAuthActivity.kt

@@ -3,6 +3,8 @@ package com.develop.auth.ui
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
+import android.widget.FrameLayout
+import android.widget.RelativeLayout
 import androidx.fragment.app.Fragment
 import com.alibaba.android.arouter.facade.annotation.Autowired
 import com.alibaba.android.arouter.facade.annotation.Route
@@ -11,6 +13,7 @@ import com.develop.auth.R
 import com.develop.auth.databinding.ActivityMemberAuthBinding
 import com.develop.auth.viewmodel.FragmentTag
 import com.develop.auth.viewmodel.MemberViewModel
+import com.develop.base.ext.dimenRes
 import com.develop.base.ext.getSN
 import com.develop.base.ext.isBrand011A
 import com.develop.base.ext.isBrand036I
@@ -24,6 +27,7 @@ import com.develop.base.util.MMkvUtils
 import com.develop.common.router.Screens
 import com.develop.common.tag.LOGIN_TAG
 import com.develop.common.ui.CommonBVMActivity
+import com.develop.common.utils.ScreenSizeUtils
 
 @Route(path = Screens.Auth.MEMBER)
 class MemberAuthActivity : CommonBVMActivity<ActivityMemberAuthBinding, MemberViewModel>() {
@@ -64,7 +68,11 @@ class MemberAuthActivity : CommonBVMActivity<ActivityMemberAuthBinding, MemberVi
         } else if (sn.startsWith("002D")) {
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_002d)
         } else if (sn.startsWith("011")) {
-            binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_011a)
+            var params = FrameLayout.LayoutParams(
+                ScreenSizeUtils.getScreenWidthSize(this@MemberAuthActivity),
+                FrameLayout.LayoutParams.MATCH_PARENT)
+            binding.ivBanner.layoutParams = params
+            binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_011a)
         } else if (isBrand054A()) {
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_054a)
         } else if (isBrand062()) {

BusinessCommon/src/main/java/com/develop/common/data_repo/db/DataFactory.kt

@@ -517,9 +517,10 @@ val dataSn = getSN()
             "A-Z",
             resource.getString(R.string.newest),
         )
+        //处理011隐藏最受欢迎分类  R.string.most_popular
         else if (sn.startsWith("011"))mutableListOf(
             resource.getString(R.string.all_name),
-            resource.getString(R.string.most_popular),
+//            resource.getString(R.string.most_popular),
             resource.getString(R.string.newest),
         ) else mutableListOf(
             "A-Z",
@@ -690,6 +691,14 @@ val dataSn = getSN()
         R.drawable.entrance_bg_4
     )
 
+    private var bg029ResIds = arrayListOf<Int>(
+        R.drawable.entrance_bg_029_1,
+        R.drawable.entrance_bg_029_2,
+        R.drawable.entrance_bg_029_3,
+        R.drawable.entrance_bg_029_4
+    )
+
+
     private var bg036IResIds = arrayListOf<Int>(
         R.drawable.entrance_036i_bg_1,
         R.drawable.entrance_036i_bg_2,
@@ -751,8 +760,8 @@ val dataSn = getSN()
 
     private var icon029cResIds = arrayListOf<Int>(
         R.drawable.entrance_icon_1,
-        R.drawable.entrance_icon_2,
         R.drawable.entrance_icon_3,
+        R.drawable.entrance_icon_2,
         R.drawable.entrance_icon_4
     )
     private var titleStrIds = mutableListOf<Int>(

BusinessCommon/src/main/java/com/develop/common/dialog/OverrideModeDialog.kt

@@ -0,0 +1,87 @@
+package com.develop.common.dialog
+
+import android.os.Bundle
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.RelativeLayout
+import com.develop.base.mvvm.FullScreenTransparentDialog
+import com.develop.common.databinding.DialogCancelConfirmBinding
+import org.greenrobot.eventbus.EventBus
+
+
+class OverrideModeDialog(
+) : FullScreenTransparentDialog() {
+
+    lateinit var binding: DialogCancelConfirmBinding
+
+    var title = ""
+    var cancelStr = ""
+    var confirmStr = ""
+    var showConfirm = true
+    var showCancel = true
+    var onDialogClickListener: OnDialogClickListener? = null
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+    ): View {
+        binding = DialogCancelConfirmBinding.inflate(
+            inflater, container, false
+        )
+        binding.tvYes.setOnClickListener {
+            onDialogClickListener?.onConfirm()
+            removeSelf()
+        }
+        binding.tvCancel.setOnClickListener {
+            onDialogClickListener?.onCancel()
+            removeSelf()
+        }
+        binding.tvTitle.text = title
+        if (cancelStr.isNotEmpty()) {
+            binding.tvCancel.text = cancelStr
+        }
+        if (confirmStr.isNotEmpty()) {
+            binding.tvYes.text = confirmStr
+        }
+
+        //只显示确认按钮
+        if (showConfirm && !showCancel) {
+            binding.tvCancel.visibility = View.GONE;
+            binding.tvYes.visibility = View.VISIBLE;
+            val layoutParams = binding.tvYes.layoutParams as RelativeLayout.LayoutParams;
+            layoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL)
+            binding.tvCancel.layoutParams = layoutParams
+        }
+
+        if (!showConfirm && showCancel) {
+            binding.tvYes.visibility = View.GONE;
+            binding.tvCancel.visibility = View.VISIBLE;
+            val layoutParams = binding.tvCancel.layoutParams as RelativeLayout.LayoutParams;
+            layoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL)
+            binding.tvCancel.layoutParams = layoutParams
+        }
+        //监听旋钮点击回调
+        setOnKeyFun(object : onKeyFun {
+            override fun onType() {
+                if (binding.tvYes.visibility == View.VISIBLE) {
+                    binding.tvYes.performClick() //默认点击控件
+                } else if (binding.tvCancel.visibility == View.VISIBLE) {
+                    binding.tvCancel.performClick()
+                }
+
+
+            }
+        })
+
+
+        return binding.root
+    }
+    fun onConfirmClick(){
+        binding.tvYes.callOnClick()
+    }
+
+    interface OnDialogClickListener {
+        fun onConfirm()
+        fun onCancel()
+    }
+}

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

@@ -0,0 +1,29 @@
+package com.develop.common.utils
+
+import android.content.Context
+import com.develop.base.ext.dimenRes
+
+object ScreenSizeUtils {
+
+    fun  getScreenWidthSize(context: Context):Int{
+        var defWidth = when (StringUtils.getScreenSize(context)) {
+            5 -> {
+                dimenRes(com.develop.common.R.dimen.convert_430px)
+            }
+
+            7 -> {
+                dimenRes(com.develop.common.R.dimen.convert_450px)
+            }
+
+            10 -> {
+                dimenRes(com.develop.common.R.dimen.convert_460px)
+            }
+
+            else -> {
+                dimenRes(com.develop.common.R.dimen.convert_450px)
+            }
+        }
+
+        return  defWidth;
+    }
+}

BusinessCommon/src/main/java/com/develop/common/utils/StringUtils.java

@@ -1,5 +1,6 @@
 package com.develop.common.utils;
 
+import static com.develop.base.ext.GlobaExtKt.dimenRes;
 import static com.develop.common.utils.TuyaUtils.TAG;
 
 import android.app.ActivityManager;
@@ -47,6 +48,7 @@ public class StringUtils {
         }
     }
 
+
     public static int getScreenSize(Context context) {
         DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
         float width = displayMetrics.widthPixels / displayMetrics.density;

BusinessCommon/src/main/java/com/develop/common/widget/DirectionView.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import android.widget.FrameLayout
+import com.develop.base.ext.getSN
 import com.develop.common.R
 import com.develop.common.databinding.DirectionViewBinding
 
@@ -11,9 +12,8 @@ import com.develop.common.databinding.DirectionViewBinding
 class DirectionView : FrameLayout {
 
     private var binding: DirectionViewBinding
-
-
     var onDirectionClickListener: OnDirectionClickListener? = null
+    private var sn = getSN()
 
     constructor(context: Context) : super(context) {}
     constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
@@ -40,6 +40,12 @@ class DirectionView : FrameLayout {
             updateDirectionView(Direction.LEFT)
             onDirectionClickListener?.onDirectionClick(Direction.LEFT)
         }
+        if (sn.startsWith("011")){
+            //由于之前声明控件有问题，需要详细看
+            binding.tvTurnRight.text = resources.getString(R.string.turn_left_011)
+            binding.tvTurnLeft.text = resources.getString(R.string.turn_right_011)
+        }
+
     }
 
     fun updateDirectionView(direction: Direction) {

BusinessCommon/src/main/res/layout/food_content_view.xml

@@ -89,6 +89,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/convert_6px"
         android:orientation="horizontal"
+        android:layout_marginStart="@dimen/convert_18px"
         app:layout_constraintTop_toBottomOf="@+id/tv_time_and_level"
 
         >
@@ -97,15 +98,14 @@
             android:id="@+id/star_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/convert_22px"
             android:visibility="gone"
+            android:layout_marginStart="@dimen/convert_4px"
             />
 
         <ImageView
             android:id="@+id/iv_content_new"
             android:layout_width="@dimen/convert_26px"
             android:layout_height="@dimen/convert_26px"
-            android:layout_marginStart="@dimen/convert_22px"
             android:src="@drawable/recipe_content_new"
             android:visibility="gone"
             />
@@ -116,8 +116,6 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:visibility="gone"
-        android:layout_marginStart="@dimen/convert_22px"
-
         >
         <View
             android:layout_width="@dimen/convert_40px"

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

@@ -85,6 +85,9 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="tuya_sn_title">Cobotmix</string>
     <string name="tuya_sn_content">Please use cobotmix app to scan the QR code</string>
 
+    <string name="current_cooking_dialog_title">Overwrite current cooking process?\nBy overwriting,your current progress will got lost.</string>
+
+
     <string name="weight">WEIGHT</string>
     <string name="local_recipes">Local recipes</string>
     <string name="download">Download</string>
@@ -93,8 +96,6 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="search">Search</string>
     <string name="all_name">Alphabetical (A-Z)</string>
     <string name="most_popular">Most popular</string>
-
-
     <string name="newest">Newest</string>
     <string name="the_most_commonly_searched">The most commonly searched</string>
     <string name="notice">Notice</string>

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

@@ -63,9 +63,7 @@
     <string name="enter_search">Wprowadź dane wyszukiwania</string>
     <string name="search">Wyszukiwanie</string>
     <string name="all_name">Alfabetycznie (A-Z)</string>
-
     <string name="most_popular">Najpopularniejsze</string>
-
     <string name="newest">Najnowsze</string>
     <string name="the_most_commonly_searched">Najczęściej wyszukiwane</string>
     <string name="notice">Uwaga</string>
@@ -101,6 +99,7 @@
     <string name="hard">hard</string>
     <string name="srl_footer_finish">Załadowano</string>
     <string name="srl_footer_loading">Ładowanie…</string>
+    <string name="current_cooking_dialog_title">Czy na pewno chcesz zatrzymać program uruchomiony za kulisami i uruchomić program na bieżącej stronie?</string>
 
 
     <string name="restore_factory_settings">Przywracanie ustawień fabrycznych</string>
@@ -379,8 +378,8 @@
     <string name="tare_011">Zeruj</string>
     <string name="note_title_011">Moje notatki</string>
 
-    <string name="turn_left_011">W lewo</string>
-    <string name="turn_right_011">W prawo</string>
+    <string name="turn_left_011">Lewo</string>
+    <string name="turn_right_011">Prawo</string>
 
 
     <string name="preparation_011">Przygotowanie:</string>

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

@@ -2,6 +2,7 @@
 <resources>
     <dimen name="convert_78px_negative">-39.0dp</dimen>
     <dimen name="convert_40px_negative">-20.0dp</dimen>
+    <dimen name="convert_2px_negative">-2.0dp</dimen>
     <dimen name="convert_0px">0.0dp</dimen>
     <dimen name="convert_1px">0.5dp</dimen>
     <dimen name="convert_2px">1.0dp</dimen>

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

@@ -74,6 +74,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="tuya_app_content">Please use app (with Tuya ) to scan the QR code</string>
     <string name="tuya_sn_title">Cobotmix</string>
     <string name="tuya_sn_content">Please use cobotmix app to scan the QR code</string>
+    <string name="current_cooking_dialog_title">Overwrite current cooking process?\nBy overwriting,your current progress will got lost.</string>
     <string name="weight">WEIGHT</string>
     <string name="local_recipes">Local recipes</string>
     <string name="download">Download</string>
@@ -83,7 +84,6 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="all_name">Alphabetical (A-Z)</string>
     <string name="most_popular">Most popular</string>
 
-
     <string name="newest">Newest</string>
     <string name="the_most_commonly_searched">The most commonly searched</string>
     <string name="notice">Notice</string>

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

@@ -88,7 +88,7 @@
 
     <style name="Splash011ATheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- 这里的trans自己写一个#00000000即可-->
-        <item name="android:windowBackground">@drawable/ic_screensaver_011a</item>
+        <item name="android:windowBackground">@drawable/ic_screensaver_011a_app</item>
 <!--        <item name="android:windowBackground">@color/color_fff</item>-->
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>

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

@@ -22,6 +22,7 @@ import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.isBrand054A
 import com.develop.base.ext.isFrLanguage
 import com.develop.base.ext.isNightTheme
+import com.develop.base.ext.load
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.src
 import com.develop.base.ext.updateText
@@ -407,7 +408,8 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                     onBind {
                         val model = getModel<EntranceData>()
                         findView<AppCompatTextView>(com.develop.common.R.id.tv_title).setText(model.titleStrId)
-                        findView<ImageView>(com.develop.common.R.id.ic_icon).src = model.iconResId
+//                        findView<ImageView>(com.develop.common.R.id.ic_icon).src = model.iconResId
+                        findView<ImageView>(com.develop.common.R.id.iv_bg).load(model.bgResId)
                     }
                     R.id.content_view.onClick {
                         val clickModel = getModel<EntranceData>()

BusinessMain/src/main/java/com/develop/main/viewmodel/HomeViewModel.kt

@@ -154,8 +154,8 @@ class HomeViewModel : BaseViewModel() {
                         .queryRecipesByCategoryStartLetter(categoryNum, letter)
                         .toMutableList()
                 }
-            //如果首字母没有的情况下，再获取包含
-            if (totalLocalRecipes.isEmpty()) {
+            //如果首字母没有的情况下，再获取包含  --- 011客户不需要包含
+            if (totalLocalRecipes.isEmpty()&&!snModel.startsWith("011")) {
                 totalLocalRecipes =
                     if (categoryNum == globalApp().getString(com.develop.common.R.string.all)) FoodDataProvider.getDatabase()
                         .recipeDao()

BusinessMain/src/main/res/layout/item_entrance_029c.xml

@@ -5,18 +5,22 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/convert_365px"
     android:layout_margin="@dimen/convert_5px"
-    android:background="@drawable/home_item_bg_029"
     tools:ignore="MissingDefaultResource"
 
     >
+    <ImageView
+        android:id="@+id/iv_bg"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
 
+        />
 
     <ImageView
         android:id="@+id/ic_icon"
         android:layout_width="@dimen/convert_140px"
         android:layout_height="@dimen/convert_140px"
-        android:layout_centerInParent="true"
-        android:layout_centerVertical="true" />
+        android:visibility="gone"
+        android:layout_centerInParent="true" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_title"

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

@@ -242,11 +242,12 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
             }else if (sn.startsWith("011")){
 
                 ivLogoParam.apply {
-                    width = dimenRes(com.develop.common.R.dimen.convert_321px)
-                    height = dimenRes(com.develop.common.R.dimen.convert_95px)
+                    width = dimenRes(com.develop.common.R.dimen.convert_320px)
+                    height = dimenRes(com.develop.common.R.dimen.convert_130px)
                     marginStart = dimenRes(com.develop.common.R.dimen.convert_135px)
                 }
-                binding.ivLogo.setBackgroundResource(com.develop.common.R.drawable.ic_logo_011)
+                binding.ivLogo.background = null
+                binding.ivLogo.setImageResource(com.develop.common.R.drawable.ic_logo_011)
 //                ivLogoParam.width = dimenRes(com.develop.common.R.dimen.convert_180px)
 //                ivLogoParam.height = dimenRes(com.develop.common.R.dimen.convert_180px)
             }
@@ -275,7 +276,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         }
         binding.ivLogo.layoutParams = ivLogoParam
         binding.icUpdate.layoutParams = ivUpdateParam
-        binding.tvTitle.updateText(getString(com.develop.common.R.string.About))
+        binding.tvTitle.updateText(getString(com.develop.common.R.string.about))
         binding.ivClose.setOnClickListener {
 //            var file = File(Environment.getExternalStorageDirectory(),"text.txt")
 //
@@ -629,6 +630,8 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         viewModel.getDevInfo()
     }
 
+
+
     override fun onDestroy() {
         super.onDestroy()
         commonDialog.removeSelf()

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

@@ -47,7 +47,7 @@ class BrightnessActivity : CommonBindingActivity<ActivityBirghtnessBinding>() {
             binding.tvScreenLockTime.visibility = View.INVISIBLE
             binding.tvTitle.updateText(getString(com.develop.common.R.string.brightness_011))
         }else{
-            binding.tvTitle.updateText(getString(com.develop.common.R.string.Brightness))
+            binding.tvTitle.updateText(getString(com.develop.common.R.string.brightness))
         }
 
         binding.rb3Min.text =  "   " + resources.getString(com.develop.common.R.string.time_5min)

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

@@ -14,6 +14,7 @@ import androidx.appcompat.widget.AppCompatTextView
 import com.develop.base.ext.load
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.blankj.utilcode.util.LanguageUtils
+import com.develop.base.ext.dimenRes
 import com.develop.base.ext.getSN
 import com.develop.base.ext.isBrand011A
 import com.develop.base.ext.isBrand036I
@@ -36,6 +37,7 @@ import com.develop.common.router.Screens
 import com.develop.common.tag.*
 import com.develop.common.dialog.CancelConfirmDialog
 import com.develop.common.utils.ConfigUtils
+import com.develop.common.utils.ScreenSizeUtils
 import com.develop.setting.R
 import com.develop.setting.databinding.ActivityLanguageBinding
 import com.drake.brv.utils.bindingAdapter
@@ -79,6 +81,9 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
             binding.ivLogo.setGone()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_062a)
         } else if (is011) {
+            binding.ivBanner.background = null
+            var params = RelativeLayout.LayoutParams(ScreenSizeUtils.getScreenWidthSize(this@LanguageActivity),RelativeLayout.LayoutParams.MATCH_PARENT)
+            binding.ivBanner.layoutParams = params
             binding.ivLogo.setGone()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_011a)
         } else if (getSN().startsWith("045")) {

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

@@ -5,8 +5,10 @@ import android.view.LayoutInflater
 import android.view.View
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import android.widget.RelativeLayout
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.develop.base.ext.background_drawable
+import com.develop.base.ext.dimenRes
 import com.develop.base.ext.getSN
 import com.develop.base.ext.isBrand011A
 import com.develop.base.ext.isBrand036I
@@ -26,6 +28,7 @@ import com.develop.common.router.Screens
 import com.develop.common.tag.CURRENT_LANGUAGE
 import com.develop.common.tag.EN
 import com.develop.common.tag.POLICY_FROM_MAIN_SETTING
+import com.develop.common.utils.ScreenSizeUtils
 import com.develop.common.utils.TimeDownUtil
 import com.develop.setting.databinding.ActivityPrivacePolicyBinding
 import org.greenrobot.eventbus.Subscribe
@@ -65,7 +68,13 @@ class PrivacyPolicyActivity : BaseBindingActivity<ActivityPrivacePolicyBinding>(
         }else if (sn.startsWith("045")){
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_045a)
         }else if (sn.startsWith("011")){
+            binding.ivBanner.background = null
+            var params = RelativeLayout.LayoutParams(
+                ScreenSizeUtils.getScreenWidthSize(this@PrivacyPolicyActivity),
+                RelativeLayout.LayoutParams.MATCH_PARENT)
+            binding.ivBanner.layoutParams = params
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_011a)
+
         }else if (sn.startsWith("029")) {
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_029c)
         }

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

@@ -40,7 +40,7 @@ class RestoreActivity : CommonBindingActivity<ActivityRestoreBinding>() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding.tvTitle.updateText(getString(com.develop.common.R.string.restore_factory_settings))
+        binding.tvTitle.updateText(getString(com.develop.common.R.string.reset))
         binding.ivRestoreClose.setImageResource(com.develop.common.R.drawable.ic_close)
         binding.ivRestoreClose.setOnClickListener {
             finish()

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

@@ -36,6 +36,7 @@ import com.develop.common.router.Screens
 import com.develop.common.tag.WIFI_FROM_MAIN_SETTING
 import com.develop.common.ui.CommonBindingActivity
 import com.develop.common.utils.FoucsLinearLayoutManager
+import com.develop.common.utils.ScreenSizeUtils.getScreenWidthSize
 import com.develop.common.widget.WifiContentView
 import com.develop.setting.R
 import com.develop.setting.databinding.ActivityWifiListBinding
@@ -128,6 +129,9 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_062a)
             binding.ivLogo.setGone()
         } else if (sn.startsWith("011")) {
+            binding.ivBanner.background = null
+            var params = RelativeLayout.LayoutParams(getScreenWidthSize(this@WifiListActivity),RelativeLayout.LayoutParams.MATCH_PARENT)
+            binding.ivBanner.layoutParams = params
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_011a)
             binding.ivLogo.setGone()
         } else if (sn.startsWith("045")) {

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

@@ -1,30 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:background="@color/bg_color"
-    android:layout_height="match_parent">
-
-    <ImageView
-        android:id="@+id/iv_back"
-        android:layout_width="@dimen/convert_54px"
-        android:layout_height="@dimen/convert_68px"
-        android:layout_marginStart="@dimen/convert_20px"
-        android:layout_marginTop="@dimen/convert_19px"
-        android:layout_toEndOf="@id/iv_banner"
-        android:padding="@dimen/convert_10px"
-        android:src="@drawable/ic_left_arrow" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tv_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/convert_290px"
-        android:layout_marginTop="@dimen/convert_40px"
-        android:layout_toEndOf="@id/iv_banner"
-        android:text="@string/privacy_policy"
-        android:textColor="@color/common_title"
-        android:textSize="@dimen/convert_36px" />
+    android:layout_height="match_parent"
+    android:background="@color/bg_color">
 
     <ImageView
         android:id="@+id/iv_banner"
@@ -32,73 +10,99 @@
         android:layout_height="match_parent"
         android:background="@drawable/guide_bg" />
 
-    <ImageView
-        android:visibility="gone"
-        android:id="@+id/iv_logo"
-        android:layout_width="@dimen/convert_320px"
-        android:layout_height="@dimen/convert_130px"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="@dimen/convert_65px"
-        android:background="@drawable/ic_logo_036i" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_toEndOf="@id/iv_banner">
 
 
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tv_agree"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/convert_98px"
-        android:layout_alignParentBottom="true"
-        android:layout_marginStart="@dimen/convert_40px"
-        android:layout_marginEnd="@dimen/convert_40px"
-        android:layout_marginBottom="@dimen/convert_50px"
-        android:layout_toEndOf="@id/iv_banner"
-        android:background="@drawable/policy_corners"
-        android:gravity="center"
-        android:textColor="@color/policy_agree"
-        android:textSize="@dimen/convert_36px" />
-
-    <LinearLayout
-        android:id="@+id/agree_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/tv_agree"
-        android:layout_marginStart="@dimen/convert_208px"
-        android:layout_marginBottom="@dimen/convert_20px"
-        android:layout_toEndOf="@id/iv_banner"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
+        <ImageView
+            android:id="@+id/iv_back"
+            android:layout_width="@dimen/convert_54px"
+            android:layout_height="@dimen/convert_68px"
+            android:layout_marginStart="@dimen/convert_20px"
+            android:layout_marginTop="@dimen/convert_19px"
+            android:padding="@dimen/convert_10px"
+            android:src="@drawable/ic_left_arrow" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/convert_40px"
+            android:layout_marginLeft="@dimen/convert_100px"
+            android:layout_marginRight="@dimen/convert_40px"
+            android:text="@string/privacy_policy"
+            android:textColor="@color/common_title"
+            android:textSize="@dimen/convert_36px" />
+
 
         <ImageView
-            android:id="@+id/iv_selected"
-            android:layout_width="@dimen/convert_30px"
-            android:layout_height="@dimen/convert_30px"
-            android:background="@drawable/ic_unselected" />
+            android:id="@+id/iv_logo"
+            android:layout_width="@dimen/convert_320px"
+            android:layout_height="@dimen/convert_130px"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="@dimen/convert_65px"
+            android:background="@drawable/ic_logo_036i"
+            android:visibility="gone" />
+
 
         <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_agree"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/convert_98px"
+            android:layout_alignParentBottom="true"
+            android:layout_marginStart="@dimen/convert_40px"
+            android:layout_marginEnd="@dimen/convert_40px"
+            android:layout_marginBottom="@dimen/convert_50px"
+            android:background="@drawable/policy_corners"
+            android:gravity="center"
+            android:textColor="@color/policy_agree"
+            android:textSize="@dimen/convert_36px" />
+
+        <LinearLayout
+            android:id="@+id/agree_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/convert_24px"
-            android:text="@string/i_have_read_the_privacy_policy"
-            android:textColor="@color/policy_agree_tip"
-            android:textSize="@dimen/convert_26px" />
-    </LinearLayout>
+            android:layout_above="@id/tv_agree"
+            android:layout_marginStart="@dimen/convert_208px"
+            android:layout_marginBottom="@dimen/convert_20px"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
+            <ImageView
+                android:id="@+id/iv_selected"
+                android:layout_width="@dimen/convert_30px"
+                android:layout_height="@dimen/convert_30px"
+                android:background="@drawable/ic_unselected" />
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@id/agree_layout"
-        android:layout_below="@id/tv_title"
-        android:layout_marginStart="@dimen/convert_40px"
-        android:layout_marginTop="@dimen/convert_24px"
-        android:layout_marginEnd="@dimen/convert_40px"
-        android:layout_marginBottom="@dimen/convert_40px"
-        android:layout_toEndOf="@id/iv_banner"
-        android:background="@drawable/policy_content_stoke">
-
-       <WebView
-           android:id="@+id/webview"
-           android:layout_width="match_parent"
-           android:layout_height="match_parent"/>
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/convert_24px"
+                android:text="@string/i_have_read_the_privacy_policy"
+                android:textColor="@color/policy_agree_tip"
+                android:textSize="@dimen/convert_26px" />
+        </LinearLayout>
+
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@id/agree_layout"
+            android:layout_below="@id/tv_title"
+            android:layout_marginStart="@dimen/convert_40px"
+            android:layout_marginTop="@dimen/convert_24px"
+            android:layout_marginEnd="@dimen/convert_40px"
+            android:layout_marginBottom="@dimen/convert_40px"
+            android:background="@drawable/policy_content_stoke">
+
+            <WebView
+                android:id="@+id/webview"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </RelativeLayout>
     </RelativeLayout>
 
 

BusinessStep/src/main/java/com/develop/step/ui/ModesDetailActivity.kt

@@ -1271,10 +1271,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                 }
             }
         }
-
+        overrideModeDialog.title = getString(com.develop.common.R.string.current_cooking_dialog_title)
         overrideModeDialog.apply {
-            title =
-                "Overwrite current cooking process?\n By overwriting,your current progress will got lost."
             onDialogClickListener = object : CancelConfirmDialog.OnDialogClickListener {
                 override fun onConfirm() {
                     val cookStepEvent = CookStepEvent(

BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepActivity.kt

@@ -441,9 +441,10 @@ class CookStepActivity : CookStepBaseActivity() {
 
 
                     if (baseSn.startsWith("011")&&it.workMode =="DESCRIPTION"){
-                        binding.tvStepName.setGone()
-                        binding.tvStepMsg.setVisible()
-                        binding.tvStepMsg.text = it.source.description
+                        binding.tvStepName.setVisible()
+                        binding.tvStepMsg.setGone()
+//                        binding.tvStepMsg.text = it.source.description
+                        binding.tvStepName.text = it.source.description
                     }else{
                         binding.tvStepName.text = it.source.description
 
@@ -516,14 +517,13 @@ class CookStepActivity : CookStepBaseActivity() {
                 }
             }
         }
-
+        overrideModeDialog.title = getString(R.string.current_cooking_dialog_title)
         overrideModeDialog.apply {
-            title =
-                "Overwrite current cooking process?\n By overwriting,your current progress will got lost."
             onDialogClickListener = object : CancelConfirmDialog.OnDialogClickListener {
                 override fun onConfirm() {
                     isFromOverWrite = true
                     viewModel.displayStep()?.let {
+
                         viewModel.setTargetCookingStep(it)
                         configDataAndStart(it.uiData)
                     }
@@ -748,14 +748,14 @@ class CookStepActivity : CookStepBaseActivity() {
                     } else if (CofarSDK.devInfo().potCloverStatus.toInt() == 1) {
                         showPotCloverDialog()
                     } else if (CofarSDK.devInfo().runningInstId != "${recipeNumber}:${viewModel.stepIndex}") {
-                        overrideModeDialog.showDialog(supportFragmentManager, "overrideModeDialog")
+                        overrideModeDialog?.showDialog(supportFragmentManager, "overrideModeDialog")
                     }
                     /**
                      * 需求：扭橙模式一打开，如果没有扭橙汁配件时需要提示
                      * CofarSDK.devInfo().resetZero.toInt()==1 代表已经是扭橙汁配件
                      * */
                     else if (workModes?.type == WorkModes.CITRUS_JUICER && CofarSDK.devInfo().resetZero.toInt() != 1) {
-                        showMsgDialog(resources.getString(com.develop.common.R.string.dev_not_orange_parts))
+                        showMsgDialog(getString(com.develop.common.R.string.dev_not_orange_parts))
                     }
                     /**
                      * 需求：非扭橙模式打开点击运行，且是扭橙的配件时需要提示用户
@@ -1578,7 +1578,7 @@ class CookStepActivity : CookStepBaseActivity() {
 
 
             //2023年06月22日10:55:55 增加步骤程序自动完成的时候自动跳转下一步
-            if (CommonEventTypes.CONFIRM_STOP == event.type || CommonEventTypes.AUTO_STOP == event.type) {
+            if ((CommonEventTypes.CONFIRM_STOP == event.type || CommonEventTypes.AUTO_STOP == event.type)&&!isFromOverWrite) {
                 clickNextStep();
             }
 

BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepBaseActivity.kt

@@ -149,7 +149,6 @@ abstract class CookStepBaseActivity :
             viewIconSpeed.background_drawable = R.drawable.cook_speed_selector
         }
         binding.tvStepName.movementMethod = ScrollingMovementMethod.getInstance()
-        binding.tvStepMsg.movementMethod = ScrollingMovementMethod.getInstance()
         binding.viewProgress.background = cookProgressDrawable
 //        binding.tvTitleStep.setOnClickListener {
 //            if (!isNightTheme()){

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

@@ -34,17 +34,17 @@ class CookDetailSourceFragment :
 
     override fun onPostCreateView() {
         super.onPostCreateView()
-        if (sn.startsWith("033")){
+        if (sn.startsWith("033")) {
             binding.sourceScroll.visibility = View.VISIBLE
             viewModel.getRecipeLiveData().observe(viewLifecycleOwner) {
-                var  foodDescription = it.recipe.foodDescription
-                if (foodDescription.isNullOrEmpty()){
+                var foodDescription = it.recipe.foodDescription
+                if (foodDescription.isNullOrEmpty()) {
                     foodDescription = ""
                 }
                 //由于菜谱包介绍的json会返回null,估添加以上判断，如果null下面就会崩
                 //食谱总步骤内容过于密集显示，需要分段显示
 //            binding.tvStepDetail.text = it.recipe.introduction
-                foodDescription.let {str ->
+                foodDescription.let { str ->
 //                    binding.tvSourceDetail.text = StringUtils.getStringWrap(str)
                     binding.tvSourceDetail.text = str
                 }
@@ -52,7 +52,7 @@ class CookDetailSourceFragment :
             }
 
 
-        }else{
+        } else {
             binding.rvList.visibility = View.VISIBLE
             binding.rvList.apply {
                 /**
@@ -67,7 +67,12 @@ class CookDetailSourceFragment :
 //                }
                 linear()
                 setup {
-                    addType<CookSourceItem>(R.layout.item_cook_source)
+                    if (sn.startsWith("011")){
+                        addType<CookSourceItem>(R.layout.item_cook_source_011)
+                    }else{
+                        addType<CookSourceItem>(R.layout.item_cook_source)
+                    }
+
                     onBind {
                         val model = getModel<CookSourceItem>()
                         findView<TextView>(R.id.tv_source_name).updateText(model.name)
@@ -82,7 +87,10 @@ class CookDetailSourceFragment :
                     for (recipeFood in it.material) {
                         val sourceItem = CookSourceItem(
                             recipeFood.foodName ?: "",
-                            "${BigDecimal.valueOf(recipeFood.amount ?: 0f.toDouble()).stripTrailingZeros().toPlainString()} ${recipeFood.unit}"
+                            "${
+                                BigDecimal.valueOf(recipeFood.amount ?: 0f.toDouble())
+                                    .stripTrailingZeros().toPlainString()
+                            } ${recipeFood.unit}"
                         )
                         if (recipeFood.recipePortionSizeNumber == size.portionSize) {
                             sourceItems.add(sourceItem)
@@ -93,6 +101,16 @@ class CookDetailSourceFragment :
                         // 防止没有任何数据显示
                         sourceItems.addAll(originalList)
                     }
+
+                    if (sn.startsWith("011")){
+                        if (sourceItems.isNotEmpty()&&!it.recipe.foodDescription.isNullOrEmpty()){
+                            getTvSource()
+                        }else if (sourceItems.isEmpty()){
+                            getTvSource()
+                        }
+                    }
+
+
                     val jarCount = size?.portionSize?.toIntOrNull() ?: 1
                     val string = if (jarCount > 1) {
                         getString(com.develop.common.R.string.make_n_jars) ?: jarCount.toString()
@@ -104,6 +122,24 @@ class CookDetailSourceFragment :
                 }
             }
         }
+    }
 
+    private fun getTvSource() {
+        binding.rvList.visibility = View.GONE
+        binding.sourceScroll.visibility = View.VISIBLE
+        viewModel.getRecipeLiveData().observe(viewLifecycleOwner) {
+            var foodDescription = it.recipe.foodDescription
+            if (foodDescription.isNullOrEmpty()) {
+                foodDescription = ""
+            }
+            //由于菜谱包介绍的json会返回null,估添加以上判断，如果null下面就会崩
+            //食谱总步骤内容过于密集显示，需要分段显示
+//            binding.tvStepDetail.text = it.recipe.introduction
+            foodDescription.let { str ->
+//                    binding.tvSourceDetail.text = StringUtils.getStringWrap(str)
+                binding.tvSourceDetail.text = str
+            }
+
+        }
     }
 }

BusinessStep/src/main/res/layout/fragment_detail_cook_source.xml

@@ -13,6 +13,7 @@
         android:layout_height="match_parent"
         android:paddingHorizontal="@dimen/convert_50px"
         android:scrollbarSize="@dimen/convert_8px"
+        android:fadeScrollbars="false"
         android:scrollbarThumbVertical="@color/color_CCAAAAAA"
         android:paddingTop="@dimen/convert_40px">
 

BusinessStep/src/main/res/layout/item_cook_controller.xml

@@ -145,7 +145,6 @@
         android:id="@+id/fl_direction"
         android:layout_width="@dimen/convert_240px"
         android:layout_height="@dimen/convert_240px"
-        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

BusinessStep/src/main/res/layout/item_cook_source_011.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/convert_83px"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:paddingStart="@dimen/convert_7px"
+    android:layout_marginRight="@dimen/convert_26px"
+    android:layout_marginLeft="@dimen/convert_26px"
+    xmlns:tools="http://schemas.android.com/tools">
+    <TextView
+        android:id="@+id/tv_source_amount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/convert_30px"
+        android:textColor="@color/source_amount"
+        android:layout_marginTop="@dimen/convert_21px"
+        tools:text="AAAAAAA"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+    <com.develop.common.widget.MarqueeTextView
+        android:id="@+id/tv_source_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/convert_30px"
+        android:textColor="@color/source_name"
+        android:layout_marginTop="@dimen/convert_21px"
+        tools:text="AA"
+        android:layout_marginEnd="@dimen/convert_16px"
+        android:includeFontPadding="false"
+        android:paddingLeft="@dimen/convert_40px"
+        android:ellipsize="marquee"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:singleLine="true"
+        android:gravity="right"
+        app:layout_constraintStart_toEndOf="@+id/tv_source_amount"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/convert_1px"
+        android:background="@color/source_line"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/build.gradle

@@ -18,7 +18,7 @@ ext {
 
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
-    brandCode="029C"
+    brandCode="011D"
 //    brandCode = "010D"
     model = "1039"
 
@@ -163,7 +163,7 @@ android {
             dimension "platform"
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"011\"")
-            resValue("string", "app_theme", "@style/Splash011ATheme")
+            resValue("string", "app_theme", "@style/Splash011DTheme")
             buildConfigField("String", "model", "\"1039\"")
             buildConfigField("String", "brandCode", "\"011D\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
@@ -240,6 +240,8 @@ android {
             dimension "platform"
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"036I\"")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"036I\"")
             resValue("string", "app_theme", "@style/Splash036IDTheme")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
@@ -540,7 +542,6 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
 
-
 //            resValue("string", "app_theme", "@style/SplashTheme")
 //            buildConfigField("String", "UpdatePlatform", "\"normal\"")
 //            buildConfigField("String", "model", "\"5037\"")
@@ -548,7 +549,7 @@ android {
 //            //versionCode 1.01 指向bug修复，2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")
 ////            buildConfigField("String", "appCode", "\"2.01\"")
-
+//            manifestPlaceholders = [channelName: "brand0062ATuya"]
 //            resValue("string", "app_theme", "@style/Splash062ATheme")
 //            buildConfigField("String", "UpdatePlatform", "\"062A\"")
 //            buildConfigField("String", "model", "\"1039\"")
@@ -571,13 +572,13 @@ android {
 //            //appCode 1.01 指向bug修复，2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
-//            manifestPlaceholders = [channelName: "brand011ATuya"]
-//            buildConfigField("String", "UpdatePlatform", "\"011\"")
-//            resValue("string", "app_theme", "@style/Splash011ATheme")
-//            buildConfigField("String", "model", "\"1039\"")
-//            buildConfigField("String", "brandCode", "\"011A\"")
-//            //appCode 1.01 指向bug修复，2.01指向功能变更
-//            buildConfigField("String", "appCode", "\"1.01\"")
+            manifestPlaceholders = [channelName: "brand011ATuya"]
+            buildConfigField("String", "UpdatePlatform", "\"011\"")
+            resValue("string", "app_theme", "@style/Splash011ATheme")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"011A\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
 
 //            buildConfigField("String", "UpdatePlatform", "\"normal\"")
 //            resValue("string", "app_theme", "@style/SplashTheme")
@@ -661,13 +662,13 @@ android {
 //
 //            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
 
-            manifestPlaceholders = [channelName: "brand036ITuya"]
-            buildConfigField("String", "UpdatePlatform", "\"036I\"")
-            resValue("string", "app_theme", "@style/Splash036IDTheme")
-            buildConfigField("String", "model", "\"1039\"")
-            buildConfigField("String", "brandCode", "\"036I\"")
-            //appCode 1.01 指向bug修复，2.01指向功能变更
-            buildConfigField("String", "appCode", "\"1.01\"")
+//            manifestPlaceholders = [channelName: "brand036I"]
+//            buildConfigField("String", "UpdatePlatform", "\"036I\"")
+//            resValue("string", "app_theme", "@style/Splash036IDTheme")
+//            buildConfigField("String", "model", "\"1039\"")
+//            buildConfigField("String", "brandCode", "\"036I\"")
+//            //appCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
 
 
         }

app/src/brand011ATuya/res/values-en/strings.xml

@@ -171,7 +171,7 @@ Nanfang plus client is an online information platform developed and operated by
 
     <string name="srl_footer_finish">Load Success</string>
     <string name="srl_footer_loading">Loading…</string>
-
+    <string name="current_cooking_dialog_title">Overwrite current cooking process?\nBy overwriting,your current progress will got lost.</string>
     <string name="unset_param_tips">Please set the operation parameters</string>
     <string name="pmpt_confirm">Confirm</string>
     <string name="pmpt_cancel">Cancel</string>
@@ -420,7 +420,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="tare_011">Tare</string>
     <string name="newest_011">The latest</string>
     <string name="most_popular_011">Favourites</string>
-
+    <!-- 修改turn_left_011/turn_right_011  记得同步修改 turn_left /turn_right -->
     <string name="turn_right_011">Right</string>
     <string name="turn_left_011">Left</string>
     <string name="preparation_011">Preparation:</string>

app/src/brand011ATuya/res/values-pl/strings.xml

@@ -101,7 +101,7 @@
     <string name="hard">Trudny</string>
     <string name="srl_footer_finish">Załadowano</string>
     <string name="srl_footer_loading">Ładowanie…</string>
-
+    <string name="current_cooking_dialog_title">Czy na pewno chcesz zatrzymać program uruchomiony za kulisami i uruchomić program na bieżącej stronie?</string>
 
     <string name="restore_factory_settings">Przywróć ustawienia fabryczne</string>
     <string name="connected_successfully">Połączenie powiodło się</string>
@@ -129,8 +129,8 @@
     <string name="cancel">ANULUJ</string>
     <string name="confirm">POTWIERDŹ</string>
     <string name="stop">STOP</string>
-    <string name="turn_right">Lewo</string>
-    <string name="turn_left">Prawo</string>
+    <string name="turn_right">Prawo</string>
+    <string name="turn_left">Lewo</string>
     <string name="temperature">TEMPERATURA</string>
     <string name="time">CZAS</string>
     <string name="speed">PRĘDKOŚĆ</string>
@@ -380,7 +380,7 @@
     <string name="newest_011">Najnowsze</string>
     <string name="tare_011">Zeruj</string>
     <string name="note_title_011">Moje notatki</string>
-
+    <!-- 修改turn_left_011/turn_right_011  记得同步修改 turn_left /turn_right -->
     <string name="turn_left_011">Lewo</string>
     <string name="turn_right_011">Prawo</string>
     <string name="preparation_011">Przygotowanie:</string>

app/src/brand011ATuya/res/values-uk/strings.xml

@@ -419,6 +419,8 @@
     <string name="dicing_011">Нарізка кубиками </string>
     <string name="citrus_juicer_011">Витискання соку з цитрусових</string>
     <string name="potato_peeler_011">Чищення картоплі</string>
+
+    <!-- 修改turn_left_011/turn_right_011  记得同步修改 turn_left /turn_right -->
     <string name="turn_right_011">Гаразд</string>
     <string name="turn_left_011">Ліворуч</string>
     <string name="preparation_011">Підготовка:</string>

app/src/brand011DTuya/res/values-en/strings.xml

@@ -171,7 +171,7 @@ Nanfang plus client is an online information platform developed and operated by
 
     <string name="srl_footer_finish">Load Success</string>
     <string name="srl_footer_loading">Loading…</string>
-
+    <string name="current_cooking_dialog_title">Overwrite current cooking process?\nBy overwriting,your current progress will got lost.</string>
     <string name="unset_param_tips">Please set the operation parameters</string>
     <string name="pmpt_confirm">Confirm</string>
     <string name="pmpt_cancel">Cancel</string>
@@ -420,7 +420,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="tare_011">Tare</string>
     <string name="newest_011">The latest</string>
     <string name="most_popular_011">Favourites</string>
-
+    <!-- 修改turn_left_011/turn_right_011  记得同步修改 turn_left /turn_right -->
     <string name="turn_right_011">Right</string>
     <string name="turn_left_011">Left</string>
     <string name="preparation_011">Preparation:</string>

app/src/brand011DTuya/res/values-pl/strings.xml

@@ -101,7 +101,7 @@
     <string name="hard">Trudny</string>
     <string name="srl_footer_finish">Załadowano</string>
     <string name="srl_footer_loading">Ładowanie…</string>
-
+    <string name="current_cooking_dialog_title">Czy na pewno chcesz zatrzymać program uruchomiony za kulisami i uruchomić program na bieżącej stronie?</string>
 
     <string name="restore_factory_settings">Przywróć ustawienia fabryczne</string>
     <string name="connected_successfully">Połączenie powiodło się</string>
@@ -129,8 +129,8 @@
     <string name="cancel">ANULUJ</string>
     <string name="confirm">POTWIERDŹ</string>
     <string name="stop">STOP</string>
-    <string name="turn_right">Lewo</string>
-    <string name="turn_left">Prawo</string>
+    <string name="turn_right">Prawo</string>
+    <string name="turn_left">Lewo</string>
     <string name="temperature">TEMPERATURA</string>
     <string name="time">CZAS</string>
     <string name="speed">PRĘDKOŚĆ</string>
@@ -380,7 +380,7 @@
     <string name="newest_011">Najnowsze</string>
     <string name="tare_011">Zeruj</string>
     <string name="note_title_011">Moje notatki</string>
-
+    <!-- 修改turn_left_011/turn_right_011  记得同步修改 turn_left /turn_right -->
     <string name="turn_left_011">Lewo</string>
     <string name="turn_right_011">Prawo</string>
     <string name="preparation_011">Przygotowanie:</string>

app/src/brand011DTuya/res/values-uk/strings.xml

@@ -419,6 +419,8 @@
     <string name="dicing_011">Нарізка кубиками </string>
     <string name="citrus_juicer_011">Витискання соку з цитрусових</string>
     <string name="potato_peeler_011">Чищення картоплі</string>
+
+    <!-- 修改turn_left_011/turn_right_011  记得同步修改 turn_left /turn_right -->
     <string name="turn_right_011">Гаразд</string>
     <string name="turn_left_011">Ліворуч</string>
     <string name="preparation_011">Підготовка:</string>

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

@@ -105,7 +105,6 @@ class FoodCookingApp : BaseApp() {
 //        CatchException.getInstence().init(this)
 
 
-
         WindowManager.getInstance().init(this, OptionFactory())
 
 

libBase/src/main/java/com/develop/base/ext/GlobaExt.kt

@@ -264,6 +264,8 @@ fun getSN(): String {
 
 }
 
+
+
 fun getGoneLogin(): Boolean {
     var sn = getSN()
     return sn.startsWith("032D") || sn.startsWith("011")

libBase/src/main/java/com/develop/base/manager/WifiHelp.kt

@@ -81,7 +81,6 @@ class WifiHelp {
     }
 
     fun connect(wifiData: WifiData, isSaveType: Boolean) {
-        countTime()
         connectNew(wifiData, "", isSaveType)
     }