Browse Source

010H/I修改

zhangshenjie 3 months ago
parent
commit
baa06db6a7

+ 6 - 0
BusinessAuth/src/main/java/com/develop/auth/ui/MemberAuthActivity.kt

@@ -77,6 +77,12 @@ class MemberAuthActivity : CommonBVMActivity<ActivityMemberAuthBinding, MemberVi
             }
         } else if (sn.startsWith("054")) {
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_054a)
+        } else if (sn.startsWith("010H")||sn.startsWith("010I")) {
+            if (sn.startsWith("010H")){
+                binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_010h)
+            }else{
+                binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_010i)
+            }
         }  else if (sn.startsWith("053")) {
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_053a)
         } else if (sn.startsWith("077")||sn.startsWith("025")||sn.startsWith("000B")) {

BIN
BusinessCommon/src/main/res/drawable-xxxhdpi/account_background_010h.png


BIN
BusinessCommon/src/main/res/drawable-xxxhdpi/account_background_010i.png


BIN
BusinessCommon/src/main/res/drawable-xxxhdpi/ic_screensaver_010h.png


BIN
BusinessCommon/src/main/res/drawable-xxxhdpi/ic_screensaver_010i.png


+ 9 - 1
BusinessSetting/src/main/java/com/develop/setting/ui/LanguageActivity.kt

@@ -77,7 +77,15 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
         } else if (sn.startsWith("053")) {
             binding.ivLogo.setGone()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_053a)
-        } else if (sn.startsWith("077")||sn.startsWith("025")||sn.startsWith("000B")) {
+        }else if (sn.startsWith("010H")||sn.startsWith("010I")) {
+            binding.ivLogo.setGone()
+            if (sn.startsWith("010H")){
+                binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_010h)
+            }else{
+                binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_010i)
+
+            }
+        }  else if (sn.startsWith("077")||sn.startsWith("025")||sn.startsWith("000B")) {
             binding.ivLogo.setGone()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.guide_bg_000)
         }else if (is062) {

+ 7 - 1
BusinessSetting/src/main/java/com/develop/setting/ui/PrivacyPolicyActivity.kt

@@ -60,7 +60,13 @@ class PrivacyPolicyActivity : BaseBindingActivity<ActivityPrivacePolicyBinding>(
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_054a)
         }else if (sn.startsWith("053")){
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_053a)
-        }else if (sn.startsWith("077")||sn.startsWith("025")||sn.startsWith("000B")) {
+        }else if (sn.startsWith("010H")||sn.startsWith("010I")) {
+            if (sn.startsWith("010H")){
+                binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_010h)
+            }else{
+                binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_010i)
+            }
+        } else if (sn.startsWith("077")||sn.startsWith("025")||sn.startsWith("000B")) {
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.guide_bg_000)
         } else if (isBrand062()){
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_062a)

+ 6 - 4
BusinessSetting/src/main/java/com/develop/setting/ui/RestoreActivity.kt

@@ -115,7 +115,6 @@ class RestoreActivity : CommonBindingActivity<ActivityRestoreBinding>() {
             if (delete) {
                 FoodDataProvider.deleteAll()
             }
-            MMkvUtils.save(ISTUYA, false)
             val cacheDirectory = cacheDir
             WifiHelp.Build(this@RestoreActivity).build().removeAllWifi()
             FoodDataProvider.getUserDatabase().userInfoDao().apply {
@@ -130,9 +129,12 @@ class RestoreActivity : CommonBindingActivity<ActivityRestoreBinding>() {
                 .userInfoDao()
                 .deleteUserInfoByUserId(CURRENT_USER_ID)
             val saveToken: String? = null
-            MMkvUtils.save(API_TOKEN, saveToken)
-            MMkvUtils.save(LOGIN_TAG, false)
-            MMkvUtils.save(CURRENT_USER_ID_TAG, 0)
+            MMkvUtils.clearAll()
+
+//            MMkvUtils.save(ISTUYA, false)
+//            MMkvUtils.save(API_TOKEN, saveToken)
+//            MMkvUtils.save(LOGIN_TAG, false)
+//            MMkvUtils.save(CURRENT_USER_ID_TAG, 0)
 
 
             if (delete) {

+ 10 - 0
BusinessSetting/src/main/java/com/develop/setting/ui/ScreensaverActivity.kt

@@ -60,6 +60,14 @@ class ScreensaverActivity : CommonBindingActivity<ActivityScreensaverBinding>()
         val dataList000 = mutableListOf(
             com.develop.common.R.drawable.ic_screensaver_000
         )
+        val dataList010H = mutableListOf(
+            com.develop.common.R.drawable.ic_screensaver_010h
+        )
+
+        val dataList010I = mutableListOf(
+            com.develop.common.R.drawable.ic_screensaver_010i
+        )
+
 
         val bannerAdapter = ScreenBannerAdapter(
             if (sn.startsWith("011A")) dataList011A
@@ -68,6 +76,8 @@ class ScreensaverActivity : CommonBindingActivity<ActivityScreensaverBinding>()
             else if (sn.startsWith("011E")) dataList011E
             else if (sn.startsWith("054")) dataList054
             else if (sn.startsWith("045")) dataList045
+            else if (sn.startsWith("010H")) dataList010H
+            else if (sn.startsWith("010I")) dataList010I
             else if (sn.startsWith("077") || sn.startsWith("025") || sn.startsWith("053")|| sn.startsWith("000B")) dataList000
             else dataList
         )

+ 8 - 1
BusinessSetting/src/main/java/com/develop/setting/ui/WifiListActivity.kt

@@ -123,7 +123,14 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
         } else if (sn.startsWith("053")) {
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_053a)
             binding.ivLogo.setGone()
-        } else if (sn.startsWith("077")||sn.startsWith("025")||sn.startsWith("000B")) {
+        }else if (sn.startsWith("010H")||sn.startsWith("010I")) {
+            binding.ivLogo.setGone()
+            if (sn.startsWith("010H")){
+                binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_010h)
+            }else{
+                binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_010i)
+            }
+        }  else if (sn.startsWith("077")||sn.startsWith("025")||sn.startsWith("000B")) {
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.guide_bg_000)
             binding.ivLogo.setGone()
         }else if (isBrand062()) {