提交人：jtm

提交内容：添加036i型号

BusinessAirFryer/src/main/assets/config_036.json

@@ -0,0 +1,93 @@
+{
+  "baseQrUrl": "https://icook.schneiderconsumer.com/h5/index.html",
+  "workModes": [
+    {
+      "type": "ADAPTED_COOKING",
+      "name": "adapted_cooking",
+      "bg": "ic_mode_chop",
+      "icon": "ic_grid_adapted_cooking",
+      "devMode": "SOUP",
+      "listShow": false
+    },
+    {
+      "type": "STEAM",
+      "name": "steam",
+      "bg": "ic_mode_steam",
+      "icon": "ic_grid_steam",
+      "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": "SLOW_COOK",
+      "name": "slow_cook",
+      "bg": "ic_mode_slow_cook",
+      "icon": "ic_grid_slow_cook",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "FERMENT",
+      "name": "ferment",
+      "bg": "ic_mode_ferment",
+      "icon": "ic_grid_ferment",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "MULSIFY",
+      "name": "mulsify",
+      "bg": "cm_icon_mulsify",
+      "icon": "cm_icon_mulsify",
+      "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": "CHOP",
+      "name": "chop",
+      "bg": "ic_mode_chop",
+      "icon": "ic_grid_chop",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "WIGHT",
+      "name": "wight",
+      "bg": "ic_mode_weight",
+      "icon": "ic_grid_weight",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "AUTO_CLEAN",
+      "name": "auto_clean",
+      "bg": "cm_icon_auto_clean",
+      "icon": "cm_icon_auto_clean",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "TURBO",
+      "name": "turbo",
+      "bg": "ic_mode_turbo",
+      "icon": "ic_grid_turbo",
+      "devMode": "SOUP",
+      "listShow": true
+    }
+  ]
+}

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

@@ -11,6 +11,7 @@ import com.develop.auth.R
 import com.develop.auth.databinding.ActivityMemberAuthBinding
 import com.develop.auth.viewmodel.FragmentTag
 import com.develop.auth.viewmodel.MemberViewModel
+import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
 import com.develop.base.util.MMkvUtils
@@ -51,6 +52,9 @@ class MemberAuthActivity : CommonBVMActivity<ActivityMemberAuthBinding, MemberVi
         } else {
             binding.tvSkip.setBackgroundResource(com.develop.common.R.drawable.bg_skip_text)
         }
