From 38c21cab4641e896489c3d8c080e66f99464cb5e Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Mon, 29 May 2023 15:19:46 +0800 Subject: [PATCH] =?UTF-8?q?[Modify]=E5=88=86=E5=8C=BA=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yizhuan/erban/ui/im/RouterHandler.java | 4 ++++ .../java/com/yizhuan/erban/ui/setting/AreaSelectActivity.kt | 1 + .../java/com/yizhuan/erban/ui/setting/SettingActivity.kt | 2 -- .../xchat_android_core/im/custom/bean/RouterType.java | 5 +++++ nim_uikit/res/values-ar/strings.xml | 5 +++++ nim_uikit/res/values-en/strings.xml | 5 +++++ nim_uikit/res/values-in/strings.xml | 5 +++++ nim_uikit/res/values-tr/strings.xml | 5 +++++ nim_uikit/res/values-zh-rTW/strings.xml | 5 +++++ nim_uikit/res/values-zh/strings.xml | 5 +++++ nim_uikit/res/values/strings-ptr.xml | 6 ------ nim_uikit/res/values/strings.xml | 5 +++++ 12 files changed, 45 insertions(+), 8 deletions(-) delete mode 100644 nim_uikit/res/values/strings-ptr.xml diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java b/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java index a68b07035..725dd072d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java @@ -35,6 +35,7 @@ import com.yizhuan.erban.team.view.NimTeamMessageActivity; import com.yizhuan.erban.ui.login.BindPhoneActivity; import com.yizhuan.erban.ui.login.ShowBindPhoneActivity; import com.yizhuan.erban.ui.pay.ChargeActivity; +import com.yizhuan.erban.ui.setting.AreaSelectActivity; import com.yizhuan.erban.ui.setting.FeedbackActivity; import com.yizhuan.erban.ui.setting.ModifyPwdActivity; import com.yizhuan.erban.ui.user.activity.UserInfoActivity; @@ -321,6 +322,9 @@ public class RouterHandler { case RouterType.MY_SET: UIHelper.showSettingAct(context); break; + case RouterType.SWITCHING_PARTITION: + AreaSelectActivity.start(context); + break; default: SingleToastUtil.showToast(ResUtil.getString(R.string.ui_im_routerhandler_07)); return false; 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 2f44584b2..746eed198 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 @@ -23,6 +23,7 @@ class AreaSelectActivity : BaseViewBindingActivity() private val mPartitionAdapter by lazy { PartitionAdapter() } companion object { + @JvmStatic fun start(context: Context) { val starter = Intent(context, AreaSelectActivity::class.java) context.startActivity(starter) diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.kt index a747a76f7..153adeec7 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.kt @@ -72,7 +72,6 @@ class SettingActivity : BaseViewBindingActivity(), View. binding.tvShieldManager.setOnClickListener(this) binding.rlyPermission.setOnClickListener(this) binding.rlyCheck.setOnClickListener(this) - binding.rlyArea.setOnClickListener(this) } @SuppressLint("CheckResult") @@ -136,7 +135,6 @@ class SettingActivity : BaseViewBindingActivity(), View. R.id.tv_shield_manager -> ShieldManageActivity.start(context) R.id.rly_permission -> PermissionGuideActivity.start(context) R.id.rly_check -> AppUpgradeHelper.checkAppUpgrade(this, dialogManager) - R.id.rly_area -> AreaSelectActivity.start(this) } } diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RouterType.java b/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RouterType.java index 9ffcdafaf..9156ee7c0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RouterType.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RouterType.java @@ -271,4 +271,9 @@ public class RouterType { * 75-设置 */ public static final int MY_SET = 75; + + /** + * 76-切换分区 + */ + public static final int SWITCHING_PARTITION = 76; } diff --git a/nim_uikit/res/values-ar/strings.xml b/nim_uikit/res/values-ar/strings.xml index bc9726815..85b90f848 100644 --- a/nim_uikit/res/values-ar/strings.xml +++ b/nim_uikit/res/values-ar/strings.xml @@ -429,4 +429,9 @@ !فارغ أو الملف غير موجود مسار الصورة فارغ + Library + تحميل… + فشل التحميل - الرجاء المحاولة مرة أخرى + لا مزيد من البيانات + diff --git a/nim_uikit/res/values-en/strings.xml b/nim_uikit/res/values-en/strings.xml index 53b15af72..db63dc2fa 100644 --- a/nim_uikit/res/values-en/strings.xml +++ b/nim_uikit/res/values-en/strings.xml @@ -430,4 +430,9 @@ Is empty or the file does not exist! Image path is empty + Library + Loading… + Failed, try again + No more data + diff --git a/nim_uikit/res/values-in/strings.xml b/nim_uikit/res/values-in/strings.xml index 7b0d5a203..febc74393 100644 --- a/nim_uikit/res/values-in/strings.xml +++ b/nim_uikit/res/values-in/strings.xml @@ -430,4 +430,9 @@ Kosong atau file tidak ada! Jalur gambar kosong + Library + Memuat… + Gagal, coba lagi + Tidak ada data + diff --git a/nim_uikit/res/values-tr/strings.xml b/nim_uikit/res/values-tr/strings.xml index 8f1d793ec..3933f62f2 100644 --- a/nim_uikit/res/values-tr/strings.xml +++ b/nim_uikit/res/values-tr/strings.xml @@ -430,4 +430,9 @@ boş veya dosya mevcut değil! Resim yolu boş + Library + Yükleniyor… + Başarısız, tekrar deneyin + Daha fazla veri yok + diff --git a/nim_uikit/res/values-zh-rTW/strings.xml b/nim_uikit/res/values-zh-rTW/strings.xml index 8f87104ab..ee3ef98c8 100644 --- a/nim_uikit/res/values-zh-rTW/strings.xml +++ b/nim_uikit/res/values-zh-rTW/strings.xml @@ -432,4 +432,9 @@ 為空或者該文件不存在! 圖片路徑為空 + Library + 正在加载中… + 加載失敗，請點我重試 + 沒有更多數據 + diff --git a/nim_uikit/res/values-zh/strings.xml b/nim_uikit/res/values-zh/strings.xml index 8f87104ab..ee3ef98c8 100644 --- a/nim_uikit/res/values-zh/strings.xml +++ b/nim_uikit/res/values-zh/strings.xml @@ -432,4 +432,9 @@ 為空或者該文件不存在! 圖片路徑為空 + Library + 正在加载中… + 加載失敗，請點我重試 + 沒有更多數據 + diff --git a/nim_uikit/res/values/strings-ptr.xml b/nim_uikit/res/values/strings-ptr.xml deleted file mode 100644 index 3c627a978..000000000 --- a/nim_uikit/res/values/strings-ptr.xml +++ /dev/null @@ -1,6 +0,0 @@ - - Library - 正在加载中... - 加載失敗，請點我重試 - 沒有更多數據 - diff --git a/nim_uikit/res/values/strings.xml b/nim_uikit/res/values/strings.xml index 53b15af72..db63dc2fa 100644 --- a/nim_uikit/res/values/strings.xml +++ b/nim_uikit/res/values/strings.xml @@ -430,4 +430,9 @@ Is empty or the file does not exist! Image path is empty + Library + Loading… + Failed, try again + No more data +