011换肤

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

@@ -1,6 +1,7 @@
 package com.develop.common.dialog
 
 import android.animation.ObjectAnimator
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -28,6 +29,7 @@ class RecipeUpdateDialog() : FullScreenTransparentDialog() {
     var msg = ""
     var is062 = isBrand062()
 
+    @SuppressLint("UseCompatLoadingForDrawables")
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View {
@@ -77,7 +79,7 @@ class RecipeUpdateDialog() : FullScreenTransparentDialog() {
             layoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL)
             binding.tvCancel.layoutParams = layoutParams
             if (is062){
-                binding.tvYes.setBackgroundResource(R.drawable.dialog_recipes_cancel)
+                binding.tvYes.background = resources.getDrawable(R.drawable.dialog_recipes_cancel_062)
             }
             binding.tvYes.text = getString(R.string.stop)
 
@@ -94,7 +96,7 @@ class RecipeUpdateDialog() : FullScreenTransparentDialog() {
             binding.tvCancel.layoutParams = layoutParams
             binding.tvYes.text = getString(R.string.ok)
             if (is062){
-                binding.tvYes.setBackgroundResource(R.drawable.dialog_recipes_download)
+                binding.tvYes.background = resources.getDrawable(R.drawable.dialog_recipes_download_062)
             }
         }
        val animation = RotateAnimation(

BusinessCommon/src/main/java/com/develop/common/event/CommonEvent.kt

@@ -9,6 +9,8 @@ class RefreshLikeDataEvent(var isLike: Boolean, var recipeNumber: String) {}
 
 class RefreshStarDataEvent(var starCount: Int, var recipeNumber: String,var useNum:Long) {}
 
+class TuyaEventBus(){}
+
 data class CookStepEvent(
     var recipeNumber: String = "",
     var coverPath: Any,
@@ -16,5 +18,4 @@ data class CookStepEvent(
     var isMode: Boolean = false,
     var modeName: String = "",
     var modeType: String = "",
-) {
-}
+) {}

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

@@ -116,7 +116,10 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
     }
 
     override fun onResume() {
-        EventBus.getDefault().register(this)
+        if (this.localClassName != "com.develop.setting.ui.SettingMainActivity") {
+            EventBus.getDefault().register(this)
+        }
+
         super.onResume()
         isResume = true
         if (!hasShowScreenSaver) {
@@ -131,7 +134,10 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
     }
 
     override fun onPause() {
-        EventBus.getDefault().unregister(this)
+        //由于涂鸦功能，需要 SettingMainActivity  onPause 接收信息，估有此判断
+        if (this.localClassName != "com.develop.setting.ui.SettingMainActivity") {
+            EventBus.getDefault().unregister(this)
+        }
         super.onPause()
         isResume = false
         stopScreenSaverCount()
@@ -272,6 +278,7 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
 
     private val cancelConfirmDialog = CancelConfirmDialog()
     private val cancelConfirmImageDialog = CancelConfirmImageDialog()
+
     @Subscribe
     fun onCookDevMsgEvent(event: DevPromptEvent) {
         Log.d(
@@ -350,7 +357,7 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
         }
         lastMsg = event.msg
 
-        if (is062&&event.msg == "dev_end_of_run_tips"){
+        if (is062 && event.msg == "dev_end_of_run_tips") {
             cancelConfirmImageDialog.showCancel = event.isShowCancelBtn
             cancelConfirmImageDialog.showConfirm = event.isShowConfirmBtn
 
@@ -389,7 +396,7 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
 
                 }
 
-        }else{
+        } else {
             cancelConfirmDialog.showCancel = event.isShowCancelBtn
             cancelConfirmDialog.showConfirm = event.isShowConfirmBtn
 

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

@@ -8,6 +8,7 @@ import android.util.AttributeSet
 import android.util.TypedValue
 import android.view.MotionEvent
 import android.view.View
+import com.develop.base.ext.isBrand011A
 import com.develop.base.ext.isBrand062
 import com.develop.base.ext.isNightTheme
 import kotlin.math.*
@@ -20,6 +21,7 @@ class RingControlView @JvmOverloads constructor(
     private val ringPaint = Paint(Paint.ANTI_ALIAS_FLAG) //圆点
     private val extraPaint = Paint(Paint.ANTI_ALIAS_FLAG) //圆弧
     private val is062 = isBrand062()
+    private val is011 = isBrand011A()
     private val ringStrokeWidth = TypedValue.applyDimension(
         TypedValue.COMPLEX_UNIT_DIP, 7f, context.resources.displayMetrics
     )
@@ -81,7 +83,7 @@ class RingControlView @JvmOverloads constructor(
             }
         }
         canvas.drawPath(fillPath, ringPaint)
-        extraPaint.color = if (nightTheme) 0xffDF3F54.toInt() else if (is062) 0xffDAE343.toInt() else 0xffFFA627.toInt()
+        extraPaint.color = if (nightTheme) 0xffDF3F54.toInt() else if (is062) 0xffDAE343.toInt()else if (is011) 0xffC10A27.toInt() else 0xffFFA627.toInt()
 
         // -150 ~ 150
         val angle = 300.0 * progress - 150.0

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

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

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

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

BusinessCommon/src/main/res/drawable/shape_44pxc10a27_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_C10A27" />
+    <solid android:color="@color/color_FFE3E3"/>
+</shape>

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

@@ -32,7 +32,9 @@
     <color name="color_1A1A1A">#1A1A1A</color>
     <color name="color_EE8F08">#EE8F08</color>
     <color name="color_5887DA">#5887DA</color>
+    <color name="color_C10A27">#C10A27 </color>
     <color name="color_FFEEF4FF">#ffeef4ff</color>
+    <color name="color_FFE3E3">#FFE3E3</color>
     <color name="color_FFF6E9">#FFF6E9</color>
     <color name="color_A3A3A2">#A3A3A2</color>
     <color name="color_E4E4E4">#E4E4E4</color>
@@ -158,6 +160,7 @@
     <color name="dialog_recipes_no">#FB900C</color>
     <color name="view_change">#EE8F08</color>
     <color name="view_change_062">#5887DA</color>
+    <color name="view_change_011">#C10A27 </color>
     <color name="text_hit">#B1B2B2</color>
     <color name="direction_color">#ffffff</color>
     <color name="egg_red">#B83546</color>

BusinessMain/src/main/java/com/develop/main/adapter/LetterTextAdapter.kt

@@ -35,12 +35,14 @@ class LetterTextAdapter:  RecyclerView.Adapter<RecyclerView.ViewHolder>() {
         var colorTrue = when (isType) {
             1 -> mContext.resources.getColor(com.develop.common.R.color.color_E03E52)
             2 -> mContext.resources.getColor(com.develop.common.R.color.color_5887DA)
+            3 -> mContext.resources.getColor(com.develop.common.R.color.color_C10A27)
             else -> mContext.resources.getColor(com.develop.common.R.color.color_EE8F08)
         }
 
         var colorFlase = when (isType) {
             1 -> mContext.resources.getColor(com.develop.common.R.color.color_fff)
             2 -> mContext.resources.getColor(com.develop.common.R.color.color_000000)
+            3 -> mContext.resources.getColor(com.develop.common.R.color.color_000000)
             else -> mContext.resources.getColor(com.develop.common.R.color.color_000000)
         }
 

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

@@ -20,6 +20,7 @@ import com.bumptech.glide.Glide
 import com.develop.base.ext.background_color
 import com.develop.base.ext.background_drawable
 import com.develop.base.ext.globalApp
+import com.develop.base.ext.isBrand011A
 import com.develop.base.ext.isBrand062
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
@@ -258,7 +259,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
                                     var letterTextAdapter = LetterTextAdapter()
                                     letterTextAdapter.setData(
                                         letterStringList,
-                                        if (isNightTheme()) 1 else if (isBrand062()) 2 else 0,
+                                        if (isNightTheme()) 1 else if (isBrand062()) 2 else if (isBrand011A()) 3  else 0,
                                         letterPosition,
                                         object : LetterTextAdapter.onItem {
                                             override fun onClickStr(str: String, pos: Int) {

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

@@ -15,6 +15,7 @@ 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.getSN
+import com.develop.base.ext.isBrand011A
 import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.isBrand054A
 import com.develop.base.ext.isBrand062
@@ -56,6 +57,7 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
     private var isFromSetting = false
     private var language :String? = ""
     private  var is062 = false
+    private  var is011 = false
     override fun createViewBinding(inflater: LayoutInflater): ActivityLanguageBinding {
         return ActivityLanguageBinding.inflate(inflater)
     }
@@ -64,6 +66,8 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
         super.onCreate(savedInstanceState)
         language = MMkvUtils.getString(CURRENT_LANGUAGE)
         is062 = isBrand062()
+        is011 = isBrand011A()
+
         if (isBrand036I()) {
             binding.ivLogo.setVisible()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.guide_bg_036i)
@@ -118,6 +122,9 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
                         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 if (is011){
+                            tvTitle.setTextColor(context.resources.getColor(com.develop.common.R.color.color_C10A27))
+                            cardView.setBackgroundResource(com.develop.common.R.drawable.shape_44pxc10a27_stoke)
                         }else{
                             tvTitle.setTextColor(context.resources.getColor(com.develop.common.R.color.color_EE8F08))
                             cardView.setBackgroundResource(com.develop.common.R.drawable.shape_44pxfff6e9_stoke)

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

@@ -1,5 +1,6 @@
 package com.develop.setting.ui
 
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.graphics.Rect
 import android.net.NetworkInfo
@@ -22,20 +23,29 @@ import com.develop.base.ext.src
 import com.develop.base.ext.updateText
 import com.develop.base.manager.WifiHelp
 import com.develop.base.util.FileKit
+import com.develop.base.util.MMkvUtils
 import com.develop.common.data_repo.db.DataFactory
+import com.develop.common.data_repo.db.FoodContentModel
 import com.develop.common.data_repo.db.SettingModel
 import com.develop.common.data_repo.db.SettingType
+import com.develop.common.event.RefreshStarDataEvent
+import com.develop.common.event.TuyaEventBus
 import com.develop.common.router.Screens
+import com.develop.common.tag.ISTUYA
 import com.develop.common.tag.LANGUAGE_FROM_SETTING
 import com.develop.common.tag.WIFI_FROM_MAIN_SETTING
 import com.develop.common.ui.CommonBindingActivity
+import com.develop.common.utils.TuyaUtils
 import com.develop.setting.R
 import com.develop.setting.databinding.ActivitySettingMainBinding
+import com.drake.brv.utils.bindingAdapter
 import com.drake.brv.utils.grid
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
 import com.kuyuntech.cofarcooking.device.sdk.constant.core.DevStatus
 import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
 
 
 @Route(path = Screens.Setting.MAIN_SETTING)
@@ -48,12 +58,14 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        EventBus.getDefault().register(this)
+
         var ctx = this
         dataList = if (getSN().startsWith("010D")) {
             DataFactory.genSetting010DModesList(resources)
         } else if (getSN().startsWith("032D")) {
             DataFactory.genSetting032DModesList(resources)
-        } else if (getSN().startsWith("011A")|| getSN().startsWith("030A")) {
+        } else if (getSN().startsWith("011A") || getSN().startsWith("030A")) {
             DataFactory.genSetting011AModesList(resources)
         } else {
             DataFactory.genSettingModesList(resources)
@@ -174,6 +186,33 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
         }
     }
 
+    @SuppressLint("NotifyDataSetChanged")
+    @Subscribe
+    fun tuyaEvent(event: TuyaEventBus) {
+        Log.e("TAG Setting","涂鸦功能！！~~~~~~~~~")
+        //判断是否有涂鸦功能
+        if (MMkvUtils.getBool(ISTUYA, false)) {
+            dataList.clear()
+            dataList = if (getSN().startsWith("010D")) {
+                DataFactory.genSetting010DModesList(resources)
+            } else if (getSN().startsWith("032D")) {
+                DataFactory.genSetting032DModesList(resources)
+            } else if (getSN().startsWith("011A") || getSN().startsWith("030A")) {
+                DataFactory.genSetting011AModesList(resources)
+            } else {
+                DataFactory.genSettingModesList(resources)
+            }
+            binding.mainSettingRecycler.bindingAdapter._data = dataList
+            binding.mainSettingRecycler.bindingAdapter.notifyDataSetChanged()
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        //由于在 base 的 onPause  不要注销eventBus ，估在onDestroy 注销
+        EventBus.getDefault().unregister(this)
+    }
+
     companion object {
         var dp156 = (com.develop.common.R.dimen.convert_156px).resId2Dimension().toInt()
         var dp40 = (com.develop.common.R.dimen.convert_40px).resId2Dimension().toInt()

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

@@ -1,11 +1,11 @@
 package com.develop.setting.ui
 
-import android.content.Context
 import android.graphics.Rect
-import android.net.wifi.WifiConfiguration
+import android.net.NetworkInfo
 import android.net.wifi.WifiManager
 import android.os.Bundle
 import android.os.CountDownTimer
+import android.os.Handler
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -28,17 +28,27 @@ import com.develop.base.ext.setVisible
 import com.develop.base.manager.WifiData
 import com.develop.base.manager.WifiHelp
 import com.develop.base.util.GlobalToast
+import com.develop.base.util.MMkvUtils
+import com.develop.common.data_repo.net.Api
+import com.develop.common.data_repo.net.model.request.DeviceInfoBody
+import com.develop.common.data_repo.net.model.response.DevInfoResult
 import com.develop.common.event.FinishAtyEvent
+import com.develop.common.event.TuyaEventBus
 import com.develop.common.router.Screens
+import com.develop.common.tag.ISTUYA
 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.TuyaUtils
 import com.develop.common.widget.WifiContentView
 import com.develop.setting.R
 import com.develop.setting.databinding.ActivityWifiListBinding
 import com.drake.brv.utils.bindingAdapter
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
+import com.drake.net.Post
+import com.drake.net.utils.scopeNetLife
+import com.google.gson.Gson
 import com.yanzhenjie.permission.AndPermission
 import com.yanzhenjie.permission.runtime.Permission
 import org.greenrobot.eventbus.EventBus
@@ -54,6 +64,7 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
     private var selectedPosition = -1
 
     private var timer: CountDownTimer? = null
+    private var isSuccess = false
 
     override fun createViewBinding(inflater: LayoutInflater): ActivityWifiListBinding {
         return ActivityWifiListBinding.inflate(inflater)
@@ -89,16 +100,16 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
         if (isBrand036I()) {
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.guide_bg_036i)
             binding.ivLogo.setVisible()
-        }else if (isBrand054A()){
+        } else if (isBrand054A()) {
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_054a)
             binding.ivLogo.setGone()
-        }else if (isBrand062()){
+        } else if (isBrand062()) {
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_062a)
             binding.ivLogo.setGone()
-        }else if (isBrand011A()){
+        } else if (isBrand011A()) {
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_011a)
             binding.ivLogo.setGone()
-        }else if (getSN().startsWith("045")){
+        } else if (getSN().startsWith("045")) {
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_045a)
             binding.ivLogo.setGone()
         }
@@ -183,19 +194,19 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
     private fun initListener() {
         binding.tvSkin.setOnClickListener {
             if (NetworkUtils.isConnected()) {
-                if (getGoneLogin()){
-                    if (isBrand062()){
+                if (getGoneLogin()) {
+                    if (isBrand062()) {
                         navigateTo(Screens.Main.ENTRANCE_CHOSEN_TWO)
-                    }else{
+                    } else {
                         navigateTo(Screens.Main.ENTRANCE_CHOSEN)
                     }
-                }else{
+                } else {
                     navigateTo(Screens.Auth.MEMBER)
                 }
             } else {
-                if (isBrand062()){
+                if (isBrand062()) {
                     navigateTo(Screens.Main.ENTRANCE_CHOSEN_TWO)
-                }else{
+                } else {
                     navigateTo(Screens.Main.ENTRANCE_CHOSEN)
                 }
 
@@ -209,10 +220,10 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
             if (isFromMainSetting) {
                 finish()
             } else {
-                if (getGoneLogin()){
+                if (getGoneLogin()) {
                     navigateTo(Screens.Main.ENTRANCE_CHOSEN)
                     finish()
-                }else{
+                } else {
                     navigateTo(Screens.Auth.MEMBER)
                 }
                 finish()
@@ -236,6 +247,14 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
         }.setAlreadyConnectionCallback {
             dismissPlainDialog()
         }.setNetworkStateChangedListener {
+            //连接成功 // 处理涂鸦功能，出厂设置后，没设置wifi 会导致请求超时
+            if (it == NetworkInfo.DetailedState.CONNECTED) {
+                if (!isSuccess) {
+                    //设置 isSuccess 避免重复请求
+                    isSuccess = true
+                    Handler().postDelayed({ getDevInfo() }, 1000)
+                }
+            }
             dismissPlainDialog()
         }.build()
 
@@ -293,6 +312,36 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
         binding.wifiRecycler.scrollY = deltaHeight
     }
 
+    //获取是否有涂鸦功能
+    fun getDevInfo() {
+        //已经有涂鸦功能，避免再次请求
+        if (MMkvUtils.getBool(ISTUYA, false)) {
+            return
+        }
+        scopeNetLife {
+            val result = Post<DevInfoResult>(Api.DEV_INFO) {
+                body = DeviceInfoBody.genDeviceInfoBody()
+            }.await()
+            getInitTuya(result)
+        }.catch {
+        }
+    }
 
+    fun getInitTuya(result: DevInfoResult) {
+        var gson = Gson()
+        if (result.tuyaLicense != null) {
+            result.tuyaLicense?.let {
+                TuyaUtils.mAk = it.ak
+                TuyaUtils.mPid = it.pid
+                TuyaUtils.mUid = it.uuid
+                TuyaUtils.initSDK(this, "1.0.0")
+                //涂鸦存值判断有涂鸦功能
+                MMkvUtils.save(ISTUYA, true)
+                if (isFromMainSetting) {
+                    EventBus.getDefault().post(TuyaEventBus())
+                }
+            }
+        }
+    }
 
 }

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

@@ -19,6 +19,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.bumptech.glide.Glide
 import com.develop.base.ext.getModelNum
 import com.develop.base.ext.getSN
+import com.develop.base.ext.isBrand011A
 import com.develop.base.ext.isBrand062
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
@@ -120,6 +121,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     private var isModelNum = ""
     private var devMode = ""
     private var is062 = false
+    private var is011 = false
 
     private val deviceStateDialog by lazy {
         CancelConfirmDialog()
@@ -214,12 +216,13 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         hasShowScreenSaver = true
         configLock = true
         is062 = isBrand062()
+        is011 = isBrand011A()
         devMode = CofarSDK.devInfo().devMode
         isModelNum = getModelNum()
 
         if (!isNightTheme()) {
             var color =
-                if (is062) com.develop.common.R.color.white else com.develop.common.R.color.view_change
+                if (is062) com.develop.common.R.color.white else if(is011) com.develop.common.R.color.view_change_011 else com.develop.common.R.color.view_change
             binding.ivBack.drawable?.apply {
                 DrawableCompat.setTint(
                     this,

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

@@ -136,7 +136,12 @@ class CookStepActivity : CookStepBaseActivity() {
                 binding.viewChangeCrush.setBgColor(R.color.view_change_062)
                 binding.viewChangeWeight.setBgColor(R.color.view_change_062)
                 binding.viewRemark.setBgColor(R.color.white)
-            } else {
+            } else if(is011){
+                binding.viewChangeCrush.setBgColor(R.color.view_change_011)
+                binding.viewChangeWeight.setBgColor(R.color.view_change_011)
+                binding.viewRemark.setBgColor(R.color.white)
+                binding.viewWeightClose.setBgColor(R.color.view_change_011)
+            }else {
                 binding.viewChangeCrush.setBgColor(R.color.view_change)
                 binding.viewChangeWeight.setBgColor(R.color.view_change)
                 binding.viewRemark.setBgColor(R.color.view_change)

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

@@ -17,6 +17,7 @@ import androidx.core.graphics.drawable.DrawableCompat
 import com.alibaba.android.arouter.facade.annotation.Autowired
 import com.alibaba.android.arouter.launcher.ARouter
 import com.develop.base.ext.background_drawable
+import com.develop.base.ext.isBrand011A
 import com.develop.base.ext.isBrand062
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.setGone
@@ -85,6 +86,7 @@ abstract class CookStepBaseActivity :
     private var rotateAnimator: ObjectAnimator? = null
     private var rotateAnimDir = -1
     public var is062 = false
+    public var is011 = false
     abstract fun clickNextStep()
 
     abstract fun clickPrevStep()
@@ -124,6 +126,7 @@ abstract class CookStepBaseActivity :
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         is062 = isBrand062()
+        is011 = isBrand011A()
         hasShowScreenSaver = true
         ARouter.getInstance().inject(this)
         binding.controller.apply {
@@ -192,7 +195,7 @@ abstract class CookStepBaseActivity :
             }
         } else {
             binding.viewRemark.src = R.drawable.ic_cooking_remark
-            if (is062) {
+            if (is062||is011) {
             } else {
                 binding.viewRemark.drawable?.apply {
                     DrawableCompat.setTint(this, resources.getColor(R.color.white))

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

@@ -70,7 +70,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
     private var cookDetailJson: String? = null
     private var portionSizelJson: String? = null
     private var is062 = false
-
+    private var is011 = false
     private val shareQRCodeDialog by lazy {
         ShareQRCodeDialog()
     }
@@ -93,7 +93,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         super.onCreate(savedInstanceState)
         ARouter.getInstance().inject(this)
         is062 = isBrand062()
-
+        is011 = isBrand011A()
         initView()
         initData()
         initListener()
@@ -184,6 +184,8 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
                 binding.viewProgress.setButtonColor(Color.parseColor("#E03E52"))
             } else if (is062){
                 binding.viewProgress.setButtonColor(Color.parseColor("#CCDAE343"))
+            } else if (is011){
+                binding.viewProgress.setButtonColor(Color.parseColor("#C10A27"))
             }else {
                 binding.viewProgress.setButtonColor(Color.parseColor("#CCEE8F08"))
             }
@@ -194,6 +196,8 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             if (is062){
                 binding.viewProgress.setButtonColor(Color.parseColor("#CCDAE343"))
 
+            }else if (is011){
+                binding.viewProgress.setButtonColor(Color.parseColor("#C10A27"))
             }else{
                 binding.viewProgress.setButtonColor(Color.parseColor("#CC1296DB"))
 

app/build.gradle

@@ -13,7 +13,7 @@ ext {
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
 //    brandCode="036I"
-    brandCode = "062A"
+    brandCode = "011A"
     model = "1039"
 
 }
@@ -80,6 +80,10 @@ android {
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
             resValue("string", "app_theme", "@style/SplashThemeNotLogo")
+            buildConfigField("String", "model", "\"5037\"")
+            buildConfigField("String", "brandCode", "\"045A\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
         }
 
 //        brand011ATuya {
@@ -306,12 +310,12 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 ////            buildConfigField("String", "appCode", "\"2.01\"")
 
-            resValue("string", "app_theme", "@style/Splash062ATheme")
-            buildConfigField("String", "UpdatePlatform", "\"062A\"")
-            buildConfigField("String", "model", "\"1039\"")
-            buildConfigField("String", "brandCode", "\"062A\"")
-            //appCode 1.01 指向bug修复，2.01指向功能变更
-            buildConfigField("String", "appCode", "\"1.01\"")
+//            resValue("string", "app_theme", "@style/Splash062ATheme")
+//            buildConfigField("String", "UpdatePlatform", "\"062A\"")
+//            buildConfigField("String", "model", "\"1039\"")
+//            buildConfigField("String", "brandCode", "\"062A\"")
+//            //appCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
 
 
 //             resValue("string", "app_theme", "@style/SplashTheme")
@@ -335,6 +339,15 @@ android {
 //            buildConfigField("String", "brandCode", "\"063A\"")
 //            //appCode 1.01 指向bug修复，2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")
+
+            buildConfigField("String", "UpdatePlatform", "\"011A\"")
+            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\"")
+
+
         }
     }
 

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

@@ -88,25 +88,43 @@ class FoodCookingApp : BaseApp() {
         //处理崩溃问题
 //        CrashHandler.getInstance().init(this);
         //FoodDataProvider.initFoodDataBase()
-        ResourceUtils.copyFileFromAssets(
-            ASSETS_BLUE_SKIN_PACK,
-            SKIN_PACK_PATH + BLUE_SKIN_PACK_NAME
-        )
-        ResourceUtils.copyFileFromAssets(
-            ASSETS_NIGHT_SKIN_PACK,
-            SKIN_PACK_PATH + NIGHT_SKIN_PACK_NAME
-        )
+
+
         WindowManager.getInstance().init(this, OptionFactory())
         setAppCode(BuildConfig.appCode)
         val isNight = BuildConfig.UpdatePlatform.equals("night")
         val is062 = BuildConfig.UpdatePlatform.equals("062A")
+        val is011 = BuildConfig.UpdatePlatform.equals("011A")
         setIsBrand036I(BuildConfig.UpdatePlatform.equals("036I"))
-        setIsBrand011A(BuildConfig.UpdatePlatform.equals("011A"))
         setIsBrand054A(BuildConfig.UpdatePlatform.equals("054A"))
+        setIsBrand011A(is011)
         setIsBrand062(is062)
 
+
+        if (is062){
+            ResourceUtils.copyFileFromAssets(
+                ASSETS_BLUE_SKIN_PACK,
+                SKIN_PACK_PATH + BLUE_SKIN_PACK_NAME
+            )
+        }
+        if (is011){
+            ResourceUtils.copyFileFromAssets(
+                ASSETS_ZERO_ONE_ONE_SKIN_PACK,
+                SKIN_PACK_PATH + ZERO_ONE_ONE_SKIN_PACK_NAME
+            )
+        }
+       if (isNight){
+           ResourceUtils.copyFileFromAssets(
+               ASSETS_NIGHT_SKIN_PACK,
+               SKIN_PACK_PATH + NIGHT_SKIN_PACK_NAME
+           )
+       }
+
+
+
+
         //切换主题，theme=0 night= false 是0000的主题，而且需要AndroidManifest.xml主题设置为  android:theme="@style/SplashTheme"
-        ThemeSkinService.getInstance().switchThemeSkin(if (isNight) 1 else if (is062) 2  else 0)
+        ThemeSkinService.getInstance().switchThemeSkin(if (isNight) 1 else if (is062) 2 else if (is011)3 else 0)
         setNightTheme(isNight)
         CofarSDK.init(getBrandNum())
         SerialPortUtils.init()
@@ -345,6 +363,7 @@ class OptionFactory : IOptionFactory {
         return when (theme) {
             1 -> NightOption()
             2 -> BlueOption()
+            3 ->ZeroOneOneOption()
             else -> null
         }
     }
@@ -367,12 +386,25 @@ class BlueOption : IThemeSkinOption {
     }
 }
 
+class ZeroOneOneOption : IThemeSkinOption {
+    override fun getStandardSkinPackPath(): LinkedHashSet<String> {
+        val pathSet = LinkedHashSet<String>()
+        pathSet.add(SKIN_PACK_PATH + ZERO_ONE_ONE_SKIN_PACK_NAME)
+        return pathSet
+    }
+}
+
+
 const val NIGHT_SKIN_PACK_NAME = "night.skin"
 const val ASSETS_NIGHT_SKIN_PACK = "skins/night.skin"
 
 const val BLUE_SKIN_PACK_NAME = "blue.skin"
 const val ASSETS_BLUE_SKIN_PACK = "skins/blue.skin"
 
+const val ZERO_ONE_ONE_SKIN_PACK_NAME = "zeroOneOne.skin"
+const val ASSETS_ZERO_ONE_ONE_SKIN_PACK = "skins/zeroOneOne.skin"
+
+
 /**
  * 应用存储空间根路径
  */

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

@@ -60,6 +60,10 @@ class MainActivity : CommonBindingActivity<ActivityMainBinding>() {
                 }
             }
 
+
+
+
+
             //获取配置语言，然后设置系统语言，首语言默认英语
             SerialportUtils.getAddLocale(listStr)
 
@@ -76,30 +80,20 @@ class MainActivity : CommonBindingActivity<ActivityMainBinding>() {
 
 
 
-//        this.initSDK()
-        //初始化涂鸦
-//        var tuyaConfig = ConfigUtils.loadTuyaConfig()
-//        if (tuyaConfig != null) {
-//            TuyaUtils.mAk = tuyaConfig.get("ak")
-//            TuyaUtils.mPid = tuyaConfig.get("pid")
-//            TuyaUtils.mUid = tuyaConfig.get("uid")
-//            TuyaUtils.initSDK(this, "1.0.0")
-//        }
         getDevInfo()
 
     }
 
-
     //获取是否有涂鸦功能
     fun getDevInfo() {
-//        println("涂鸦请求")
+        println("涂鸦请求")
         scopeNetLife {
             val result = Post<DevInfoResult>(Api.DEV_INFO) {
                 body = DeviceInfoBody.genDeviceInfoBody()
             }.await()
             getInitTuya(result)
         }.catch {
-//            println("涂鸦请求 异常")
+            println("涂鸦请求 异常")
             getAppTuya(true)
         }
     }

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

@@ -211,7 +211,7 @@ fun getSN(): String {
 //     return "000A10390020123010190001"
 //        return "000A50370020123010190005"/
 //    return "010D10390020123010190001"
-//    return "011A10390020123010190001"
+        return "011A10390020123010190001"
 //        return "000A50370020123010190004"
 //        return "011A50370020123010190003"
 //        return "011A50370020123010190004"
@@ -226,7 +226,8 @@ fun getSN(): String {
 //        return "000A50370020123010190011"
 //    return  "030A10390020123010190002"
 //        return "029C21010020123010190001"
-        return  "062A10390020123010190002"
+//        return  "062A10390020123010190001"
+//        return "062A20030020123010190001"
 //        return  "063A10390020123010190001"
 //        return "000A50370020123010190018"
 //        return  "000A10390020123010190023"
@@ -306,10 +307,11 @@ fun setScreenHeight(height: Int) {
     MMkvUtils.save("screen_height", height)
 }
 
-fun setAppCode(code :String){
+fun setAppCode(code: String) {
     MMkvUtils.save("appCode", code)
 }
-fun getAppCode() :String {
+
+fun getAppCode(): String {
     return MMkvUtils.getString("appCode") ?: "1.01"
 }
 

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

@@ -1,12 +0,0 @@
-/**
- * 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";
-}