054UI 上传

BusinessAirFryer/src/main/assets/config_054.json

@@ -0,0 +1,189 @@
+{
+  "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": true
+    },
+    {
+      "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": "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_054.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
+    }
+  ]
+}

BusinessAirFryer/src/main/assets/tuya_config.json

@@ -179,7 +179,8 @@
       "pid": "as3ox9yav2atavax",
       "uid": "uuidac8a5cf8224a59e3",
       "ak": "A3rA6eguEINAo1NEjmd3onsemJns90e9"
-    }, "000A50370020123010190011": {
+    },
+    "000A50370020123010190011": {
       "pid": "as3ox9yav2atavax",
       "uid": "uuid407731a5d3be267e",
       "ak": "Fo63MumjKU71sQNfPDCMh7gIqbKDWV16"
@@ -353,6 +354,16 @@
       "pid": "yrt1a3lrkt3bbebr",
       "uid": "uuid9fe5261dbd0ad0fe",
       "ak": "wjbbvACRUws6oVdtu2qqgdbq6d3rpq1M"
+    },
+    "054A10390020123010190001": {
+      "pid": "n7sfbw9e37cg8fns",
+      "uid": "uuid44d6edfec5c04492",
+      "ak": "PZdffxAHN2QJNSADL7WMlbYEaz7royTp"
+    },
+    "054A10390020123010190002": {
+      "pid": "n7sfbw9e37cg8fns",
+      "uid": "uuid4e27604207919411",
+      "ak": "WPW1wSIzAyj3BMem2eKn9QaA5gMXuQAx"
     }
   }
 }

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

@@ -14,6 +14,7 @@ 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.isBrand054A
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.setVisible
@@ -62,6 +63,8 @@ class MemberAuthActivity : CommonBVMActivity<ActivityMemberAuthBinding, MemberVi
             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)
+        }else if (isBrand054A()){
+            binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_054a)
         }
         initFragmentList()
         viewModel.enterFromHome = enterFromHome

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

@@ -462,6 +462,13 @@ object DataFactory {
         R.drawable.entrance_011a_bg_4
     )
 
+    private var bg054AResIds = arrayListOf<Int>(
+        R.drawable.entrance_054a_bg_1,
+        R.drawable.entrance_054a_bg_2,
+        R.drawable.entrance_054a_bg_3,
+        R.drawable.entrance_054a_bg_4
+    )
+
     private var iconResIds = arrayListOf<Int>(
         R.drawable.entrance_icon_1,
         R.drawable.entrance_icon_2,
@@ -578,7 +585,17 @@ object DataFactory {
         }
         return dataList
     }
-
+    fun get054AEntranceData(): MutableList<EntranceData> {
+        val dataList = mutableListOf<EntranceData>()
+        for (i in iconResIds.indices) {
+            dataList.add(
+                EntranceData(
+                    bg054AResIds[i], iconResIds[i], titleStrIds[i], title2StrIds[i], typeList[i]
+                )
+            )
+        }
+        return dataList
+    }
     fun get002DEntranceData(): MutableList<EntranceData> {
         val dataList = mutableListOf<EntranceData>()
         for (i in iconResIds.indices) {

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

@@ -87,4 +87,12 @@
         <item name="windowActionBar">false</item>
         <item name="android:windowFullscreen">true</item>
     </style>
+
+    <style name="Splash054ATheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <!-- 这里的trans自己写一个#00000000即可-->
+        <item name="android:windowBackground">@drawable/splash_054a_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

@@ -12,6 +12,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
 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.isFrLanguage
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
@@ -430,7 +431,7 @@ 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 if (isBrand054A())DataFactory.get054AEntranceData()else DataFactory.getEntranceData()
         }
 
 //        if (isBrand011A()) DataFactory.get011AEntranceData()

BusinessMain/src/main/res/layout/activity_mode_entrance.xml

@@ -2,7 +2,9 @@
 <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:id="@+id/content_view"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/bg_color"
+    >
 
     <FrameLayout
         android:id="@+id/home_layout"

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

@@ -24,6 +24,7 @@ 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.isBrand054A
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.setVisible
 import com.develop.base.ext.updateText
@@ -120,6 +121,10 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
                 width = dimenRes(com.develop.common.R.dimen.convert_36px)
                 height = dimenRes(com.develop.common.R.dimen.convert_47px)
             }
+
+            if (isBrand054A()) {
+                binding.ivLogo.setBackgroundResource(com.develop.common.R.drawable.ic_logo_054a)
+            }
         }
         binding.ivLogo.layoutParams = ivLogoParam
         binding.icUpdate.layoutParams = ivUpdateParam

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

@@ -12,6 +12,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.isBrand036I
+import com.develop.base.ext.isBrand054A
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
@@ -59,6 +60,10 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
             binding.ivLogo.setVisible()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.guide_bg_036i)
         }
+        if (isBrand054A()) {
+            binding.ivLogo.setGone()
+            binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_054a)
+        }
         binding.ivClose.setVisible()
         binding.ivClose.setImageResource( com.develop.common.R.drawable.ic_close)
         isFromSetting = intent.extras?.getBoolean(LANGUAGE_FROM_SETTING) ?: false

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

