011 换肤，062换肤，sdk 更新

BusinessAirFryer/src/main/assets/config.json

@@ -106,6 +106,14 @@
       "devMode": "SOUP",
       "listShow": true
     },
+    {
+      "type": "BROWN",
+      "name": "brown",
+      "bg": "cm_icon_roast",
+      "icon": "cm_icon_roast",
+      "devMode": "SOUP",
+      "listShow": false
+    },
     {
       "type": "ROAST",
       "name": "roast",
@@ -114,6 +122,7 @@
       "devMode": "SOUP",
       "listShow": true
     },
+
     {
       "type": "SMOOTHIE",
       "name": "smoothie",

BusinessAirFryer/src/main/assets/config_000.json

@@ -49,6 +49,14 @@
       "devMode": "SOUP",
       "listShow": true
     },
+    {
+      "type": "ROAST",
+      "name": "roast",
+      "bg": "cm_icon_roast",
+      "icon": "cm_icon_roast",
+      "devMode": "SOUP",
+      "listShow": false
+    },
     {
       "type": "KNEAD_TOUGH",
       "name": "knead_dough",

BusinessAirFryer/src/main/assets/config_007.json

@@ -85,6 +85,14 @@
       "devMode": "SOUP",
       "listShow": true
     },
+    {
+      "type": "ROAST",
+      "name": "roast",
+      "bg": "cm_icon_roast",
+      "icon": "cm_icon_roast",
+      "devMode": "SOUP",
+      "listShow": false
+    },
     {
       "type": "AF_DIY",
       "name": "af_diy",

BusinessAirFryer/src/main/assets/config_010.json

@@ -9,6 +9,22 @@
       "devMode": "SOUP",
       "listShow": false
     },
