From 5a067ec0fd5ae6e376d1939a2371c972acccdab1 Mon Sep 17 00:00:00 2001
From: max <mxruan@163.com>
Date: Tue, 14 May 2024 16:32:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=EF=BC=9A=E7=B2=89=E4=B8=9D=E5=9B=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chwl/app/avroom/fragment/SingleRoomFragment.kt  | 12 +++++++-----
 .../com/chwl/app/fansteam/FansTeamJoinActivity.kt   |  2 +-
 .../com/chwl/app/fansteam/FansTeamJoinedActivity.kt |  9 +++++----
 app/src/main/res/values-ar/strings.xml              |  8 ++++++++
 app/src/main/res/values-zh-rTW/strings.xml          |  9 +++++++++
 app/src/main/res/values/strings.xml                 | 13 +++++++++++--
 6 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt
index 5bd1df9fd..99d13f681 100644
--- a/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt
+++ b/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt
@@ -149,7 +149,7 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
             if (AvRoomDataManager.get().isRoomOwner) {
                 gameBinding.flFansTeamJoinTip.isVisible = false
                 gameBinding.tvFansTeamOpt.isVisible = true
-                gameBinding.tvFansTeamOpt.text = "粉絲團(${initInfo.anchorFansNum})"
+                gameBinding.tvFansTeamOpt.text = String.format(getString(R.string.fans_team_4),"${initInfo.anchorFansNum}")
                 clickListener = View.OnClickListener {
                     DialogWebViewActivity.start(
                         requireContext(),
@@ -160,8 +160,10 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
                 if (initInfo.isAnchorFans) {
                     gameBinding.flFansTeamJoinTip.isVisible = false
                     gameBinding.tvFansTeamOpt.isVisible = true
-                    gameBinding.tvFansTeamOpt.text =
-                        "粉絲LV.${if (initInfo.fansLevelSeq == 0) 1 else initInfo.fansLevelSeq}"
+                    val level = if (initInfo.fansLevelSeq == 0) 1 else initInfo.fansLevelSeq
+                    val levelStr =
+                        String.format(requireContext().getString(R.string.fans_team_5), level.toString())
+                    gameBinding.tvFansTeamOpt.text = levelStr
                     clickListener = View.OnClickListener {
                         FansTeamJoinedActivity.start(requireContext())
                     }
@@ -177,7 +179,7 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
             if (AvRoomDataManager.get().isRoomOwner) {
                 gameBinding.flFansTeamJoinTip.isVisible = false
                 gameBinding.tvFansTeamOpt.isVisible = true
-                gameBinding.tvFansTeamOpt.text = "開通粉絲團"
+                gameBinding.tvFansTeamOpt.text = getString(R.string.fans_team_6)
                 clickListener = View.OnClickListener {
                     CommonWebViewActivity.start(
                         requireContext(),
@@ -187,7 +189,7 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
             } else {
                 gameBinding.flFansTeamJoinTip.isVisible = false
                 gameBinding.tvFansTeamOpt.isVisible = true
-                gameBinding.tvFansTeamOpt.text = "TA暫未開通粉絲團"
+                gameBinding.tvFansTeamOpt.text = getString(R.string.layout_fragment_single_room_03)
             }
         }
         gameBinding.flFansTeam.setOnClickListener(clickListener)
diff --git a/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinActivity.kt b/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinActivity.kt
index b72f166b8..6a038ec8c 100644
--- a/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinActivity.kt
+++ b/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinActivity.kt
@@ -88,7 +88,7 @@ class FansTeamJoinActivity : BaseViewBindingActivity<ActivityFansTeamJoinBinding
                                     .compose(bindToLifecycle())
                                     .handleBeanData()
                                     .subscribe({
-                                        "加入粉絲團成功!".toast()
+                                        toast(R.string.fans_team_3)
                                         finish()
                                     }, { t ->
                                         t.message.toast()
diff --git a/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinedActivity.kt b/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinedActivity.kt
index 524c12398..ff7309e4c 100644
--- a/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinedActivity.kt
+++ b/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinedActivity.kt
@@ -73,10 +73,11 @@ class FansTeamJoinedActivity : BaseViewBindingActivity<ActivityFansTeamJoinedBin
             it?.let {
                 binding.ivAvatar.load(it.anchorAvatar)
                 binding.tvFansTeamName.text = it.anchorNick.subAndReplaceDot(7) + ResUtil.getString(R.string.erban_fansteam_fansteamjoinedactivity_02)
-                binding.tvFansTeamFansNum.text = "${it.teamNum}人"
+                binding.tvFansTeamFansNum.text = "${it.teamNum}${context.getString(R.string.person)}"
 
                 binding.ivMeAvatar.load(it.memberAvatar)
-                binding.tvValue.text = "親密值Lv.${it.levelSeq}"
+                binding.tvValue.text =
+                    context.getString(R.string.fans_team_8, it.levelSeq.toString())
                 binding.tvCurrValue.text = "${it.levelExper}/${it.nextLevelExper}"
                 binding.pbValue.max = it.nextLevelExper
                 binding.pbValue.progress = it.levelExper
@@ -90,7 +91,7 @@ class FansTeamJoinedActivity : BaseViewBindingActivity<ActivityFansTeamJoinedBin
 
         fansTeamViewModel.exitFansTeamLiveData.observe(this) {
             if (it == true) {
-                "退出粉絲團成功!".toast()
+                toast(R.string.fans_team_9)
                 finish()
             }
         }
@@ -116,7 +117,7 @@ class FansTeamJoinedActivity : BaseViewBindingActivity<ActivityFansTeamJoinedBin
             popupWindow.dismiss()
         }
         contentView.findViewById<View>(R.id.tv_exit).setOnClickListener {
-            dialogManager.showOkCancelDialog("退出後粉絲團後24小時內不能再次加入,確定退出嗎?", true) {
+            dialogManager.showOkCancelDialog(context.getString(R.string.fans_team_1), true) {
                 popupWindow.dismiss()
                 fansTeamViewModel.exitFansTeam()
             }
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index e470474c7..628e266f9 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -5270,4 +5270,12 @@
     <string name="load_failed">فشل التحميل</string>
     <string name="retry">أعد المحاولة</string>
     <string name="data_empty">لايوجد بيانات</string>
+
+    <string name="fans_team_1">بعد الخروج من  نادي المعجبين، لا يمكنك الانضمام إلية مرة أخرى خلال 24 ساعة. هل أنت متأكد من الخروج؟</string>
+    <string name="fans_team_3">!تم الانضمام بنجاح إلى نادي المعجبين</string>
+    <string name="fans_team_4">فريق المعجبين(s%)</string>
+    <string name="fans_team_5">مستوي المعجبين s%</string>
+    <string name="fans_team_6">فتح نادي المعجبين</string>
+    <string name="fans_team_8">親密值Lv.%s</string>
+    <string name="fans_team_9">退出粉絲團成功!</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 3cde9c0eb..abc2bfd0a 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -5213,4 +5213,13 @@
     <string name="retry">重試</string>
 
     <string name="data_empty">暫無數據</string>
+
+
+    <string name="fans_team_1">退出粉絲團後24小時內不能再次加入,確定退出嗎?</string>
+    <string name="fans_team_3">加入粉絲團成功!</string>
+    <string name="fans_team_4">粉絲團(%s)</string>
+    <string name="fans_team_5">粉絲LV.%s</string>
+    <string name="fans_team_6">開通粉絲團</string>
+    <string name="fans_team_8">親密值Lv.%s</string>
+    <string name="fans_team_9">退出粉絲團成功!</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 22d96601b..89fa44882 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4546,8 +4546,8 @@
     <string name="layout_fragment_mini_world_category_my_empty_01">You haven\'t joined any worlds yet. Go to the World Square to explore!</string>
     <string name="layout_fragment_mini_world_category_my_empty_02">Discover Worlds</string>
     <string name="layout_fragment_single_room_01">Host Ranking</string>
-    <string name="layout_fragment_single_room_02">Join Fan Club</string>
-    <string name="layout_fragment_single_room_03">No Fan Club Available</string>
+    <string name="layout_fragment_single_room_02">Join the fan club</string>
+    <string name="layout_fragment_single_room_03">Fan club not yet opened</string>
     <string name="layout_fragment_single_room_04">Hourly Ranking</string>
     <string name="layout_fragment_single_room_05">First Recharge Red Envelope</string>
     <string name="layout_fragment_single_room_06">Maritime Adventure</string>
@@ -5251,6 +5251,15 @@
     <string name="load_failed">Loading failed</string>
     <string name="retry">Retry</string>
     <string name="data_empty">No data</string>
+
+    <string name="fans_team_1">"Do you want to confirm quitting?
+You cannot join again within 24 hours after leaving</string>
+    <string name="fans_team_3">Successfully joined the fan club!</string>
+    <string name="fans_team_4">Fan club(%s)</string>
+    <string name="fans_team_5">Fan LV.%s</string>
+    <string name="fans_team_6">Open fan club</string>
+    <string name="fans_team_8">intimacy Lv.%s</string>
+    <string name="fans_team_9">Successfully exited the fan club!</string>
 </resources>