@@ -8,6 +8,7 @@ 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.isBrand054A
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.setVisible
@@ -45,6 +46,8 @@ class PrivacyPolicyActivity : BaseBindingActivity<ActivityPrivacePolicyBinding>(
         if (isBrand036I()) {
           //  binding.ivLogo.setVisible()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.guide_bg_036i)
+        }else if (isBrand054A()){
+            binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_054a)
         }
         countForPolicyTime()
         binding.ivBack.setOnClickListener {

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

@@ -6,6 +6,7 @@ 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.isBrand054A
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.setGone
 import com.develop.base.mvvm.BaseBindingActivity
@@ -38,7 +39,10 @@ class ScreensaverActivity : CommonBindingActivity<ActivityScreensaverBinding>()
         val dataList011 = mutableListOf(
             com.develop.common.R.drawable.ic_screensaver_011a
         )
-        val bannerAdapter = ScreenBannerAdapter(if (isBrand011A()) dataList011 else dataList)
+        val dataList054 = mutableListOf(
+            com.develop.common.R.drawable.ic_screensaver_054a
+        )
+        val bannerAdapter = ScreenBannerAdapter(if (isBrand011A()) dataList011 else if (isBrand054A()) dataList054 else dataList)
         binding.bannerView.adapter = bannerAdapter
 
         binding.circleRecycler.apply {

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

@@ -78,7 +78,6 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
                     findView<ImageView>(R.id.iv_icon).src = model.resId
                 }
                 R.id.iv_icon.onClick {
-                    Log.d("dddddd", "---")
                     when (dataList[absoluteAdapterPosition].type) {
                         SettingType.BRIGHTNESS -> {
                             navigateTo(Screens.Setting.BRIGHTNESS)

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

@@ -17,6 +17,7 @@ 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.isBrand054A
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
 import com.develop.base.ext.setGone
@@ -86,6 +87,9 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
         if (isBrand036I()) {
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.guide_bg_036i)
             binding.ivLogo.setVisible()
+        }else if (isBrand054A()){
+            binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_054a)
+            binding.ivLogo.setGone()
         }
         if (isFromMainSetting) {
             binding.ivLogo.setGone()

BusinessStep/src/main/res/layout/activity_cook_detail.xml

@@ -196,11 +196,11 @@
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-
         <TextView
             android:id="@+id/tv_download"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:gravity="center"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="@dimen/convert_21px"
             android:text="@string/start_cooking"

app/build.gradle

@@ -176,6 +176,13 @@ android {
             resValue("string", "app_theme", "@style/Splash007DTheme")
         }
 
+        brand054ATuya {
+            dimension "platform"
+            applicationId "com.develop.foodcooking"
+            buildConfigField("String", "UpdatePlatform", "\"054A\"")
+            resValue("string", "app_theme", "@style/Splash054ATheme")
+        }
+
     }
 
     signingConfigs {
@@ -223,8 +230,9 @@ android {
         debug{
             debuggable true
             productFlavors.brand010D.signingConfig signingConfigs.debug
-            buildConfigField("String", "UpdatePlatform", "\"night\"")
-            resValue("string", "app_theme", "@style/Splash010DTheme")
+            buildConfigField("String", "UpdatePlatform", "\"054A\"")
+//            buildConfigField("String", "FLAVOR", "\"brand054ATuya\"")
+            resValue("string", "app_theme", "@style/Splash054ATheme")
         }
     }
 

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

@@ -17,6 +17,7 @@ import com.develop.base.app.BaseApp
 import com.develop.base.ext.getBrandNum
 import com.develop.base.ext.setIsBrand011A
 import com.develop.base.ext.setIsBrand036I
+import com.develop.base.ext.setIsBrand054A
 import com.develop.base.ext.setNightTheme
 import com.develop.base.util.MMkvUtils
 import com.develop.common.bean.TuyaEvent
@@ -88,6 +89,7 @@ class FoodCookingApp : BaseApp() {
         val isNight = BuildConfig.UpdatePlatform.equals("night")
         setIsBrand036I(BuildConfig.UpdatePlatform.equals("036I"))
         setIsBrand011A(BuildConfig.UpdatePlatform.equals("011A"))
+        setIsBrand054A(BuildConfig.UpdatePlatform.equals("054A"))
         //切换主题，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

@@ -189,15 +189,15 @@ fun getSN(): String {
 //    return "045A10220020123010120023"
 //    return "000A30150020123010190001"
 //     return "002A30150020123010190001"
-//     return "000A10390020123010190001"
-    return "010D10390020123010190001"
+     return "000A10390020123010190001"
+//    return "010D10390020123010190001"
 //    return "011A30150020123010190001"
 //    return "007D20020020123010190001"
 //    return "036I21060020123010180001"
 //    return  "030A10390020123010190001"
 //    return  "017A20060020123010190001"
 //    return "010D10390020123010190001"
-  //  return "000A10390020123010190009"
+//    return "000A10390020123010190009"
     //通过反射获取sn号
     try {
         val c = Class.forName("android.os.SystemProperties")
@@ -264,4 +264,11 @@ fun setIsBrand011A(is011A: Boolean) {
 
 fun isBrand011A(): Boolean {
     return MMkvUtils.getBool("is011A", false)
+}
+fun setIsBrand054A(is054A: Boolean) {
+    MMkvUtils.save("is054A", is054A)
+}
+
+fun isBrand054A(): Boolean {
+    return MMkvUtils.getBool("is054A", false)
 }