+    {
+      "type": "BROWN",
+      "name": "brown",
+      "bg": "cm_icon_roast",
+      "icon": "cm_icon_roast",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "ROAST",
+      "name": "roast",
+      "bg": "cm_icon_roast",
+      "icon": "cm_icon_roast",
+      "devMode": "SOUP",
+      "listShow": true
+    },
     {
       "type": "STEAM",
       "name": "steam",

BusinessAirFryer/src/main/assets/config_063.json

@@ -0,0 +1,197 @@
+{
+  "baseQrUrl": "https://icook.cofarcn.com/h5/index.html",
+  "workModes": [
+    {
+      "type": "ADAPTED_COOKING",
+      "name": "adapted_cooking",
+      "bg": "ic_mode_diy",
+      "icon": "ic_grid_adapted_cooking",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "COOK_EGGS",
+      "name": "cook_eggs",
+      "bg": "cm_icon_cook_eggs_bg",
+      "icon": "cm_icon_cook_eggs",
+      "devMode": "SOUP",
+      "listShow": false
+    },
+    {
+      "type": "WIGHT",
+      "name": "wight",
+      "bg": "ic_mode_weight",
+      "icon": "ic_grid_weight",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "BOIL_WATER",
+      "name": "boil_water",
+      "bg": "ic_mode_boil_water",
+      "icon": "ic_grid_boil_water",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "CHOP",
+      "name": "chop",
+      "bg": "ic_mode_chop",
+      "icon": "ic_grid_chop",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "SLOW_COOK",
+      "name": "slow_cook",
+      "bg": "ic_mode_slow_cook",
+      "icon": "ic_grid_slow_cook",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "KNEAD_TOUGH",
+      "name": "knead_dough",
+      "bg": "ic_mode_knead_dough",
+      "icon": "ic_grid_knead_dough",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "STEAM",
+      "name": "steam",
+      "bg": "ic_mode_steam",
+      "icon": "ic_grid_steam",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "FOOD_PROCESSOR",
+      "name": "food_processor",
+      "bg": "ic_mode_food_processor",
+      "icon": "ic_grid_food_processor",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "TURBO",
+      "name": "turbo",
+      "bg": "ic_mode_turbo",
+      "icon": "ic_grid_turbo",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "AF_DIY",
+      "name": "af_diy",
+      "bg": "af_diy_bg",
+      "icon": "af_diy",
+      "devMode": "AIR_FRYER",
+      "listShow": false
+    },
+    {
+      "type": "AF_AIR_FRYER",
+      "name": "af_air_fryer",
+       "bg": "af_air_fryer_bg",
+      "icon": "af_air_fryer",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "WIGHT",
+      "name": "wight",
+      "bg": "ic_mode_weight",
+      "icon": "ic_grid_weight",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_BAKE",
+      "name": "af_bake",
+      "bg": "af_bake_bg",
+      "icon": "af_bake",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_DRUMSTICKS",
+      "name": "af_drumsticks",
+      "bg": "af_drumsticks_bg",
+      "icon": "af_drumsticks",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_EGG_TART",
+      "name": "af_egg_tart",
+      "bg": "af_egg_tart_bg",
+      "icon": "af_egg_tart",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_PIZZA",
+      "name": "af_pizza",
+      "bg": "af_pizza_bg",
+      "icon": "af_pizza",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_DEHYDRATE",
+      "name": "af_dehydrate",
+      "bg": "af_dehydrate_bg",
+      "icon": "af_dehydrate",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_REHEAT",
+      "name": "af_reheat",
+      "bg": "af_reheat_bg",
+      "icon": "af_reheat",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_CHICKEN_WING",
+      "name": "af_chicken_wing",
+      "bg": "af_chicken_wing_bg",
+      "icon": "af_chicken_wing",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_STEAK",
+      "name": "af_steak",
+      "bg": "af_steak_bg",
+      "icon": "af_steak",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_SEA_FOOD",
+      "name": "af_sea_food",
+      "bg": "af_sea_food_bg",
+      "icon": "af_sea_food",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_VEGETABLE",
+      "name": "af_vegetable",
+      "bg": "af_vegetable_bg",
+      "icon": "af_vegetable",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_MUTTON_CHOP",
+      "name": "af_mutton_chop",
+      "bg": "af_mutton_chop_bg",
+      "icon": "af_mutton_chop",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    }
+  ]
+}

BusinessAirFryer/src/main/assets/lang_config_063.json

@@ -0,0 +1,179 @@
+{
+  "langs": [
+    {
+      "name": "Polish(波兰语)",
+      "value": "PL",
+      "icon": "icon_lang_pl",
+      "showName": "Polski",
+      "show": false
+    },
+    {
+      "name": "German(德语)",
+      "value": "DE",
+      "icon": "icon_lang_de",
+      "showName": "Deutsch",
+      "show": false
+    },
+    {
+      "name": "French(法语)",
+      "value": "FR",
+      "icon": "icon_lang_fr",
+      "showName": "Français",
+      "show": false
+    },
+    {
+      "name": "Dutch(荷兰语)",
+      "value": "NL",
+      "icon": "icon_lang_nl",
+      "showName": "Nederlands",
+      "show": false
+    },
+    {
+      "name": "Portuguese(葡萄牙语)",
+      "value": "PT",
+      "icon": "icon_lang_pt",
+      "showName": "Português",
+      "show": false
+    },
+    {
+      "name": "Spanish(西班牙语)",
+      "value": "ES",
+      "icon": "icon_lang_es",
+      "showName": "Español",
+      "show": false
+    },
+    {
+      "name": "Italiano(意大利语)",
+      "value": "IT",
+      "icon": "icon_lang_it",
+      "showName": "Italiano",
+      "show": false
+    },
+    {
+      "name": "English(英语)",
+      "value": "EN",
+      "icon": "icon_lang_en",
+      "showName": "English",
+      "show": true
+    },
+    {
+      "name": "Greek(希腊语)",
+      "value": "GR",
+      "icon": "icon_lang_gr",
+      "showName": "Ελληνικά",
+      "show": false
+    },
+    {
+      "name": "Russian(俄语)",
+      "value": "RU",
+      "icon": "icon_lang_ru",
+      "showName": "Русский",
+      "show": false
+    },
+    {
+      "name": "Romanian(罗马尼亚语)",
+      "value": "RO",
+      "icon": "icon_lang_ro",
+      "showName": "Română",
+      "show": false
+    },
+    {
+      "name": "Finnish(芬兰语)",
+      "value": "FI",
+      "icon": "icon_lang_fi",
+      "showName": "Suomi",
+      "show": false
+    },
+    {
+      "name": "Norsk(挪威语)",
+      "value": "NO",
+      "icon": "icon_lang_no",
+      "showName": "Norsk",
+      "show": false
+    },
+    {
+      "name": "Swedish(瑞典语)",
+      "value": "SE",
+      "icon": "icon_lang_se",
+      "showName": "Svenska",
+      "show": false
+    },
+    {
+      "name": "Danish(丹麦语)",
+      "value": "DK",
+      "icon": "icon_lang_dk",
+      "showName": "Dansk",
+      "show": false
+    },
+    {
+      "name": "Czech(捷克语)",
+      "value": "CZ",
+      "icon": "icon_lang_cz",
+      "showName": "Čeština",
+      "show": false
+    },
+    {
+      "name": "Estonki(爱沙尼亚语)",
+      "value": "EE",
+      "icon": "icon_lang_ee",
+      "showName": "Eesti keel",
+      "show": false
+    },
+    {
+      "name": "Slovak(斯洛伐克语)",
+      "value": "SK",
+      "icon": "icon_lang_sk",
+      "showName": "Slovenčina",
+      "show": false
+    },
+    {
+      "name": "Ukrainian(乌克兰语)",
+      "value": "UK",
+      "icon": "icon_lang_uk",
+      "showName": "Українська",
+      "show": false
+    },
+    {
+      "name": "Arabic(阿拉伯语)",
+      "value": "AR",
+      "icon": "icon_lang_ar",
+      "showName": "العربية",
+      "show": false
+    },
+    {
+      "name": "Lithuanian(立陶宛语)",
+      "value": "LT",
+      "icon": "icon_lang_lt",
+      "showName": "Lietuvių kalba",
+      "show": false
+    },
+    {
+      "name": "Farsi(波斯语)",
+      "value": "IR",
+      "icon": "icon_lang_ir",
+      "showName": "فارسی",
+      "show": false
+    },
+    {
+      "name": "Kazakh(哈萨克语)",
+      "value": "KZ",
+      "icon": "icon_lang_kz",
+      "showName": "Қазақша",
+      "show": false
+    },
+    {
+      "name": "Chinese(中文)",
+      "value": "ZH",
+      "icon": "icon_lang_zh",
+      "showName": "中文",
+      "show": false
+    },
+    {
+      "name": "Japanese(日语)",
+      "value": "JA",
+      "icon": "icon_lang_ja",
+      "showName": "日本語",
+      "show": false
+    }
+  ]
+}

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

@@ -155,17 +155,17 @@ class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, Me
                     viewModel.chooseAvatar.value = userAvatar?.toInt()
                     when (selectGender) {
                         2 -> {
-                            binding.tvChooseSex.text = "Male"
+                            binding.tvChooseSex.text =  resources.getString(com.develop.common.R.string.male)
                             binding.tvChooseSex.setTextColor(Color.BLACK)
                         }
 
                         1 -> {
-                            binding.tvChooseSex.text = "Female"
+                            binding.tvChooseSex.text = resources.getString(com.develop.common.R.string.female)
                             binding.tvChooseSex.setTextColor(Color.BLACK)
                         }
 
                         0 -> {
-                            binding.tvChooseSex.text = "None"
+                            binding.tvChooseSex.text = resources.getString(com.develop.common.R.string.none)
                             binding.tvChooseSex.setTextColor(Color.BLACK)
                         }
                     }

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

@@ -10,6 +10,7 @@ import android.view.ViewGroup
 import android.view.Window
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil.setContentView
+import com.develop.base.ext.isBrand062
 import com.develop.base.mvvm.FullScreenTransparentDialog
 import com.develop.common.R
 import com.develop.common.databinding.DialogDataPickerBinding
@@ -22,6 +23,7 @@ class AgeSelectDialog(
 
     private val binding = DialogDataPickerBinding.inflate(activity.layoutInflater)
     private val initIndex = 0
+    private var is062 = false
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -31,8 +33,8 @@ class AgeSelectDialog(
         return binding.root
     }
     init {
+        is062 = isBrand062()
         val listData = createAgeListData()
-
         binding.root.setOnClickListener {
             dismiss()
         }
@@ -41,7 +43,8 @@ class AgeSelectDialog(
             val currentIndex = binding.wheelPicker.currentItemPosition
             onConfirm(currentIndex, true)
         }
-        binding.wheelPicker.selectedItemTextColor = Color.BLACK
+
+        binding.wheelPicker.selectedItemTextColor = if (is062) resources.getColor(R.color.color_5887DA) else Color.BLACK
         binding.wheelPicker.itemTextColor = 0xff000000.toInt()
         binding.wheelPicker.setAtmospheric(true)
         binding.wheelPicker.isCurved = true

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

@@ -0,0 +1,78 @@
+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 com.develop.common.databinding.DialogCancelConfirmImageBinding
+import org.greenrobot.eventbus.EventBus
+
+
+class CancelConfirmImageDialog(
+) : FullScreenTransparentDialog() {
+
+    lateinit var binding: DialogCancelConfirmImageBinding
+
+    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 = DialogCancelConfirmImageBinding.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
+        }
+
+
+
+        return binding.root
+    }
+    fun onConfirmClick(){
+        binding.tvYes.callOnClick()
+    }
+
+
+    interface OnDialogClickListener {
+        fun onConfirm()
+        fun onCancel()
+    }
+}

BusinessCommon/src/main/java/com/develop/common/ui/CommonBindingActivity.kt

@@ -16,6 +16,7 @@ import android.widget.EditText
 import androidx.viewbinding.ViewBinding
 import com.develop.base.ext.getModelNum
 import com.develop.base.ext.getSN
+import com.develop.base.ext.isBrand062
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.toJson
 import com.develop.base.mvvm.BaseBindingActivity
@@ -27,6 +28,7 @@ import com.develop.common.R
 import com.develop.common.data_repo.FoodDataProvider
 import com.develop.common.data_repo.net.TokenInvalidateEvent
 import com.develop.common.dialog.CancelConfirmDialog
+import com.develop.common.dialog.CancelConfirmImageDialog
 import com.develop.common.dialog.PlainDialogView
 import com.develop.common.food_sdk.FoodSdkUtils
 import com.develop.common.food_sdk.GlobalDevEvent
@@ -49,6 +51,7 @@ import org.greenrobot.eventbus.Subscribe
 abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>() {
 
 
+    private var is062 = false
     private var screenReceiver: BroadcastReceiver? = null
 
 
@@ -72,8 +75,8 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
     private var screenSaverTime = 3 //minute
 
     override fun onCreate(savedInstanceState: Bundle?) {
-
         super.onCreate(savedInstanceState)
+        is062 = isBrand062()
         isModelNum = getModelNum()
         screenReceiver = object : BroadcastReceiver() {
             override fun onReceive(context: Context, intent: Intent) {
@@ -268,7 +271,7 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
     var lastMsg = ""
 
     private val cancelConfirmDialog = CancelConfirmDialog()
-
+    private val cancelConfirmImageDialog = CancelConfirmImageDialog()
     @Subscribe
     fun onCookDevMsgEvent(event: DevPromptEvent) {
         Log.d(
@@ -346,46 +349,89 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
             return
         }
         lastMsg = event.msg
-//        if (isWidget && lastMsg != "dian_zi_cheng_tong_xin_yi_chan") {
-//            return
-//        }
-        cancelConfirmDialog.showCancel = event.isShowCancelBtn
-        cancelConfirmDialog.showConfirm = event.isShowConfirmBtn
 
-        cancelConfirmDialog.cancelStr = resources.getString(
-            resources.getIdentifier(
-                event.cancelBtnText, "string", this.packageName
+        if (is062&&event.msg == "dev_end_of_run_tips"){
+            cancelConfirmImageDialog.showCancel = event.isShowCancelBtn
+            cancelConfirmImageDialog.showConfirm = event.isShowConfirmBtn
+
+            cancelConfirmImageDialog.cancelStr = resources.getString(
+                resources.getIdentifier(
+                    event.cancelBtnText, "string", this.packageName
+                )
             )
-        )
-        cancelConfirmDialog.confirmStr = resources.getString(
-            resources.getIdentifier(
-                event.confirmButtonText, "string", this.packageName
+            cancelConfirmImageDialog.confirmStr = resources.getString(
+                resources.getIdentifier(
+                    event.confirmButtonText, "string", this.packageName
+                )
             )
-        )
-        cancelConfirmDialog.title =
-            resources.getString(resources.getIdentifier(event.msg, "string", this.packageName))
-
-        cancelConfirmDialog.showDialog(supportFragmentManager, "confirmCancelDialog")
+            cancelConfirmImageDialog.title =
+                resources.getString(resources.getIdentifier(event.msg, "string", this.packageName))
+
+            cancelConfirmImageDialog.showDialog(supportFragmentManager, "confirmCancelDialog")
+
+            cancelConfirmImageDialog.onDialogClickListener =
+                object : CancelConfirmImageDialog.OnDialogClickListener {
+                    override fun onConfirm() {
+                        if (event.confirm != null) {
+                            event.confirm.callback();
+                        }
+                        cancelConfirmImageDialog.removeSelf();
+                        lastMsg = "";
+                    }
 
-        cancelConfirmDialog.onDialogClickListener =
-            object : CancelConfirmDialog.OnDialogClickListener {
-                override fun onConfirm() {
-                    if (event.confirm != null) {
-                        event.confirm.callback();
+                    override fun onCancel() {
+                        if (event.cancel != null) {
+                            event.cancel.callback();
+                        }
+                        cancelConfirmImageDialog.removeSelf();
+                        lastMsg = "";
                     }
-                    cancelConfirmDialog.removeSelf();
-                    lastMsg = "";
+
                 }
 
-                override fun onCancel() {
-                    if (event.cancel != null) {
-                        event.cancel.callback();
+        }else{
+            cancelConfirmDialog.showCancel = event.isShowCancelBtn
+            cancelConfirmDialog.showConfirm = event.isShowConfirmBtn
+
+            cancelConfirmDialog.cancelStr = resources.getString(
+                resources.getIdentifier(
+                    event.cancelBtnText, "string", this.packageName
+                )
+            )
+            cancelConfirmDialog.confirmStr = resources.getString(
+                resources.getIdentifier(
+                    event.confirmButtonText, "string", this.packageName
+                )
+            )
+            cancelConfirmDialog.title =
+                resources.getString(resources.getIdentifier(event.msg, "string", this.packageName))
+
+            cancelConfirmDialog.showDialog(supportFragmentManager, "confirmCancelDialog")
+
+            cancelConfirmDialog.onDialogClickListener =
+                object : CancelConfirmDialog.OnDialogClickListener {
+                    override fun onConfirm() {
+                        if (event.confirm != null) {
+                            event.confirm.callback();
+                        }
+                        cancelConfirmDialog.removeSelf();
+                        lastMsg = "";
                     }
-                    cancelConfirmDialog.removeSelf();
-                    lastMsg = "";
+
+                    override fun onCancel() {
+                        if (event.cancel != null) {
+                            event.cancel.callback();
+                        }
+                        cancelConfirmDialog.removeSelf();
+                        lastMsg = "";
+                    }
+
                 }
 
-            }
+        }
+//        if (isWidget && lastMsg != "dian_zi_cheng_tong_xin_yi_chan") {
+//            return
+//        }
 
     }
 

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

@@ -57,7 +57,31 @@ object ConfigUtils {
             null
         }
     }
+    fun loadCookConfig(): CfConfig? {
+        return try {
+            var sn = getSN()
+            var brandNum = sn.substring(0, 3)
+
+            val fileList = GlobalApp().assets.list("") ?: arrayOf()
+            var inputStream: InputStream? = null
 
+                inputStream = GlobalApp().assets.open("config.json")
+//            inputStream = GlobalApp().assets.open("config_036.json")
+
+            val size = inputStream.available()
+            val buffer = ByteArray(size)
+            inputStream.read(buffer)
+            inputStream.close()
+
+            val jsonString = String(buffer, Charset.defaultCharset())
+            val gson = Gson()
+            val cfConfig = gson.fromJson(jsonString, CfConfig::class.java)
+            cfConfig;
+        } catch (ex: IOException) {
+            ex.printStackTrace()
+            null
+        }
+    }
 
     fun loadLangConfig(): LangConfig? {
         return try {

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

@@ -110,15 +110,21 @@ class FoodContentView : ConstraintLayout {
                                                     CURRENT_USER_ID, foodId
                                                 )
                                         }
-                                        FoodDataProvider.getDatabase().runInTransaction {
-                                            val recipeDao =
-                                                FoodDataProvider.getDatabase().recipeDao()
-                                            val recipes = recipeDao.queryRecipe(foodId)
-                                            recipes?.apply {
-                                                recipeDao.deleteRecipe(this)
-                                            }
-                                            FoodDataProvider.deleteRecipeResource(foodId)
-                                        }
+
+                                        /***
+                                         * 2024.03.04 删除下载记录，只删除记录，不删除食谱
+                                         */
+
+
+//                                        FoodDataProvider.getDatabase().runInTransaction {
+//                                            val recipeDao =
+//                                                FoodDataProvider.getDatabase().recipeDao()
+//                                            val recipes = recipeDao.queryRecipe(foodId)
+//                                            recipes?.apply {
+//                                                recipeDao.deleteRecipe(this)
+//                                            }
+//                                            FoodDataProvider.deleteRecipeResource(foodId)
+//                                        }
                                         EventBus.getDefault().post(RefreshDataEvent())
                                     }
 

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

@@ -81,7 +81,7 @@ class RingControlView @JvmOverloads constructor(
             }
         }
         canvas.drawPath(fillPath, ringPaint)
-        extraPaint.color = if (nightTheme) 0xffDF3F54.toInt() else if (is062) 0xff5887DA.toInt() else 0xffFFA627.toInt()
+        extraPaint.color = if (nightTheme) 0xffDF3F54.toInt() else if (is062) 0xffDAE343.toInt() else 0xffFFA627.toInt()
 
         // -150 ~ 150
         val angle = 300.0 * progress - 150.0

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

@@ -11,6 +11,7 @@ import android.view.animation.Animation
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.LinearSnapHelper
+import com.develop.base.ext.isBrand062
 import com.develop.base.ext.updateText
 import com.develop.common.R
 import com.develop.common.databinding.TimePickerViewBinding
@@ -35,6 +36,7 @@ class TimePickerView : ConstraintLayout {
 
     private var firstUnit: String? = null
     private var secondUnit: String? = null
+    private var is062 = false
 
     var onTimePickerCallback: OnTimePickerCallback? = null
     private var firstManager: ScrollLinearManager
@@ -57,6 +59,7 @@ class TimePickerView : ConstraintLayout {
     init {
         val root = View.inflate(context, R.layout.time_picker_view, this)
         binding = TimePickerViewBinding.bind(root)
+        is062 = isBrand062()
         repeat(60) { idx ->
             if (idx < 10) {
                 firstData.add("0$idx")
@@ -85,6 +88,7 @@ class TimePickerView : ConstraintLayout {
         context.obtainStyledAttributes(attrs, R.styleable.TimePickerView).apply {
             timeColor = getColor(R.styleable.TimePickerView_time_color, Color.WHITE)
         }.recycle()
+        if (is062) timeColor = Color.WHITE
         binding.tvDotTime.setTextColor(timeColor)
         binding.tvFirstBottom.setTextColor(timeColor)
         binding.tvSecondBottom.setTextColor(timeColor)

BusinessCommon/src/main/res/drawable/shape_44px5887da_stoke.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/convert_60px" />
+    <stroke
+        android:width="@dimen/convert_1px"
+        android:color="@color/color_5887DA" />
+    <solid android:color="@color/color_FFEEF4FF"/>
+</shape>

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

@@ -29,8 +29,8 @@
 
         <TextView
             android:id="@+id/tv_yes"
-            android:paddingLeft="@dimen/convert_32px"
-            android:paddingRight="@dimen/convert_32px"
+            android:paddingLeft="@dimen/convert_30px"
+            android:paddingRight="@dimen/convert_30px"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/convert_60px"
             android:layout_below="@id/tv_title"
@@ -44,9 +44,9 @@
 
         <TextView
             android:id="@+id/tv_cancel"
-            android:paddingLeft="@dimen/convert_32px"
-            android:paddingRight="@dimen/convert_32px"
-            android:layout_width="@dimen/convert_140px"
+            android:paddingLeft="@dimen/convert_30px"
+            android:paddingRight="@dimen/convert_30px"
+            android:layout_width="wrap_content"
             android:layout_height="@dimen/convert_60px"
             android:layout_below="@id/tv_title"
             android:layout_alignParentEnd="true"

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

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:background="#000">
+
+    <RelativeLayout
+        android:layout_width="@dimen/convert_500px"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="@drawable/bg_white_button_round10px"
+        android:paddingTop="@dimen/convert_81px"
+        android:paddingBottom="@dimen/convert_64px">
+        <ImageView
+            android:id="@+id/dialog_ok_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/dialog_ok_image"
+            android:layout_centerHorizontal="true"
+            />
+        <TextView
+            android:layout_below="@+id/dialog_ok_image"
+            android:id="@+id/tv_title"
+            android:layout_marginTop="@dimen/convert_20px"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginStart="@dimen/convert_50px"
+            android:layout_marginEnd="@dimen/convert_50px"
+            android:gravity="center"
+            android:lineHeight="@dimen/convert_42px"
+            android:text="@string/keep_cooking_in_the_background"
+            android:textColor="#79C414"
+            android:textSize="@dimen/convert_30px" />
+
+        <TextView
+            android:id="@+id/tv_yes"
+            android:paddingLeft="@dimen/convert_30px"
+            android:paddingRight="@dimen/convert_30px"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/convert_60px"
+            android:layout_below="@id/tv_title"
+            android:layout_marginStart="@dimen/convert_90px"
+            android:layout_marginTop="@dimen/convert_40px"
+            android:background="@drawable/bg_ee8f08_button"
+            android:gravity="center"
+            android:text="@string/yes"
+            android:textColor="#fff"
+            android:textSize="@dimen/convert_30px" />
+
+        <TextView
+            android:id="@+id/tv_cancel"
+            android:paddingLeft="@dimen/convert_30px"
+            android:paddingRight="@dimen/convert_30px"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/convert_60px"
+            android:layout_below="@id/tv_title"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="@dimen/convert_40px"
+            android:layout_marginEnd="@dimen/convert_90px"
+            android:background="@drawable/bg_ee8f08_stoke"
+            android:elevation="@dimen/convert_15px"
+            android:gravity="center"
+            android:text="@string/no"
+            android:textColor="@color/no_color"
+            android:textSize="@dimen/convert_30px" />
+
+    </RelativeLayout>
+
+</FrameLayout>

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

@@ -191,9 +191,9 @@ Nanfang Plus Client, Guangdong Nanfang Newspaper Mobile Media Co, Ltd (bundan b
     <string name="score">Puan</string>
     <string name="share">Paylaş</string>
     <string name="delete">Sil</string>
-    <string name="recipe_update_tips">Toplam {{sayı}} tarif bulundu. Bunları indirmek istiyor musunuz?</string>
+    <string name="recipe_update_tips">Toplam {{num}} tarif bulundu. Bunları indirmek istiyor musunuz?</string>
     <string name="no_recipe_update_tips">Yeni tarifler için kullanılabilir güncelleme dosyası yok \n En güncel versiyon</string>
-    <string name="recipe_update_process_tips">({{devam ediyor}})Tarif güncelleme dosyaları indiriliyor...</string>
+    <string name="recipe_update_process_tips">({{progress}})Tarif güncelleme dosyaları indiriliyor...</string>
     <string name="recipe_update_finish">Tarif güncellemesi tamamlandı</string>
     <string name="update_recipe_title">Tarif güncelleme</string>
     <string name="restore_confirm_tips">Fabrika ayarlarına geri dönmek istediğinizden emin misiniz?</string>
@@ -255,6 +255,7 @@ Nanfang Plus Client, Guangdong Nanfang Newspaper Mobile Media Co, Ltd (bundan b
     <string name="confirm_change_dev_mode">Geliştirici Modu değişikliğini onaylıyor musunuz?</string>
     <string name="water_spary">WATER SPARY</string>
     <string name="error_pot_clover_tips">Mevcut pişirme modu tencere kapağı ile uyumlu değil. Doğru pişirme moduna geçmek istiyor musunuz?</string>
+    <string name="egg_msg">Ana tencereye 500ml soğuk su koyun ve tencerenin içindeki buharda pişirme sepetinde 5-6 yumurta kadar pişirin. Piştikten sonra yaklaşık 20 saniye soğuk su altında tutun ve kaynatma işlemini durdurun.</string>
 
 
 
@@ -296,4 +297,15 @@ Nanfang Plus Client, Guangdong Nanfang Newspaper Mobile Media Co, Ltd (bundan b
     <string name="no_net_error">Lütfen Wi-Fi‘a bağlanın</string>
     <string name="no_login">Giriş yapmak için lütfen yukarıdaki alanları doldurun</string>
     <string name="wrong_captcha">Doğrulama kodu yanlış</string>
+
+    <string name="size_of_the_eggs">YUMURTANIN BÜYÜKLÜĞÜ</string>
+    <string name="how_would_you_like_them">ONLARI NASIL ISTERSINIZ?</string>
+    <string name="small">KÜÇÜK</string>
+    <string name="medium">ORTA</string>
+    <string name="lareg">BÜYÜK</string>
+    <string name="soft">YUMUŞAK</string>
+    <string name="waxy_soft">MUMSU YUMUŞAK</string>
+    <string name="hard">SERT</string>
+
+
 </resources>

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

@@ -10,7 +10,6 @@
     <color name="color_FFA627">#FFA627</color>
     <color name="color_E03E52">#E03E52</color>
     <color name="color_F4A12E">#F4A12E</color>
-    <color name="color_5887DA">#5887DA</color>
     <color name="color_fff">#fff</color>
     <color name="color_33000000">#33000000</color>
     <color name="color_6B6B6B">#6B6B6B</color>
@@ -32,6 +31,8 @@
     <color name="color_000000">#000</color>
     <color name="color_1A1A1A">#1A1A1A</color>
     <color name="color_EE8F08">#EE8F08</color>
+    <color name="color_5887DA">#5887DA</color>
+    <color name="color_FFEEF4FF">#ffeef4ff</color>
     <color name="color_FFF6E9">#FFF6E9</color>
     <color name="color_A3A3A2">#A3A3A2</color>
     <color name="color_E4E4E4">#E4E4E4</color>

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

@@ -326,8 +326,8 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="none">None</string>
 
     <string name="please_fill_in_nickname">Please fill in nickname</string>
-    <string name="size_of_the_eggs">SIZE OF THE EGGS</string>
     <string name="egg_msg">Put 500ml of cold water into the main pot and cook up to 5-6 eggs in the steaming basket inside the pot. After cooking, keep it under cold water for about 20 seconds and stop the boiling process.</string>
+    <string name="size_of_the_eggs">SIZE OF THE EGGS</string>
     <string name="how_would_you_like_them">HOW WOULD YOU LIKE THEM?</string>
     <string name="small">SMALL</string>
     <string name="medium">MEDIUM</string>

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

@@ -55,6 +55,7 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
     private var isLanguageTip = false
     private var isFromSetting = false
     private var language :String? = ""
+    private  var is062 = false
     override fun createViewBinding(inflater: LayoutInflater): ActivityLanguageBinding {
         return ActivityLanguageBinding.inflate(inflater)
     }
@@ -62,14 +63,14 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         language = MMkvUtils.getString(CURRENT_LANGUAGE)
-
+        is062 = isBrand062()
         if (isBrand036I()) {
             binding.ivLogo.setVisible()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.guide_bg_036i)
         }else if (isBrand054A()) {
             binding.ivLogo.setGone()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_054a)
-        }else if (isBrand062()) {
+        }else if (is062) {
             binding.ivLogo.setGone()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_062a)
         }else if (getSN().startsWith("045")){
@@ -114,8 +115,14 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
                     val tvTitle = findView<AppCompatTextView>(R.id.tv_title)
                     val cardView = findView<RelativeLayout>(R.id.content_layout)
                     if (selectedPosition == absoluteAdapterPosition) {
-                        tvTitle.setTextColor(context.resources.getColor(com.develop.common.R.color.color_EE8F08))
-                        cardView.setBackgroundResource(com.develop.common.R.drawable.shape_44pxfff6e9_stoke)
+                        if (is062){
+                            tvTitle.setTextColor(context.resources.getColor(com.develop.common.R.color.color_5887DA))
+                            cardView.setBackgroundResource(com.develop.common.R.drawable.shape_44px5887da_stoke)
+                        }else{
+                            tvTitle.setTextColor(context.resources.getColor(com.develop.common.R.color.color_EE8F08))
+                            cardView.setBackgroundResource(com.develop.common.R.drawable.shape_44pxfff6e9_stoke)
+                        }
+
                     } else {
                         tvTitle.setTextColor(context.resources.getColor(com.develop.common.R.color.color_1A1A1A))
                         cardView.setBackgroundResource(com.develop.common.R.drawable.shape_44pxffffff_stoke)

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

@@ -116,7 +116,7 @@
                 android:paddingTop="@dimen/convert_12px"
                 android:paddingBottom="@dimen/convert_12px"
                 android:layout_height="wrap_content"
-                android:background="@drawable/about_update_btn_stoke"
+                android:background="@drawable/about_update_stroke"
                 android:layout_toStartOf="@id/tv_app_version"
                 android:layout_marginEnd="@dimen/convert_24px"
                 android:layout_centerVertical="true"
@@ -220,7 +220,7 @@
                 android:paddingTop="@dimen/convert_12px"
                 android:paddingBottom="@dimen/convert_12px"
                 android:layout_height="wrap_content"
-                android:background="@drawable/about_update_btn_stoke"
+                android:background="@drawable/about_update_stroke"
                 android:layout_toStartOf="@id/tv_firmware"
                 android:layout_marginEnd="@dimen/convert_24px"
                 android:layout_centerVertical="true"

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

@@ -218,7 +218,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         isModelNum = getModelNum()
 
         if (!isNightTheme()) {
-            var color = if (is062) com.develop.common.R.color.white else com.develop.common.R.color.view_change
+            var color =
+                if (is062) com.develop.common.R.color.white else com.develop.common.R.color.view_change
             binding.ivBack.drawable?.apply {
                 DrawableCompat.setTint(
                     this,
@@ -691,12 +692,13 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             return
         }
 
-        Log.d("TAG DevStateEvent","event:" + event.devInfo.toString())
+        Log.d("TAG DevStateEvent", "event:" + event.devInfo.toString())
         //由于sdk没有判断E7到E16 需要判断运行和暂停过程中，设备发生故障弹出窗口告知故障
         if ((isClickType == DevStatus.RUNNING.toInt() || isClickType == DevStatus.PAUSE.toInt()
-                    || isClickType == DevStatus.STOP.toInt())&& viewModel.modeType!=ModesType.WIGHT.name) {
+                    || isClickType == DevStatus.STOP.toInt()) && viewModel.modeType != ModesType.WIGHT.name
+        ) {
 
-            if (ConfigUtils.getBooleanErrCode(event.devInfo.errCode.toInt())&&event.devInfo.devMode==DevModes.AIR_FRYER) {
+            if (ConfigUtils.getBooleanErrCode(event.devInfo.errCode.toInt()) && event.devInfo.devMode == DevModes.AIR_FRYER) {
                 showErrCodeDialog(event.devInfo.errCode.toInt())
                 isClickType = event.devInfo.status
                 return
@@ -706,13 +708,13 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         ////devInfo.potStatus 0是有锅  1是没锅
         //处理换锅问题
         if (isModelNum == "5037" && event.devInfo.potStatus.toInt() == 1) {
-                // isDevModes 避免重复刷新
+            // isDevModes 避免重复刷新
 //            if (isDevModes && workMode?.devMode!=DevModes.SOUP) {
 //                isDevModes = false
 //                CofarSDK.changeDevModeFocus(DevModes.SOUP)
 //                return
 //            }
-        } else if (isModelNum == "5037"  && event.devInfo.potStatus.toInt() == 0 && workMode?.type != "WIGHT") {
+        } else if (isModelNum == "5037" && event.devInfo.potStatus.toInt() == 0 && workMode?.type != "WIGHT") {
             /**
              * 由于客户无锅状态下是默认汤锅列表，但是在一进来是空炸锅，拿出来（无锅的时候已经换了汤锅模式），
              * 但重新放空炸锅，onDevModeChange 是不会回调的，固需要用potCoverType 锅盖协议来判断是否需要重新换模式
@@ -721,7 +723,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             if (event.devInfo.potCloverType.toInt() == 1 && devMode == DevModes.SOUP) {
                 CofarSDK.changeDevModeFocus(DevModes.AIR_FRYER)
                 return
-            }else if (event.devInfo.potCloverType.toInt() == 0 && devMode == DevModes.AIR_FRYER){
+            } else if (event.devInfo.potCloverType.toInt() == 0 && devMode == DevModes.AIR_FRYER) {
                 CofarSDK.changeDevModeFocus(DevModes.SOUP)
                 return
             }
@@ -730,7 +732,6 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         }
 
 
-
         //处理中途换换锅问题
         if (sdkDevMode != event.devInfo.devMode) {
             return
@@ -1290,13 +1291,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
     /**切换到温度*/
     private fun changeTempSettingStep() {
-        if (is062){
-            binding.jianhao.setGone()
-            binding.jiahao.setGone()
-        }else{
-            binding.jianhao.setVisible()
-            binding.jiahao.setVisible()
-        }
+        binding.jianhao.setVisible()
+        binding.jiahao.setVisible()
 
         binding.steamFire.visibility = View.GONE
         binding.llWeightView.visibility = View.GONE
@@ -1327,13 +1323,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     /**切换到时间*/
     private fun changeTimeSettingStep() {
         binding.steamFire.visibility = View.GONE
-        if (is062){
-            binding.jianhao.setGone()
-            binding.jiahao.setGone()
-        }else{
-            binding.jianhao.setVisible()
-            binding.jiahao.setVisible()
-        }
+        binding.jianhao.setVisible()
+        binding.jiahao.setVisible()
         binding.llWeightView.visibility = View.GONE
         binding.functionLayout.visibility = View.VISIBLE
         binding.tempRingView.visibility = View.INVISIBLE
@@ -1354,13 +1345,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         whereIndex = -1
         binding.clSetTime.stopAlphaAnim()
         binding.steamFire.visibility = View.GONE
-        if (is062){
-            binding.jianhao.setGone()
-            binding.jiahao.setGone()
-        }else{
-            binding.jianhao.setVisible()
-            binding.jiahao.setVisible()
-        }
+        binding.jianhao.setVisible()
+        binding.jiahao.setVisible()
         binding.llWeightView.visibility = View.GONE
         binding.functionLayout.visibility = View.VISIBLE
         binding.tempRingView.visibility = View.INVISIBLE
@@ -1403,13 +1389,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         whereIndex = -1
         binding.clSetTime.stopAlphaAnim()
         binding.steamFire.visibility = View.GONE
-        if (is062){
-            binding.jianhao.setGone()
-            binding.jiahao.setGone()
-        }else{
-            binding.jianhao.setVisible()
-            binding.jiahao.setVisible()
-        }
+        binding.jianhao.setVisible()
+        binding.jiahao.setVisible()
         binding.llWeightView.visibility = View.GONE
         binding.functionLayout.visibility = View.VISIBLE
         binding.tempRingView.visibility = View.INVISIBLE
@@ -1926,8 +1907,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     private fun startClick(showStopTips: Boolean = true) {
         var devInfo = CofarSDK.devInfo()
         //判断是否是空炸错误，由于汤锅错误SDK 已经做了
-        if (ConfigUtils.getBooleanErrCode(devInfo.errCode.toInt())&&devInfo.devMode==DevModes.AIR_FRYER) {
-            lastMsg=""
+        if (ConfigUtils.getBooleanErrCode(devInfo.errCode.toInt()) && devInfo.devMode == DevModes.AIR_FRYER) {
+            lastMsg = ""
             showErrCodeDialog(devInfo.errCode.toInt())
         } else {
 
@@ -2406,7 +2387,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         //在当前页面，换了模式以后 重新启动
         if (CommonEventTypes.DEV_MODE_CHANGE == event.type) {
             //针对DIY处理
-            if (workMode?.devMode!=CofarSDK.devInfo().devMode &&(lastModeType == WorkModes.ADAPTED_COOKING || lastModeType == WorkModes.AF_DIY)) {
+            if (workMode?.devMode != CofarSDK.devInfo().devMode && (lastModeType == WorkModes.ADAPTED_COOKING || lastModeType == WorkModes.AF_DIY)) {
 //                isWidget = false
 //                viewModel.stopTurbo()
 //                viewModel.cancelAnimator()
@@ -2430,9 +2411,9 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                 finish()
             } else {
                 //称重留在当前页面
-                if (workMode?.devMode==CofarSDK.devInfo().devMode || workMode?.type == "WIGHT" ){
+                if (workMode?.devMode == CofarSDK.devInfo().devMode || workMode?.type == "WIGHT") {
                     return
-                }else{
+                } else {
                     finish()
 
                 }

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

@@ -127,15 +127,15 @@ class CookStepActivity : CookStepBaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        //做食谱步骤判断
-        configJson = ConfigUtils.loadConfig()
+        //做食谱步骤判断  由于可能对应的 cofig 缺少程序，故用总文件来 config.json
+        configJson = ConfigUtils.loadCookConfig()
         isModelNum = getModelNum()
         if (!isNightTheme()) {
-            if (is062){
+            if (is062) {
                 binding.viewChangeCrush.setBgColor(R.color.view_change_062)
                 binding.viewChangeWeight.setBgColor(R.color.view_change_062)
                 binding.viewRemark.setBgColor(R.color.white)
-            }else{
+            } else {
                 binding.viewChangeCrush.setBgColor(R.color.view_change)
                 binding.viewChangeWeight.setBgColor(R.color.view_change)
                 binding.viewRemark.setBgColor(R.color.view_change)
@@ -605,13 +605,8 @@ class CookStepActivity : CookStepBaseActivity() {
         binding.controller.clSetTime.stopAlphaAnim()
         binding.controller.llStepComplete.setGone()
         //062设计图需要隐藏加号减号按钮
-        if (is062){
-            binding.controller.jiahao.setGone()
-            binding.controller.jianhao.setGone()
-        }else{
-            binding.controller.jiahao.setVisible()
-            binding.controller.jianhao.setVisible()
-        }
+        binding.controller.jiahao.setVisible()
+        binding.controller.jianhao.setVisible()
 
 
     }
@@ -669,15 +664,14 @@ class CookStepActivity : CookStepBaseActivity() {
 
             isClickType = 1
             //判断是否是空炸错误，由于汤锅错误SDK 已经做了 ；
-            if (ConfigUtils.getBooleanErrCode(CofarSDK.devInfo().errCode.toInt())&&CofarSDK.devInfo().devMode==DevModes.AIR_FRYER) {
+            if (ConfigUtils.getBooleanErrCode(CofarSDK.devInfo().errCode.toInt()) && CofarSDK.devInfo().devMode == DevModes.AIR_FRYER) {
                 showErrCodeDialog(CofarSDK.devInfo().errCode.toInt())
             } else {
                 if (viewModel.allSteps.size == 0) {
                     //没有菜谱步骤
                     return
                 }
-                var workModes =
-                    configJson?.workModes?.find { it.type == viewModel.allSteps[viewModel.stepIndex].workMode }
+                var workModes = configJson?.workModes?.find { it.type == viewModel.allSteps[viewModel.stepIndex].workMode }
                 var wrokDevMode = workModes?.devMode
                 //由于菜谱内包含汤锅和空炸估做判断当前步骤是否是所需要得锅
                 if (wrokDevMode != CofarSDK.devInfo().devMode) {
@@ -902,6 +896,7 @@ class CookStepActivity : CookStepBaseActivity() {
             binding.weightView.setWeightNumber(uiData.weightNum.toFloat())
         }
     }
+
     private fun showErrMsgDialog(msg: String) {
         if (lastMsg == msg) {
             return
@@ -1519,7 +1514,7 @@ class CookStepActivity : CookStepBaseActivity() {
         Log.d("TAG dddddd", "cook event:" + event.devInfo.toString())
         //由于sdk没有判断E7到E16 需要判断运行和暂停过程中，设备发生故障弹出窗口告知故障
         if (isClickType == DevStatus.RUNNING.toInt() || isClickType == DevStatus.PAUSE.toInt()) {
-            if (ConfigUtils.getBooleanErrCode(event.devInfo.errCode.toInt())&&event.devInfo.devMode==DevModes.AIR_FRYER) {
+            if (ConfigUtils.getBooleanErrCode(event.devInfo.errCode.toInt()) && event.devInfo.devMode == DevModes.AIR_FRYER) {
                 showErrCodeDialog(event.devInfo.errCode.toInt())
                 isClickType = event.devInfo.status
                 return

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

@@ -192,8 +192,8 @@ abstract class CookStepBaseActivity :
             }
         } else {
             binding.viewRemark.src = R.drawable.ic_cooking_remark
-            if (is062){
-            }else{
+            if (is062) {
+            } else {
                 binding.viewRemark.drawable?.apply {
                     DrawableCompat.setTint(this, resources.getColor(R.color.white))
                 }
@@ -377,13 +377,8 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeTempSettingPanel() {
-        if (is062) {
-            binding.controller.jianhao.setGone()
-            binding.controller.jiahao.setGone()
-        } else {
-            binding.controller.jianhao.setVisible()
-            binding.controller.jiahao.setVisible()
-        }
+        binding.controller.jianhao.setVisible()
+        binding.controller.jiahao.setVisible()
 
         binding.controller.waterRingView.visibility = View.GONE
         binding.controller.waterSprayShow.visibility = View.GONE
@@ -419,13 +414,8 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeTimeSettingPanel() {
-        if (is062) {
-            binding.controller.jianhao.setGone()
-            binding.controller.jiahao.setGone()
-        } else {
-            binding.controller.jianhao.setVisible()
-            binding.controller.jiahao.setVisible()
-        }
+        binding.controller.jianhao.setVisible()
+        binding.controller.jiahao.setVisible()
 
         binding.controller.steamFire.visibility = View.GONE;
 //        binding.controller.steamFireSmall.visibility = View.GONE;
@@ -447,13 +437,8 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeSpeedSettingStep() {
-        if (is062) {
-            binding.controller.jianhao.setGone()
-            binding.controller.jiahao.setGone()
-        } else {
-            binding.controller.jianhao.setVisible()
-            binding.controller.jiahao.setVisible()
-        }
+        binding.controller.jianhao.setVisible()
+        binding.controller.jiahao.setVisible()
 
         binding.controller.steamFire.visibility = View.GONE;
 //        binding.controller.steamFireSmall.visibility = View.GONE;
@@ -476,13 +461,8 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeWaterGearSettingStep() {
-        if (is062) {
-            binding.controller.jianhao.setGone()
-            binding.controller.jiahao.setGone()
-        } else {
-            binding.controller.jianhao.setVisible()
-            binding.controller.jiahao.setVisible()
-        }
+        binding.controller.jianhao.setVisible()
+        binding.controller.jiahao.setVisible()
 
         binding.controller.steamFire.visibility = View.GONE;
 //        binding.controller.steamFireSmall.visibility = View.GONE;

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

@@ -69,6 +69,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
 
     private var cookDetailJson: String? = null
     private var portionSizelJson: String? = null
+    private var is062 = false
 
     private val shareQRCodeDialog by lazy {
         ShareQRCodeDialog()
@@ -91,6 +92,8 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         ARouter.getInstance().inject(this)
+        is062 = isBrand062()
+
         initView()
         initData()
         initListener()
@@ -176,7 +179,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             binding.tvDownload.setText(com.develop.common.R.string.start_cooking)
             if (isNightTheme()) {
                 binding.viewProgress.setButtonColor(Color.parseColor("#E03E52"))
-            } else if (isBrand062()){
+            } else if (is062){
                 binding.viewProgress.setButtonColor(Color.parseColor("#CCDAE343"))
             }else {
                 binding.viewProgress.setButtonColor(Color.parseColor("#CCEE8F08"))
@@ -185,7 +188,13 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         } else {
             binding.tvDownload.text =
                 getString(com.develop.common.R.string.download).uppercase(Locale.ROOT)
-            binding.viewProgress.setButtonColor(Color.parseColor("#CC1296DB"))
+            if (is062){
+                binding.viewProgress.setButtonColor(Color.parseColor("#CCDAE343"))
+
+            }else{
+                binding.viewProgress.setButtonColor(Color.parseColor("#CC1296DB"))
+
+            }
             binding.viewIcon.src = com.develop.common.R.drawable.ic_detail_cook_download
         }
         hideViews.let {
@@ -199,7 +208,12 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         allTabViews.add(binding.ivTab3)
         binding.ivTab4.setGone()
         selectTab(TAB_SOURCE)
-        binding.tvMoreDelete.setGone()
+        if (is062){
+            binding.tvMoreDelete.setVisible()
+        }else{
+            binding.tvMoreDelete.setGone()
+
+        }
     }
 
     private fun initListener() {

app/build.gradle

@@ -13,7 +13,7 @@ ext {
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
 //    brandCode="036I"
-    brandCode = "030A"
+    brandCode = "063A"
     model = "1039"
 
 }
@@ -224,7 +224,17 @@ android {
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
         }
-
+        brand063ATuya {
+            dimension "platform"
+            applicationId "com.develop.foodcooking"
+            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+            resValue("string", "app_theme", "@style/SplashTheme")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"063A\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+//            buildConfigField("String", "appCode", "\"2.01\"")
+        }
     }
 
     signingConfigs {
@@ -266,6 +276,7 @@ android {
             productFlavors.brand045ATuya.signingConfig signingConfigs.release
             productFlavors.brand032DTuya.signingConfig signingConfigs.release
             productFlavors.brand032D.signingConfig signingConfigs.release
+            productFlavors.brand063ATuya.signingConfig signingConfigs.release
             productFlavors.brand002DTuya.signingConfig signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
@@ -303,13 +314,13 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
 
-            buildConfigField("String", "UpdatePlatform", "\"normal\"")
-            resValue("string", "app_theme", "@style/SplashTheme")
-            buildConfigField("String", "model", "\"1039\"")
-            buildConfigField("String", "brandCode", "\"011A\"")
-            //appCode 1.01 指向bug修复，2.01指向功能变更
-            buildConfigField("String", "appCode", "\"1.01\"")
-//            buildConfigField("String", "appCode", "\"2.01\"")
+//            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+//            resValue("string", "app_theme", "@style/SplashTheme")
+//            buildConfigField("String", "model", "\"1039\"")
+//            buildConfigField("String", "brandCode", "\"062A\"")
+//            //appCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
+////            buildConfigField("String", "appCode", "\"2.01\"")
 
 //             buildConfigField("String", "UpdatePlatform", "\"011A\"")
 //            resValue("string", "app_theme", "@style/Splash011A5037Theme")
@@ -318,6 +329,13 @@ android {
 //            //appCode 1.01 指向bug修复，2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
+
+            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+            resValue("string", "app_theme", "@style/SplashTheme")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"063A\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
         }
     }
 

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

@@ -41,6 +41,7 @@ class MainActivity : CommonBindingActivity<ActivityMainBinding>() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         getScreen()
+
         if (MMkvUtils.getBool(FIRST_IN)) {
             if (isBrand062()){
                 navigateTo(Screens.Main.ENTRANCE_CHOSEN_TWO)
@@ -73,6 +74,8 @@ class MainActivity : CommonBindingActivity<ActivityMainBinding>() {
         }
 
 
+
+
 //        this.initSDK()
         //初始化涂鸦
 //        var tuyaConfig = ConfigUtils.loadTuyaConfig()
@@ -85,16 +88,18 @@ class MainActivity : CommonBindingActivity<ActivityMainBinding>() {
         getDevInfo()
 
     }
+
+
     //获取是否有涂鸦功能
     fun getDevInfo() {
-        println("涂鸦请求")
+//        println("涂鸦请求")
         scopeNetLife {
             val result = Post<DevInfoResult>(Api.DEV_INFO) {
                 body = DeviceInfoBody.genDeviceInfoBody()
             }.await()
             getInitTuya(result)
         }.catch {
-            println("涂鸦请求 异常")
+//            println("涂鸦请求 异常")
             getAppTuya(true)
         }
     }
@@ -120,9 +125,9 @@ class MainActivity : CommonBindingActivity<ActivityMainBinding>() {
 
 
     fun getInitTuya(result: DevInfoResult) {
-        var gson = Gson()
-        println("涂鸦请求 成功")
-        println("涂鸦请求3 ： "+gson.toJson(result))
+//        var gson = Gson()
+//        println("涂鸦请求 成功")
+//        println("涂鸦请求3 ： "+gson.toJson(result))
         if (result.tuyaLicense != null) {
             result.tuyaLicense?.let {
                 TuyaUtils.mAk = it.ak

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

@@ -208,7 +208,7 @@ fun getSN(): String {
 //     return "000A10390020123010190001"
 //        return "000A50370020123010190005"/
 //    return "010D10390020123010190001"
-    return "011A10390020123010190001"
+//    return "011A10390020123010190001"
 //        return "000A50370020123010190004"
 //        return "011A50370020123010190003"
 //        return "011A50370020123010190004"
@@ -217,13 +217,14 @@ fun getSN(): String {
 //        return "030A10390020123010190001"
 //    return  "017A20060020123010190001"
 //        return  "017A10390020123010190001"
-//    return "010D10390020123010190001"
+    return "010D10390020123010190001"
 //    return "000A10390020123010190009"
 //        return "032D21060020123010190001"
 //        return "000A50370020123010190011"
 //    return  "030A10390020123010190002"
 //        return "029C21010020123010190001"
 //        return  "062A10390020123010190002"
+//        return  "063A10390020123010190001"
 //        return "000A50370020123010190018"
 //        return  "000A10390020123010190023"
     } else {

libBase/src/main/java/com/develop/base/util/SerialportUtils.java

@@ -51,6 +51,8 @@ public class SerialportUtils {
         }
     }
 
+
+    //添加系统语言
     public static void getAddLocale(List<String> list) {
 
         List<Locale> listLocale = new ArrayList<>();
@@ -97,6 +99,7 @@ public class SerialportUtils {
         }
     }
 
+    //获取 Locale 对象
     private static Locale getLocale(String lankey) {
         if (LangKey.ZH_CN.equals(lankey)) {
             return Locale.CHINA;

settings.gradle

@@ -36,4 +36,5 @@ include ':BusinessStep'
 include ':BusinessAirFryer'
 include ':skin-support'
 include ':LocalTools'
-include ':skin-blue'
+include ':skin-blue'
+include ':skin-zeroOneOne'

skin-blue/src/main/res/drawable/hide_bg_conner.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
 
-    <solid android:color="#5887DA"/>
+    <solid android:color="#DAE343"/>
 </shape>

skin-blue/src/main/res/values/colors.xml

@@ -30,7 +30,7 @@
     <color name="color_EE0000">#EE0000</color>
     <color name="color_000000">#000</color>
     <color name="color_1A1A1A">#1A1A1A</color>
-    <color name="color_EE8F08">#E03E52</color>
+    <color name="color_EE8F08">#5887DA</color>
     <color name="color_FFF6E9">#FFF6E9</color>
     <color name="color_A3A3A2">#A3A3A2</color>
     <color name="color_E4E4E4">#E4E4E4</color>
@@ -42,15 +42,15 @@
     <color name="bg_color">#ffffff</color>
     <color name="common_title">#1A1A1A</color>
     <color name="about_app_name">#1A1A1A</color>
-    <color name="about_update_stroke">#5887DA</color>
-    <color name="about_update_recipes">#5887DA</color>
+    <color name="about_update_stroke">#92cf40</color>
+    <color name="about_update_recipes">#92cf40</color>
     <color name="about_function_stroke">#E5E5E5</color>
     <color name="about_function_title">#1A1A1A</color>
     <color name="about_function_des">#A3A3A2</color>
     <color name="about_line">#E5E5E5</color>
-    <color name="about_update">#79C414</color>
+    <color name="about_update">#5887DA</color>
 
-    <color name="brightness_content">#ffffff</color>
+    <color name="brightness_content">#1A1A1A</color>
     <color name="seekbar_selected">#1296DB</color>
     <color name="seekbar_unselect">#E5E5E5</color>
     <color name="language_conner">#5887DA</color>

skin-zeroOneOne/build.gradle

@@ -0,0 +1,32 @@
+plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    namespace 'com.develop.skin_zeroOneOne'
+    compileSdk 31
+
+    defaultConfig {
+        applicationId "com.develop.skin_zeroOneOne"
+        minSdk 21
+        targetSdk 30
+        versionCode 1
+        versionName "1.0"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    applicationVariants.all { variant ->
+        variant.outputs.all { output ->
+            outputFileName = "zeroOneOne.skin"
+        }
+    }
+
+}
+

skin-zeroOneOne/build/generated/source/buildConfig/release/com/develop/skin_blue/BuildConfig.java

@@ -0,0 +1,12 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package com.develop.skin_blue;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = false;
+  public static final String APPLICATION_ID = "com.develop.skin_blue";
+  public static final String BUILD_TYPE = "release";
+  public static final int VERSION_CODE = 1;
+  public static final String VERSION_NAME = "1.0";
+}