[Modify]分区功能完善

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;

app/src/main/java/com/yizhuan/erban/ui/setting/AreaSelectActivity.kt

@@ -23,6 +23,7 @@ class AreaSelectActivity : BaseViewBindingActivity<ActivityAreaSelectBinding>()
     private val mPartitionAdapter by lazy { PartitionAdapter() }
 
     companion object {
+        @JvmStatic
         fun start(context: Context) {
             val starter = Intent(context, AreaSelectActivity::class.java)
             context.startActivity(starter)

app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.kt

@@ -72,7 +72,6 @@ class SettingActivity : BaseViewBindingActivity<ActivitySettingBinding>(), 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<ActivitySettingBinding>(), 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)
         }
     }
 

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;
 }

nim_uikit/res/values-ar/strings.xml

@@ -429,4 +429,9 @@
     <string name="xchat_android_core_file_filemodel_01">!فارغ أو الملف غير موجود</string>
     <string name="image_file_empty">مسار الصورة فارغ</string>
 
+    <string name="app_name">Library</string>
+    <string name="loading"> تحميل…</string>
+    <string name="load_failed">فشل التحميل - الرجاء المحاولة مرة أخرى</string>
+    <string name="load_end">لا مزيد من البيانات</string>
+
 </resources>

nim_uikit/res/values-en/strings.xml

@@ -430,4 +430,9 @@
     <string name="xchat_android_core_file_filemodel_01">Is empty or the file does not exist!</string>
     <string name="image_file_empty">Image path is empty</string>
 
+    <string name="app_name">Library</string>
+    <string name="loading">Loading…</string>
+    <string name="load_failed">Failed, try again</string>
+    <string name="load_end">No more data</string>
+
 </resources>

nim_uikit/res/values-in/strings.xml

@@ -430,4 +430,9 @@
     <string name="xchat_android_core_file_filemodel_01">Kosong atau file tidak ada!</string>
     <string name="image_file_empty">Jalur gambar kosong</string>
 
+    <string name="app_name">Library</string>
+    <string name="loading">Memuat…</string>
+    <string name="load_failed">Gagal, coba lagi</string>
+    <string name="load_end">Tidak ada data</string>
+
 </resources>

nim_uikit/res/values-tr/strings.xml

@@ -430,4 +430,9 @@
     <string name="xchat_android_core_file_filemodel_01">boş veya dosya mevcut değil!</string>
     <string name="image_file_empty">Resim yolu boş</string>
 
+    <string name="app_name">Library</string>
+    <string name="loading">Yükleniyor…</string>
+    <string name="load_failed">Başarısız, tekrar deneyin</string>
+    <string name="load_end">Daha fazla veri yok</string>
+
 </resources>

nim_uikit/res/values-zh-rTW/strings.xml

@@ -432,4 +432,9 @@
     <string name="xchat_android_core_file_filemodel_01"> 為空或者該文件不存在!</string>
     <string name="image_file_empty">圖片路徑為空</string>
 
+    <string name="app_name">Library</string>
+    <string name="loading">正在加载中…</string>
+    <string name="load_failed">加載失敗，請點我重試</string>
+    <string name="load_end">沒有更多數據</string>
+
 </resources>

nim_uikit/res/values-zh/strings.xml

@@ -432,4 +432,9 @@
     <string name="xchat_android_core_file_filemodel_01"> 為空或者該文件不存在!</string>
     <string name="image_file_empty">圖片路徑為空</string>
 
+    <string name="app_name">Library</string>
+    <string name="loading">正在加载中…</string>
+    <string name="load_failed">加載失敗，請點我重試</string>
+    <string name="load_end">沒有更多數據</string>
+
 </resources>

nim_uikit/res/values/strings-ptr.xml

@@ -1,6 +0,0 @@
-<resources>
-    <string name="app_name">Library</string>
-    <string name="loading">正在加载中...</string>
-    <string name="load_failed">加載失敗，請點我重試</string>
-    <string name="load_end">沒有更多數據</string>
-</resources>

nim_uikit/res/values/strings.xml

@@ -430,4 +430,9 @@
     <string name="xchat_android_core_file_filemodel_01">Is empty or the file does not exist!</string>
     <string name="image_file_empty">Image path is empty</string>
 
+    <string name="app_name">Library</string>
+    <string name="loading">Loading…</string>
+    <string name="load_failed">Failed, try again</string>
+    <string name="load_end">No more data</string>
+
 </resources>