011代码上传，cofarjar替换

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

@@ -12,6 +12,7 @@ import com.develop.auth.databinding.ActivityMemberAuthBinding
 import com.develop.auth.viewmodel.FragmentTag
 import com.develop.auth.viewmodel.MemberViewModel
 import com.develop.base.ext.getSN
+import com.develop.base.ext.isBrand011A
 import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
@@ -59,6 +60,8 @@ class MemberAuthActivity : CommonBVMActivity<ActivityMemberAuthBinding, MemberVi
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.guide_bg_036i)
         } else if (getSN().startsWith("002D")){
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_002d)
+        }else if (isBrand011A()){
+            binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_011a)
         }
         initFragmentList()
         viewModel.enterFromHome = enterFromHome

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

@@ -456,14 +456,10 @@ object DataFactory {
     )
 
     private var bg011AResIds = arrayListOf<Int>(
-        R.drawable.entrance_036i_bg_1,
-        R.drawable.entrance_036i_bg_2,
-        R.drawable.entrance_036i_bg_3,
-        R.drawable.entrance_036i_bg_4
-//        R.drawable.entrance_011a_bg_1,
-//        R.drawable.entrance_011a_bg_2,
-//        R.drawable.entrance_011a_bg_3,
-//        R.drawable.entrance_011a_bg_4
+        R.drawable.entrance_011a_bg_1,
+        R.drawable.entrance_011a_bg_2,
+        R.drawable.entrance_011a_bg_3,
+        R.drawable.entrance_011a_bg_4
     )
 
     private var iconResIds = arrayListOf<Int>(

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

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

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

@@ -252,7 +252,96 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                     }
                 }
             }.models = DataFactory.get002DEntranceData()
-        } else {
+        }
+
+//        else if (getSN().startsWith("011A")) {
+//            binding.entranceRecycle.apply {
+//                grid(2)
+//                setup {
+//                    addType<EntranceData>(R.layout.item_entrance)
+//                    onBind {
+//                        val itemView = findView<EntranceItemView>(R.id.entrance_item)
+//                        val params = itemView.layoutParams as LayoutParams
+//                        params.height = (ScreenUtil.getScreenSize(this@ModeEntranceActivity)[1] / 2)
+//                        itemView.layoutParams = params
+//                        itemView.setEntranceData(getModel())
+//
+//                    }
+//                    R.id.entrance_item.onClick {
+//                        val clickModel = getModel<EntranceData>()
+//                        title = getString(clickModel.title2StrId)
+//                        when (clickModel.type) {
+//                            EntranceType.automatic_recipes -> {
+//                                if (FoodDataProvider.checkDataExit()) {
+//                                    val bundle = Bundle()
+//                                    bundle.putInt(MODE_ENTRANCE, Recipes)
+//                                    bundle.putInt(RECIPES_TYPE, LocalFood)
+//                                    bundle.putString(HOME_TITLE, title)
+//                                    navigateTo(Screens.Main.HOME) {
+//                                        with(bundle)
+//                                    }
+//                                } else {
+//                                    showLoading()
+//                                }
+//                            }
+//
+//                            EntranceType.automatic_programmes -> {
+//                                if (FoodDataProvider.checkDataExit()) {
+//                                    val bundle = Bundle()
+//                                    bundle.putInt(MODE_ENTRANCE, Mode)
+//                                    bundle.putString(HOME_TITLE, title)
+//                                    navigateTo(Screens.Main.HOME) {
+//                                        with(bundle)
+//                                    }
+//                                } else {
+//                                    showLoading()
+//                                }
+//
+//                            }
+//
+//                            EntranceType.manual_cooking -> {
+//                                if (FoodDataProvider.checkDataExit()) {
+//                                    navigateTo(Screens.Cook.COOK_MODES) {
+//                                        if (DevModes.SOUP == CofarSDK.devInfo().devMode) {
+//                                            val bundle = Bundle()
+//                                            bundle.putString(MODE_TYPE, WorkModes.ADAPTED_COOKING)
+//                                            bundle.putString(
+//                                                "mode_name",
+//                                                resources.getString(com.develop.common.R.string.adapted_cooking)
+//                                            )
+//                                            with(bundle)
+//                                        } else {
+//                                            val bundle = Bundle()
+//                                            bundle.putString(MODE_TYPE, WorkModes.AF_DIY)
+//                                            with(bundle)
+//                                        }
+//                                    }
+//                                } else {
+//                                    showLoading()
+//                                }
+//                            }
+//
+//                            EntranceType.download_new_recipes -> {
+//                                if (FoodDataProvider.checkDataExit()) {
+//                                    val bundle = Bundle()
+//                                    bundle.putInt(MODE_ENTRANCE, Recipes)
+//                                    bundle.putInt(RECIPES_TYPE, NetFood)
+//                                    bundle.putString(HOME_TITLE, title)
+//                                    navigateTo(Screens.Main.HOME) {
+//                                        with(bundle)
+//                                    }
+//                                } else {
+//                                    showLoading()
+//                                }
+//
+//                            }
+//                        }
+//                    }
+//                }
+//            }.models  = DataFactory.get011AEntranceData()
+//        }
+//
+        else {
             binding.entranceRecycle.apply {
                 grid(2)
                 setup {
@@ -337,9 +426,10 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                     }
                 }
             }.models =
