提交人：jtm

提交内容：添加036i型号

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

@@ -130,7 +130,11 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 
         binding.tvFirmware.text = Build.DISPLAY
 
-        binding.model.text = getSN().substring(4, 8)
+        binding.model.text = if (isBrand036I()){
+            "2106"
+        } else {
+            getSN().substring(4, 8)
+        }
 
         recipeUpdateDialog.onDialogClickListener =
             object : RecipeUpdateDialog.OnDialogClickListener {

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

@@ -11,6 +11,7 @@ import androidx.appcompat.widget.AppCompatTextView
 import com.develop.base.ext.load
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.blankj.utilcode.util.LanguageUtils
+import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
@@ -106,7 +107,7 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
             object : CancelConfirmDialog.OnDialogClickListener {
                 override fun onConfirm() {
                     if (isLanguageTip) {
-                        if (isNightTheme()) {
+                        if (isNightTheme() || isBrand036I()) {
                             MMkvUtils.save(CURRENT_LANGUAGE, FR)
                             LanguageUtils.applyLanguage(Locale.FRANCE)
                         } else {
@@ -114,7 +115,7 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
                         }
 //                        navigateTo(Screens.Main.ENTRANCE_CHOSEN)
 //                        finish()
-                        if (!isNightTheme()) {
+                        if (!isNightTheme() && !isBrand036I()) {
                             val pm = getSystemService(Context.POWER_SERVICE) as PowerManager
                             pm.reboot("")
                         } else if (isFromSetting) {
@@ -140,7 +141,7 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
                 return@setOnClickListener
             }
             if (isFromSetting) {
-                if (isNightTheme()) {
+                if (isNightTheme() || isBrand036I()) {
                     if (binding.languageRecycle.models?.size!! > 1) {
                         isLanguageTip = true
                         cancelConfirmDialog.title =
@@ -161,7 +162,7 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
                 }
 
             } else {
-                if (isNightTheme()) {
+                if (isNightTheme() || isBrand036I()) {
                     MMkvUtils.save(CURRENT_LANGUAGE, FR)
                     LanguageUtils.applyLanguage(Locale.FRANCE)
                 } else {