+        if (isBrand036I()){
+            binding.ivBanner.setImageResource(com.develop.common.R.drawable.guide_bg_036i)
+        }
         initFragmentList()
         viewModel.enterFromHome = enterFromHome
         binding.tvSkip.setOnClickListener {

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

@@ -1,6 +1,7 @@
 package com.develop.common.data_repo.db
 
 import android.content.res.Resources
+import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.isNightTheme
 import com.develop.base.util.MMkvUtils
 import com.develop.common.R
@@ -18,7 +19,7 @@ object DataFactory {
 
     fun createLanguageData(resource: Resources): MutableList<LanguageModel> {
         val languageList = mutableListOf<LanguageModel>()
-        val strList = if (isNightTheme()) {
+        val strList = if (isNightTheme()|| isBrand036I()) {
             mutableListOf<String>(
 //            resource.getString(R.string.chinese),
                 resource.getString(R.string.france),
@@ -31,7 +32,7 @@ object DataFactory {
 //            resource.getString(R.string.japan)
             )
         }
-        val iconList = if (isNightTheme()) {
+        val iconList = if (isNightTheme()|| isBrand036I()) {
             mutableListOf<Int>(
 //
 //            R.drawable.ic_chinese,
@@ -44,7 +45,7 @@ object DataFactory {
 //            R.drawable.ic_japan
             )
         }
-        val typeList = if (isNightTheme()) {
+        val typeList = if (isNightTheme()|| isBrand036I()) {
             mutableListOf<LanguageType>(
 //            LanguageType.Chinese,
                 LanguageType.France
@@ -386,6 +387,14 @@ object DataFactory {
         R.drawable.entrance_bg_3,
         R.drawable.entrance_bg_4
     )
+
+    private var bg036IResIds = 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
+    )
+
     private var iconResIds = arrayListOf<Int>(
         R.drawable.entrance_icon_1,
         R.drawable.entrance_icon_2,
@@ -459,6 +468,18 @@ object DataFactory {
         return dataList
     }
 
+    fun get036IEntranceData(): MutableList<EntranceData> {
+        val dataList = mutableListOf<EntranceData>()
+        for (i in iconResIds.indices) {
+            dataList.add(
+                EntranceData(
+                    bg036IResIds[i], iconResIds[i], titleStrIds[i], title2StrIds[i], typeList[i]
+                )
+            )
+        }
+        return dataList
+    }
+
 
     fun getNightEntranceData(): MutableList<EntranceData> {
         val dataList = mutableListOf<EntranceData>()

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

@@ -24,11 +24,19 @@
         <item name="android:windowFullscreen">true</item>
     </style>
 
-    <style name="SplashNightTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="Splash010DTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- 这里的trans自己写一个#00000000即可-->
         <item name="android:windowBackground">@drawable/splash_logo_010</item>
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
         <item name="android:windowFullscreen">true</item>
     </style>
+
+    <style name="Splash036IDTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <!-- 这里的trans自己写一个#00000000即可-->
+        <item name="android:windowBackground">@drawable/splash_036i_logo</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
+        <item name="android:windowFullscreen">true</item>
+    </style>
 </resources>

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

@@ -9,6 +9,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.recyclerview.widget.RecyclerView
 import androidx.room.Update
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.isFrLanguage
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
@@ -215,7 +216,8 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                         }
                     }
                 }
-            }.models = DataFactory.getEntranceData()
+            }.models =
+                if (isBrand036I()) DataFactory.get036IEntranceData() else DataFactory.getEntranceData()
         }
 
         binding.rightContentLayout.setOnClickListener {

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

@@ -23,6 +23,7 @@ import com.blankj.utilcode.util.AppUtils
 import com.develop.base.R
 import com.develop.base.ext.dimenRes
 import com.develop.base.ext.getSN
+import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.updateText
 import com.develop.base.util.GlobalToast
@@ -87,12 +88,15 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         super.onCreate(savedInstanceState)
         val ivLogoParam = binding.ivLogo.layoutParams as RelativeLayout.LayoutParams
         val ivUpdateParam = binding.icUpdate.layoutParams as LinearLayout.LayoutParams
-        if (isNightTheme()) {
+        if (isNightTheme() || isBrand036I()) {
             ivLogoParam.apply {
                 width = dimenRes(com.develop.common.R.dimen.convert_321px)
                 height = dimenRes(com.develop.common.R.dimen.convert_95px)
                 marginStart = dimenRes(com.develop.common.R.dimen.convert_135px)
             }
+            if (isBrand036I()) {
+                binding.ivLogo.setBackgroundResource(com.develop.common.R.drawable.ic_logo_036i)
+            }
             ivUpdateParam.apply {
                 width = dimenRes(com.develop.common.R.dimen.convert_66px)
                 height = dimenRes(com.develop.common.R.dimen.convert_66px)
@@ -120,7 +124,8 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         binding.devSn.text = getSN()
 
         CofarSDK.devInfo().let {
-            binding.tvMcuVersion.text = (it.manufacturer.toString() + "P" + it.haradware.toString() + "S" + it.software.toString())
+            binding.tvMcuVersion.text =
+                (it.manufacturer.toString() + "P" + it.haradware.toString() + "S" + it.software.toString())
         }
 
         binding.tvFirmware.text = Build.DISPLAY
@@ -167,38 +172,39 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
             if (weightAlignCount >= 7) {
                 weightAlignCount = 0
 
-                 //2023年06月29日14:16:18 处理密码弹出
+                //2023年06月29日14:16:18 处理密码弹出
                 val pwdDialog = PwdDialog()
                 pwdDialog.title = getString(com.develop.common.R.string.password)
-                pwdDialog.showDialog(supportFragmentManager,"pwdDialog")
-                pwdDialog.onDialogClickListener = object :PwdDialog.OnDialogClickListener{
-
-                    override fun onConfirm(pwd:String) {
-                         if("12345678".equals(pwd)){
-                             pwdDialog.removeSelf()
-                             cancelConfirmDialog.title = getString(com.develop.common.R.string.change_lang_tips)
-                             cancelConfirmDialog.showCancel = false
-                             cancelConfirmDialog.onDialogClickListener =
-                                 object : CancelConfirmDialog.OnDialogClickListener {
-                                     override fun onConfirm() {
-
-                                     }
-
-                                     override fun onCancel() {
-                                     }
-
-                                 }
-                             if (CofarSDK.devInfo().runningStatus == DevStatus.RUNNING) {
-                                 cancelConfirmDialog.showDialog(supportFragmentManager, "confirm")
-                             } else {
-                                 //进入称重标定模式
-                                 CofarSDK.startWeightAlign()
-                                 GlobalDevEvent.weight = true
-                             }
-
-                         }else{
-                             GlobalToast.showToast(getString(com.develop.common.R.string.password_uncorrect))
-                         }
+                pwdDialog.showDialog(supportFragmentManager, "pwdDialog")
+                pwdDialog.onDialogClickListener = object : PwdDialog.OnDialogClickListener {
+
+                    override fun onConfirm(pwd: String) {
+                        if ("12345678".equals(pwd)) {
+                            pwdDialog.removeSelf()
+                            cancelConfirmDialog.title =
+                                getString(com.develop.common.R.string.change_lang_tips)
+                            cancelConfirmDialog.showCancel = false
+                            cancelConfirmDialog.onDialogClickListener =
+                                object : CancelConfirmDialog.OnDialogClickListener {
+                                    override fun onConfirm() {
+
+                                    }
+
+                                    override fun onCancel() {
+                                    }
+
+                                }
+                            if (CofarSDK.devInfo().runningStatus == DevStatus.RUNNING) {
+                                cancelConfirmDialog.showDialog(supportFragmentManager, "confirm")
+                            } else {
+                                //进入称重标定模式
+                                CofarSDK.startWeightAlign()
+                                GlobalDevEvent.weight = true
+                            }
+
+                        } else {
+                            GlobalToast.showToast(getString(com.develop.common.R.string.password_uncorrect))
+                        }
                     }
 
                     override fun onCancel() {
@@ -285,11 +291,11 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
                 //2023年06月29日14:16:18 处理密码弹出
                 val pwdDialog = PwdDialog()
                 pwdDialog.title = getString(com.develop.common.R.string.password)
-                pwdDialog.showDialog(supportFragmentManager,"pwdDialog")
-                pwdDialog.onDialogClickListener = object :PwdDialog.OnDialogClickListener{
+                pwdDialog.showDialog(supportFragmentManager, "pwdDialog")
+                pwdDialog.onDialogClickListener = object : PwdDialog.OnDialogClickListener {
 
-                    override fun onConfirm(pwd:String) {
-                        if("12345678".equals(pwd)){
+                    override fun onConfirm(pwd: String) {
+                        if ("12345678".equals(pwd)) {
                             if (isAdbDebuggingEnabled(ctx)) {
                                 Toast.makeText(ctx, "adb disable", Toast.LENGTH_SHORT).show()
                                 toggleAdbDebugging(ctx, false)
@@ -297,7 +303,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
                                 Toast.makeText(ctx, "adb enable", Toast.LENGTH_SHORT).show()
                                 toggleAdbDebugging(ctx, true)
                             }
-                        }else{
+                        } else {
                             GlobalToast.showToast(getString(com.develop.common.R.string.password_uncorrect))
                         }
                     }
@@ -308,7 +314,6 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
                 }
 
 
-
             }
         }
 
@@ -322,13 +327,13 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
                 //2023年06月29日14:16:18 处理密码弹出
                 val pwdDialog = PwdDialog()
                 pwdDialog.title = getString(com.develop.common.R.string.password)
-                pwdDialog.showDialog(supportFragmentManager,"pwdDialog")
-                pwdDialog.onDialogClickListener = object :PwdDialog.OnDialogClickListener{
+                pwdDialog.showDialog(supportFragmentManager, "pwdDialog")
+                pwdDialog.onDialogClickListener = object : PwdDialog.OnDialogClickListener {
 
-                    override fun onConfirm(pwd:String) {
-                        if("12345678".equals(pwd)){
+                    override fun onConfirm(pwd: String) {
+                        if ("12345678".equals(pwd)) {
                             togglePointerLocation(ctx)
-                        }else{
+                        } else {
                             GlobalToast.showToast(getString(com.develop.common.R.string.password_uncorrect))
                         }
                     }
@@ -353,11 +358,11 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
                 //2023年06月29日14:16:18 处理密码弹出
                 val pwdDialog = PwdDialog()
                 pwdDialog.title = getString(com.develop.common.R.string.password)
-                pwdDialog.showDialog(supportFragmentManager,"pwdDialog")
-                pwdDialog.onDialogClickListener = object :PwdDialog.OnDialogClickListener{
+                pwdDialog.showDialog(supportFragmentManager, "pwdDialog")
+                pwdDialog.onDialogClickListener = object : PwdDialog.OnDialogClickListener {
 
-                    override fun onConfirm(pwd:String) {
-                        if("12345678".equals(pwd)){
+                    override fun onConfirm(pwd: String) {
+                        if ("12345678".equals(pwd)) {
                             // 创建启动目标活动的Intent
                             val intent = Intent()
                             intent.component = ComponentName(
@@ -367,7 +372,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 
                             // 启动目标活动
                             startActivity(intent)
-                        }else{
+                        } else {
                             GlobalToast.showToast(getString(com.develop.common.R.string.password_uncorrect))
                         }
                     }
@@ -378,7 +383,6 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
                 }
 
 
-
             }
         }
 
@@ -397,7 +401,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
             binding.updateFirmware.visibility = View.VISIBLE
         }
 
-        viewModel.errorCallBack.observe(this){
+        viewModel.errorCallBack.observe(this) {
             GlobalToast.showToast(getString(com.develop.common.R.string.no_net_error))
         }
 
@@ -408,7 +412,8 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         try {
             val packageInstaller = context.packageManager.packageInstaller
 
-            val params = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL)
+            val params =
+                PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL)
 
             val sessionId = packageInstaller.createSession(params)
             val session = packageInstaller.openSession(sessionId)
@@ -416,7 +421,8 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
             addApkToSession(apk, session)
 
             val intent = Intent(context, InstallResultReceiver::class.java)
-            val pendingIntent = PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+            val pendingIntent =
+                PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
 
             session.commit(pendingIntent.intentSender)
 

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

@@ -7,6 +7,7 @@ import android.webkit.WebView
 import android.webkit.WebViewClient
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.develop.base.ext.background_drawable
+import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
 import com.develop.base.mvvm.BaseBindingActivity
@@ -37,6 +38,10 @@ class PrivacyPolicyActivity : BaseBindingActivity<ActivityPrivacePolicyBinding>(
             binding.tvAgree.visibility = View.GONE
             binding.agreeLayout.visibility = View.GONE
         }
+
+        if (isBrand036I()){
+            binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.guide_bg_036i)
+        }
         countForPolicyTime()
         binding.ivBack.setOnClickListener {
             finish()

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

@@ -15,6 +15,7 @@ import com.blankj.utilcode.util.DeviceUtils
 import com.blankj.utilcode.util.KeyboardUtils
 import com.blankj.utilcode.util.NetworkUtils
 import com.blankj.utilcode.util.ViewUtils
+import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
 import com.develop.base.manager.WifiData
@@ -76,6 +77,9 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
     private fun initView() {
         isFromMainSetting = intent.extras?.getBoolean(WIFI_FROM_MAIN_SETTING) ?: false
 
+        if (isBrand036I()){
+            binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.guide_bg_036i)
+        }
         if (isFromMainSetting) {
             binding.tvSkin.visibility = View.GONE
             val params = binding.tvNext.layoutParams as RelativeLayout.LayoutParams

app/build.gradle

@@ -12,7 +12,7 @@ ext{
 
     versionCode=Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
-    brandCode="010D"
+    brandCode="036I"
     model="1039"
 }
 
@@ -67,6 +67,12 @@ android {
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
         }
 
+        brand036I {
+            dimension "platform"
+            applicationId "com.develop.foodcooking"
+            buildConfigField("String", "UpdatePlatform", "\"036I\"")
+        }
+
     }
 
     signingConfigs {
@@ -96,6 +102,7 @@ android {
             minifyEnabled false
             productFlavors.brand010D.signingConfig signingConfigs.release
             productFlavors.brand030A.signingConfig signingConfigs.release
+            productFlavors.brand036I.signingConfig signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }

app/src/main/AndroidManifest.xml

@@ -42,14 +42,14 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/SplashNightTheme"
+        android:theme="@style/Splash036IDTheme"
         android:largeHeap="true"
         tools:targetApi="31">
         <activity
             android:screenOrientation="landscape"
             android:name=".MainActivity"
             android:exported="true"
-            android:theme="@style/SplashNightTheme">
+            android:theme="@style/Splash036IDTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.HOME" />

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

@@ -15,6 +15,7 @@ import com.blankj.utilcode.util.Utils
 import com.develop.base.app.BaseApp
 import com.develop.base.ext.getBrandNum
 import com.develop.base.ext.isNightTheme
+import com.develop.base.ext.setIsBrand036I
 import com.develop.base.ext.setNightTheme
 import com.develop.base.util.MMkvUtils
 import com.develop.common.data_repo.FoodDataProvider
@@ -76,6 +77,7 @@ class FoodCookingApp : BaseApp() {
         )
         WindowManager.getInstance().init(this, OptionFactory())
         val isNight = BuildConfig.UpdatePlatform.equals("night")
+        setIsBrand036I(BuildConfig.UpdatePlatform.equals("036I"))
         //切换主题，theme=0 night= false 是0000的主题，而且需要AndroidManifest.xml主题设置为  android:theme="@style/SplashTheme"
         ThemeSkinService.getInstance().switchThemeSkin(if (isNight) 1 else 0)
         setNightTheme(isNight)

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

@@ -179,7 +179,7 @@ fun getWifiMacAddress(context: Context): String {
  * @return
  */
 fun getBrandNum(): String {
-    return getSN().substring(0,3)
+    return getSN().substring(0, 3)
 }
 
 /**
@@ -258,4 +258,12 @@ fun isFrLanguage(): Boolean {
 
 fun setNightTheme(isNight: Boolean) {
     MMkvUtils.save("nightTheme", isNight)
+}
+
+fun setIsBrand036I(is036I: Boolean) {
+    MMkvUtils.save("is036I", is036I)
+}
+
+fun isBrand036I(): Boolean {
+    return MMkvUtils.getBool("is036I", false)
 }