From b3898958d62461f1fafdbe6fa6633bb540847765 Mon Sep 17 00:00:00 2001
From: wushaocheng <15876365887@163.com>
Date: Wed, 7 Jun 2023 17:35:19 +0800
Subject: [PATCH] =?UTF-8?q?[Modify]=E5=88=A4=E6=96=AD=E4=B8=AD=E6=96=87?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=89=8D=E6=98=BE=E7=A4=BA=E4=B8=AD=E6=96=87?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/avroom/fragment/BaseRoomFragment.kt | 21 ++++++++++++++++---
 .../erban/ui/setting/AreaSelectActivity.kt    |  5 -----
 .../common/SpConstants.kt                     |  1 -
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt
index 6da1a6dad..dcb14724e 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt
@@ -117,6 +117,7 @@ import io.reactivex.disposables.Disposable
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
+import java.util.*
 
 
 /**
@@ -702,7 +703,13 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
             .compose(bindUntilEvent(FragmentEvent.DESTROY))
             .doOnError {
                 if (it is VipLevelNotEnoughException) {
-                    dialogManager.showOkDialog("${getString(R.string.not_yet_given)}${giftInfo.giftName}${getString(R.string.rank_of_nobility_required)}${giftInfo.giftVipInfo?.vipName}")
+                    dialogManager.showOkDialog(
+                        "${getString(R.string.not_yet_given)}${giftInfo.giftName}${
+                            getString(
+                                R.string.rank_of_nobility_required
+                            )
+                        }${giftInfo.giftVipInfo?.vipName}"
+                    )
                 }
             }
             .subscribe { _, throwable ->
@@ -800,7 +807,13 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
                 }
             })
         val buttonItem4 =
-            ButtonItem(getString(R.string.up_micro)) { toUpMicroPhone(micPosition, currentUid.toString() + "", false) }
+            ButtonItem(getString(R.string.up_micro)) {
+                toUpMicroPhone(
+                    micPosition,
+                    currentUid.toString() + "",
+                    false
+                )
+            }
         //別問為什麽，ui調整了順序
         //禁用超管的上麥和抱TA上麥
         if (!SuperAdminUtil.isSuperAdmin()) {
@@ -1059,7 +1072,9 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
         val rvSpeedyMessage =
             speedyMessageContainer.findViewById<RecyclerView>(R.id.rv_speedy_message)
         val phrases = AvRoomDataManager.get().phrases
-        if (ListUtils.isListEmpty(phrases) || !TimeUtils.isTomorrow(DemoCache.readSpeedyMessageGoneTime())) {
+        if (ListUtils.isListEmpty(phrases) || !TimeUtils.isTomorrow(DemoCache.readSpeedyMessageGoneTime())
+            || Locale.getDefault().language != "zh"
+        ) {
             speedyMessageContainer.visibility = View.GONE
             return
         }
diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/AreaSelectActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/setting/AreaSelectActivity.kt
index e38be1584..f4b519b32 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/setting/AreaSelectActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/ui/setting/AreaSelectActivity.kt
@@ -50,11 +50,6 @@ class AreaSelectActivity : BaseViewBindingActivity<ActivityAreaSelectBinding>()
 
         setViewModel.changePartitionLiveData.observe(this) {
             EventBus.getDefault().post(AreaChangeEvent())
-            if(mPartitionAdapter.getItem(mPosition)?.desc == "华语区"){
-                SPUtils.putString(SpConstants.AREA_SELECT, "华语区")
-            }else {
-                SPUtils.putString(SpConstants.AREA_SELECT, "其它地区")
-            }
         }
 
         mPartitionAdapter.setOnItemClickListener { _, _, position ->
diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/SpConstants.kt b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/SpConstants.kt
index 0460f653e..43ba125f3 100644
--- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/SpConstants.kt
+++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/SpConstants.kt
@@ -2,5 +2,4 @@ package com.yizhuan.xchat_android_library.common
 
 object SpConstants {
     const val TAB_INFO_LIST = "tab_info_list"
-    const val AREA_SELECT = "area_select"
 }
\ No newline at end of file