-                if (isBrand036I()) DataFactory.get036IEntranceData() else if (isBrand011A()) DataFactory.get011AEntranceData() else DataFactory.getEntranceData()
+                if (isBrand036I()) DataFactory.get036IEntranceData() else if (isBrand011A()) DataFactory.get011AEntranceData()else DataFactory.getEntranceData()
         }
 
+//        if (isBrand011A()) DataFactory.get011AEntranceData()
         binding.rightContentLayout.setOnClickListener {
 
         }

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

@@ -28,7 +28,11 @@ class HelpDocsActivity : AppCompatActivity() {
                 return true
             }
         }
-        val language = MMkvUtils.getString(CURRENT_LANGUAGE)
+        var language = MMkvUtils.getString(CURRENT_LANGUAGE)
+        if (language==null){
+            language = "EN"
+        }
+
         if (isNightTheme()) {
             webView.loadUrl("file:///android_asset/help/${language}/help.html")
         } else {

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

@@ -74,7 +74,11 @@ class PrivacyPolicyActivity : BaseBindingActivity<ActivityPrivacePolicyBinding>(
             }
         }
 
-        val language = MMkvUtils.getString(CURRENT_LANGUAGE)
+        var language = MMkvUtils.getString(CURRENT_LANGUAGE)
+        if (language==null){
+            language = "EN"
+        }
+
         if (isNightTheme()) {
             binding.webview.loadUrl("file:///android_asset/help/${language}/privacy_night.html")
         } else {

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

@@ -5,6 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.develop.base.ext.isBrand011A
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.setGone
 import com.develop.base.mvvm.BaseBindingActivity
@@ -34,7 +35,10 @@ class ScreensaverActivity : CommonBindingActivity<ActivityScreensaverBinding>()
         val dataList = mutableListOf(
             com.develop.common.R.drawable.ic_screensaver
         )
-        val bannerAdapter = ScreenBannerAdapter(dataList)
+        val dataList011 = mutableListOf(
+            com.develop.common.R.drawable.ic_screensaver_011a
+        )
+        val bannerAdapter = ScreenBannerAdapter(if (isBrand011A()) dataList011 else dataList)
         binding.bannerView.adapter = bannerAdapter
 
         binding.circleRecycler.apply {
@@ -50,7 +54,7 @@ class ScreensaverActivity : CommonBindingActivity<ActivityScreensaverBinding>()
                     }
                 }
             }
-        }.models = dataList
+        }.models =if (isBrand011A()) dataList011 else dataList
         if (isNightTheme()){
             binding.circleRecycler.setGone()
         }

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

@@ -2184,7 +2184,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         CofarSDK.confirm()
     }
     private fun  visibilityEgg(visibility :Int){
-        if ("COOK_EGGS " == viewModel.modeType) {
+        if ("COOK_EGGS" == viewModel.modeType) {
             binding.ivEggs.visibility = visibility
         }else{
             binding.ivEggs.visibility = View.GONE

app/build.gradle

@@ -13,7 +13,7 @@ ext{
     versionCode=Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
 //    brandCode="036I"
-    brandCode="007D"
+    brandCode="011A"
     model="1039"
 
 }

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

@@ -188,8 +188,10 @@ fun getSN(): String {
 
 //    return "045A10220020123010120023"
 //    return "000A30150020123010190001"
+    return "010D30150020123010190001"
+
 //    return "011A30150020123010190001"
-    return "007D20020020123010190001"
+//    return "007D20020020123010190001"
     //通过反射获取sn号
     try {
         val c = Class.forName("android.os.SystemProperties")
@@ -249,6 +251,7 @@ fun setIsBrand036I(is036I: Boolean) {
 fun isBrand036I(): Boolean {
     return MMkvUtils.getBool("is036I", false)
 }
+
 fun setIsBrand011A(is011A: Boolean) {
     MMkvUtils.save("is011A", is011A)
 }

libThirdPart/build.gradle

@@ -76,9 +76,9 @@ dependencies {
     //------------------------------业务功能库-------------------------------------
     api files('libs/android-serialport-2.1.2.aar')
     api files('libs/PaintedSkin-release.aar')
-    api files('libs/cofar-cooking-device-sdk-0.0.1-SNAPSHOT.jar')
     api files('libs/commons-lang3-3.12.0.jar')
     api files('libs/commons-beanutils-1.9.4.jar')
+    api files('libs/cofar-cooking-device-sdk-0.0.1-SNAPSHOT.jar')
     api 'com.github.princekin-f:EasyFloat:2.0.4'
     api 'de.hdodenhof:circleimageview:3.1.0'
     api 'com.google.zxing:core:3.3.3'