diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/DatingMicroViewAdapter.kt b/app/src/main/java/com/yizhuan/erban/avroom/adapter/DatingMicroViewAdapter.kt
index 09ca665b3..38194c7e6 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/DatingMicroViewAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/DatingMicroViewAdapter.kt
@@ -100,13 +100,17 @@ class DatingMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context)
                         ) {
                             tvSelectedStatus.text =
                                 if (AvRoomDataManager.get().isDatingVipMic(it.selectMicPosition)
-                                ) ResUtil.getString(R.string.avroom_adapter_datingmicroviewadapter_01) else "選${it.selectMicPosition + 1}號"
+                                ) ResUtil.getString(R.string.avroom_adapter_datingmicroviewadapter_01) else "${
+                                    context.getString(
+                                        R.string.micro_select
+                                    )
+                                }${it.selectMicPosition + 1}${context.getString(R.string.micro_number)}"
                         } else {
-                            tvSelectedStatus.text = "已選擇"
+                            tvSelectedStatus.text = context.getString(R.string.micro_have_select)
                         }
                     } else {
                         tvSelectedStatus.isSelected = false
-                        tvSelectedStatus.text = "未選擇"
+                        tvSelectedStatus.text = context.getString(R.string.micro_no_select)
                     }
                 }
 
@@ -128,7 +132,8 @@ class DatingMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context)
                 if (AvRoomDataManager.POSITION_VIP_MIC == position) {
                     tvNick.text = ""
                 } else if (position != -1) {
-                    tvNick.text = "號${if (manMicro) "男神" else "女神"}位"
+                    tvNick.text = "${context.getString(R.string.micro_number)}${if (manMicro) context.getString(
+                                            R.string.god) else context.getString(R.string.goddess)}${context.getString(R.string.place)}"
                 }
             }
 
@@ -145,7 +150,7 @@ class DatingMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context)
             super.bind(info, position)
             if (info.mChatRoomMember == null) {
                 tvNick.alpha = 1f
-                tvNick.text = "主持人"
+                tvNick.text = context.getString(R.string.micro_compere)
                 ivVipWear.isVisible = false
             } else {
                 if (info.mChatRoomMember.isVipMic) {
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKSearchAdapter.kt b/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKSearchAdapter.kt
index 5357eb569..8ca314129 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKSearchAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKSearchAdapter.kt
@@ -12,7 +12,7 @@ class RoomPKSearchAdapter :
 
     override fun convert(helper: BaseViewHolder, item: SimpleRoomInfo) {
         helper.setText(R.id.tv_room_title,item.title.subAndReplaceDot(7))
-            .setText(R.id.tv_room_id,"Peko号:${item.erbanNo}")
+            .setText(R.id.tv_room_id,"${mContext.getString(R.string.peko_number)}${item.erbanNo}")
             .setChecked(R.id.check_box,item.checked)
         ImageLoadUtils.loadImage(mContext,item.avatar,helper.getView(R.id.iv_avatar))
         helper.addOnClickListener(R.id.iv_avatar,R.id.check_box)
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkFinishDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkFinishDialog.kt
index 24f90646b..4975f38ab 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkFinishDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkFinishDialog.kt
@@ -54,7 +54,7 @@ class RoomPkFinishDialog : BaseDialog<DialogRoomPkFinishBinding>() {
 
         roomPkBean.csRank.getOrNull(0)?.let {
             binding.tvNickContribute.text = it.nick.subAndReplaceDot(7)
-            binding.tvValueContribute.text = "神豪值:${it.amount}"
+            binding.tvValueContribute.text = "${getString(R.string.divine_value)}${it.amount}"
             ImageLoadUtils.loadImage(
                 context,
                 it.avatar,
@@ -65,7 +65,7 @@ class RoomPkFinishDialog : BaseDialog<DialogRoomPkFinishBinding>() {
 
         roomPkBean.crRank.getOrNull(0)?.let {
             binding.tvNickCharm.text = it.nick.subAndReplaceDot(7)
-            binding.tvValueCharm.text = "魅力值:${it.amount}"
+            binding.tvValueCharm.text = "${getString(R.string.charm_value)}${it.amount}"
             ImageLoadUtils.loadImage(
                 context,
                 it.avatar,
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkReceivedDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkReceivedDialog.kt
index 2a707068f..a369a9003 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkReceivedDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkReceivedDialog.kt
@@ -3,6 +3,7 @@ package com.yizhuan.erban.avroom.anotherroompk
 import android.annotation.SuppressLint
 import android.os.Bundle
 import androidx.core.view.isVisible
+import com.yizhuan.erban.R
 import com.yizhuan.erban.base.BaseDialog
 import com.yizhuan.erban.databinding.DialogRoomPkReceivedBinding
 import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean
@@ -37,7 +38,7 @@ class RoomPkReceivedDialog : BaseDialog<DialogRoomPkReceivedBinding>() {
     @SuppressLint("CheckResult")
     override fun init() {
         binding.tvNick.text = pkBean.inviteRoomTitle.subAndReplaceDot(7)
-        binding.tvTime.text = "${pkBean.pkDuration}分鐘"
+        binding.tvTime.text = "${pkBean.pkDuration}${getString(R.string.avroom_dialog_pktimepickerdialog_01)}"
         pkBean.pkDesc.ifNotNullOrEmpty {
             binding.tvDescTitle.isVisible = true
             binding.tvDesc.isVisible = true
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/SendBroadcastDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/dialog/SendBroadcastDialog.kt
index d054f82ea..d416c81e1 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/SendBroadcastDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/SendBroadcastDialog.kt
@@ -7,6 +7,7 @@ import android.text.Editable
 import android.text.style.ForegroundColorSpan
 import android.view.WindowManager
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.yizhuan.erban.R
 import com.yizhuan.erban.avroom.adapter.SendBroadcastAdapter
 import com.yizhuan.erban.base.BaseActivity
 import com.yizhuan.erban.base.BaseDialog
@@ -91,12 +92,12 @@ class SendBroadcastDialog : BaseDialog<DialogSendBroadcastBinding>() {
         broadcastInfo = info
         rvDelegate.setNewData(info.recommends)
         binding.tvAvailableCountNum.text = "${info.availableTimes}/${info.total}"
-        binding.editContent.hint = "输入内容不能少于${info.minWords}个字，请文明发言哦~"
+        binding.editContent.hint = "${getString(R.string.input_content_cannot_be_less_than)}${info.minWords}${getString(R.string.please_speak_civilized_oh)}"
         binding.tvContentNumLimit.text = "0/${info.maxWords}"
         if (info.seconds > 0) {
             beginIntervalTime(info)
         } else {
-            binding.tvSendHint.text = "发布后，${info.minutes}分钟内不可再发布广播"
+            binding.tvSendHint.text = "${getString(R.string.after_the_release)}${info.minutes}${getString(R.string.do_not_broadcast_within_minutes)}"
         }
     }
 
@@ -107,7 +108,7 @@ class SendBroadcastDialog : BaseDialog<DialogSendBroadcastBinding>() {
             .observeOn(AndroidSchedulers.mainThread())
             .compose(bindToLifecycle())
             .doOnComplete {
-                binding.tvSendHint.text = "发布后，${info.minutes}分钟内不可再发布广播"
+                binding.tvSendHint.text = "${getString(R.string.after_the_release)}${info.minutes}${getString(R.string.do_not_broadcast_within_minutes)}"
             }
             .subscribe {
                 binding.tvSendHint.text = SpannableBuilder()
@@ -115,7 +116,7 @@ class SendBroadcastDialog : BaseDialog<DialogSendBroadcastBinding>() {
                         "${info.seconds - it}",
                         ForegroundColorSpan(Color.parseColor("#FFFDA615"))
                     )
-                    .append("后可以再次发布")
+                    .append(getString(R.string.you_can_publish_it_again))
                     .build()
             }
     }
@@ -123,13 +124,13 @@ class SendBroadcastDialog : BaseDialog<DialogSendBroadcastBinding>() {
     @SuppressLint("CheckResult")
     private fun sendBroadcast() {
         if (broadcastInfo == null) {
-            "数据加载中,请稍后...".toast()
+            getString(R.string.data_loading_please_wait).toast()
             return
         }
         broadcastInfo?.let {
             val msg = binding.editContent.text
             if (msg.isNullOrEmpty() || msg.length < it.minWords) {
-                "输入内容不能少于${it.minWords}个字!".toast()
+                "${getString(R.string.the_input_content_cannot_be_less_than)}${it.minWords}${getString(R.string.a_world)}".toast()
                 return@let
             }
             val dialogManager = (requireActivity() as BaseActivity).dialogManager
@@ -138,7 +139,7 @@ class SendBroadcastDialog : BaseDialog<DialogSendBroadcastBinding>() {
                 .compose(bindToLifecycle())
                 .subscribe(
                     {
-                        "发送成功".toast()
+                        getString(R.string.send_success).toast()
                         dialogManager.dismissDialog()
                         dismissAllowingStateLoss()
                     },
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 d6491ea54..6da1a6dad 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
@@ -702,7 +702,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
             .compose(bindUntilEvent(FragmentEvent.DESTROY))
             .doOnError {
                 if (it is VipLevelNotEnoughException) {
-                    dialogManager.showOkDialog("尚未達到贈送${giftInfo.giftName}所需貴族等級,所需貴族等級:${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 ->
@@ -754,7 +754,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
     ) {
         val buttonItems: MutableList<ButtonItem> = ArrayList(4)
         val presideMic = AvRoomDataManager.get().isDatingMode && micPosition == -1
-        val presideText = if (presideMic) "當主持人" else ""
+        val presideText = if (presideMic) getString(R.string.maria_bartiromo) else ""
         val buttonItem1 = ButtonItem(
             getString(R.string.embrace_up_mic) + presideText,
             object : ButtonItem.OnClickListener {
@@ -800,7 +800,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
                 }
             })
         val buttonItem4 =
-            ButtonItem("上麥") { toUpMicroPhone(micPosition, currentUid.toString() + "", false) }
+            ButtonItem(getString(R.string.up_micro)) { toUpMicroPhone(micPosition, currentUid.toString() + "", false) }
         //別問為什麽，ui調整了順序
         //禁用超管的上麥和抱TA上麥
         if (!SuperAdminUtil.isSuperAdmin()) {
@@ -984,7 +984,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
     @SuppressLint("CheckResult")
     override fun toUpMicroPhone(micPosition: Int, currentUid: String, b: Boolean) {
         if (AvRoomDataManager.get().isSelfGamePlaying) {
-            SingleToastUtil.showToast("遊戲中不可以換麥!")
+            SingleToastUtil.showToast(getString(R.string.not_change_wheat_in_the_game))
             return
         }
         UserModel.get().cacheLoginUserInfo?.gameStatus = GameStatus.STATUS_NOT_JOIN
@@ -993,9 +993,9 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
                 if (result) {
                     mvpPresenter?.upMicroPhone(micPosition, currentUid, b)
                 } else {
-                    toast("請給予麥克風權限後再試!")
+                    toast(getString(R.string.please_give_the_microphone_permission))
                 }
-            }, { _: Throwable? -> toast("發生一些異常,請稍後重試!") })
+            }, { _: Throwable? -> toast(getString(R.string.something_abnormal_happens)) })
     }
 
     /**
@@ -1084,10 +1084,10 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
                 val roomInfo =
                     AvRoomDataManager.get().mCurrentRoomInfo ?: return@setOnItemClickListener
                 if (roomInfo.isCloseScreen) {
-                    toast("房間公屏已關閉")
+                    toast(getString(R.string.public_screen_in_the_room_is_closed))
                     return@setOnItemClickListener
                 }
-                SingleToastUtil.showToast("你發送的太頻繁啦，請稍後再試")
+                SingleToastUtil.showToast(getString(R.string.send_too_often))
             }
         }
         speedyMessageContainer.findViewById<View>(R.id.iv_close_speedy_message).setOnClickListener {
@@ -1101,7 +1101,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
     }
 
     override fun onFollowFail(msg: String?) {
-        toast("關註失敗，請稍後重試")
+        toast(getString(R.string.focus_failure))
     }
 
     override fun updateMicView() {
@@ -1200,7 +1200,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
                                 AudioEngineManager.get().setRole(Constants.CLIENT_ROLE_BROADCASTER)
                                 updateMicBtn()
                             } else {
-                                toast("開啟權限後才能開麥")
+                                toast(getString(R.string.only_after_the_permission_is_enabled))
                             }
                         }
                     return
@@ -1227,7 +1227,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
                     dynamicFaceDialog?.show()
                 }
             } else {
-                toast("上麥才能發表情哦!")
+                toast(getString(R.string.you_have_to_do_it_on_the_mic))
             }
         }
 
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/SingleRoomFragment.kt b/app/src/main/java/com/yizhuan/erban/avroom/fragment/SingleRoomFragment.kt
index 907338a41..6768a51e6 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/SingleRoomFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/SingleRoomFragment.kt
@@ -129,7 +129,7 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
 
         if (initInfo.hasFansTeamCurrentRoom) {
             if (AvRoomDataManager.get().isRoomOwner) {
-                gameBinding.tvFansTeamOpt.text = "粉絲團(${initInfo.anchorFansNum})"
+                gameBinding.tvFansTeamOpt.text = "${getString(R.string.fans_club)}${initInfo.anchorFansNum})"
                 clickListener = View.OnClickListener {
                     DialogWebViewActivity.start(
                         requireContext(),
@@ -139,7 +139,7 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
             } else {
                 if (initInfo.isAnchorFans) {
                     gameBinding.tvFansTeamOpt.text =
-                        "粉絲LV.${if (initInfo.fansLevelSeq == 0) 1 else initInfo.fansLevelSeq}"
+                        "${getString(R.string.fans_lv)}${if (initInfo.fansLevelSeq == 0) 1 else initInfo.fansLevelSeq}"
                     clickListener = View.OnClickListener {
                         FansTeamJoinedActivity.start(requireContext())
                     }
@@ -151,7 +151,7 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
             }
         } else {
             if (AvRoomDataManager.get().isRoomOwner) {
-                gameBinding.tvFansTeamOpt.text = "開通粉絲團"
+                gameBinding.tvFansTeamOpt.text = getString(R.string.open_a_fan_club)
                 clickListener = View.OnClickListener {
                     CommonWebViewActivity.start(
                         requireContext(),
@@ -159,7 +159,7 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
                     )
                 }
             } else {
-                gameBinding.tvFansTeamOpt.text = "該主播暫未開通粉絲團"
+                gameBinding.tvFansTeamOpt.text = getString(R.string.the_anchor_has_not_yet_opened_the_fan_group)
             }
         }
         gameBinding.flFansTeam.setOnClickListener(clickListener)
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/BaseRoomPresenter.java b/app/src/main/java/com/yizhuan/erban/avroom/presenter/BaseRoomPresenter.java
index c55b357ad..16e0d820f 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/BaseRoomPresenter.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/presenter/BaseRoomPresenter.java
@@ -455,12 +455,12 @@ public class BaseRoomPresenter<V extends IBaseRoomView> extends BaseMvpPresenter
             ChatRoomMessage firstMsg = IMNetEaseManager.get().getFirstMessageContent();
             IMNetEaseManager.get().addCloseScreenMessages(firstMsg);
             if (AvRoomDataManager.get().closeScreenBySAdmin()) {
-                contentText = "系統檢測涉嫌違規，予以關閉公屏消息警告";
+                contentText = ResUtil.getString(R.string.the_system_detects_suspected_violations);
             } else {
-                contentText = "管理員已關閉聊天公屏";
+                contentText = ResUtil.getString(R.string.the_administrator_has_closed);
             }
         } else {
-            contentText = "管理員已開啟聊天公屏";
+            contentText = ResUtil.getString(R.string.administrator_has_enabled_the_chat_public_screen);
         }
         RoomInfoAttachment attachment = new RoomInfoAttachment(CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO,
                 CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLOSE_SCREEN);
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageOpenDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageOpenDialog.kt
index 46a8be153..03656c0fa 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageOpenDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageOpenDialog.kt
@@ -161,7 +161,7 @@ class RedPackageOpenDialog : BaseDialog<DialogRedPackageOpenBinding>() {
                         binding.tvNoGet.visibility = View.VISIBLE
                     }
                 }
-                binding.tvRedNum.text = "已領取${pickNum}/${totalNum}個"
+                binding.tvRedNum.text = "${getString(R.string.already_received)}${pickNum}/${totalNum}${getString(R.string.individual)}"
                 if (type == ALL_GIFT || type == ALL_DIAMOND) {
                     DemoCache.saveRedPackage(id)
                 }
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt
index bf579475b..405e1c0d2 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt
@@ -41,7 +41,8 @@ import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 
 @ActLayoutRes(R.layout.dialog_red_package_send)
-class RedPackageSendDialog : BaseDialog<DialogRedPackageSendBinding>(), GridPasswordNoFocusView.OnPasswordChangedListener, TextWatcher {
+class RedPackageSendDialog : BaseDialog<DialogRedPackageSendBinding>(),
+    GridPasswordNoFocusView.OnPasswordChangedListener, TextWatcher {
 
     private var passWordFragment: GiveGoldPassWordFragment? = null
     private val dialogManager by lazy { DialogManager(context) }
@@ -78,8 +79,12 @@ class RedPackageSendDialog : BaseDialog<DialogRedPackageSendBinding>(), GridPass
             binding.tvRoomRed.alpha = 1f
             binding.indicatorAllRed.visibility = View.GONE
             binding.indicatorRoomRed.visibility = View.VISIBLE
-            binding.tvGoldNumHint.text = "紅包總金額不低於${initInfo.redEnvelopeConfig.roomRedEnvelopeMinAmount}鉆石，且必須為10的倍數"
-            binding.editRedNum.hint = "${initInfo.redEnvelopeConfig.roomRedEnvelopeMinNum}-${initInfo.redEnvelopeConfig.roomRedEnvelopeMaxNum}"
+            binding.tvGoldNumHint.text =
+                "${getString(R.string.total_amount_not_less_than)}${initInfo.redEnvelopeConfig.roomRedEnvelopeMinAmount}${
+                    getString(R.string.must_be_a_multiple_of_10)
+                }"
+            binding.editRedNum.hint =
+                "${initInfo.redEnvelopeConfig.roomRedEnvelopeMinNum}-${initInfo.redEnvelopeConfig.roomRedEnvelopeMaxNum}"
         }
 
         /**
@@ -91,8 +96,10 @@ class RedPackageSendDialog : BaseDialog<DialogRedPackageSendBinding>(), GridPass
             binding.tvRoomRed.alpha = 0.5f
             binding.indicatorAllRed.visibility = View.VISIBLE
             binding.indicatorRoomRed.visibility = View.GONE
-            binding.tvGoldNumHint.text = "紅包總金額不低於${initInfo.redEnvelopeConfig.serverRedEnvelopeMinAmount}鉆石，且必須為100的倍數"
-            binding.editRedNum.hint = "${initInfo.redEnvelopeConfig.serverRedEnvelopeMinNum}-${initInfo.redEnvelopeConfig.serverRedEnvelopeMaxNum}"
+            binding.tvGoldNumHint.text =
+                "${getString(R.string.total_amount_not_less_than)}${initInfo.redEnvelopeConfig.serverRedEnvelopeMinAmount}${getString(R.string.must_be_a_multiple_of_100)}"
+            binding.editRedNum.hint =
+                "${initInfo.redEnvelopeConfig.serverRedEnvelopeMinNum}-${initInfo.redEnvelopeConfig.serverRedEnvelopeMaxNum}"
         }
 
         when (initInfo.redEnvelopedPosition) {
@@ -106,12 +113,12 @@ class RedPackageSendDialog : BaseDialog<DialogRedPackageSendBinding>(), GridPass
         binding.tvChangeType.setOnClickListener {
             if (isGift) {
                 isGift = false
-                binding.tvRedTypeHint.text = "當前為手氣紅包，"
-                binding.tvChangeType.text = "改為禮物紅包"
+                binding.tvRedTypeHint.text = getString(R.string.the_present_is_a_lucky_red_envelope)
+                binding.tvChangeType.text = getString(R.string.change_to_gift_red_envelope)
             } else {
                 isGift = true
-                binding.tvRedTypeHint.text = "當前為禮物紅包，"
-                binding.tvChangeType.text = "改為手氣紅包"
+                binding.tvRedTypeHint.text = getString(R.string.the_present_is_a_gift_red_envelope)
+                binding.tvChangeType.text = getString(R.string.change_to_lucky_money)
             }
         }
         //默認就已經是手氣紅包,如果後臺配置為了禮物紅包就在這裏改下
@@ -134,7 +141,12 @@ class RedPackageSendDialog : BaseDialog<DialogRedPackageSendBinding>(), GridPass
             }
         }
         binding.ivClose.setOnClickListener { dismissAllowingStateLoss() }
-        binding.ivHelp.setOnClickListener { DialogWebViewActivity.start(context, UriProvider.getRedPacketRule()) }
+        binding.ivHelp.setOnClickListener {
+            DialogWebViewActivity.start(
+                context,
+                UriProvider.getRedPacketRule()
+            )
+        }
         binding.ivSend.setOnClickListener {
             UserModel.get().cacheLoginUserInfo?.let {
                 if (!it.isBindPaymentPwd) {
@@ -142,44 +154,52 @@ class RedPackageSendDialog : BaseDialog<DialogRedPackageSendBinding>(), GridPass
                     return@setOnClickListener
                 }
             }
-            val minNum = if (isAll) initInfo.redEnvelopeConfig.serverRedEnvelopeMinNum else initInfo.redEnvelopeConfig.roomRedEnvelopeMinNum
-            val maxNum = if (isAll) initInfo.redEnvelopeConfig.serverRedEnvelopeMaxNum else initInfo.redEnvelopeConfig.roomRedEnvelopeMaxNum
-            val minGold = if (isAll) initInfo.redEnvelopeConfig.serverRedEnvelopeMinAmount else initInfo.redEnvelopeConfig.roomRedEnvelopeMinAmount
-            val maxGold = if (isAll) initInfo.redEnvelopeConfig.serverRedEnvelopeMaxAmount else initInfo.redEnvelopeConfig.roomRedEnvelopeMaxAmount
-            val rate = if (initInfo.redEnvelopeConfig.exchangeDiamondsRate == 0.0) 0.68 else initInfo.redEnvelopeConfig.exchangeDiamondsRate
+            val minNum =
+                if (isAll) initInfo.redEnvelopeConfig.serverRedEnvelopeMinNum else initInfo.redEnvelopeConfig.roomRedEnvelopeMinNum
+            val maxNum =
+                if (isAll) initInfo.redEnvelopeConfig.serverRedEnvelopeMaxNum else initInfo.redEnvelopeConfig.roomRedEnvelopeMaxNum
+            val minGold =
+                if (isAll) initInfo.redEnvelopeConfig.serverRedEnvelopeMinAmount else initInfo.redEnvelopeConfig.roomRedEnvelopeMinAmount
+            val maxGold =
+                if (isAll) initInfo.redEnvelopeConfig.serverRedEnvelopeMaxAmount else initInfo.redEnvelopeConfig.roomRedEnvelopeMaxAmount
+            val rate =
+                if (initInfo.redEnvelopeConfig.exchangeDiamondsRate == 0.0) 0.68 else initInfo.redEnvelopeConfig.exchangeDiamondsRate
 
             val redNum = binding.editRedNum.text.toString().toIntOrDef()
             if (redNum < minNum || redNum > maxNum) {
-                SingleToastUtil.showToast("紅包數量不能小於${minNum}或大於${maxNum}!")
+                SingleToastUtil.showToast("${getString(R.string.the_number_of_red_packets_cannot_be_less_than)}${minNum}${getString(R.string.or_greater_than)}${maxNum}!")
                 return@setOnClickListener
             }
             val goldNum = binding.editGoldNum.text.toString().toIntOrDef()
 
             if (isAll) {
                 if (goldNum % 100 != 0) {
-                    SingleToastUtil.showToast("鉆石數必須為100的倍數!")
+                    SingleToastUtil.showToast(getString(R.string.diamonds_must_be_a_multiple_of_100))
                     return@setOnClickListener
                 }
             } else {
                 if (goldNum % 10 != 0) {
-                    SingleToastUtil.showToast("鉆石數必須為10的倍數!")
+                    SingleToastUtil.showToast(getString(R.string.diamonds_must_be_a_multiple_of_10))
                     return@setOnClickListener
                 }
             }
 
             if (goldNum < minGold || goldNum > maxGold) {
-                SingleToastUtil.showToast("鉆石數量不能小於${minGold}或大於${maxGold}!")
+                SingleToastUtil.showToast("${getString(R.string.diamonds_should_not_be_less_than)}${minGold}${getString(R.string.or_greater_than)}${maxGold}!")
                 return@setOnClickListener
             }
             if (isGift && goldNum.toFloat() / redNum < 1) {//單個禮物紅包價值不低於1鉆石
-                SingleToastUtil.showToast("單個紅包金額過低")
+                SingleToastUtil.showToast(getString(R.string.single_red_packet_is_too_low))
                 return@setOnClickListener
             }
             if (!isGift && goldNum.toFloat() / redNum * rate < 0.1) {//單個手氣紅包價值不低於0.1水晶
-                SingleToastUtil.showToast("單個紅包金額過低")
+                SingleToastUtil.showToast(getString(R.string.single_red_packet_is_too_low))
                 return@setOnClickListener
             }
-            GiveGoldPassWordFragment.newInstance(childFragmentManager, binding.editGoldNum.text.toString()).apply {
+            GiveGoldPassWordFragment.newInstance(
+                childFragmentManager,
+                binding.editGoldNum.text.toString()
+            ).apply {
                 setListener(this@RedPackageSendDialog)
                 passWordFragment = this
             }
@@ -220,10 +240,14 @@ class RedPackageSendDialog : BaseDialog<DialogRedPackageSendBinding>(), GridPass
         val password = passWordFragment?.password?.password ?: ""
         if (password.length == 6) {
             dialogManager.showProgressDialog(context)
-            RedPackageModel.sendRedPackage(binding.editGoldNum.text.toString(),
-                binding.editRedText.text.toString().ifEmpty { "恭喜發財，大吉大利！" },
+            RedPackageModel.sendRedPackage(
+                binding.editGoldNum.text.toString(),
+                binding.editRedText.text.toString().ifEmpty { getString(R.string.may_you_come_into_a_good_fortune) },
                 binding.editRedNum.text.toString(),
-                AvRoomDataManager.get().mCurrentRoomInfo?.uid.toString(), getRedType(), DESUtils.DESAndBase64(password))
+                AvRoomDataManager.get().mCurrentRoomInfo?.uid.toString(),
+                getRedType(),
+                DESUtils.DESAndBase64(password)
+            )
                 .doOnError {
                     dialogManager.dismissDialog()
                     SingleToastUtil.showToast(it.message)
@@ -232,7 +256,7 @@ class RedPackageSendDialog : BaseDialog<DialogRedPackageSendBinding>(), GridPass
                 .subscribe { _ ->
                     PayModel.get().getWalletInfo(AuthModel.get().currentUid).subscribe()
                     dialogManager.dismissDialog()
-                    SingleToastUtil.showToast("發送成功")
+                    SingleToastUtil.showToast(getString(R.string.send_success))
                     passWordFragment?.dismissAllowingStateLoss()
                     dismissAllowingStateLoss()
                 }
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchAdapter.kt b/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchAdapter.kt
index b84434b52..8cd7d4f3e 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchAdapter.kt
@@ -21,13 +21,13 @@ class SingleRoomPKSearchAdapter :
         val tvSelect = helper.getView<TextView>(R.id.tv_select)
         tvSelect.isEnabled = !item.crossPking && item.valid
         if (!item.valid) {
-            tvSelect.text = "離線"
+            tvSelect.text = mContext.getString(R.string.off_line)
             tvSelect.setTextColor("#80C6C6E9".toColorInt())
         } else if (item.crossPking) {
-            tvSelect.text = "PK中"
+            tvSelect.text = mContext.getString(R.string.pk_now)
             tvSelect.setTextColor("#80C6C6E9".toColorInt())
         } else {
-            tvSelect.text = "選擇"
+            tvSelect.text = mContext.getString(R.string.select)
             tvSelect.setTextColor(Color.WHITE)
         }
     }
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkFinishDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkFinishDialog.kt
index 3dbe6ba94..dd2bb8bc2 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkFinishDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkFinishDialog.kt
@@ -41,7 +41,7 @@ class SingleRoomPkFinishDialog : BaseDialog<DialogSingleRoomPkFinishBinding>() {
         roomPkBean.csRank.getOrNull(0)?.let {
             binding.groupRank1.isVisible = true
             binding.tvRankNick1.text = it.nick.subAndReplaceDot(7)
-            binding.tvRankValue1.text = "PK值:${it.amount}"
+            binding.tvRankValue1.text = "${getString(R.string.pk_value)}${it.amount}"
             binding.ivAvatar1.load(it.avatar, defaultRes = R.drawable.default_avatar)
         } ?: run {
             binding.groupRank1.isVisible = false
@@ -51,7 +51,7 @@ class SingleRoomPkFinishDialog : BaseDialog<DialogSingleRoomPkFinishBinding>() {
         roomPkBean.csRank.getOrNull(1)?.let {
             binding.groupRank2.isVisible = true
             binding.tvRankNick2.text = it.nick.subAndReplaceDot(7)
-            binding.tvRankValue2.text = "PK值:${it.amount}"
+            binding.tvRankValue2.text = "${getString(R.string.pk_value)}${it.amount}"
             binding.ivAvatar2.load(it.avatar, defaultRes = R.drawable.default_avatar)
         } ?: run {
             binding.groupRank2.isVisible = false
@@ -60,7 +60,7 @@ class SingleRoomPkFinishDialog : BaseDialog<DialogSingleRoomPkFinishBinding>() {
         roomPkBean.csRank.getOrNull(2)?.let {
             binding.groupRank3.isVisible = true
             binding.tvRankNick3.text = it.nick.subAndReplaceDot(7)
-            binding.tvRankValue3.text = "PK值:${it.amount}"
+            binding.tvRankValue3.text = "${getString(R.string.pk_value)}${it.amount}"
             binding.ivAvatar3.load(it.avatar, defaultRes = R.drawable.default_avatar)
         } ?: run {
             binding.groupRank3.isVisible = false
@@ -71,7 +71,7 @@ class SingleRoomPkFinishDialog : BaseDialog<DialogSingleRoomPkFinishBinding>() {
             .observeOn(AndroidSchedulers.mainThread())
             .doOnComplete { dismissAllowingStateLoss() }
             .subscribe {
-                binding.tvClose.text = "關閉(${5 - it})"
+                binding.tvClose.text = "${getString(R.string.close)}(${5 - it})"
             }
 
         when (roomPkBean.winUid) {
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkReceivedDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkReceivedDialog.kt
index 37374e419..921e97baa 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkReceivedDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkReceivedDialog.kt
@@ -3,6 +3,7 @@ package com.yizhuan.erban.avroom.singleroompk
 import android.annotation.SuppressLint
 import android.os.Bundle
 import androidx.core.view.isVisible
+import com.yizhuan.erban.R
 import com.yizhuan.erban.base.BaseDialog
 import com.yizhuan.erban.databinding.DialogSingleRoomPkReceivedBinding
 import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean
@@ -37,7 +38,7 @@ class SingleRoomPkReceivedDialog : BaseDialog<DialogSingleRoomPkReceivedBinding>
     @SuppressLint("CheckResult")
     override fun init() {
         binding.tvNick.text = pkBean.inviteRoomTitle.subAndReplaceDot(7)
-        binding.tvTime.text = "${pkBean.pkDuration}分鐘"
+        binding.tvTime.text = "${pkBean.pkDuration}${getString(R.string.avroom_dialog_pktimepickerdialog_01)}"
         pkBean.pkDesc.ifNotNullOrEmpty {
             binding.tvDescTitle.isVisible = true
             binding.tvDesc.isVisible = true
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java
index 3328cacec..725229e3b 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java
@@ -1018,29 +1018,29 @@ public class MessageView extends FrameLayout {
                     case CUSTOM_MSG_SUB_DRAW_GIFT_L1:
                     case CUSTOM_MSG_SUB_DRAW_GIFT_L2:
                     case CUSTOM_MSG_SUB_DRAW_BALL_L1:
-                        builder = builderDrawMsg(tvContent, fairyMsgInfo, "厲害了！");
+                        builder = builderDrawMsg(tvContent, fairyMsgInfo, mContext.getString(R.string.message_amazing));
                         break;
                     case CUSTOM_MSG_SUB_DRAW_GIFT_L3:
                     case CUSTOM_MSG_SUB_DRAW_GIFT_L4:
                     case CUSTOM_MSG_SUB_DRAW_GIFT_L5:
                     case CUSTOM_MSG_SUB_DRAW_BALL_L2:
                     case CUSTOM_MSG_SUB_DRAW_BALL_L3:
-                        builder = builderDrawMsg(tvContent, fairyMsgInfo, "好運爆棚！");
+                        builder = builderDrawMsg(tvContent, fairyMsgInfo, mContext.getString(R.string.message_good_luck));
                         break;
                     case CUSTOM_MSG_SUB_CONVERT_L1:
-                        builder = builderConvertMsg(tvContent, fairyMsgInfo, "初級召喚");
+                        builder = builderConvertMsg(tvContent, fairyMsgInfo, mContext.getString(R.string.message_primary_call));
                         break;
                     case CUSTOM_MSG_SUB_CONVERT_L2:
-                        builder = builderConvertMsg(tvContent, fairyMsgInfo, "史詩召喚");
+                        builder = builderConvertMsg(tvContent, fairyMsgInfo, mContext.getString(R.string.message__epic_call));
                         break;
                     case CUSTOM_MSG_SUB_CONVERT_L3:
-                        builder = builderConvertMsg(tvContent, fairyMsgInfo, "傳說召喚");
+                        builder = builderConvertMsg(tvContent, fairyMsgInfo, mContext.getString(R.string.message_legend_call));
                         break;
                 }
 
                 if (builder != null) {
                     if (GoldBoxHelper.isShowFairy()) {
-                        builder.append(" 去參加!", new OriginalDrawStatusClickSpan(Color.parseColor("#FFBC51")) {
+                        builder.append(mContext.getString(R.string.message_to_join), new OriginalDrawStatusClickSpan(Color.parseColor("#FFBC51")) {
                             @Override
                             public void onClick(@NonNull View widget) {
                                 HomeFairyActivity.start(mContext);
@@ -1057,7 +1057,7 @@ public class MessageView extends FrameLayout {
 
         private SpannableBuilder builderConvertMsg(TextView textView, @NonNull FairyMsgInfo fairyMsgInfo, String type) {
             return new SpannableBuilder(textView)
-                    .append("厲害了！", new ForegroundColorSpan(whiteColor))
+                    .append(mContext.getString(R.string.message_amazing), new ForegroundColorSpan(whiteColor))
                     .append(StringExtensionKt.subAndReplaceDot(fairyMsgInfo.getNick(), 7), new OriginalDrawStatusClickSpan(roomTipNickColor, false) {
 
                         @Override
@@ -1065,8 +1065,8 @@ public class MessageView extends FrameLayout {
                             RxBus.get().post(new ShowUserInfoDialogEvent(String.valueOf(fairyMsgInfo.getUid())));
                         }
                     })
-                    .append("在奪寶精靈中 " + type, new ForegroundColorSpan(whiteColor))
-                    .append(fairyMsgInfo.getRewardShowValue() + "鉆" + fairyMsgInfo.getRewardName(), new ForegroundColorSpan(roomTipColor));
+                    .append(mContext.getString(R.string.message_In_the_raiders_of_the_treasure) + type, new ForegroundColorSpan(whiteColor))
+                    .append(fairyMsgInfo.getRewardShowValue() + mContext.getString(R.string.wallet_adapter_withdrawjeweladapter_01) + fairyMsgInfo.getRewardName(), new ForegroundColorSpan(roomTipColor));
         }
 
         private SpannableBuilder builderDrawMsg(TextView textView, @NonNull FairyMsgInfo fairyMsgInfo, String desc) {
@@ -1079,7 +1079,7 @@ public class MessageView extends FrameLayout {
                             RxBus.get().post(new ShowUserInfoDialogEvent(String.valueOf(fairyMsgInfo.getUid())));
                         }
                     })
-                    .append(" 在奪寶精靈中獲得 ", new ForegroundColorSpan(whiteColor))
+                    .append(mContext.getString(R.string.message_obtained_in_raiders_of_the_treasure), new ForegroundColorSpan(whiteColor))
                     .append(fairyMsgInfo.getRewardName(), new ForegroundColorSpan(Color.WHITE));
             if (fairyMsgInfo.getRewardNum() > 1) {
                 builder.append(" x" + fairyMsgInfo.getRewardNum(), new ForegroundColorSpan(roomTipNickColor));
@@ -1481,7 +1481,7 @@ public class MessageView extends FrameLayout {
             tvContent.setTextColor(Color.WHITE);
             RoomFollowOwnerAttachment2 roomFollowOwnerAttachment = (RoomFollowOwnerAttachment2) chatRoomMessage.getAttachment();
             SpannableBuilder append = new SpannableBuilder(tvContent)
-                    .append(mContext.getResources().getDrawable(R.drawable.bg_follow), ScreenUtil.dip2px(190), ScreenUtil.dip2px(40));
+                    .append(ContextCompat.getDrawable(mContext, R.drawable.bg_follow), ScreenUtil.dip2px(190), ScreenUtil.dip2px(40));
             tvContent.setText(append.build());
         }
 
@@ -2723,13 +2723,13 @@ public class MessageView extends FrameLayout {
                 return;
             String senderNick = RegexUtil.getPrintableString(attachment.nick);
             // 系統通知icon
-            Drawable icNotification = mContext.getResources().getDrawable(R.drawable.ic_system_notification);
+            Drawable icNotification = ContextCompat.getDrawable(mContext, R.drawable.ic_system_notification);
             int width = (int) (icNotification.getIntrinsicWidth() / (icNotification.getIntrinsicHeight() + 0.F) * sysIconHeight);
             SpannableBuilder text = new SpannableBuilder(tvContent)
                     .append(icNotification, width, sysIconHeight)
-                    .append(" 恭喜 ", new ForegroundColorSpan(greyColor))
+                    .append(mContext.getString(R.string.message_congratulation), new ForegroundColorSpan(greyColor))
                     .append(senderNick, new ForegroundColorSpan(roomTipColor))
-                    .append(" 在房間內" + (second == CustomAttachment.CUSTOM_MESS_SUB_RENEWNOBLE ? "續費" : "開通") + "\"", new ForegroundColorSpan(greyColor))
+                    .append(mContext.getString(R.string.message_In_the_room) + (second == CustomAttachment.CUSTOM_MESS_SUB_RENEWNOBLE ? mContext.getString(R.string.message_renew) : mContext.getString(R.string.message_open)) + "\"", new ForegroundColorSpan(greyColor))
                     .append(nobleInfo.getName(), new ForegroundColorSpan(roomTipColor))
                     .append("\"");
             tvContent.setText(text.build());
@@ -2748,10 +2748,10 @@ public class MessageView extends FrameLayout {
             CarveUpGoldAttachment attachment = (CarveUpGoldAttachment) chatRoomMessage.getAttachment();
             // 內容
             SpannableBuilder text = new SpannableBuilder(tvContent)
-                    .append("【簽到瓜分百萬】哇塞，恭喜 ", new ForegroundColorSpan(greyColor))
+                    .append(mContext.getString(R.string.message_sign_in_for_millions), new ForegroundColorSpan(greyColor))
                     .append(attachment.getNick() + " ", new ForegroundColorSpan(roomTipColor))
-                    .append("簽到獲得 ", new ForegroundColorSpan(greyColor))
-                    .append(attachment.getGoldNum() + "鉆石", new ForegroundColorSpan(roomTipColor))
+                    .append(mContext.getString(R.string.message_sign_in_acquisition), new ForegroundColorSpan(greyColor))
+                    .append(attachment.getGoldNum() + mContext.getString(R.string.message_diamond), new ForegroundColorSpan(roomTipColor))
                     .append("！", new ForegroundColorSpan(greyColor));
             tvContent.setText(text.build());
         }
@@ -2775,7 +2775,7 @@ public class MessageView extends FrameLayout {
             String fromAccount = chatRoomMessage.getFromAccount();
             SpannableBuilder text = new SpannableBuilder(tvContent);
             addCommonTag(chatRoomMessage, text, tvContent);
-            text.append(extension == null ? "我" : RegexUtil.getPrintableString(extension.getSenderNick()),
+            text.append(extension == null ? mContext.getString(R.string.message_me) : RegexUtil.getPrintableString(extension.getSenderNick()),
                             new ForegroundColorSpan(greyColor),
                             new OriginalDrawStatusClickSpan() {
                                 @Override
@@ -2890,7 +2890,7 @@ public class MessageView extends FrameLayout {
                                 if (!Objects.equals(mCurrentRoomInfo.getUid(), dataBean.getAppearRoomUid())) {
                                     AVRoomActivity.start(getContext(), dataBean.getAppearRoomUid());
                                 } else {
-                                    SingleToastUtil.showToast("你已經在怪獸房間內");
+                                    SingleToastUtil.showToast(mContext.getString(R.string.message_in_the_monster_room));
                                 }
                                 break;
 
@@ -2908,7 +2908,7 @@ public class MessageView extends FrameLayout {
                         CollectionRoomModel.get().followRoom("1", ((RoomFollowOwnerAttachment2) attachment).getOwnerUid())
                                 .subscribe(s -> {
                                     AvRoomDataManager.get().isRoomFans = true;
-                                    SingleToastUtil.showToast("收藏成功!");
+                                    SingleToastUtil.showToast(mContext.getString(R.string.message_collect_success));
                                     EventBus.getDefault().post(new FollowRoomEvent());
                                     PraiseModel.get().setFollowRoomSuccessRoomTip(JavaUtil.str2long(chatRoomMessage.getFromAccount()));
                                 });
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectBoxView.kt b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectBoxView.kt
index 0cc7f37d3..2d7d85d66 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectBoxView.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectBoxView.kt
@@ -1344,7 +1344,7 @@ class RoomEffectBoxView @JvmOverloads constructor(
                 ResUtil.getString(R.string.avroom_widget_roomeffectview_025),
                 ForegroundColorSpan(Color.WHITE)
             )
-            .append("「${msgBean.title}」房間", ForegroundColorSpan(Color.parseColor("#FFFC4C")))
+            .append("「${msgBean.title}」${ResUtil.getString(R.string.room)}", ForegroundColorSpan(Color.parseColor("#FFFC4C")))
             .append(msgBean.desc, ForegroundColorSpan(Color.WHITE))
             .append("TOP1", ForegroundColorSpan(Color.parseColor("#FFFC4C")))
         textView.text = text.build()
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt
index 42238aa16..57a020683 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt
@@ -1654,7 +1654,7 @@ class RoomEffectView @JvmOverloads constructor(
                 ResUtil.getString(R.string.avroom_widget_roomeffectview_025),
                 ForegroundColorSpan(Color.WHITE)
             )
-            .append("「${msgBean.title}」房間", ForegroundColorSpan(Color.parseColor("#FFFC4C")))
+            .append("「${msgBean.title}」${ResUtil.getString(R.string.room)}", ForegroundColorSpan(Color.parseColor("#FFFC4C")))
             .append(msgBean.desc, ForegroundColorSpan(Color.WHITE))
             .append("TOP1", ForegroundColorSpan(Color.parseColor("#FFFC4C")))
         textView.text = text.build()
diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogManager.java b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogManager.java
index fe304eabc..b05e9bac0 100644
--- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogManager.java
+++ b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogManager.java
@@ -32,6 +32,7 @@ import com.yizhuan.erban.ui.utils.ImageLoadUtils;
 import com.yizhuan.erban.ui.widget.ButtonItem;
 import com.yizhuan.erban.utils.SpannableBuilder;
 import com.yizhuan.xchat_android_core.utils.ActivityUtil;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
 import com.yizhuan.xchat_android_library.utils.log.MLog;
 
 import java.util.List;
@@ -888,11 +889,11 @@ public class DialogManager {
     }
 
     public void showProgressDialog(Context context) {
-        showProgressDialog(context, "請稍後...", mCanceledOnClickBackKey);
+        showProgressDialog(context, ResUtil.getString(R.string.waiting_text), mCanceledOnClickBackKey);
     }
 
     public void showProgressDialog(Context context, boolean cancelable) {
-        showProgressDialog(context, "請稍後...", cancelable);
+        showProgressDialog(context, ResUtil.getString(R.string.waiting_text), cancelable);
     }
 
     public void showProgressDialog(Context context, String msg) {
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/DecorationCommonAdapter.kt b/app/src/main/java/com/yizhuan/erban/decoration/adapter/DecorationCommonAdapter.kt
index 5814e4655..d96330163 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/DecorationCommonAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/decoration/adapter/DecorationCommonAdapter.kt
@@ -13,7 +13,7 @@ open class DecorationCommonAdapter(layoutResId: Int = R.layout.item_decoration_c
 
     override fun convert(helper: BaseViewHolder, item: DecorationInfo) {
         helper.getView<ImageView>(R.id.iv_pic).load(item.pic)
-        helper.setText(R.id.tv_name, "${item.name}(${item.dressDay})天")
+        helper.setText(R.id.tv_name, "${item.name}(${item.dressDay})${mContext.getString(R.string.day)}")
             .setText(R.id.tv_price, item.dressPrice.toString())
             .setGone(R.id.tv_limit, item.dressLimitStatus == 0)
             .addOnClickListener(R.id.tv_buy, R.id.tv_send)
diff --git a/app/src/main/java/com/yizhuan/erban/earn/activity/ConvertDiamondActivity.kt b/app/src/main/java/com/yizhuan/erban/earn/activity/ConvertDiamondActivity.kt
index 65e90c0cb..30889f650 100644
--- a/app/src/main/java/com/yizhuan/erban/earn/activity/ConvertDiamondActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/earn/activity/ConvertDiamondActivity.kt
@@ -132,9 +132,9 @@ class ConvertDiamondActivity : BaseViewBindingActivity<ActivityConvertDiamondBin
 
             binding.tvConvert.setOnClickListener { view ->
                 if (binding.edDiamond.text.toString().toLong() < it.minDiamonds) {
-                    toast("至少需要兌換${it.minDiamonds}鉆石")
+                    toast("${getString(R.string.at_least_exchange)}${it.minDiamonds}${getString(R.string.diamond)}")
                 } else if (binding.edDiamond.text.toString().toLong() > it.maxDiamonds) {
-                    toast("兌換鉆石數不能超過${it.maxDiamonds}鉆")
+                    toast("${getString(R.string.diamonds_exchanged_must_not_exceed)}${it.maxDiamonds}${getString(R.string.diamond_name)}")
                 } else {
                     //去掉小数凑整:不管小数是多少，都进一
                     val gold = DoubleUtils.convertDoubleToString(
diff --git a/app/src/main/java/com/yizhuan/erban/earn/activity/EarnWithdrawActivity.kt b/app/src/main/java/com/yizhuan/erban/earn/activity/EarnWithdrawActivity.kt
index bf304a6c1..ecc4ad314 100644
--- a/app/src/main/java/com/yizhuan/erban/earn/activity/EarnWithdrawActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/earn/activity/EarnWithdrawActivity.kt
@@ -125,11 +125,11 @@ class EarnWithdrawActivity : BaseViewBindingActivity<ActivityEarnWithdrawBinding
                     } else if (binding.edGold.text.toString().toDouble() < it.minGolds.toString()
                             .toDouble()
                     ) {
-                        toast("至少需要提現${it.minGolds}金幣")
+                        toast("${getString(R.string.need_to_withdraw_money)}${it.minGolds}${getString(R.string.gold)}")
                     } else if (binding.edGold.text.toString().toDouble() > it.maxGolds.toString()
                             .toDouble()
                     ) {
-                        toast("提現不能超過${it.maxGolds}金幣")
+                        toast("${getString(R.string.the_withdrawal_cannot_exceed)}${it.maxGolds}${getString(R.string.gold)}")
                     } else {
                         GiveGoldPassWordFragment.newInstance(
                             supportFragmentManager,
diff --git a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinActivity.kt b/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinActivity.kt
index 18f011a52..ab787039e 100644
--- a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinActivity.kt
@@ -56,7 +56,7 @@ class FansTeamJoinActivity : BaseViewBindingActivity<ActivityFansTeamJoinBinding
             it?.let {
                 binding.ivAvatar.load(it.anchorAvatar)
                 binding.tvFansTeamName.text = it.anchorNick.subAndReplaceDot(7) + ResUtil.getString(R.string.erban_fansteam_fansteamjoinactivity_01)
-                binding.tvFansTeamFansNum.text = "${it.teamNum}人"
+                binding.tvFansTeamFansNum.text = "${it.teamNum}${getString(R.string.person)}"
                 binding.ivRank0.load(it.avatarList.getOrNull(0))
                 binding.ivRank1.load(it.avatarList.getOrNull(1))
                 binding.ivRank2.load(it.avatarList.getOrNull(2))
@@ -88,14 +88,14 @@ class FansTeamJoinActivity : BaseViewBindingActivity<ActivityFansTeamJoinBinding
                                     .compose(bindToLifecycle())
                                     .handleBeanData()
                                     .subscribe({
-                                        "加入粉絲團成功!".toast()
+                                        getString(R.string.join_the_fan_club_successfully).toast()
                                         finish()
                                     }, { t ->
                                         t.message.toast()
                                     })
 
                             } ?: run {
-                                "數據初始化中,請稍後~".toast()
+                                getString(R.string.ui_setting_modifypwdactivity_01).toast()
                             }
                         }
                     }
diff --git a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinedActivity.kt b/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinedActivity.kt
index 6a005927c..eebb4d3b4 100644
--- a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinedActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinedActivity.kt
@@ -73,10 +73,10 @@ 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}${getString(R.string.person)}"
 
                 binding.ivMeAvatar.load(it.memberAvatar)
-                binding.tvValue.text = "親密值Lv.${it.levelSeq}"
+                binding.tvValue.text = "${getString(R.string.intimacy_value_lv)}${it.levelSeq}"
                 binding.tvCurrValue.text = "${it.levelExper}/${it.nextLevelExper}"
                 binding.pbValue.max = it.nextLevelExper
                 binding.pbValue.progress = it.levelExper
@@ -90,7 +90,7 @@ class FansTeamJoinedActivity : BaseViewBindingActivity<ActivityFansTeamJoinedBin
 
         fansTeamViewModel.exitFansTeamLiveData.observe(this) {
             if (it == true) {
-                "退出粉絲團成功!".toast()
+                getString(R.string.quit_the_fan_club_successfully).toast()
                 finish()
             }
         }
@@ -116,7 +116,7 @@ class FansTeamJoinedActivity : BaseViewBindingActivity<ActivityFansTeamJoinedBin
             popupWindow.dismiss()
         }
         contentView.findViewById<View>(R.id.tv_exit).setOnClickListener {
-            dialogManager.showOkCancelDialog("退出後粉絲團後24小時內不能再次加入,確定退出嗎?", true) {
+            dialogManager.showOkCancelDialog(getString(R.string.rejoin_a_fan_club_for_24_hours_after_you_quit), true) {
                 popupWindow.dismiss()
                 fansTeamViewModel.exitFansTeam()
             }
diff --git a/app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt b/app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt
index 17cd45966..b5329b15c 100644
--- a/app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt
+++ b/app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt
@@ -32,6 +32,7 @@ import com.yizhuan.xchat_android_core.user.bean.UserInfo
 import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity
 import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
 import com.yizhuan.xchat_android_library.utils.ListUtils
+import com.yizhuan.xchat_android_library.utils.ResUtil
 import com.yizhuan.xchat_android_library.utils.SingleToastUtil
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -119,7 +120,7 @@ class AnchorCardView @JvmOverloads constructor(
             .observeOn(AndroidSchedulers.mainThread())
             .doOnNext { aLong ->
                 count -= 1
-                binding.tvTime.text = "剩餘${finalCount - aLong}s"
+                binding.tvTime.text = "${ResUtil.getString(R.string.decoration_remainder)}${finalCount - aLong}s"
             }
             .doOnComplete {
                 if (!audioPlaying) isVisible = false
@@ -207,7 +208,7 @@ class AnchorCardView @JvmOverloads constructor(
         binding.ivAudioControl.setImageResource(R.drawable.ic_skill_play)
         AudioPlayerHelper.get().playInThread(url, object : OnPlayListener {
             override fun onError(error: String) {
-                SingleToastUtil.showToast("播放出錯，請重試")
+                SingleToastUtil.showToast(ResUtil.getString(R.string.please_try_again))
                 stopAudio()
             }
 
diff --git a/app/src/main/java/com/yizhuan/erban/other/dialog/PrivacyAgreementDialog.java b/app/src/main/java/com/yizhuan/erban/other/dialog/PrivacyAgreementDialog.java
index 38f621b0d..21259e0fa 100644
--- a/app/src/main/java/com/yizhuan/erban/other/dialog/PrivacyAgreementDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/other/dialog/PrivacyAgreementDialog.java
@@ -52,7 +52,7 @@ public class PrivacyAgreementDialog extends Dialog implements View.OnClickListen
         tvConfirm.setOnClickListener(this);
         findViewById(R.id.btn_cancel).setOnClickListener(this);
         tvConfirm.setEnabled(true);
-        tvConfirm.setText("同意");
+        tvConfirm.setText(ResUtil.getString(R.string.other_dialog_privacyagreementdialog_01));
         TextView tvDesc = findViewById(R.id.tv_desc);
         String privacyAgreementTip = getContext().getString(R.string.tip_privacy_agreement);
         String userAgreementTip = getContext().getString(R.string.tip_user_agreement);
diff --git a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSuccessActivity.kt b/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSuccessActivity.kt
index 3ac650b21..e9add77b7 100644
--- a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSuccessActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSuccessActivity.kt
@@ -24,8 +24,8 @@ class GiveGoldSuccessActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_give_gold_success)
         initTitleBar(ResUtil.getString(R.string.pay_activity_givegoldsuccessactivity_01))
-        tvNickname.text = "轉贈給:${intent.getStringExtra("nickname")}"
-        tvGold.text = "${intent.getStringExtra("gold")?.toInt()}鉆石"
+        tvNickname.text = "${getString(R.string.transfer_to)}${intent.getStringExtra("nickname")}"
+        tvGold.text = "${intent.getStringExtra("gold")?.toInt()}${getString(R.string.diamond)}"
         tvSure.setOnClickListener { finish() }
     }
 
diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/CpViewHelper.kt b/app/src/main/java/com/yizhuan/erban/relation/cp/CpViewHelper.kt
index 71720e302..c893a8976 100644
--- a/app/src/main/java/com/yizhuan/erban/relation/cp/CpViewHelper.kt
+++ b/app/src/main/java/com/yizhuan/erban/relation/cp/CpViewHelper.kt
@@ -10,6 +10,7 @@ import androidx.annotation.ColorInt
 import com.netease.nim.uikit.common.util.sys.ScreenUtil
 import com.yizhuan.erban.R
 import com.yizhuan.erban.common.widget.dialog.DialogManager
+import com.yizhuan.xchat_android_library.utils.ResUtil
 
 object CpViewHelper {
 
@@ -41,7 +42,7 @@ object CpViewHelper {
     }
 
     fun setInviteTimeRemain(time: String, tv: TextView) {
-        val s = "請在${time}內決定，過期自動失效！"
+        val s = "${ResUtil.getString(R.string.please_write_in)}${time}${ResUtil.getString(R.string.expired_automatically_invalid)}"
         tv.text = getColorSpan(s, Color.parseColor("#FB466A"), 2, time.length + 2)
     }
 
@@ -106,6 +107,6 @@ object CpViewHelper {
             message.length,
             SpannableStringBuilder.SPAN_INCLUSIVE_INCLUSIVE
         )
-        DialogManager(context).showOkCancelDialog(title, builder, "確定", "取消", true, listener)
+        DialogManager(context).showOkCancelDialog(title, builder, ResUtil.getString(R.string.sure), ResUtil.getString(R.string.cancel), true, listener)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpInviteRecordActivity.kt b/app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpInviteRecordActivity.kt
index 96d43bfcb..d811d0343 100644
--- a/app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpInviteRecordActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpInviteRecordActivity.kt
@@ -86,7 +86,10 @@ class CpInviteRecordActivity : BaseBindingActivity<ActivityCpInviteRecordBinding
         }
         val layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
         mBinding.recyclerView.layoutManager = layoutManager
-        adapter.emptyView = EmptyViewHelper.createEmptyTextView(this, ResUtil.getString(R.string.cp_activity_cpinviterecordactivity_02))
+        adapter.emptyView = EmptyViewHelper.createEmptyTextView(
+            this,
+            ResUtil.getString(R.string.cp_activity_cpinviterecordactivity_02)
+        )
         adapter.bindToRecyclerView(mBinding.recyclerView)
         mBinding.swipeRefresh.setOnRefreshListener {
             queryRecord(type)
@@ -107,12 +110,16 @@ class CpInviteRecordActivity : BaseBindingActivity<ActivityCpInviteRecordBinding
 
     private fun showConfirmDialog(item: CpInviteDetailEntity, isAgree: Boolean) {
         val shb = CpViewHelper.getColorSpan(
-            "是否${if (isAgree) "同意" else "拒絕"}與${item.inviteNick}成為CP？\n",
+            "${getString(R.string.whether)}${
+                if (isAgree) getString(R.string.lu_agree) else getString(
+                    R.string.lu_reject
+                )
+            }${getString(R.string.avroom_widget_roomeffectview_02)}${item.inviteNick}${getString(R.string.become_cp)}\n",
             Color.parseColor("#4C5AF1"),
             5, 5 + item.inviteNick.length
         )
         if (isAgree) {
-            val str = "（同意將自動拒絕其他邀請）"
+            val str = getString(R.string.consent_will_automatically_decline_other_invitations)
             val append = CpViewHelper.getSizeSpan(str, 12f, 0, str.length)
             shb.append(append)
         }
diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInviteReplyDialog.kt b/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInviteReplyDialog.kt
index d16360169..33ab14266 100644
--- a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInviteReplyDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInviteReplyDialog.kt
@@ -42,7 +42,7 @@ class CpInviteReplyDialog(context: Context) :
     private fun setPage(data: CpInviteDetailEntity) {
 
         binding.tvDialogTitle.text = getColorSpan(
-            "${data.inviteNick}邀請你達成CP關系，是否同意？",
+            "${data.inviteNick}${context.getString(R.string.invite_you_to_enter_into_cp_relationship)}",
             Color.parseColor("#4C5AF1"),
             0,
             data.inviteNick.length
diff --git a/app/src/main/java/com/yizhuan/erban/skill/adapter/SkillSelectionAdapter.kt b/app/src/main/java/com/yizhuan/erban/skill/adapter/SkillSelectionAdapter.kt
index 09aac69e0..5d229198f 100644
--- a/app/src/main/java/com/yizhuan/erban/skill/adapter/SkillSelectionAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/skill/adapter/SkillSelectionAdapter.kt
@@ -75,7 +75,7 @@ class SkillSelectionAdapter(
                     true -> {
                         selectedCount++
                         if (selectedCount > maxSelectNumber) {
-                            "最多只能选择${maxSelectNumber}项".toast()
+                            "${context.getString(R.string.at_best_can_only_choose)}${maxSelectNumber}${context.getString(R.string.nape)}".toast()
                             selectedCount--
                             item.isSelected = false
                             return
diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/FairyViewModel.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/FairyViewModel.kt
index 0710751d0..4bf717eb0 100644
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/FairyViewModel.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/FairyViewModel.kt
@@ -4,6 +4,7 @@ import android.util.SparseArray
 import androidx.core.util.forEach
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import com.yizhuan.erban.R
 import com.yizhuan.erban.base.BaseViewModel
 import com.yizhuan.erban.base.Event
 import com.yizhuan.erban.treasurefairy.event.UpdateDataEvent
@@ -13,6 +14,7 @@ import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo
 import com.yizhuan.xchat_android_core.treasurefairy.*
 import com.yizhuan.xchat_android_core.utils.net.ServerException
 import com.yizhuan.xchat_android_core.utils.toast
+import com.yizhuan.xchat_android_library.utils.ResUtil
 import org.greenrobot.eventbus.EventBus
 
 class FairyViewModel : BaseViewModel() {
@@ -219,7 +221,7 @@ class FairyViewModel : BaseViewModel() {
             block = {
                 TreasureFairyModel.askForFairy(elfId, targetUid)
                 _sendFairyLiveData.value = Event(true)
-                "已向好友發送索要信息".toast()
+                ResUtil.getString(R.string.has_been_sent_to_a_friend).toast()
             }
         )
     }
@@ -233,7 +235,7 @@ class FairyViewModel : BaseViewModel() {
             block = {
                 TreasureFairyModel.sendFairy(elfId, targetUid)
                 _sendFairyLiveData.value = Event(true)
-                "贈送成功!".toast()
+                ResUtil.getString(R.string.gift_success).toast()
                 EventBus.getDefault().post(UpdateDataEvent())
             }
         )
@@ -272,10 +274,10 @@ class FairyViewModel : BaseViewModel() {
         val array = _compoundFairyInfosLiveData.value ?: SparseArray()
 
         if (array.size() >= 3) {
-            "試煉爐已滿!".toast()
+            ResUtil.getString(R.string.the_furnace_is_full).toast()
         } else {
             if (fairyInfo.elfNum == 0) {
-                "你還未捕捉到該精靈".toast()
+                ResUtil.getString(R.string.caught_the_sprite_yet).toast()
                 return
             }
             var selectedNum = 0
@@ -286,7 +288,7 @@ class FairyViewModel : BaseViewModel() {
             }
 
             if (selectedNum + 1 > fairyInfo.elfNum) {
-                "精靈數量不足".toast()
+                ResUtil.getString(R.string.not_enough_sprites).toast()
                 return
             }
             array.put(nextIndex(array), fairyInfo)
@@ -317,7 +319,7 @@ class FairyViewModel : BaseViewModel() {
         val compoundFairyInfos = _compoundFairyInfosLiveData.value ?: SparseArray()
         var needNum = 3 - compoundFairyInfos.size()
         if (needNum == 0) {
-            "試煉爐已滿!".toast()
+            ResUtil.getString(R.string.the_furnace_is_full).toast()
             return
         }
         fairyInfos.forEach {
@@ -328,7 +330,7 @@ class FairyViewModel : BaseViewModel() {
             }
         }
         if (needNum <= 3 && needNum != 0) {
-            "精靈數量不足".toast()
+            ResUtil.getString(R.string.not_enough_sprites).toast()
             return
         }
         _compoundFairyInfosLiveData.value = compoundFairyInfos
@@ -351,7 +353,7 @@ class FairyViewModel : BaseViewModel() {
     fun testFairy(level: Int): Boolean {
         val fairyInfos = _compoundFairyInfosLiveData.value ?: SparseArray()
         if (fairyInfos.size() != 3) {
-            "精靈數量不足".toast()
+            ResUtil.getString(R.string.not_enough_sprites).toast()
             return false
         }
         safeLaunch(
diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/HomeFairyActivity.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/HomeFairyActivity.kt
index ece3bebcb..658003360 100644
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/HomeFairyActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/HomeFairyActivity.kt
@@ -169,9 +169,9 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
 
                 binding.tvShortLuckyValue.text =
                     SpannableBuilder()
-                        .append("幸運值達到", ForegroundColorSpan("#59FDFF".toColorInt()))
+                        .append(getString(R.string.message_lucky_number_reached), ForegroundColorSpan("#59FDFF".toColorInt()))
                         .append("${it.needLuckyNum}", ForegroundColorSpan("#FFE8AA".toColorInt()))
-                        .append("后，下次奪寶獲贈精靈球", ForegroundColorSpan("#59FDFF".toColorInt()))
+                        .append(getString(R.string.message_get_a_fairy_ball), ForegroundColorSpan("#59FDFF".toColorInt()))
                         .build()
                 binding.ivLuckyStone.post {
                     val drawable =
@@ -198,7 +198,8 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
 
         viewModel.showGetKeyLiveData.observe(this) {
             it.getContentIfNotHandled()?.let {
-                DialogManager(context).showOkCancelDialog("購買限時裝扮活動奪寶券", "去參与", "取消") {
+                DialogManager(context).showOkCancelDialog(getString(R.string.message_buy_a_limited_time_dress_up_event_ticket), getString(
+                                    R.string.message_participate), getString(R.string.message_cancel)) {
                     FairyDialogWebViewActivity.start(context, UriProvider.getFairyKey())
                 }
             }
@@ -210,7 +211,8 @@ class HomeFairyActivity : BaseViewBindingActivity<TreasureFairyDialogHomeBinding
         if (keyNum >= num) {
             return true
         }
-        DialogManager(context).showOkCancelDialog("購買限時裝扮活動奪寶券", "去參与", "取消") {
+        DialogManager(context).showOkCancelDialog(getString(R.string.message_buy_a_limited_time_dress_up_event_ticket), getString(
+            R.string.message_participate), getString(R.string.message_cancel)) {
             FairyDialogWebViewActivity.start(context, UriProvider.getFairyKey())
         }
         return false
diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/MyFairyRecordAdapter.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/MyFairyRecordAdapter.kt
index 1c4b6cd4d..5a5ccefb6 100644
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/MyFairyRecordAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/MyFairyRecordAdapter.kt
@@ -12,7 +12,8 @@ import java.util.*
 class MyFairyRecordAdapter :
     BaseQuickAdapter<SendFairyInfo, BaseViewHolder>(R.layout.treasure_fairy_item_my_fairy_record) {
 
-    private val format = SimpleDateFormat("yyyy年MM月dd日 HH時mm分ss秒", Locale.CHINA)
+    private val format =
+        SimpleDateFormat(mContext.getString(R.string.fairy_year_month_day), Locale.CHINA)
 
     override fun convert(helper: BaseViewHolder, item: SendFairyInfo) {
         helper.getView<ImageView>(R.id.iv_fairy_icon).load(item.elfPicUrl)
@@ -20,7 +21,15 @@ class MyFairyRecordAdapter :
         val isSend = item.type == 2
         helper.setText(
             R.id.tv_content,
-            "${if (isSend) "你" else item.targetNick}贈送${if (isSend) item.targetNick else "了你"}一張“${item.elfName}”精靈卡"
+            "${if (isSend) mContext.getString(R.string.fairy_you) else item.targetNick}${
+                mContext.getString(
+                    R.string.fairy_give
+                )
+            }${if (isSend) item.targetNick else mContext.getString(R.string.fairy_your_gun)}${
+                mContext.getString(
+                    R.string.fairy_a_sheet_of
+                )
+            }“${item.elfName}”${mContext.getString(R.string.fairy_genie_card)}"
         )
     }
 
diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/TestFairyRecordAdapter.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/TestFairyRecordAdapter.kt
index f182b4582..c372d4533 100644
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/TestFairyRecordAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/TestFairyRecordAdapter.kt
@@ -20,8 +20,8 @@ class TestFairyRecordAdapter :
         helper.setText(R.id.tv_prize_name, item.elfName)
         helper.setText(
             R.id.tv_prize_type, when (item.elfLevel) {
-                2 -> "史詩試煉"
-                else -> "傳說試煉"
+                2 -> mContext.getString(R.string.fairy_epic_trial)
+                else -> mContext.getString(R.string.fairy_legend_test)
             }
         )
 
diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/ForestFairyDialog.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/ForestFairyDialog.kt
index 967a94c96..8c130f63f 100644
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/ForestFairyDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/ForestFairyDialog.kt
@@ -135,7 +135,7 @@ class ForestFairyDialog : BaseDialog<TreasureFairyDialogForestBinding>() {
         return if (ballNum >= openNum) {
             true
         } else {
-            "精靈球數量不足".toast()
+            getString(R.string.fairy_not_enough_fairy_balls).toast()
             false
         }
     }
@@ -150,24 +150,24 @@ class ForestFairyDialog : BaseDialog<TreasureFairyDialogForestBinding>() {
         when (currentType) {
             BASE -> {
                 binding.ivPrevious.isInvisible = true
-                binding.tvGrabText1.text = "(初級球X1)"
-                binding.tvGrabText10.text = "(初級球X10)"
-                binding.tvTips.text = "使用初級球有一定幾率抓到初級精靈"
+                binding.tvGrabText1.text = getString(R.string.fairy_primary_ball_x1)
+                binding.tvGrabText10.text = getString(R.string.fairy_primary_ball_x10)
+                binding.tvTips.text = getString(R.string.fairy_chance_to_catch_sprite)
                 binding.viewBgForestBase.setBackgroundResource(R.drawable.treasure_fairy_bg_forest_base)
             }
             EPIC -> {
                 binding.ivNext.isInvisible = false
                 binding.ivPrevious.isInvisible = false
-                binding.tvGrabText1.text = "(超級球X1)"
-                binding.tvGrabText10.text = "(超級球X10)"
-                binding.tvTips.text = "使用超級球有一定幾率抓到史詩精靈"
+                binding.tvGrabText1.text = getString(R.string.fairy_super_ball_x1)
+                binding.tvGrabText10.text = getString(R.string.fairy_super_ball_x10)
+                binding.tvTips.text = getString(R.string.fairy_catch_an_epic_elf_with_the_super_ball)
                 binding.viewBgForestBase.setBackgroundResource(R.drawable.treasure_fairy_bg_forest_epic)
             }
             LEGEND -> {
                 binding.ivNext.isInvisible = true
-                binding.tvGrabText1.text = "(大師球X1)"
-                binding.tvGrabText10.text = "(大師球X10)"
-                binding.tvTips.text = "使用大師球必定抓到傳說精靈"
+                binding.tvGrabText1.text = getString(R.string.fairy_master_ball_x1)
+                binding.tvGrabText10.text = getString(R.string.fairy_master_ball_x10)
+                binding.tvTips.text = getString(R.string.fairy_master_ball_to_capture_the_fairy_legend)
                 binding.viewBgForestBase.setBackgroundResource(R.drawable.treasure_fairy_bg_forest_legend)
             }
         }
diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/ForestPrizeDialog.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/ForestPrizeDialog.kt
index 0d424f5d2..4972b462d 100644
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/ForestPrizeDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/ForestPrizeDialog.kt
@@ -51,7 +51,8 @@ class ForestPrizeDialog : BaseDialog<TreasureFairyDialogForestPrizeBinding>() {
         if (isFairy) {
             viewModel.cleanDrawForestLiveData()
         }
-        binding.tvTitle.text = if (isFairy) "恭喜獲得" else "意外發現"
+        binding.tvTitle.text = if (isFairy) getString(R.string.fairy_congratulations_on_winning) else getString(
+                    R.string.fairy_serendipity)
         if (!isFairy && !isSingle && hasSurprise) {
             newInstance(true).show(context)
         }
diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairySendDialog.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairySendDialog.kt
index eeb9e8bec..57128f690 100644
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairySendDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairySendDialog.kt
@@ -8,6 +8,7 @@ import android.view.Gravity
 import android.view.WindowManager
 import androidx.core.graphics.toColorInt
 import androidx.fragment.app.activityViewModels
+import com.yizhuan.erban.R
 import com.yizhuan.erban.base.BaseDialog
 import com.yizhuan.erban.databinding.TreasureFairyDialogMyFairySendBinding
 import com.yizhuan.erban.treasurefairy.FairyViewModel
@@ -45,14 +46,14 @@ class MyFairySendDialog : BaseDialog<TreasureFairyDialogMyFairySendBinding>() {
         binding.ivFairyIcon.load(fairyInfo.elfPicUrl)
         binding.tvContent.text =
             SpannableBuilder()
-                .append(if (isSend) "確定贈送" else "確定向", ForegroundColorSpan(Color.WHITE))
+                .append(if (isSend) getString(R.string.fairy_definite_gift) else getString(R.string.fairy_definite_direction), ForegroundColorSpan(Color.WHITE))
                 .append("“${userInfo.nick}”", ForegroundColorSpan("#FEF8AA".toColorInt()))
                 .append(
-                    "${if (isSend) "" else "索要"}1張“${fairyInfo.elfName}”精靈卡嗎？",
+                    "${if (isSend) "" else getString(R.string.fairy_ask_for)}${getString(R.string.fairy_a_sheet_of)}“${fairyInfo.elfName}”${getString(R.string.fairy_genie_card_what)}",
                     ForegroundColorSpan(Color.WHITE)
                 )
                 .build()
-        binding.tvSend.text = if (isSend) "贈 送" else "索 要"
+        binding.tvSend.text = if (isSend) getString(R.string.fairy_give_away_blank) else getString(R.string.fairy_ask_for_blank)
         binding.tvClose.setOnClickListener {
             dismissAllowingStateLoss()
         }
diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ExchangeDebrisFragment.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ExchangeDebrisFragment.kt
index afc365406..9693a9523 100644
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ExchangeDebrisFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ExchangeDebrisFragment.kt
@@ -55,7 +55,7 @@ class ExchangeDebrisFragment :
         }
         debrisAdapter.setOnItemChildClickListener { _, _, position ->
             debrisAdapter.getItem(position)?.let {
-                dialogManager.showTipsDialog("您將要兌換“${it.getPrizeName()}”", "兌換") {
+                dialogManager.showTipsDialog("${getString(R.string.fairy_you_would_like_to_exchange)}“${it.getPrizeName()}”", getString(R.string.fairy_convert)) {
                     viewModel.debrisExchange(it.itemId)
                 }
             }
@@ -76,7 +76,7 @@ class ExchangeDebrisFragment :
 
         viewModel.debrisExchangeLiveData.observe(viewLifecycleOwner) {
             it?.getContentIfNotHandled()?.let {
-                "兌換成功~".toast()
+                getString(R.string.fairy_convert_success).toast()
             }
         }
 
diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ExchangeFairyFragment.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ExchangeFairyFragment.kt
index a9d9430f4..ccf531ade 100644
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ExchangeFairyFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ExchangeFairyFragment.kt
@@ -85,7 +85,7 @@ class ExchangeFairyFragment : BaseViewBindingFragment<TreasureFairyFragmentExcha
         val exchangeGift = exchangeGiftList.firstOrNull { it.level == fairyType } ?: return
         binding.ivGift.load(exchangeGift.rewardPicUrl)
         binding.tvGiftName.text = exchangeGift.rewardName
-        binding.tvGiftPrice.text = "${exchangeGift.rewardShowValue}鉆"
+        binding.tvGiftPrice.text = "${exchangeGift.rewardShowValue}${getString(R.string.wallet_adapter_withdrawjeweladapter_01)}"
         binding.ivCompound.setOnClickListener {
             viewModel.exchangeGift(exchangeGift.itemId)
         }
diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ForestPrizesFragment.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ForestPrizesFragment.kt
index ce1d1e3e6..60b087367 100644
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ForestPrizesFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ForestPrizesFragment.kt
@@ -6,6 +6,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.viewpager.widget.ViewPager
+import com.yizhuan.erban.R
 import com.yizhuan.erban.base.BaseViewBindingFragment
 import com.yizhuan.erban.databinding.TreasureFairyFragmentForestPrizesBinding
 import com.yizhuan.erban.treasurefairy.adapter.ForestIndicatorAdapter
@@ -36,9 +37,9 @@ class ForestPrizesFragment : BaseViewBindingFragment<TreasureFairyFragmentForest
         fragmentList.add(ForestPrizesChildFragment.newInstance(3))
         val pagerAdapter = UserInfoPagerAdapter(childFragmentManager, fragmentList)
         val tagList: MutableList<String> = ArrayList()
-        tagList.add("初級森林")
-        tagList.add("史詩森林")
-        tagList.add("傳說森林")
+        tagList.add(getString(R.string.fairy_primary_common_forest))
+        tagList.add(getString(R.string.fairy_epic_common_forest))
+        tagList.add(getString(R.string.fairy_legend_common_forest))
         val commonNavigator = CommonNavigator(context)
         commonNavigator.setTitleWrapContent(true)
         val magicIndicatorAdapter = ForestIndicatorAdapter(context, tagList)
diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/TestFairyFragment.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/TestFairyFragment.kt
index 48fdaa6f9..8b6d48146 100644
--- a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/TestFairyFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/TestFairyFragment.kt
@@ -83,7 +83,7 @@ class TestFairyFragment : BaseViewBindingFragment<TreasureFairyFragmentTestFairy
         }
 
         if (fairyType == MyFairyItemView.EPIC) {
-            binding.tvTips.text = "點擊投入試煉傳說精靈"
+            binding.tvTips.text = getString(R.string.fairy_click_to_enter_the_trial_fairy_legend)
         }
 
         testFairyAdapter.setOnItemClickListener { _, _, position ->
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendFragmentCpDelegate.kt b/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendFragmentCpDelegate.kt
index 216f2c0e3..0cc6868d7 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendFragmentCpDelegate.kt
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendFragmentCpDelegate.kt
@@ -16,6 +16,7 @@ import com.yizhuan.xchat_android_core.relation.cp.CpInvitePageEntity
 import com.yizhuan.xchat_android_core.utils.toast
 import com.yizhuan.xchat_android_library.common.util.DeviceUtil
 import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil
+import com.yizhuan.xchat_android_library.utils.ResUtil
 
 class FriendFragmentCpDelegate(private val fragment: BaseFragment) {
     private val cpViewModel: CpViewModel by fragment.viewModels()
@@ -64,8 +65,8 @@ class FriendFragmentCpDelegate(private val fragment: BaseFragment) {
     ) {
         CpViewHelper.showInviteTipDialog(
             fragment.requireContext(),
-            "確定送出${cpInvitePageEntity.propsName}禮物與Ta結成CP關系嗎？",
-            "（若對方拒接或24小時未同意，鉆石將會返還）"
+            "${ResUtil.getString(R.string.definite_send_out)}${cpInvitePageEntity.propsName}${ResUtil.getString(R.string.relationship_with_the_ta)}",
+            ResUtil.getString(R.string.the_diamond_will_be_returned)
         ) {
             cpViewModel.makeCpInvite(
                 cpInvitePageEntity.acceptUid,
@@ -73,7 +74,7 @@ class FriendFragmentCpDelegate(private val fragment: BaseFragment) {
                 cpInvitePageEntity.propsId
             ) {
                 DialogManager(fragment.context).showOkCancelDialog(
-                    "鉆石余額不足，請前去充值！"
+                    ResUtil.getString(R.string.diamond_balance_is_insufficient)
                 ) {
                     if (AppMetaDataUtil.getChannelID() == Constants.GOOGLE) {
                         ChargeActivity.start(fragment.requireContext())
diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.kt
index 601387c46..9ca607442 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.kt
@@ -133,8 +133,8 @@ class LoginCodeActivity : BaseViewBindingActivity<ActivityLoginCodeBinding>() {
 
                 override fun onError(e: Throwable) {
                     dialogManager.dismissDialog()
-                    toast(e.message ?: "獲取驗證碼失敗")
-                    LogUtils.e(e.message ?: "獲取驗證碼失敗")
+                    toast(e.message ?: getString(R.string.failed_to_obtain_the_verification_code))
+                    LogUtils.e(e.message ?: getString(R.string.failed_to_obtain_the_verification_code))
                 }
 
             })
diff --git a/app/src/main/java/com/yizhuan/erban/ui/wallet/ExchangeGoldActivity.java b/app/src/main/java/com/yizhuan/erban/ui/wallet/ExchangeGoldActivity.java
index 2e3b7ee5c..2eb2cb09a 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/wallet/ExchangeGoldActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/wallet/ExchangeGoldActivity.java
@@ -100,11 +100,10 @@ public class ExchangeGoldActivity extends BaseActivity {
         if (walletNum != null) {
             long value = (long) (walletNum.getDiamondNum() - walletNum.getDiamondNum() % 10);
             int result = (int) (value * SharedPreferenceUtils.getExchangeGoldRate());
-            exchangeJewNumber.setHint(String.format("請輸入兌換的鉆石數量 (最多可兌換%1$s)", result + ""));
+            exchangeJewNumber.setHint(String.format(getString(R.string.please_enter_the_amount_of_diamonds_exchanged), result + ""));
             jewNumber.setText(getString(R.string.jewel_format, FormatUtils.formatBigDecimal(walletNum.getDiamondNum())));
             goldNumber.setText(getString(R.string.gold_format, FormatUtils.formatBigDecimal(walletNum.getDiamondNum())));
-            exchangeGoldNumber.setText("0鉆石");
-//            tvExchangeHammarNum.setText("0錘子");
+            exchangeGoldNumber.setText(ResUtil.getString(R.string.empty_diamond));
             changeResultNumStyle();
             PayModel.get().setCurrentWalletInfo(walletNum);
         }
@@ -131,8 +130,7 @@ public class ExchangeGoldActivity extends BaseActivity {
                 Long value = Long.parseLong(str);
                 if (isTenMultiple(value)) {
                     int result = (int) (value * SharedPreferenceUtils.getExchangeGoldRate());
-                    exchangeGoldNumber.setText(result + "鉆石");
-//                    tvExchangeHammarNum.setText((result/1000*2) + "錘子");
+                    exchangeGoldNumber.setText(result + getString(R.string.diamond));
                     changeResultNumStyle();
                     if (walletInfo != null && value <= walletInfo.getDiamondNum()) {
                         btnEnable = true;
@@ -140,15 +138,13 @@ public class ExchangeGoldActivity extends BaseActivity {
                     tvInputTip.setVisibility(View.GONE);
                     exchangeJewNumber.setTextColor(getResources().getColor(R.color.text_tertiary));
                 } else {
-                    exchangeGoldNumber.setText("0鉆石");
-//                    tvExchangeHammarNum.setText("0錘子");
+                    exchangeGoldNumber.setText(getString(R.string.empty_diamond));
                     changeResultNumStyle();
                     tvInputTip.setVisibility(View.VISIBLE);
                     exchangeJewNumber.setTextColor(getResources().getColor(R.color.color_FF3852));
                 }
             } else {
-                exchangeGoldNumber.setText("0鉆石");
-//                tvExchangeHammarNum.setText("0錘子");
+                exchangeGoldNumber.setText(getString(R.string.empty_diamond));
                 changeResultNumStyle();
                 tvInputTip.setVisibility(View.GONE);
                 exchangeJewNumber.setTextColor(getResources().getColor(R.color.text_tertiary));
@@ -180,12 +176,7 @@ public class ExchangeGoldActivity extends BaseActivity {
     }
 
     private void changeResultNumStyle() {
-//        if("0錘子".equals(tvExchangeHammarNum.getText().toString())){
-//            tvExchangeHammarNum.setTextColor(getResources().getColor(R.color.text_color_secondary));
-//        } else {
-//            tvExchangeHammarNum.setTextColor(getResources().getColor(R.color.text_color_primary));
-//        }
-        if ("0鉆石".equals(exchangeGoldNumber.getText().toString())) {
+        if (getString(R.string.empty_diamond).equals(exchangeGoldNumber.getText().toString())) {
             exchangeGoldNumber.setTextColor(getResources().getColor(R.color.text_color_secondary));
         } else {
             exchangeGoldNumber.setTextColor(getResources().getColor(R.color.text_color_primary));
@@ -194,7 +185,7 @@ public class ExchangeGoldActivity extends BaseActivity {
 
     public void onExchangeGold(WalletInfo walletInfo) {
         getDialogManager().dismissDialog();
-        toast("兌換成功");
+        toast(getString(R.string.exchange_success));
         exchangeJewNumber.setText("");
         if (walletInfo == null) {
             return;
@@ -209,7 +200,7 @@ public class ExchangeGoldActivity extends BaseActivity {
     }
 
     public void commit(long value, int hammerNum, String pwd) {
-        getDialogManager().showProgressDialog(ExchangeGoldActivity.this, "請稍後...");
+        getDialogManager().showProgressDialog(ExchangeGoldActivity.this, getString(R.string.erban_base_baseactivity_01));
         PayModel.get().exchangeGold((int) value, hammerNum, DESAndBase64(pwd))
                 .subscribe(new BeanObserver<WalletInfo>() {
                     @Override
diff --git a/app/src/main/java/com/yizhuan/erban/utils/MsgBuilder.kt b/app/src/main/java/com/yizhuan/erban/utils/MsgBuilder.kt
index ab20704bf..5e0e315a1 100644
--- a/app/src/main/java/com/yizhuan/erban/utils/MsgBuilder.kt
+++ b/app/src/main/java/com/yizhuan/erban/utils/MsgBuilder.kt
@@ -3,10 +3,12 @@ package com.yizhuan.erban.utils
 import android.text.style.ForegroundColorSpan
 import android.view.View
 import androidx.core.graphics.toColorInt
+import com.yizhuan.erban.R
 import com.yizhuan.erban.ui.webview.CommonWebViewActivity
 import com.yizhuan.xchat_android_core.im.custom.bean.FairyMsgAttachment
 import com.yizhuan.xchat_android_core.manager.RoomEvent
 import com.yizhuan.xchat_android_core.utils.sub
+import com.yizhuan.xchat_android_library.utils.ResUtil
 
 class MsgBuilder {
 
@@ -37,12 +39,12 @@ class MsgBuilder {
             when (roomEvent) {
                 RoomEvent.FAIRY_DRAW_GIFT_L4,
                 RoomEvent.FAIRY_DRAW_GIFT_L5 -> {
-                    builder.append("好運爆棚！", ForegroundColorSpan("#8C4700".toColorInt()))
+                    builder.append(ResUtil.getString(R.string.message_good_luck), ForegroundColorSpan("#8C4700".toColorInt()))
                         .append(
                             fairyMsgInfo.nick.sub(6),
                             ForegroundColorSpan("#EC4613".toColorInt())
                         )
-                        .append(" 在奪寶精靈中獲得 ", ForegroundColorSpan("#8C4700".toColorInt()))
+                        .append(ResUtil.getString(R.string.message_obtained_in_raiders_of_the_treasure), ForegroundColorSpan("#8C4700".toColorInt()))
                         .append(
                             fairyMsgInfo.rewardName,
                             ForegroundColorSpan("#EC4613".toColorInt())
@@ -50,39 +52,39 @@ class MsgBuilder {
                 }
 
                 RoomEvent.FAIRY_CONVERT_L1 -> {
-                    builder.append("厲害了！", ForegroundColorSpan("#8C4700".toColorInt()))
+                    builder.append(ResUtil.getString(R.string.message_amazing), ForegroundColorSpan("#8C4700".toColorInt()))
                         .append(
                             fairyMsgInfo.nick.sub(6),
                             ForegroundColorSpan("#EC4613".toColorInt())
                         )
-                        .append(" 在奪寶精靈中初級召喚 ", ForegroundColorSpan("#8C4700".toColorInt()))
+                        .append(ResUtil.getString(R.string.summon_at_primary_level_in_the_raiders), ForegroundColorSpan("#8C4700".toColorInt()))
                         .append(
-                            "${fairyMsgInfo.rewardShowValue}鉆${fairyMsgInfo.rewardName}",
+                            "${fairyMsgInfo.rewardShowValue}${ResUtil.getString(R.string.diamond_name)}${fairyMsgInfo.rewardName}",
                             ForegroundColorSpan("#EC4613".toColorInt())
                         )
                 }
                 RoomEvent.FAIRY_CONVERT_L2 -> {
-                    builder.append("厲害了！", ForegroundColorSpan("#8C4700".toColorInt()))
+                    builder.append(ResUtil.getString(R.string.message_amazing), ForegroundColorSpan("#8C4700".toColorInt()))
                         .append(
                             fairyMsgInfo.nick.sub(6),
                             ForegroundColorSpan("#EC4613".toColorInt())
                         )
-                        .append(" 在奪寶精靈中史詩召喚 ", ForegroundColorSpan("#8C4700".toColorInt()))
+                        .append(ResUtil.getString(R.string.epic_call_in_the_raider_of_the_treasure), ForegroundColorSpan("#8C4700".toColorInt()))
                         .append(
-                            "${fairyMsgInfo.rewardShowValue}鉆${fairyMsgInfo.rewardName}",
+                            "${fairyMsgInfo.rewardShowValue}${ResUtil.getString(R.string.wallet_adapter_withdrawjeweladapter_01)}${fairyMsgInfo.rewardName}",
                             ForegroundColorSpan("#EC4613".toColorInt())
                         )
                 }
 
                 RoomEvent.FAIRY_CONVERT_L3 -> {
-                    builder.append("厲害了！", ForegroundColorSpan("#8C4700".toColorInt()))
+                    builder.append(ResUtil.getString(R.string.message_amazing), ForegroundColorSpan("#8C4700".toColorInt()))
                         .append(
                             fairyMsgInfo.nick.sub(6),
                             ForegroundColorSpan("#EC4613".toColorInt())
                         )
-                        .append(" 在奪寶精靈中傳說召喚 ", ForegroundColorSpan("#8C4700".toColorInt()))
+                        .append(ResUtil.getString(R.string.called_in_the_legend_of_the_raiders), ForegroundColorSpan("#8C4700".toColorInt()))
                         .append(
-                            "${fairyMsgInfo.rewardShowValue}鉆${fairyMsgInfo.rewardName}",
+                            "${fairyMsgInfo.rewardShowValue}${ResUtil.getString(R.string.diamond_name)}${fairyMsgInfo.rewardName}",
                             ForegroundColorSpan("#EC4613".toColorInt())
                         )
                 }
diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipBroadcastDialog.kt b/app/src/main/java/com/yizhuan/erban/vip/VipBroadcastDialog.kt
index 687460092..023040d0c 100644
--- a/app/src/main/java/com/yizhuan/erban/vip/VipBroadcastDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/vip/VipBroadcastDialog.kt
@@ -64,7 +64,7 @@ class VipBroadcastDialog : BaseDialog<DialogVipBroadcastBinding>() {
             if (beanResult.isSuccess) {
                 beanResult.data?.let {
                     binding.clRoot.isVisible = true
-                    binding.tvSendLimit.text = "剩餘次數${it.remainCount}/${it.totalCount}"
+                    binding.tvSendLimit.text = "${getString(R.string.residue_degree)}${it.remainCount}/${it.totalCount}"
                     disposable?.dispose()
                     disposable = Observable.interval(0, 1, TimeUnit.SECONDS)
                         .observeOn(AndroidSchedulers.mainThread())
@@ -72,12 +72,12 @@ class VipBroadcastDialog : BaseDialog<DialogVipBroadcastBinding>() {
                             val remainTime =
                                 (CurrentTimeUtils.getCurrentTime() - it.lastSendTime) / 1000
                             if (remainTime > 60) {
-                                binding.tvSendTip.text = "發布後，1分鐘內不可使用小喇叭～"
+                                binding.tvSendTip.text = getString(R.string.not_use_the_loudspeaker_within_1_minute)
                                 binding.ivSend.isEnabled = true
                                 disposable?.dispose()
                             } else {
                                 binding.ivSend.isEnabled = false
-                                binding.tvSendTip.text = "${60 - remainTime}後可再次使用喇叭喊話~"
+                                binding.tvSendTip.text = "${60 - remainTime}${getString(R.string.you_can_use_the_loudspeaker_again)}"
                             }
                         }
                 }
diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipUpgradeDialog.kt b/app/src/main/java/com/yizhuan/erban/vip/VipUpgradeDialog.kt
index c0b3b2919..166b685f7 100644
--- a/app/src/main/java/com/yizhuan/erban/vip/VipUpgradeDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/vip/VipUpgradeDialog.kt
@@ -6,6 +6,7 @@ import androidx.fragment.app.activityViewModels
 import com.opensource.svgaplayer.SVGADrawable
 import com.opensource.svgaplayer.SVGAParser
 import com.opensource.svgaplayer.SVGAVideoEntity
+import com.yizhuan.erban.R
 import com.yizhuan.erban.base.BaseActivity
 import com.yizhuan.erban.base.BaseDialog
 import com.yizhuan.erban.databinding.DialogVipUpgradeBinding
@@ -66,6 +67,6 @@ class VipUpgradeDialog : BaseDialog<DialogVipUpgradeBinding>() {
         } catch (e: MalformedURLException) {
 
         }
-        binding.tvLevelDesc.text = "恭喜你成為「${vipInfo.vipName}」！當前已自動佩戴該等級裝扮，是否保留原有裝扮？"
+        binding.tvLevelDesc.text = "${getString(R.string.congratulations_on_becoming)}「${vipInfo.vipName}」${getString(R.string.want_to_keep_the_original_dress)}"
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xhdpi/ic_charge_diamond.png b/app/src/main/res/drawable-xhdpi/ic_charge_diamond.png
deleted file mode 100644
index 12e0f0f3f..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_charge_diamond.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_charge_diamond.webp b/app/src/main/res/drawable-xhdpi/ic_charge_diamond.webp
new file mode 100644
index 000000000..2ff8ae90a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_charge_diamond.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/treasure_fairy_ic_test_fairy_refresh.png b/app/src/main/res/drawable-xhdpi/treasure_fairy_ic_test_fairy_refresh.png
deleted file mode 100644
index ddd1096ca..000000000
Binary files a/app/src/main/res/drawable-xhdpi/treasure_fairy_ic_test_fairy_refresh.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/treasure_fairy_ic_test_fairy_refresh.webp b/app/src/main/res/drawable-xhdpi/treasure_fairy_ic_test_fairy_refresh.webp
new file mode 100644
index 000000000..4350efb47
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/treasure_fairy_ic_test_fairy_refresh.webp differ
diff --git a/app/src/main/res/layout/activity_add_team_member.xml b/app/src/main/res/layout/activity_add_team_member.xml
index e79b92772..82a643c75 100644
--- a/app/src/main/res/layout/activity_add_team_member.xml
+++ b/app/src/main/res/layout/activity_add_team_member.xml
@@ -91,7 +91,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:background="@null"
-                android:gravity="right"
+                android:gravity="end"
                 android:text="@string/family_member_label2"
                 android:visibility="gone"
                 android:textColor="@color/color_999999"
diff --git a/app/src/main/res/layout/activity_add_team_member_search_list.xml b/app/src/main/res/layout/activity_add_team_member_search_list.xml
index d9c6f8091..6c9e1b968 100644
--- a/app/src/main/res/layout/activity_add_team_member_search_list.xml
+++ b/app/src/main/res/layout/activity_add_team_member_search_list.xml
@@ -35,7 +35,7 @@
                 android:layout_width="0dp"
                 android:layout_height="29dp"
                 android:layout_gravity="center_vertical"
-                android:layout_marginRight="15dp"
+                android:layout_marginEnd="15dp"
                 android:layout_weight="1.0"
                 android:background="@drawable/bg_search_edit"
                 android:gravity="center_vertical"
@@ -45,14 +45,14 @@
                     android:id="@+id/search_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="15dp"
+                    android:layout_marginStart="15dp"
                     android:src="@mipmap/icon_little_search" />
 
                 <EditText
                     android:id="@+id/search_edit"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="15dp"
+                    android:layout_marginStart="15dp"
                     android:layout_weight="1"
                     android:background="@null"
                     android:hint="@string/family_group_search_hint"
@@ -71,8 +71,8 @@
                     android:id="@+id/iv_clear_text"
                     android:layout_width="@dimen/dp_15"
                     android:layout_height="@dimen/dp_15"
-                    android:layout_marginLeft="4dp"
-                    android:layout_marginRight="8dp"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="8dp"
                     android:onClick="@{click}"
                     android:src="@mipmap/ic_text_clear" />
 
@@ -86,7 +86,8 @@
                 android:layout_gravity="center_vertical"
                 android:gravity="center"
                 android:onClick="@{click}"
-                android:paddingRight="16dp"
+                android:paddingStart="@dimen/dp_0"
+                android:paddingEnd="@dimen/dp_16"
                 android:text="@string/search"
                 android:textColor="@color/text_primary"
                 android:textSize="16sp" />
diff --git a/app/src/main/res/layout/activity_bill_gift_income_group.xml b/app/src/main/res/layout/activity_bill_gift_income_group.xml
index 0f09f8a27..781d9fa8d 100644
--- a/app/src/main/res/layout/activity_bill_gift_income_group.xml
+++ b/app/src/main/res/layout/activity_bill_gift_income_group.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -36,23 +37,24 @@
         android:layout_height="49dp"
         android:layout_alignParentBottom="true"
         android:background="@color/white"
-        android:drawableLeft="@drawable/icon_gold_num"
         android:drawablePadding="10dp"
         android:gravity="center_vertical"
-        android:paddingLeft="15dp"
+        android:paddingStart="15dp"
+        android:paddingEnd="@dimen/dp_0"
         android:text="52256225"
         android:textColor="@color/color_333333"
         android:textSize="14sp"
         android:textStyle="bold"
-        android:visibility="gone"/>
+        android:visibility="gone"
+        app:drawableLeftCompat="@drawable/icon_gold_num" />
 
     <ImageView
         android:id="@+id/iv_goto_top"
         android:layout_width="50dp"
         android:layout_height="50dp"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginRight="15dp"
+        android:layout_marginEnd="15dp"
         android:layout_marginBottom="50dp"
         android:src="@mipmap/ic_goto_top"/>
 
diff --git a/app/src/main/res/layout/activity_bills.xml b/app/src/main/res/layout/activity_bills.xml
index 8fb9713bb..11d55d05c 100644
--- a/app/src/main/res/layout/activity_bills.xml
+++ b/app/src/main/res/layout/activity_bills.xml
@@ -31,7 +31,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:layout_marginLeft="15dp"
+                    android:layout_marginStart="15dp"
                     android:text="@string/layout_activity_bills_01"
                     android:textColor="@color/color_999999"
                     android:textSize="18sp" />
@@ -41,7 +41,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_centerVertical="true"
-                    android:layout_toLeftOf="@+id/tv_selector_date"
+                    android:layout_toStartOf="@+id/tv_selector_date"
                     android:paddingLeft="8dp"
                     android:paddingRight="8dp"
                     android:src="@mipmap/ic_day_today_yellow"
@@ -51,10 +51,11 @@
                     android:id="@+id/tv_selector_date"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
-                    android:layout_marginRight="15dp"
-                    android:paddingLeft="8dp"
+                    android:layout_marginEnd="15dp"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="@dimen/dp_0"
                     android:src="@drawable/icon_date_yellow" />
             </RelativeLayout>
 
@@ -86,9 +87,9 @@
             android:id="@+id/iv_goto_top"
             android:layout_width="50dp"
             android:layout_height="50dp"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
-            android:layout_marginRight="15dp"
+            android:layout_marginEnd="15dp"
             android:layout_marginBottom="50dp"
             android:src="@mipmap/ic_goto_top" />
 
diff --git a/app/src/main/res/layout/activity_bills_gift.xml b/app/src/main/res/layout/activity_bills_gift.xml
index 1aac18b4d..e7e7dcd50 100644
--- a/app/src/main/res/layout/activity_bills_gift.xml
+++ b/app/src/main/res/layout/activity_bills_gift.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <data>
 
@@ -34,23 +35,24 @@
             android:layout_height="49dp"
             android:layout_alignParentBottom="true"
             android:background="@color/white"
-            android:drawableLeft="@drawable/icon_gold_num"
             android:drawablePadding="10dp"
             android:gravity="center_vertical"
-            android:paddingLeft="15dp"
+            android:paddingStart="15dp"
+            android:paddingEnd="@dimen/dp_0"
             android:text="52256225"
             android:textColor="@color/color_333333"
             android:textSize="14sp"
             android:textStyle="bold"
-            android:visibility="gone"/>
+            android:visibility="gone"
+            app:drawableLeftCompat="@drawable/icon_gold_num" />
 
         <ImageView
             android:id="@+id/iv_goto_top"
             android:layout_width="50dp"
             android:layout_height="50dp"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
-            android:layout_marginRight="15dp"
+            android:layout_marginEnd="15dp"
             android:layout_marginBottom="50dp"
             android:src="@mipmap/ic_goto_top"/>
 
diff --git a/app/src/main/res/layout/activity_bind_withdraw_msg.xml b/app/src/main/res/layout/activity_bind_withdraw_msg.xml
index f89bd5ce2..373a6ab94 100644
--- a/app/src/main/res/layout/activity_bind_withdraw_msg.xml
+++ b/app/src/main/res/layout/activity_bind_withdraw_msg.xml
@@ -35,7 +35,7 @@
 
                 <TextView
                     android:id="@+id/tvSwiftCode"
-                    android:text="Swift code/BIC:"
+                    android:text="@string/swift_code_bic"
                     android:textSize="@dimen/sp_14"
                     android:textColor="@color/color_1F1A4E"
                     android:textStyle="bold"
@@ -70,7 +70,7 @@
 
                 <TextView
                     android:id="@+id/tvBankName"
-                    android:text="bank name:"
+                    android:text="@string/bank_name_what"
                     android:textSize="@dimen/sp_14"
                     android:textColor="@color/color_1F1A4E"
                     android:textStyle="bold"
@@ -105,7 +105,7 @@
 
                 <TextView
                     android:id="@+id/tvAccountNumber"
-                    android:text="account number:"
+                    android:text="@string/account_number"
                     android:textSize="@dimen/sp_14"
                     android:textColor="@color/color_1F1A4E"
                     android:textStyle="bold"
@@ -140,7 +140,7 @@
 
                 <TextView
                     android:id="@+id/tvAccountName"
-                    android:text="account name:"
+                    android:text="@string/account_name"
                     android:textSize="@dimen/sp_14"
                     android:textColor="@color/color_1F1A4E"
                     android:textStyle="bold"
@@ -175,7 +175,7 @@
 
                 <TextView
                     android:id="@+id/tvAddress"
-                    android:text="address:"
+                    android:text="@string/address"
                     android:textSize="@dimen/sp_14"
                     android:textColor="@color/color_1F1A4E"
                     android:textStyle="bold"
@@ -210,7 +210,7 @@
 
                 <TextView
                     android:id="@+id/tvCity"
-                    android:text="city:"
+                    android:text="@string/city"
                     android:textSize="@dimen/sp_14"
                     android:textColor="@color/color_1F1A4E"
                     android:textStyle="bold"
@@ -245,7 +245,7 @@
 
                 <TextView
                     android:id="@+id/tvProvince"
-                    android:text="province:"
+                    android:text="@string/province"
                     android:textSize="@dimen/sp_14"
                     android:textColor="@color/color_1F1A4E"
                     android:textStyle="bold"
@@ -280,7 +280,7 @@
 
                 <TextView
                     android:id="@+id/tvPostCode"
-                    android:text="post code:"
+                    android:text="@string/post_code"
                     android:textSize="@dimen/sp_14"
                     android:textColor="@color/color_1F1A4E"
                     android:textStyle="bold"
diff --git a/app/src/main/res/layout/activity_binder_alipay.xml b/app/src/main/res/layout/activity_binder_alipay.xml
index 320c7e7be..4c8fb482e 100644
--- a/app/src/main/res/layout/activity_binder_alipay.xml
+++ b/app/src/main/res/layout/activity_binder_alipay.xml
@@ -27,7 +27,7 @@
             android:gravity="center_vertical"
             android:text="@string/layout_activity_binder_alipay_01"
             android:textColor="@color/text_title_color"
-            android:textSize="14dp" />
+            android:textSize="@dimen/sp_14" />
 
         <EditText
             android:id="@+id/et_phone"
@@ -35,7 +35,7 @@
             android:layout_height="match_parent"
             android:background="@null"
             android:hint="@string/layout_activity_binder_alipay_02"
-            android:paddingLeft="15dp"
+            android:paddingStart="15dp"
             android:textColor="@color/text_normal_c6c6e9"
             android:textColorHint="@color/text_hint_555574"
             android:textCursorDrawable="@null"
@@ -63,7 +63,7 @@
             android:gravity="center_vertical"
             android:text="@string/layout_activity_binder_alipay_03"
             android:textColor="@color/text_title_color"
-            android:textSize="14dp" />
+            android:textSize="@dimen/sp_14" />
 
         <EditText
             android:id="@+id/et_name"
@@ -99,7 +99,7 @@
         android:paddingLeft="15dp"
         android:text="@string/layout_activity_binder_alipay_05"
         android:textColor="@color/text_normal_c6c6e9"
-        android:textSize="14dp"
+        android:textSize="@dimen/sp_14"
         android:visibility="gone" />
 
     <View
diff --git a/app/src/main/res/layout/activity_cd_key_charge.xml b/app/src/main/res/layout/activity_cd_key_charge.xml
index 78bc10396..2b3d0041f 100644
--- a/app/src/main/res/layout/activity_cd_key_charge.xml
+++ b/app/src/main/res/layout/activity_cd_key_charge.xml
@@ -33,7 +33,7 @@
                 android:textColor="@color/text_color_primary"
                 android:textColorHint="@color/text_color_secondary"
                 android:textCursorDrawable="@null"
-                android:textSize="14dp" />
+                android:textSize="@dimen/sp_14" />
         </RelativeLayout>
 
     </RelativeLayout>
@@ -45,7 +45,7 @@
         android:layout_margin="15dp"
         android:text="@string/layout_activity_cd_key_charge_02"
         android:textColor="#999999"
-        android:textSize="13dp" />
+        android:textSize="@dimen/sp_13" />
 
     <Button
         android:id="@+id/btn_charge"
@@ -59,5 +59,5 @@
         android:background="@drawable/shape_semi_round_gray_solid"
         android:text="@string/layout_activity_cd_key_charge_03"
         android:textColor="#1A1A1A"
-        android:textSize="16dp" />
+        android:textSize="@dimen/sp_16" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_create_pk.xml b/app/src/main/res/layout/activity_create_pk.xml
index 92f0c966a..cb2042455 100644
--- a/app/src/main/res/layout/activity_create_pk.xml
+++ b/app/src/main/res/layout/activity_create_pk.xml
@@ -54,7 +54,7 @@
                     android:paddingRight="6dp"
                     android:text="@string/wait_for_mic"
                     android:textColor="@color/color_FFFFFF"
-                    android:textSize="10dp" />
+                    android:textSize="@dimen/sp_11" />
 
             </LinearLayout>
 
@@ -83,7 +83,7 @@
                     android:paddingRight="6dp"
                     android:text="@string/wait_for_mic"
                     android:textColor="@color/color_FFFFFF"
-                    android:textSize="10dp" />
+                    android:textSize="@dimen/sp_11" />
 
             </LinearLayout>
 
@@ -113,7 +113,7 @@
                     android:paddingRight="6dp"
                     android:text="@string/wait_for_mic"
                     android:textColor="@color/color_FFFFFF"
-                    android:textSize="10dp" />
+                    android:textSize="@dimen/sp_11" />
 
             </LinearLayout>
 
@@ -144,7 +144,7 @@
                     android:paddingRight="6dp"
                     android:text="@string/wait_for_mic"
                     android:textColor="@color/color_FFFFFF"
-                    android:textSize="10dp" />
+                    android:textSize="@dimen/sp_11" />
 
             </LinearLayout>
 
@@ -192,7 +192,7 @@
                     android:paddingRight="6dp"
                     android:text="@string/wait_for_mic"
                     android:textColor="@color/color_FFFFFF"
-                    android:textSize="10dp" />
+                    android:textSize="@dimen/sp_11" />
 
             </LinearLayout>
 
@@ -221,7 +221,7 @@
                     android:paddingRight="6dp"
                     android:text="@string/wait_for_mic"
                     android:textColor="@color/color_FFFFFF"
-                    android:textSize="10dp" />
+                    android:textSize="@dimen/sp_11" />
 
             </LinearLayout>
 
@@ -251,7 +251,7 @@
                     android:paddingRight="6dp"
                     android:text="@string/wait_for_mic"
                     android:textColor="@color/color_FFFFFF"
-                    android:textSize="10dp" />
+                    android:textSize="@dimen/sp_11" />
 
             </LinearLayout>
 
@@ -281,7 +281,7 @@
                     android:paddingRight="6dp"
                     android:text="@string/wait_for_mic"
                     android:textColor="@color/color_FFFFFF"
-                    android:textSize="10dp" />
+                    android:textSize="@dimen/sp_11" />
 
             </LinearLayout>
         </androidx.gridlayout.widget.GridLayout>
@@ -404,7 +404,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="7.5"
-            android:gravity="right"
+            android:gravity="end"
             android:textColor="@color/text_normal_c6c6e9"
             android:textSize="14sp"
             tools:text="@string/layout_activity_create_pk_01" />
diff --git a/app/src/main/res/layout/activity_decoration_store.xml b/app/src/main/res/layout/activity_decoration_store.xml
index 9a4457cc8..912d254f5 100644
--- a/app/src/main/res/layout/activity_decoration_store.xml
+++ b/app/src/main/res/layout/activity_decoration_store.xml
@@ -54,14 +54,14 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:drawableStart="@drawable/ic_charge_diamond"
             android:drawablePadding="3dp"
             android:gravity="center"
             android:includeFontPadding="false"
             android:text="@string/layout_activity_decoration_store_01"
             android:layout_marginStart="15dp"
             android:textColor="@color/color_999999"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            app:drawableStartCompat="@drawable/ic_charge_diamond" />
 
         <TextView
             android:id="@+id/tv_diamond_num"
diff --git a/app/src/main/res/layout/activity_exchange_gold.xml b/app/src/main/res/layout/activity_exchange_gold.xml
index 31c140926..f886e09f8 100644
--- a/app/src/main/res/layout/activity_exchange_gold.xml
+++ b/app/src/main/res/layout/activity_exchange_gold.xml
@@ -77,57 +77,6 @@
 
     </LinearLayout>
 
-    <!--<RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="44dp"
-        android:layout_marginTop="5dp"
-        android:background="@color/white">
-
-        <ImageView
-            android:id="@+id/jew_number_img"
-            android:layout_width="19dp"
-            android:layout_height="17.5dp"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="20dp"
-            android:src="@drawable/icon_exchange_jew" />
-
-        <TextView
-            android:id="@+id/gew_number"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="10dp"
-            android:layout_toRightOf="@id/jew_number_img"
-            android:textColor="@color/text_color_primary"
-            android:textSize="14dp" />
-
-        <View
-            android:id="@+id/divider"
-            android:layout_width="1px"
-            android:layout_height="20dp"
-            android:layout_centerInParent="true"
-            android:background="#e6e6e6" />
-
-        <ImageView
-            android:id="@+id/gole_number_img"
-            android:layout_width="18dp"
-            android:layout_height="18dp"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="20dp"
-            android:layout_toRightOf="@id/divider"
-            android:src="@drawable/icon_exchange_gold" />
-
-        <TextView
-            android:id="@+id/gold_number"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="10dp"
-            android:layout_toRightOf="@id/gole_number_img"
-            android:textColor="@color/text_color_primary"
-            android:textSize="14dp" />
-    </RelativeLayout>-->
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="50dp"
@@ -255,5 +204,5 @@
         android:enabled="false"
         android:text="@string/layout_activity_exchange_gold_07"
         android:textColor="@color/color_B3B3B3"
-        android:textSize="16dp" />
+        android:textSize="@dimen/sp_16" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_family_text_input.xml b/app/src/main/res/layout/activity_family_text_input.xml
index 1f3d0ae76..767f8f86d 100644
--- a/app/src/main/res/layout/activity_family_text_input.xml
+++ b/app/src/main/res/layout/activity_family_text_input.xml
@@ -24,7 +24,7 @@
         android:id="@+id/et_input"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="left"
+        android:gravity="start"
         android:inputType="text"
         android:hint="@string/family_name_hint"
         android:maxLength="15"
diff --git a/app/src/main/res/layout/activity_my_recommend_card.xml b/app/src/main/res/layout/activity_my_recommend_card.xml
index bf1b78de8..379d6fa34 100644
--- a/app/src/main/res/layout/activity_my_recommend_card.xml
+++ b/app/src/main/res/layout/activity_my_recommend_card.xml
@@ -8,7 +8,7 @@
     <com.yizhuan.erban.base.TitleBar
         android:id="@+id/title_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"></com.yizhuan.erban.base.TitleBar>
+        android:layout_height="wrap_content"/>
 
     <com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
         android:id="@+id/indicator"
diff --git a/app/src/main/res/layout/activity_my_voice.xml b/app/src/main/res/layout/activity_my_voice.xml
index 30b22e9fb..4e3f5ad2b 100644
--- a/app/src/main/res/layout/activity_my_voice.xml
+++ b/app/src/main/res/layout/activity_my_voice.xml
@@ -12,18 +12,6 @@
         android:layout_height="wrap_content"
         android:background="@android:color/transparent" />
 
-    <!-- <android.support.v7.widget.RecyclerView
-         android:id="@+id/recycler_view_my_voice_in_review"
-         android:layout_width="match_parent"
-         android:layout_height="150dp"
-         android:background="@drawable/bg_my_voice_vie_stub"
-         android:paddingLeft="15dp"
-         android:paddingTop="26dp"
-         android:paddingRight="15dp"
-         android:paddingBottom="26dp"
-         android:visibility="gone"
-         tools:visibility="visible" />-->
-
     <com.yizhuan.erban.common.widget.StatusLayout
         android:id="@+id/status_layout"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_new_user_list.xml b/app/src/main/res/layout/activity_new_user_list.xml
index 14d3964c4..607fd289c 100644
--- a/app/src/main/res/layout/activity_new_user_list.xml
+++ b/app/src/main/res/layout/activity_new_user_list.xml
@@ -30,7 +30,6 @@
                 android:paddingRight="15dp"
                 android:paddingBottom="12dp" />
 
-
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     </com.yizhuan.erban.common.widget.StatusLayout>
diff --git a/app/src/main/res/layout/activity_show_photo.xml b/app/src/main/res/layout/activity_show_photo.xml
index 55b44514a..b6a7a760f 100644
--- a/app/src/main/res/layout/activity_show_photo.xml
+++ b/app/src/main/res/layout/activity_show_photo.xml
@@ -22,10 +22,5 @@
         android:textColor="@color/white"
         android:gravity="center_horizontal"
         />
-    <!--<ImageView-->
-        <!--android:id="@+id/photoview"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="match_parent"-->
-        <!--/>-->
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_withdraw_rule.xml b/app/src/main/res/layout/activity_withdraw_rule.xml
index c1e5da656..05af7335d 100644
--- a/app/src/main/res/layout/activity_withdraw_rule.xml
+++ b/app/src/main/res/layout/activity_withdraw_rule.xml
@@ -9,11 +9,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-
     <WebView
         android:id="@+id/wv_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"></WebView>
-
+        android:layout_height="match_parent"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_bottom_magic.xml b/app/src/main/res/layout/dialog_bottom_magic.xml
index 623e7f97d..2aea6fc8f 100644
--- a/app/src/main/res/layout/dialog_bottom_magic.xml
+++ b/app/src/main/res/layout/dialog_bottom_magic.xml
@@ -19,7 +19,7 @@
             android:paddingStart="10dp"
             android:text="@string/layout_dialog_bottom_magic_01"
             android:textColor="@color/white"
-            android:textSize="13dp" />
+            android:textSize="@dimen/sp_13" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view_avatar"
diff --git a/app/src/main/res/layout/dialog_exit_room.xml b/app/src/main/res/layout/dialog_exit_room.xml
index 55a9bbba3..247459878 100644
--- a/app/src/main/res/layout/dialog_exit_room.xml
+++ b/app/src/main/res/layout/dialog_exit_room.xml
@@ -12,12 +12,6 @@
         android:layout_height="match_parent"
         tools:background="@color/blue">
 
-       <!-- <ImageView
-            android:id="@+id/iv_blur"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="fitXY" />-->
-
         <com.github.mmin18.widget.RealtimeBlurView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/dialog_first_charge_prize.xml b/app/src/main/res/layout/dialog_first_charge_prize.xml
index f09440c36..3b527cb94 100644
--- a/app/src/main/res/layout/dialog_first_charge_prize.xml
+++ b/app/src/main/res/layout/dialog_first_charge_prize.xml
@@ -55,7 +55,7 @@
                 android:layout_marginEnd="40dp"
                 android:text="@string/layout_dialog_first_charge_prize_02"
                 android:textColor="@color/white"
-                android:textSize="10sp" />
+                android:textSize="@dimen/sp_11" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/dialog_gift_all_service_level_three.xml b/app/src/main/res/layout/dialog_gift_all_service_level_three.xml
index 27a3c305d..6bf78eeb9 100644
--- a/app/src/main/res/layout/dialog_gift_all_service_level_three.xml
+++ b/app/src/main/res/layout/dialog_gift_all_service_level_three.xml
@@ -146,7 +146,7 @@
                     android:singleLine="true"
                     android:text="@{giftBean.recvUserNick}"
                     android:textColor="@color/white"
-                    android:textSize="10dp"
+                    android:textSize="@dimen/sp_11"
                     tools:text="@string/layout_dialog_gift_all_service_level_three_02" />
 
             </RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_gift_all_service_level_two.xml b/app/src/main/res/layout/dialog_gift_all_service_level_two.xml
index 5f23276a3..557bc6f97 100644
--- a/app/src/main/res/layout/dialog_gift_all_service_level_two.xml
+++ b/app/src/main/res/layout/dialog_gift_all_service_level_two.xml
@@ -133,7 +133,7 @@
                     android:singleLine="true"
                     android:text="@{giftBean.recvUserNick}"
                     android:textColor="@color/white"
-                    android:textSize="10dp"
+                    android:textSize="@dimen/sp_11"
                     tools:text="@string/layout_dialog_gift_all_service_level_two_02" />
 
             </RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_loading.xml b/app/src/main/res/layout/dialog_loading.xml
index 35bed2826..bd876743e 100644
--- a/app/src/main/res/layout/dialog_loading.xml
+++ b/app/src/main/res/layout/dialog_loading.xml
@@ -13,10 +13,6 @@
         app:autoPlay="true"
         app:source="svga/loading.svga" />
 
-<!--    <ProgressBar-->
-<!--        android:layout_width="240dp"-->
-<!--        android:layout_height="wrap_content"/>-->
-
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_monster.xml b/app/src/main/res/layout/dialog_monster.xml
index 125a8a87a..a835b2762 100644
--- a/app/src/main/res/layout/dialog_monster.xml
+++ b/app/src/main/res/layout/dialog_monster.xml
@@ -48,7 +48,7 @@
                 android:gravity="center"
                 android:text="0"
                 android:textColor="#fef9dc"
-                android:textSize="24dp" />
+                android:textSize="@dimen/text_size_24" />
 
             <TextView
                 android:id="@+id/tv2"
@@ -59,7 +59,7 @@
                 android:gravity="center"
                 android:text="0"
                 android:textColor="#fef9dc"
-                android:textSize="24dp" />
+                android:textSize="@dimen/text_size_24" />
 
             <ImageView
                 android:layout_width="wrap_content"
@@ -77,7 +77,7 @@
                 android:gravity="center"
                 android:text="0"
                 android:textColor="#fef9dc"
-                android:textSize="24dp" />
+                android:textSize="@dimen/text_size_24" />
 
             <TextView
                 android:id="@+id/tv4"
@@ -88,7 +88,7 @@
                 android:gravity="center"
                 android:text="0"
                 android:textColor="#fef9dc"
-                android:textSize="24dp" />
+                android:textSize="@dimen/text_size_24" />
         </LinearLayout>
 
         <TextView
@@ -102,7 +102,7 @@
             android:gravity="center_vertical"
             android:ellipsize="end"
             tools:text="幸运怪兽：树妖携带“钻石1000,座驾兰博基尼 15 天，某实物,钻石1000,钻石1000,座驾兰博基尼 15 天，某实物,钻石1000”将在15秒后抵达战场，立即前往房间ID：“4909539”打怪。"
-            android:textSize="13dp"
+            android:textSize="@dimen/sp_13"
             android:textColor="@color/black"
             android:text="@{monsterInfo.notifyMessage}"/>
 
diff --git a/app/src/main/res/layout/dialog_monster_escape.xml b/app/src/main/res/layout/dialog_monster_escape.xml
index 75db80025..edd030a9f 100644
--- a/app/src/main/res/layout/dialog_monster_escape.xml
+++ b/app/src/main/res/layout/dialog_monster_escape.xml
@@ -21,7 +21,7 @@
         <TextView
             android:layout_marginTop="13dp"
             android:text="@string/layout_dialog_monster_escape_01"
-            android:textSize="@dimen/dp_15"
+            android:textSize="@dimen/sp_15"
             android:textColor="@color/color_2f4663"
             android:gravity="center"
             android:layout_width="match_parent"
@@ -35,7 +35,7 @@
         android:gravity="center"
         android:layout_gravity="center"
         android:text="@string/layout_dialog_monster_escape_02"
-        android:textSize="@dimen/dp_14"
+        android:textSize="@dimen/sp_14"
         android:layout_width="172dp"
         android:layout_height="45dp" />
 
diff --git a/app/src/main/res/layout/dialog_new_user_charge_prize.xml b/app/src/main/res/layout/dialog_new_user_charge_prize.xml
index 22d14f73b..5f370b9ef 100644
--- a/app/src/main/res/layout/dialog_new_user_charge_prize.xml
+++ b/app/src/main/res/layout/dialog_new_user_charge_prize.xml
@@ -44,7 +44,7 @@
                 android:layout_marginTop="7dp"
                 android:text="@string/layout_dialog_new_user_charge_prize_01"
                 android:textColor="#E64A94"
-                android:textSize="10sp" />
+                android:textSize="@dimen/sp_11" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/dialog_pk_select_people.xml b/app/src/main/res/layout/dialog_pk_select_people.xml
index 377d8b612..ed81dc866 100644
--- a/app/src/main/res/layout/dialog_pk_select_people.xml
+++ b/app/src/main/res/layout/dialog_pk_select_people.xml
@@ -21,6 +21,6 @@
         android:background="@drawable/selector_common_confirm"
         android:text="@string/ok"
         android:textColor="@color/text_title_color"
-        android:textSize="15dp" />
+        android:textSize="@dimen/sp_15" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_pub_room_shutup.xml b/app/src/main/res/layout/dialog_pub_room_shutup.xml
index af28d7fbf..5dab07d5c 100644
--- a/app/src/main/res/layout/dialog_pub_room_shutup.xml
+++ b/app/src/main/res/layout/dialog_pub_room_shutup.xml
@@ -95,7 +95,7 @@
                 android:layout_marginTop="22dp"
                 android:text="@string/layout_dialog_pub_room_shutup_07"
                 android:gravity="center"
-                android:textSize="15dp"
+                android:textSize="@dimen/sp_15"
                 android:textColor="@color/color_333333"
                 android:paddingRight="30dp"
                 android:background="@drawable/popup_down" />
diff --git a/app/src/main/res/layout/dialog_quit_monster_hunting.xml b/app/src/main/res/layout/dialog_quit_monster_hunting.xml
index 86dd5e193..b1034553f 100644
--- a/app/src/main/res/layout/dialog_quit_monster_hunting.xml
+++ b/app/src/main/res/layout/dialog_quit_monster_hunting.xml
@@ -14,7 +14,7 @@
         android:text="@string/text_quit_monster_hunting"
         android:gravity="center"
         android:textColor="@color/color_aa3b29"
-        android:textSize="@dimen/dp_18" />
+        android:textSize="@dimen/sp_18" />
 
 
     <LinearLayout
diff --git a/app/src/main/res/layout/dialog_room_impose.xml b/app/src/main/res/layout/dialog_room_impose.xml
index 4c5ed4ad6..343f71713 100644
--- a/app/src/main/res/layout/dialog_room_impose.xml
+++ b/app/src/main/res/layout/dialog_room_impose.xml
@@ -47,7 +47,7 @@
                     android:singleLine="true"
                     android:text="@string/layout_dialog_room_impose_01"
                     android:textColor="#ff3f3f3f"
-                    android:textSize="16dp"
+                    android:textSize="@dimen/sp_16"
                     android:visibility="visible"
                     tools:visibility="visible" />
 
@@ -76,7 +76,7 @@
                     android:singleLine="true"
                     android:text="@string/layout_dialog_room_impose_02"
                     android:textColor="#ff3f3f3f"
-                    android:textSize="16dp"
+                    android:textSize="@dimen/sp_16"
                     android:visibility="visible"
                     tools:visibility="visible" />
 
@@ -107,7 +107,7 @@
                     android:singleLine="true"
                     android:text="@string/layout_dialog_room_impose_03"
                     android:textColor="#ff3f3f3f"
-                    android:textSize="16dp"
+                    android:textSize="@dimen/sp_16"
                     android:visibility="visible"
                     tools:visibility="visible" />
 
@@ -138,7 +138,7 @@
                     android:singleLine="true"
                     android:text="@string/layout_dialog_room_impose_04"
                     android:textColor="#ff3f3f3f"
-                    android:textSize="16dp"
+                    android:textSize="@dimen/sp_16"
                     android:visibility="visible"
                     tools:visibility="visible" />
 
@@ -169,7 +169,7 @@
                 android:minHeight="@dimen/dialog_msg_min_height"
                 android:onClick="@{click}"
                 android:text="@string/layout_dialog_room_impose_05"
-                android:textSize="16dp"
+                android:textSize="@dimen/sp_16"
                 android:visibility="visible"
                 tools:visibility="visible" />
 
diff --git a/app/src/main/res/layout/dialog_room_pk_force_finish.xml b/app/src/main/res/layout/dialog_room_pk_force_finish.xml
index 5cd213dcb..4ca3135b4 100644
--- a/app/src/main/res/layout/dialog_room_pk_force_finish.xml
+++ b/app/src/main/res/layout/dialog_room_pk_force_finish.xml
@@ -65,7 +65,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:textColor="@color/white"
-            android:textSize="10sp"
+            android:textSize="@dimen/sp_11"
             app:layout_constraintEnd_toEndOf="@id/iv_avatar_red"
             app:layout_constraintStart_toStartOf="@id/iv_avatar_red"
             app:layout_constraintTop_toBottomOf="@id/iv_avatar_red"
@@ -111,7 +111,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:textColor="@color/white"
-            android:textSize="10sp"
+            android:textSize="@dimen/sp_11"
             app:layout_constraintEnd_toEndOf="@id/iv_avatar_blue"
             app:layout_constraintStart_toStartOf="@id/iv_avatar_blue"
             app:layout_constraintTop_toBottomOf="@id/iv_avatar_blue"
diff --git a/app/src/main/res/layout/dialog_room_pk_rule.xml b/app/src/main/res/layout/dialog_room_pk_rule.xml
index 0240bc697..fa617f5d9 100644
--- a/app/src/main/res/layout/dialog_room_pk_rule.xml
+++ b/app/src/main/res/layout/dialog_room_pk_rule.xml
@@ -32,7 +32,7 @@
             android:layout_marginEnd="15dp"
             android:text="@string/room_pk_rule"
             android:textColor="@color/white"
-            android:textSize="14dp"
+            android:textSize="@dimen/sp_14"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/dialog_single_room_pk_force_finish.xml b/app/src/main/res/layout/dialog_single_room_pk_force_finish.xml
index 9c95e3953..47b9cf7b0 100644
--- a/app/src/main/res/layout/dialog_single_room_pk_force_finish.xml
+++ b/app/src/main/res/layout/dialog_single_room_pk_force_finish.xml
@@ -55,7 +55,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:textColor="#FFFF0000"
-            android:textSize="10sp"
+            android:textSize="@dimen/sp_11"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="@id/iv_avatar_red"
             app:layout_constraintStart_toStartOf="@id/iv_avatar_red"
@@ -92,7 +92,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:textColor="#FF0060D1"
-            android:textSize="10sp"
+            android:textSize="@dimen/sp_11"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="@id/iv_avatar_blue"
             app:layout_constraintStart_toStartOf="@id/iv_avatar_blue"
@@ -120,6 +120,5 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/iv_avatar_red" />
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_vip_broadcast.xml b/app/src/main/res/layout/dialog_vip_broadcast.xml
index 45ac7ab86..fabd69771 100644
--- a/app/src/main/res/layout/dialog_vip_broadcast.xml
+++ b/app/src/main/res/layout/dialog_vip_broadcast.xml
@@ -47,7 +47,7 @@
             android:includeFontPadding="false"
             android:text="@string/layout_dialog_vip_broadcast_03"
             android:textColor="#ffbc9e66"
-            android:textSize="10sp"
+            android:textSize="@dimen/sp_11"
             app:layout_constraintBaseline_toBaselineOf="@id/tv_send_text"
             app:layout_constraintBottom_toBottomOf="@id/tv_send_text"
             app:layout_constraintStart_toEndOf="@id/tv_send_text" />
@@ -102,7 +102,7 @@
             android:layout_marginBottom="24dp"
             android:text="@string/layout_dialog_vip_broadcast_05"
             android:textColor="#ffbc9e66"
-            android:textSize="10sp"
+            android:textSize="@dimen/sp_11"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/layout/fragment_dialog_open_noble.xml b/app/src/main/res/layout/fragment_dialog_open_noble.xml
index 864519bc2..e2cfa5850 100644
--- a/app/src/main/res/layout/fragment_dialog_open_noble.xml
+++ b/app/src/main/res/layout/fragment_dialog_open_noble.xml
@@ -5,7 +5,6 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -20,7 +19,7 @@
             android:layout_marginTop="49dp"
             android:gravity="center"
             android:textColor="@color/color_E0B980"
-            android:textSize="23dp"
+            android:textSize="23sp"
             tools:text="@string/layout_fragment_dialog_open_noble_01" />
 
 
@@ -31,7 +30,7 @@
             android:layout_marginTop="5dp"
             android:gravity="center"
             android:textColor="@color/color_E0B980"
-            android:textSize="13dp"
+            android:textSize="@dimen/sp_13"
             tools:text="@string/layout_fragment_dialog_open_noble_02" />
 
         <TextView
@@ -41,7 +40,7 @@
             android:layout_marginTop="60dp"
             android:gravity="center"
             android:textColor="@color/color_E0B980"
-            android:textSize="14dp"
+            android:textSize="@dimen/sp_14"
             tools:text="@string/layout_fragment_dialog_open_noble_03" />
 
         <Button
diff --git a/app/src/main/res/layout/fragment_family.xml b/app/src/main/res/layout/fragment_family.xml
index c0be53e22..d194313dd 100644
--- a/app/src/main/res/layout/fragment_family.xml
+++ b/app/src/main/res/layout/fragment_family.xml
@@ -327,15 +327,6 @@
                             android:textColor="#B3B3B3"
                             android:textSize="14sp" />
 
-                        <!--<TextView
-                            android:id="@+id/tv_customer_service_id"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="5dp"
-                            android:textColor="@color/color_999999"
-                            android:textSize="12dp"
-                            tools:text="@string/family_customer_service_hint" />-->
-
                     </LinearLayout>
 
                     <ImageView
@@ -396,18 +387,6 @@
 
                 </LinearLayout>
 
-                <!-- <TextView
-                     android:id="@+id/tv_customer_service_hotline"
-                     android:layout_width="match_parent"
-                     android:layout_height="wrap_content"
-                     android:layout_marginTop="5dp"
-                     android:gravity="center_horizontal"
-                     android:paddingTop="@dimen/dp_15"
-                     android:paddingBottom="@dimen/dp_15"
-                     android:textColor="@color/color_999999"
-                     android:textSize="12sp"
-                     tools:text="@string/family_customer_service_hotline" />-->
-
             </LinearLayout>
 
         </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/fragment_recycler_view_bind_no_bg.xml b/app/src/main/res/layout/fragment_recycler_view_bind_no_bg.xml
index 431db4de9..24b8335e5 100644
--- a/app/src/main/res/layout/fragment_recycler_view_bind_no_bg.xml
+++ b/app/src/main/res/layout/fragment_recycler_view_bind_no_bg.xml
@@ -50,7 +50,7 @@
                 android:layout_marginBottom="30dp"
                 android:text="@string/bills_bottom_tips_most_three_month"
                 android:textColor="@color/color_D9FEFEFE"
-                android:textSize="13dp" />
+                android:textSize="@dimen/sp_13" />
         </LinearLayout>
 
     </com.yizhuan.erban.common.widget.StatusLayout>
diff --git a/app/src/main/res/layout/fragment_voice_card.xml b/app/src/main/res/layout/fragment_voice_card.xml
index fe40a0b80..2661a5a77 100644
--- a/app/src/main/res/layout/fragment_voice_card.xml
+++ b/app/src/main/res/layout/fragment_voice_card.xml
@@ -8,14 +8,6 @@
     android:focusable="false"
     android:padding="20dp">
 
-    <!--<android.support.v7.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="30dp"
-        android:focusable="false"
-        card_view:cardCornerRadius="15dp"
-        card_view:cardElevation="2dp">-->
-
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/item_banner.xml b/app/src/main/res/layout/item_banner.xml
index 0769ae6a0..c8198cc58 100644
--- a/app/src/main/res/layout/item_banner.xml
+++ b/app/src/main/res/layout/item_banner.xml
@@ -16,11 +16,7 @@
         android:layout_marginEnd="@dimen/dp_10"
         android:visibility="gone"
         app:rollviewpager_hint_gravity="left"
-        app:rollviewpager_hint_paddingBottom="8dp"
-
-
-        />
-    <!--app:rollviewpager_hint_paddingLeft="@dimen/dp_10"-->
+        app:rollviewpager_hint_paddingBottom="8dp" />
 
     <LinearLayout
         android:id="@+id/ll_panel_container"
diff --git a/app/src/main/res/layout/item_erban_grid_empty.xml b/app/src/main/res/layout/item_erban_grid_empty.xml
index 155ef38c4..0c676a2ce 100644
--- a/app/src/main/res/layout/item_erban_grid_empty.xml
+++ b/app/src/main/res/layout/item_erban_grid_empty.xml
@@ -53,7 +53,7 @@
         android:maxLines="1"
         android:text="@string/layout_item_erban_grid_empty_01"
         android:textColor="@color/color_333333"
-        android:textSize="12dp"
+        android:textSize="@dimen/sp_12"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/square_layout" />
diff --git a/app/src/main/res/layout/item_erban_top_message.xml b/app/src/main/res/layout/item_erban_top_message.xml
index b753a585e..46b7d61c5 100644
--- a/app/src/main/res/layout/item_erban_top_message.xml
+++ b/app/src/main/res/layout/item_erban_top_message.xml
@@ -29,7 +29,7 @@
                 android:maxLines="1"
                 android:ellipsize="end"
                 android:textColor="@color/color_1A1A1A"
-                android:textSize="12.5dp"/>
+                android:textSize="12.5sp"/>
         </LinearLayout>
 
         <View
@@ -53,7 +53,7 @@
                 android:maxLines="1"
                 android:ellipsize="end"
                 android:textColor="@color/color_1A1A1A"
-                android:textSize="12.5dp"/>
+                android:textSize="12.5sp"/>
         </LinearLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/item_exit_room.xml b/app/src/main/res/layout/item_exit_room.xml
index ee0fb077b..113656828 100644
--- a/app/src/main/res/layout/item_exit_room.xml
+++ b/app/src/main/res/layout/item_exit_room.xml
@@ -57,11 +57,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
-            android:drawableStart="@drawable/ic_home_hot_hot"
             android:textColor="@color/white"
             android:drawablePadding="3dp"
             android:textSize="12sp"
-            tools:text="77" />
+            tools:text="77"
+            app:drawableStartCompat="@drawable/ic_home_hot_hot" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_family_currency_bill_date.xml b/app/src/main/res/layout/item_family_currency_bill_date.xml
index ad12251b7..daf4c1018 100644
--- a/app/src/main/res/layout/item_family_currency_bill_date.xml
+++ b/app/src/main/res/layout/item_family_currency_bill_date.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -14,11 +15,11 @@
         android:id="@+id/tv_date"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableRight="@mipmap/ic_family_currency_bill_date_arrow_down"
         android:gravity="left|center_vertical"
         android:textColor="@color/color_333333"
         android:textSize="13sp"
-        tools:text="@string/layout_item_family_currency_bill_date_01" />
+        tools:text="@string/layout_item_family_currency_bill_date_01"
+        app:drawableRightCompat="@mipmap/ic_family_currency_bill_date_arrow_down" />
 
     <TextView
         android:id="@+id/tv_summary"
diff --git a/app/src/main/res/layout/item_family_currency_empty.xml b/app/src/main/res/layout/item_family_currency_empty.xml
index 253411c4e..7af4931fe 100644
--- a/app/src/main/res/layout/item_family_currency_empty.xml
+++ b/app/src/main/res/layout/item_family_currency_empty.xml
@@ -21,6 +21,6 @@
         android:gravity="center"
         android:text="@string/no_list_data"
         android:textColor="@android:color/darker_gray"
-        android:textSize="14dp" />
+        android:textSize="@dimen/sp_14" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_family_game_list.xml b/app/src/main/res/layout/item_family_game_list.xml
index 28fbf1cad..de747ea10 100644
--- a/app/src/main/res/layout/item_family_game_list.xml
+++ b/app/src/main/res/layout/item_family_game_list.xml
@@ -26,7 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="7dp"
         android:textColor="@color/color_1A1A1A"
-        android:textSize="13dp"
+        android:textSize="@dimen/sp_13"
         tools:text="@string/layout_item_family_game_list_01" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_family_list.xml b/app/src/main/res/layout/item_family_list.xml
index 79cbc4c36..a1277e803 100644
--- a/app/src/main/res/layout/item_family_list.xml
+++ b/app/src/main/res/layout/item_family_list.xml
@@ -45,7 +45,7 @@
                 android:layout_marginTop="5dp"
                 android:text="@string/family_id"
                 android:textColor="@color/color_999999"
-                android:textSize="12dp" />
+                android:textSize="@dimen/sp_12" />
 
             <TextView
                 android:layout_marginLeft="17dp"
@@ -55,7 +55,7 @@
                 android:layout_marginTop="5dp"
                 android:text="@string/family_member_count"
                 android:textColor="@color/color_999999"
-                android:textSize="12dp" />
+                android:textSize="@dimen/sp_12" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_family_manage_rv.xml b/app/src/main/res/layout/item_family_manage_rv.xml
index 3e4ea864b..8fff02818 100644
--- a/app/src/main/res/layout/item_family_manage_rv.xml
+++ b/app/src/main/res/layout/item_family_manage_rv.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="60dp"
@@ -22,11 +23,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/dp_10"
-        android:drawableEnd="@drawable/arrow_right"
         android:paddingRight="@dimen/dp_10"
         android:textColor="@color/color_333333"
         android:textSize="14sp"
-        tools:text="@string/layout_item_family_manage_rv_01" />
+        tools:text="@string/layout_item_family_manage_rv_01"
+        app:drawableEndCompat="@drawable/arrow_right" />
 
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_fans_team_task.xml b/app/src/main/res/layout/item_fans_team_task.xml
index 832ef1d41..374a8829a 100644
--- a/app/src/main/res/layout/item_fans_team_task.xml
+++ b/app/src/main/res/layout/item_fans_team_task.xml
@@ -42,7 +42,7 @@
         android:layout_marginTop="4dp"
         android:lines="1"
         android:textColor="@color/color_999999"
-        android:textSize="10sp"
+        android:textSize="@dimen/sp_11"
         app:layout_constraintBottom_toBottomOf="@id/iv_task_logo"
         app:layout_constraintStart_toStartOf="@id/tv_task_title"
         app:layout_constraintTop_toBottomOf="@id/tv_task_title"
@@ -56,7 +56,7 @@
         android:gravity="center"
         android:minWidth="48dp"
         android:textColor="@color/color_999999"
-        android:textSize="10sp"
+        android:textSize="@dimen/sp_11"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/item_friend_black_list_manage.xml b/app/src/main/res/layout/item_friend_black_list_manage.xml
index f2785a657..fdfc50e8b 100644
--- a/app/src/main/res/layout/item_friend_black_list_manage.xml
+++ b/app/src/main/res/layout/item_friend_black_list_manage.xml
@@ -13,7 +13,7 @@
         android:gravity="center"
         android:text="@string/layout_item_friend_black_list_manage_01"
         android:textColor="@color/text_title_color"
-        android:textSize="15dp" />
+        android:textSize="@dimen/sp_15" />
 
 
     <RelativeLayout
@@ -43,7 +43,7 @@
             android:layout_marginLeft="5dp"
             android:layout_toRightOf="@id/iv_avatar"
             android:textColor="@color/text_title_color"
-            android:textSize="15dp"
+            android:textSize="@dimen/sp_15"
             tools:text="@string/layout_item_friend_black_list_manage_02" />
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/treasure_fairy_dialog_exchange.xml b/app/src/main/res/layout/treasure_fairy_dialog_exchange.xml
index 3d6321992..d968d92ab 100644
--- a/app/src/main/res/layout/treasure_fairy_dialog_exchange.xml
+++ b/app/src/main/res/layout/treasure_fairy_dialog_exchange.xml
@@ -101,7 +101,7 @@
         android:lineSpacingMultiplier="0.8"
         android:paddingStart="2dp"
         android:paddingEnd="2dp"
-        android:text="兌換記錄"
+        android:text="@string/fairy_exchange_record"
         android:textColor="@color/white"
         android:textSize="12sp"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/treasure_fairy_dialog_forest_prize.xml b/app/src/main/res/layout/treasure_fairy_dialog_forest_prize.xml
index bd51dc430..f061ad0f1 100644
--- a/app/src/main/res/layout/treasure_fairy_dialog_forest_prize.xml
+++ b/app/src/main/res/layout/treasure_fairy_dialog_forest_prize.xml
@@ -22,7 +22,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="53dp"
-        android:text="意外發現"
+        android:text="@string/fairy_serendipity"
         android:textColor="@color/white"
         android:textSize="15sp"
         android:textStyle="bold"
@@ -53,7 +53,7 @@
         android:layout_marginBottom="42dp"
         android:background="@drawable/treasure_fairy_bg_forest_prize_close"
         android:gravity="center"
-        android:text="關 閉"
+        android:text="@string/fairy_close"
         android:textColor="#ff008573"
         android:textSize="13sp"
         app:layout_constraintBottom_toBottomOf="@id/view_bg"
diff --git a/app/src/main/res/layout/treasure_fairy_dialog_my_fairy_search_friend.xml b/app/src/main/res/layout/treasure_fairy_dialog_my_fairy_search_friend.xml
index d70214bf9..faa35c522 100644
--- a/app/src/main/res/layout/treasure_fairy_dialog_my_fairy_search_friend.xml
+++ b/app/src/main/res/layout/treasure_fairy_dialog_my_fairy_search_friend.xml
@@ -44,7 +44,7 @@
         android:layout_marginEnd="15dp"
         android:background="@drawable/shape_066a6e_20dp_round"
         android:gravity="center_vertical"
-        android:hint="搜索好友"
+        android:hint="@string/fairy_search_friend"
         android:paddingStart="15dp"
         android:paddingEnd="15dp"
         android:textColor="#59FDFF"
diff --git a/app/src/main/res/layout/treasure_fairy_dialog_my_fairy_send.xml b/app/src/main/res/layout/treasure_fairy_dialog_my_fairy_send.xml
index ae705bd1f..b828bb40c 100644
--- a/app/src/main/res/layout/treasure_fairy_dialog_my_fairy_send.xml
+++ b/app/src/main/res/layout/treasure_fairy_dialog_my_fairy_send.xml
@@ -52,7 +52,7 @@
         android:layout_marginBottom="42dp"
         android:background="@drawable/treasure_fairy_bg_my_fairy_send_cancel"
         android:gravity="center"
-        android:text="關 閉"
+        android:text="@string/fairy_close"
         android:textColor="#008573"
         android:textSize="13sp"
         app:layout_constraintBottom_toBottomOf="@id/view_bg"
@@ -67,7 +67,7 @@
         android:layout_marginStart="24dp"
         android:background="@drawable/treasure_fairy_bg_my_fairy_send_buy"
         android:gravity="center"
-        android:text="購 買"
+        android:text="@string/fairy_buy"
         android:textColor="#8A4801"
         android:textSize="13sp"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/treasure_fairy_dialog_test_fairy.xml b/app/src/main/res/layout/treasure_fairy_dialog_test_fairy.xml
index 7b4eec2c4..476480936 100644
--- a/app/src/main/res/layout/treasure_fairy_dialog_test_fairy.xml
+++ b/app/src/main/res/layout/treasure_fairy_dialog_test_fairy.xml
@@ -103,7 +103,7 @@
         android:lineSpacingMultiplier="0.8"
         android:paddingStart="2dp"
         android:paddingEnd="2dp"
-        android:text="試煉記錄"
+        android:text="@string/fairy_trial_record"
         android:textColor="@color/white"
         android:textSize="12sp"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/treasure_fairy_dialog_test_fairy_record.xml b/app/src/main/res/layout/treasure_fairy_dialog_test_fairy_record.xml
index c18b293ce..8a345085e 100644
--- a/app/src/main/res/layout/treasure_fairy_dialog_test_fairy_record.xml
+++ b/app/src/main/res/layout/treasure_fairy_dialog_test_fairy_record.xml
@@ -15,7 +15,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="53dp"
-        android:text="試煉記錄"
+        android:text="@string/fairy_trial_record"
         android:textColor="@color/white"
         android:textSize="15sp" />
 
@@ -29,7 +29,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center"
-            android:text="試煉時間"
+            android:text="@string/fairy_trial_time"
             android:textColor="@color/white"
             android:textSize="13sp" />
 
@@ -38,7 +38,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center"
-            android:text="類型"
+            android:text="@string/fairy_type"
             android:textColor="@color/white"
             android:textSize="13sp" />
 
@@ -47,7 +47,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center"
-            android:text="投入精靈"
+            android:text="@string/fairy_input_wizard"
             android:textColor="@color/white"
             android:textSize="13sp" />
 
@@ -56,7 +56,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center"
-            android:text="獲得獎勵"
+            android:text="@string/fairy_receive_award"
             android:textColor="@color/white"
             android:textSize="13sp" />
 
diff --git a/app/src/main/res/layout/treasure_fairy_dialog_test_fairy_result.xml b/app/src/main/res/layout/treasure_fairy_dialog_test_fairy_result.xml
index 8d0f43b48..83871c52a 100644
--- a/app/src/main/res/layout/treasure_fairy_dialog_test_fairy_result.xml
+++ b/app/src/main/res/layout/treasure_fairy_dialog_test_fairy_result.xml
@@ -22,7 +22,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="53dp"
-        android:text="恭喜獲得"
+        android:text="@string/fairy_congratulations_on_winning"
         android:textColor="@color/white"
         android:textSize="15sp"
         android:textStyle="bold"
@@ -53,7 +53,7 @@
         android:layout_marginBottom="42dp"
         android:background="@drawable/treasure_fairy_bg_forest_prize_close"
         android:gravity="center"
-        android:text="關 閉"
+        android:text="@string/fairy_close"
         android:textColor="#ff008573"
         android:textSize="13sp"
         app:layout_constraintBottom_toBottomOf="@id/view_bg"
diff --git a/app/src/main/res/layout/treasure_fairy_fragment_exchange_debris.xml b/app/src/main/res/layout/treasure_fairy_fragment_exchange_debris.xml
index b5dd2b8ba..501df6b7d 100644
--- a/app/src/main/res/layout/treasure_fairy_fragment_exchange_debris.xml
+++ b/app/src/main/res/layout/treasure_fairy_fragment_exchange_debris.xml
@@ -43,7 +43,7 @@
         android:id="@+id/tv_nickname"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="用戶昵稱~"
+        android:text="@string/fairy_nickname"
         android:textColor="@color/white"
         android:textSize="13sp"
         app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
@@ -63,7 +63,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="我的碎片："
+            android:text="@string/fairy_piece_of_me"
             android:textColor="#ff1f5764"
             android:textSize="12sp" />
 
diff --git a/app/src/main/res/layout/treasure_fairy_fragment_exchange_record_debris.xml b/app/src/main/res/layout/treasure_fairy_fragment_exchange_record_debris.xml
index b69c7f535..737b379b2 100644
--- a/app/src/main/res/layout/treasure_fairy_fragment_exchange_record_debris.xml
+++ b/app/src/main/res/layout/treasure_fairy_fragment_exchange_record_debris.xml
@@ -15,7 +15,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center"
-            android:text="兌換時間"
+            android:text="@string/fairy_time_of_exchange"
             android:textColor="@color/white"
             android:textSize="13sp" />
 
@@ -24,7 +24,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center"
-            android:text="獲得獎勵"
+            android:text="@string/fairy_receive_award"
             android:textColor="@color/white"
             android:textSize="13sp" />
 
diff --git a/app/src/main/res/layout/treasure_fairy_fragment_exchange_record_fairy.xml b/app/src/main/res/layout/treasure_fairy_fragment_exchange_record_fairy.xml
index 77680e2b6..b24f2e25c 100644
--- a/app/src/main/res/layout/treasure_fairy_fragment_exchange_record_fairy.xml
+++ b/app/src/main/res/layout/treasure_fairy_fragment_exchange_record_fairy.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -15,7 +13,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center"
-            android:text="召喚時間"
+            android:text="@string/fairy_call_time"
             android:textColor="@color/white"
             android:textSize="13sp" />
 
@@ -24,7 +22,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center"
-            android:text="類型"
+            android:text="@string/fairy_type"
             android:textColor="@color/white"
             android:textSize="13sp" />
 
@@ -33,7 +31,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center"
-            android:text="獲得獎勵"
+            android:text="@string/fairy_receive_award"
             android:textColor="@color/white"
             android:textSize="13sp" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/treasure_fairy_fragment_forest_record.xml b/app/src/main/res/layout/treasure_fairy_fragment_forest_record.xml
index 74479f835..e82346cc0 100644
--- a/app/src/main/res/layout/treasure_fairy_fragment_forest_record.xml
+++ b/app/src/main/res/layout/treasure_fairy_fragment_forest_record.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -15,7 +13,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center"
-            android:text="試煉時間"
+            android:text="@string/fairy_trial_time"
             android:textColor="@color/white"
             android:textSize="13sp" />
 
@@ -24,7 +22,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center"
-            android:text="類型"
+            android:text="@string/fairy_type"
             android:textColor="@color/white"
             android:textSize="13sp" />
 
@@ -33,7 +31,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center"
-            android:text="獲得獎勵"
+            android:text="@string/fairy_receive_award"
             android:textColor="@color/white"
             android:textSize="13sp" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/treasure_fairy_fragment_my_fairy.xml b/app/src/main/res/layout/treasure_fairy_fragment_my_fairy.xml
index 38a090892..33624ad0f 100644
--- a/app/src/main/res/layout/treasure_fairy_fragment_my_fairy.xml
+++ b/app/src/main/res/layout/treasure_fairy_fragment_my_fairy.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-
     <com.yizhuan.erban.treasurefairy.view.MyFairyItemView
         android:id="@+id/fairy_item_0"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/treasure_fairy_fragment_test_fairy.xml b/app/src/main/res/layout/treasure_fairy_fragment_test_fairy.xml
index cf0a1305f..b0a55eb1e 100644
--- a/app/src/main/res/layout/treasure_fairy_fragment_test_fairy.xml
+++ b/app/src/main/res/layout/treasure_fairy_fragment_test_fairy.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -84,7 +83,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="15dp"
         android:layout_marginTop="30dp"
-        android:text="點擊投入試煉史詩精靈"
+        android:text="@string/fairy_click_into_the_trial_epic_elf"
         android:textColor="@color/color_59fdff"
         android:textSize="12sp"
         app:layout_constraintBottom_toTopOf="@id/view_bg_bottom"
@@ -96,15 +95,15 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="15dp"
-        android:drawableStart="@drawable/treasure_fairy_ic_test_fairy_refresh"
         android:drawablePadding="5dp"
         android:gravity="center"
-        android:text="重新投入"
+        android:text="@string/fairy_recommit"
         android:textColor="@color/color_ffe8aa"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@id/tv_tips"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/tv_tips" />
+        app:layout_constraintTop_toTopOf="@id/tv_tips"
+        app:drawableStartCompat="@drawable/treasure_fairy_ic_test_fairy_refresh" />
 
     <TextView
         android:id="@+id/tv_one_key_add"
@@ -113,7 +112,7 @@
         android:layout_marginEnd="10dp"
         android:background="@drawable/shape_3aeac7_to_fffebb"
         android:gravity="center"
-        android:text="一鍵投入"
+        android:text="@string/fairy_one_click_input"
         android:textColor="#ff1f5764"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@id/tv_tips"
diff --git a/app/src/main/res/layout/treasure_fairy_item_exchange.xml b/app/src/main/res/layout/treasure_fairy_item_exchange.xml
index 711371681..4c8f19376 100644
--- a/app/src/main/res/layout/treasure_fairy_item_exchange.xml
+++ b/app/src/main/res/layout/treasure_fairy_item_exchange.xml
@@ -18,7 +18,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-
     <ImageView
         android:id="@+id/iv_fairy_icon"
         android:layout_width="0dp"
@@ -43,9 +42,9 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:maxLines="1"
-        android:text="精靈球"
+        android:text="@string/fairy_fairy_ball"
         android:textColor="@color/white"
-        android:textSize="12dp"
+        android:textSize="@dimen/sp_12"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
@@ -56,7 +55,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:textColor="#1f5764"
-        android:textSize="10sp"
+        android:textSize="@dimen/sp_11"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/treasure_fairy_item_exchange_debris_record.xml b/app/src/main/res/layout/treasure_fairy_item_exchange_debris_record.xml
index 0619c1ff3..040e208ec 100644
--- a/app/src/main/res/layout/treasure_fairy_item_exchange_debris_record.xml
+++ b/app/src/main/res/layout/treasure_fairy_item_exchange_debris_record.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/treasure_fairy_item_exchange_fairy_record.xml b/app/src/main/res/layout/treasure_fairy_item_exchange_fairy_record.xml
index bc3b5f571..ee5ae36ad 100644
--- a/app/src/main/res/layout/treasure_fairy_item_exchange_fairy_record.xml
+++ b/app/src/main/res/layout/treasure_fairy_item_exchange_fairy_record.xml
@@ -55,5 +55,4 @@
         android:textSize="12sp"
         tools:text="獲得獎勵" />
 
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/treasure_fairy_item_home.xml b/app/src/main/res/layout/treasure_fairy_item_home.xml
index c1656a025..11eb4a822 100644
--- a/app/src/main/res/layout/treasure_fairy_item_home.xml
+++ b/app/src/main/res/layout/treasure_fairy_item_home.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -29,7 +27,7 @@
             android:gravity="center"
             android:includeFontPadding="false"
             android:maxLines="1"
-            android:text="精靈球"
+            android:text="@string/fairy_fairy_ball"
             android:textColor="#FFE8AA"
             android:textSize="@dimen/sp_12" />
 
diff --git a/app/src/main/res/layout/treasure_fairy_item_home_prize.xml b/app/src/main/res/layout/treasure_fairy_item_home_prize.xml
index c56cbb690..97e14a484 100644
--- a/app/src/main/res/layout/treasure_fairy_item_home_prize.xml
+++ b/app/src/main/res/layout/treasure_fairy_item_home_prize.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="5dp"
@@ -32,7 +30,7 @@
             android:paddingTop="3dp"
             android:text="X10"
             android:textColor="#ff1f5764"
-            android:textSize="10sp" />
+            android:textSize="@dimen/sp_11" />
 
     </FrameLayout>
 
@@ -46,7 +44,7 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:maxLines="1"
-        android:text="精靈球"
+        android:text="@string/fairy_fairy_ball"
         android:textColor="#FFE8AA"
         android:textSize="13sp" />
 
diff --git a/app/src/main/res/layout/treasure_fairy_item_home_prize_single.xml b/app/src/main/res/layout/treasure_fairy_item_home_prize_single.xml
index 03456fb7a..fd928f7d7 100644
--- a/app/src/main/res/layout/treasure_fairy_item_home_prize_single.xml
+++ b/app/src/main/res/layout/treasure_fairy_item_home_prize_single.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_marginTop="5dp"
@@ -32,7 +30,7 @@
             android:paddingTop="3dp"
             android:text="X10"
             android:textColor="#ff1f5764"
-            android:textSize="10sp" />
+            android:textSize="@dimen/sp_11" />
 
     </FrameLayout>
 
@@ -46,7 +44,7 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:maxLines="1"
-        android:text="精灵球"
+        android:text="@string/fairy_fairy_ball"
         android:textColor="#FFE8AA"
         android:textSize="13sp" />
 
diff --git a/app/src/main/res/layout/treasure_fairy_item_my_fairy_base.xml b/app/src/main/res/layout/treasure_fairy_item_my_fairy_base.xml
index 611405c23..59a92bf47 100644
--- a/app/src/main/res/layout/treasure_fairy_item_my_fairy_base.xml
+++ b/app/src/main/res/layout/treasure_fairy_item_my_fairy_base.xml
@@ -112,7 +112,7 @@
             android:maxLines="1"
             android:rotationY="180"
             android:textColor="#A4FFFC"
-            android:textSize="15dp"
+            android:textSize="@dimen/sp_15"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -130,7 +130,7 @@
             android:rotationY="180"
             android:text="x0"
             android:textColor="#FFE8AA"
-            android:textSize="11dp"
+            android:textSize="11sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_fairy_name_back" />
diff --git a/app/src/main/res/layout/treasure_fairy_item_my_fairy_epic.xml b/app/src/main/res/layout/treasure_fairy_item_my_fairy_epic.xml
index 7beae7a31..ce73162ac 100644
--- a/app/src/main/res/layout/treasure_fairy_item_my_fairy_epic.xml
+++ b/app/src/main/res/layout/treasure_fairy_item_my_fairy_epic.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical">
@@ -28,9 +27,9 @@
             android:layout_marginTop="30dp"
             android:includeFontPadding="false"
             android:maxLines="1"
-            android:text="小火龍"
+            android:text="@string/fairy_charmander"
             android:textColor="#FFFED6"
-            android:textSize="15dp"
+            android:textSize="@dimen/sp_15"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -44,9 +43,9 @@
             android:gravity="center"
             android:includeFontPadding="false"
             android:maxLines="1"
-            android:text="精靈球"
+            android:text="@string/fairy_fairy_ball"
             android:textColor="#59FDFF"
-            android:textSize="12dp"
+            android:textSize="@dimen/sp_12"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_fairy_name" />
@@ -87,10 +86,10 @@
             android:layout_marginTop="30dp"
             android:includeFontPadding="false"
             android:maxLines="1"
-            android:text="小火龍"
+            android:text="@string/fairy_charmander"
             android:rotationY="180"
             android:textColor="#FFFED6"
-            android:textSize="15dp"
+            android:textSize="@dimen/sp_15"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -104,10 +103,10 @@
             android:gravity="center"
             android:includeFontPadding="false"
             android:maxLines="1"
-            android:text="精靈球"
+            android:text="@string/fairy_fairy_ball"
             android:textColor="#59FDFF"
             android:rotationY="180"
-            android:textSize="11dp"
+            android:textSize="@dimen/sp_11"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_fairy_name_back" />
@@ -175,5 +174,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/treasure_fairy_item_my_fairy_legend.xml b/app/src/main/res/layout/treasure_fairy_item_my_fairy_legend.xml
index 0144fbcc2..5a568d3ce 100644
--- a/app/src/main/res/layout/treasure_fairy_item_my_fairy_legend.xml
+++ b/app/src/main/res/layout/treasure_fairy_item_my_fairy_legend.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -70,7 +69,7 @@
         android:layout_marginTop="30dp"
         android:includeFontPadding="false"
         android:maxLines="1"
-        android:text="小火龍"
+        android:text="@string/fairy_charmander"
         android:textColor="@color/white"
         android:textSize="@dimen/sp_15"
         app:layout_constraintEnd_toEndOf="parent"
@@ -86,7 +85,7 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:maxLines="1"
-        android:text="精靈球"
+        android:text="@string/fairy_fairy_ball"
         android:textColor="#FFE8AA"
         android:textSize="@dimen/sp_12"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/treasure_fairy_item_test_fairy.xml b/app/src/main/res/layout/treasure_fairy_item_test_fairy.xml
index 28a1207da..845dc46cb 100644
--- a/app/src/main/res/layout/treasure_fairy_item_test_fairy.xml
+++ b/app/src/main/res/layout/treasure_fairy_item_test_fairy.xml
@@ -48,7 +48,7 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:maxLines="1"
-        android:text="精靈球"
+        android:text="@string/fairy_fairy_ball"
         android:textColor="#1F5764"
         android:textSize="@dimen/sp_13"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/treasure_fairy_item_test_fairy_record.xml b/app/src/main/res/layout/treasure_fairy_item_test_fairy_record.xml
index 97d1b83a4..b8754af77 100644
--- a/app/src/main/res/layout/treasure_fairy_item_test_fairy_record.xml
+++ b/app/src/main/res/layout/treasure_fairy_item_test_fairy_record.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/treasure_fairy_popup_window_home_more.xml b/app/src/main/res/layout/treasure_fairy_popup_window_home_more.xml
index c311cf97e..eaf9e39f7 100644
--- a/app/src/main/res/layout/treasure_fairy_popup_window_home_more.xml
+++ b/app/src/main/res/layout/treasure_fairy_popup_window_home_more.xml
@@ -12,7 +12,7 @@
         android:layout_height="30dp"
         android:layout_marginTop="22dp"
         android:gravity="center"
-        android:text="規則說明"
+        android:text="@string/fairy_rule_description"
         android:textColor="@color/white"
         android:textSize="13sp" />
 
@@ -21,7 +21,7 @@
         android:layout_width="wrap_content"
         android:layout_height="30dp"
         android:gravity="center"
-        android:text="獎勵記錄"
+        android:text="@string/fairy_reward_record"
         android:textColor="@color/white"
         android:textSize="13sp" />
 
@@ -30,7 +30,7 @@
         android:layout_width="wrap_content"
         android:layout_height="30dp"
         android:gravity="center"
-        android:text="奪寶達人"
+        android:text="@string/fairy_raiders_of_the_treasure"
         android:textColor="@color/white"
         android:textSize="13sp" />
 
diff --git a/app/src/main/res/layout/view_activity_timer.xml b/app/src/main/res/layout/view_activity_timer.xml
index 66c7b3b3f..7f83f1e28 100644
--- a/app/src/main/res/layout/view_activity_timer.xml
+++ b/app/src/main/res/layout/view_activity_timer.xml
@@ -24,5 +24,5 @@
         android:layout_weight="1"
         android:gravity="center"
         android:textColor="@color/color_FFF044"
-        android:textSize="@dimen/dp_13" />
+        android:textSize="@dimen/sp_13" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_give_gold_password.xml b/app/src/main/res/layout/view_give_gold_password.xml
index e559b35f1..75080026b 100644
--- a/app/src/main/res/layout/view_give_gold_password.xml
+++ b/app/src/main/res/layout/view_give_gold_password.xml
@@ -46,14 +46,14 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="3dp"
-            android:drawableLeft="@drawable/ic_redpackage_bigdiamond"
             android:drawablePadding="@dimen/dp_8"
             android:gravity="center"
             android:includeFontPadding="false"
             android:textColor="#333333"
             android:textSize="28sp"
             android:visibility="gone"
-            tools:text="20000" />
+            tools:text="20000"
+            app:drawableLeftCompat="@drawable/ic_redpackage_bigdiamond" />
 
         <TextView
             android:id="@+id/tv_rate"
@@ -62,7 +62,7 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="10dp"
             android:textColor="#333333"
-            android:textSize="10sp" />
+            android:textSize="@dimen/sp_11" />
 
         <com.yizhuan.erban.pay.widget.GridPasswordNoFocusView
             android:id="@+id/view_password"
@@ -83,7 +83,7 @@
             android:id="@+id/tv_forgetPwd"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="right"
+            android:layout_gravity="end"
             android:layout_margin="13dp"
             android:text="@string/layout_view_give_gold_password_02"
             android:textColor="#EA3B36"
diff --git a/app/src/main/res/layout/view_main_home_load_more.xml b/app/src/main/res/layout/view_main_home_load_more.xml
index 64f6d50b1..b2caafaf1 100644
--- a/app/src/main/res/layout/view_main_home_load_more.xml
+++ b/app/src/main/res/layout/view_main_home_load_more.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="@dimen/dp_40"
     android:paddingBottom="@dimen/dp_5"
@@ -13,14 +14,14 @@
         android:layout_centerInParent="true"
         android:background="@drawable/bg_main_get_more"
         android:drawablePadding="@dimen/dp_5"
-        android:drawableRight="@mipmap/ic_arrow_load_more"
         android:gravity="center"
         android:paddingEnd="@dimen/dp_15"
         android:paddingStart="@dimen/dp_15"
         android:text="@string/pull_down_get_more"
         android:textColor="@color/color_666666"
         android:textCursorDrawable="@null"
-        android:textSize="13sp" />
+        android:textSize="13sp"
+        app:drawableRightCompat="@mipmap/ic_arrow_load_more" />
 
 
     <LinearLayout
@@ -34,12 +35,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="?android:attr/progressBarStyleSmall"
-            android:layout_marginRight="@dimen/dp_4"/>
+            android:layout_marginEnd="@dimen/dp_4"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_4"
+            android:layout_marginStart="@dimen/dp_4"
             android:text="@string/loading"
             android:textColor="@android:color/black"
             android:textSize="@dimen/sp_14"/>
diff --git a/app/src/main/res/layout/view_password.xml b/app/src/main/res/layout/view_password.xml
index 38ee59099..fec5712da 100644
--- a/app/src/main/res/layout/view_password.xml
+++ b/app/src/main/res/layout/view_password.xml
@@ -18,19 +18,19 @@
                 android:layout_width="25dp"
                 android:layout_height="25dp"
                 android:layout_centerVertical="true"
-                android:layout_marginLeft="10dp"
+                android:layout_marginStart="10dp"
                 android:background="@drawable/ic_pwd_close"/>
             <TextView
                 android:id="@+id/tv_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
-                android:layout_marginLeft="15dp"
+                android:layout_marginStart="15dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="4dp"
                 android:text="@string/layout_view_password_01"
                 android:textColor="@color/color_000000"
-                android:textSize="18dp"/>
+                android:textSize="@dimen/sp_18"/>
         </RelativeLayout>
         <View
             android:layout_width="match_parent"
@@ -54,7 +54,7 @@
             android:id="@+id/tv_forgetPwd"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="right"
+            android:layout_gravity="end"
             android:layout_margin="15dp"
             android:text="@string/layout_view_password_02"
             android:textColor="@color/blue"/>
diff --git a/app/src/main/res/layout/vs_hiparty_room_first_show_layout.xml b/app/src/main/res/layout/vs_hiparty_room_first_show_layout.xml
index 8cdc895c8..5016ef92b 100644
--- a/app/src/main/res/layout/vs_hiparty_room_first_show_layout.xml
+++ b/app/src/main/res/layout/vs_hiparty_room_first_show_layout.xml
@@ -13,7 +13,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_marginTop="24dp"
-            android:textSize="15dp"
+            android:textSize="@dimen/sp_15"
             android:text="@string/layout_vs_hiparty_room_first_show_layout_01"
             android:layout_gravity="center_horizontal|bottom"
             android:textColor="@color/white"
@@ -21,7 +21,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_marginTop="8dp"
-            android:textSize="15dp"
+            android:textSize="@dimen/sp_15"
             android:text="@string/layout_vs_hiparty_room_first_show_layout_02"
             android:layout_gravity="center_horizontal|bottom"
             android:textColor="@color/color_7154EE"
diff --git a/app/src/main/res/layout/wallet_fragment_jewel.xml b/app/src/main/res/layout/wallet_fragment_jewel.xml
index 361e93ac3..fdf2c7fff 100644
--- a/app/src/main/res/layout/wallet_fragment_jewel.xml
+++ b/app/src/main/res/layout/wallet_fragment_jewel.xml
@@ -80,9 +80,9 @@
         android:layout_width="174dp"
         android:layout_height="25dp"
         android:layout_above="@id/wallet_jewel_exchange"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_marginBottom="8dp"
-        android:layout_marginRight="15dp"
+        android:layout_marginEnd="15dp"
         android:scaleType="fitEnd"
         android:src="@drawable/icon_exchange_tip" />
 
diff --git a/app/src/main/res/layout/withdraw_item.xml b/app/src/main/res/layout/withdraw_item.xml
index 5c395aed6..a690ff14a 100644
--- a/app/src/main/res/layout/withdraw_item.xml
+++ b/app/src/main/res/layout/withdraw_item.xml
@@ -18,7 +18,7 @@
             android:id="@+id/tv_jewel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="3dp"
+            android:layout_marginStart="3dp"
             tools:text="@string/layout_withdraw_item_01"
             android:textColor="@color/text_color_secondary"
             android:textSize="@dimen/font_large"/>
@@ -33,36 +33,3 @@
         android:textSize="@dimen/font_small"/>
 
 </LinearLayout>
-
-    <!--
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="44dp">
-            <ImageView
-                android:id="@+id/select_withdraw"
-                android:layout_width="23dp"
-                android:layout_height="23dp"
-                android:background="@drawable/withdraw_selector"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="15dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                />
-            <TextView
-                android:id="@+id/list_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_toRightOf="@+id/select_withdraw"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="10dp"
-                android:text="@string/layout_withdraw_item_02"
-                android:textSize="15dp"
-                android:textColor="#333333"
-                />
-        </RelativeLayout>
-    </LinearLayout>
-    -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 823935cb7..bab05583c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4965,6 +4965,7 @@
     <string name="all">全部</string>
     <string name="time">次</string>
     <string name="empty_data">暫無數據</string>
+    <string name="empty_data_what">暫無數據～</string>
     <string name="select_area_code">選擇區号</string>
     <string name="login_input_code">輸入驗證碼</string>
     <string name="bound_auth_code_is_empty">授权號不能為空</string>
@@ -5078,5 +5079,186 @@
     <string name="treasure_to_charge">去充值</string>
     <string name="treasure_in_find_love">通過尋愛之旅</string>
     <string name="give_application_storage_permission">請給予應用存儲權限，以正常保存圖片。</string>
+    <string name="message_amazing">厲害了！</string>
+    <string name="message_good_luck">好運爆棚！</string>
+    <string name="message_primary_call">初級召喚</string>
+    <string name="message__epic_call">史詩召喚</string>
+    <string name="message_legend_call">傳說召喚</string>
+    <string name="message_to_join">\u3000去參加!</string>
+    <string name="message_In_the_raiders_of_the_treasure">在奪寶精靈中\u3000</string>
+    <string name="message_obtained_in_raiders_of_the_treasure">\u3000在奪寶精靈中獲得\u3000</string>
+    <string name="message_congratulation">\u3000恭喜\u3000</string>
+    <string name="message_In_the_room">\u3000在房間內</string>
+    <string name="message_renew">續費</string>
+    <string name="message_open">開通</string>
+    <string name="message_sign_in_for_millions">【簽到瓜分百萬】哇塞，恭喜\u3000</string>
+    <string name="message_sign_in_acquisition">簽到獲得\u3000</string>
+    <string name="message_diamond">鉆石</string>
+    <string name="message_me">我</string>
+    <string name="message_in_the_monster_room">你已經在怪獸房間內</string>
+    <string name="message_collect_success">收藏成功!</string>
+    <string name="message_lucky_number_reached">幸運值達到</string>
+    <string name="message_get_a_fairy_ball">后，下次奪寶獲贈精靈球</string>
+    <string name="message_buy_a_limited_time_dress_up_event_ticket">購買限時裝扮活動奪寶券</string>
+    <string name="message_participate">去參与</string>
+    <string name="message_cancel">取消</string>
+    <string name="fairy_year_month_day">yyyy年MM月dd日 HH時mm分ss秒</string>
+    <string name="fairy_your_gun">了你</string>
+    <string name="fairy_a_sheet_of">一張</string>
+    <string name="fairy_genie_card">精靈卡</string>
+    <string name="fairy_epic_trial">史詩試煉</string>
+    <string name="fairy_legend_test">傳說試煉</string>
+    <string name="fairy_not_enough_fairy_balls">精靈球數量不足</string>
+    <string name="fairy_primary_ball_x1">(初級球X1)</string>
+    <string name="fairy_primary_ball_x10">(初級球X10)</string>
+    <string name="fairy_chance_to_catch_sprite">使用初級球有一定幾率抓到初級精靈</string>
+    <string name="fairy_super_ball_x1">(超級球X1)</string>
+    <string name="fairy_super_ball_x10">(超級球X10)</string>
+    <string name="fairy_catch_an_epic_elf_with_the_super_ball">使用超級球有一定幾率抓到史詩精靈</string>
+    <string name="fairy_master_ball_x1">(大師球X1)</string>
+    <string name="fairy_master_ball_x10">(大師球X10)</string>
+    <string name="fairy_master_ball_to_capture_the_fairy_legend">使用大師球必定抓到傳說精靈</string>
+    <string name="fairy_congratulations_on_winning">恭喜獲得</string>
+    <string name="fairy_serendipity">意外發現</string>
+    <string name="fairy_definite_gift">確定贈送</string>
+    <string name="fairy_definite_direction">確定向</string>
+    <string name="fairy_ask_for">索要</string>
+    <string name="fairy_genie_card_what">精靈卡嗎？</string>
+    <string name="fairy_give_away_blank">贈 送</string>
+    <string name="fairy_ask_for_blank">索 要</string>
+    <string name="fairy_you_would_like_to_exchange">您將要兌換</string>
+    <string name="fairy_convert_success">兌換成功~</string>
+    <string name="fairy_primary_common_forest">初級森林</string>
+    <string name="fairy_epic_common_forest">史詩森林</string>
+    <string name="fairy_legend_common_forest">史詩森林</string>
+    <string name="fairy_click_to_enter_the_trial_fairy_legend">點擊投入試煉傳說精靈</string>
+    <string name="fairy_exchange_record">兌換記錄</string>
+    <string name="fairy_close">關 閉</string>
+    <string name="fairy_search_friend">搜索好友</string>
+    <string name="fairy_buy">購 買</string>
+    <string name="fairy_trial_record">試煉記錄</string>
+    <string name="fairy_trial_time">試煉時間</string>
+    <string name="fairy_type">類型</string>
+    <string name="fairy_input_wizard">投入精靈</string>
+    <string name="fairy_receive_award">獲得獎勵</string>
+    <string name="fairy_nickname">用戶昵稱~</string>
+    <string name="fairy_piece_of_me">我的碎片：</string>
+    <string name="fairy_time_of_exchange">兌換時間</string>
+    <string name="fairy_call_time">召喚時間</string>
+    <string name="fairy_click_into_the_trial_epic_elf">點擊投入試煉史詩精靈</string>
+    <string name="fairy_recommit">重新投入</string>
+    <string name="fairy_one_click_input">一鍵投入</string>
+    <string name="fairy_charmander">小火龍</string>
+    <string name="fairy_rule_description">規則說明</string>
+    <string name="fairy_reward_record">獎勵記錄</string>
+    <string name="fairy_raiders_of_the_treasure">奪寶達人</string>
+    <string name="swift_code_bic">Swift code/BIC:</string>
+    <string name="bank_name_what">bank name:</string>
+    <string name="account_number">account number:</string>
+    <string name="account_name">account name:</string>
+    <string name="address">address:</string>
+    <string name="city">city:</string>
+    <string name="province">province:</string>
+    <string name="post_code">post code:</string>
+    <string name="message_expired">消息已過期</string>
+    <string name="message_processed">消息已處理</string>
+    <string name="failed_to_obtain_the_verification_code">獲取驗證碼失敗</string>
+    <string name="micro_compere">主持人</string>
+    <string name="micro_select">選</string>
+    <string name="micro_number">號</string>
+    <string name="micro_have_select">已選擇</string>
+    <string name="micro_no_select">未選擇</string>
+    <string name="divine_value">神豪值:</string>
+    <string name="charm_value">魅力值:</string>
+    <string name="peko_number">Peko號:</string>
+    <string name="after_the_release">发布后，</string>
+    <string name="do_not_broadcast_within_minutes">分钟内不可再发布广播</string>
+    <string name="you_can_publish_it_again">后可以再次发布</string>
+    <string name="data_loading_please_wait">数据加载中,请稍后…</string>
+    <string name="the_input_content_cannot_be_less_than">输入内容不能少于</string>
+    <string name="a_world">个字!</string>
+    <string name="send_success">发送成功</string>
+    <string name="input_content_cannot_be_less_than">输入内容不能少于</string>
+    <string name="please_speak_civilized_oh">个字，请文明发言哦~</string>
+    <string name="only_after_the_permission_is_enabled">開啟權限後才能開麥</string>
+    <string name="you_have_to_do_it_on_the_mic">上麥才能發表情哦!</string>
+    <string name="public_screen_in_the_room_is_closed">房間公屏已關閉</string>
+    <string name="send_too_often">你發送的太頻繁啦，請稍後再試</string>
+    <string name="focus_failure">關註失敗，請稍後重試</string>
+    <string name="not_yet_given">尚未達到贈送</string>
+    <string name="rank_of_nobility_required">所需貴族等級,所需貴族等級:</string>
+    <string name="maria_bartiromo">當主持人</string>
+    <string name="up_micro">上麥</string>
+    <string name="not_change_wheat_in_the_game">遊戲中不可以換麥!</string>
+    <string name="please_give_the_microphone_permission">請給予麥克風權限後再試!</string>
+    <string name="something_abnormal_happens">發生一些異常,請稍後重試!</string>
+    <string name="fans_club">粉絲團(</string>
+    <string name="fans_lv">粉絲LV.</string>
+    <string name="open_a_fan_club">開通粉絲團</string>
+    <string name="the_anchor_has_not_yet_opened_the_fan_group">該主播暫未開通粉絲團</string>
+    <string name="the_system_detects_suspected_violations">系統檢測涉嫌違規，予以關閉公屏消息警告</string>
+    <string name="the_administrator_has_closed">管理員已關閉聊天公屏</string>
+    <string name="administrator_has_enabled_the_chat_public_screen">管理員已開啟聊天公屏</string>
+    <string name="already_received">已領取</string>
+    <string name="individual">個</string>
+    <string name="total_amount_not_less_than">紅包總金額不低於</string>
+    <string name="must_be_a_multiple_of_10">鉆石，且必須為10的倍數</string>
+    <string name="must_be_a_multiple_of_100">鉆石，且必須為10的倍數</string>
+    <string name="the_present_is_a_lucky_red_envelope">當前為手氣紅包，</string>
+    <string name="change_to_gift_red_envelope">改為禮物紅包</string>
+    <string name="the_present_is_a_gift_red_envelope">當前為禮物紅包，</string>
+    <string name="change_to_lucky_money">改為手氣紅包</string>
+    <string name="the_number_of_red_packets_cannot_be_less_than">紅包數量不能小於</string>
+    <string name="or_greater_than">或大於</string>
+    <string name="diamonds_must_be_a_multiple_of_100">鉆石數必須為100的倍數!</string>
+    <string name="diamonds_must_be_a_multiple_of_10">鉆石數必須為10的倍數!</string>
+    <string name="diamonds_should_not_be_less_than">鉆石數量不能小於</string>
+    <string name="single_red_packet_is_too_low">單個紅包金額過低</string>
+    <string name="may_you_come_into_a_good_fortune">恭喜發財，大吉大利！</string>
+    <string name="pk_value">PK值:</string>
+    <string name="off_line">離線</string>
+    <string name="pk_now">PK中</string>
+    <string name="select">選擇</string>
+    <string name="at_least_exchange">至少需要兌換</string>
+    <string name="diamonds_exchanged_must_not_exceed">兌換鉆石數不能超過</string>
+    <string name="need_to_withdraw_money">至少需要提現</string>
+    <string name="the_withdrawal_cannot_exceed">提現不能超過</string>
+    <string name="join_the_fan_club_successfully">加入粉絲團成功!</string>
+    <string name="intimacy_value_lv">親密值Lv.</string>
+    <string name="quit_the_fan_club_successfully">退出粉絲團成功!</string>
+    <string name="rejoin_a_fan_club_for_24_hours_after_you_quit">退出後粉絲團後24小時內不能再次加入,確定退出嗎?</string>
+    <string name="please_try_again">播放出錯，請重試</string>
+    <string name="unmanaged_rooms">暫無管理的房間</string>
+    <string name="transfer_to">轉贈給:</string>
+    <string name="please_write_in">請在</string>
+    <string name="expired_automatically_invalid">內決定，過期自動失效！</string>
+    <string name="whether">是否</string>
+    <string name="become_cp">成為CP？</string>
+    <string name="consent_will_automatically_decline_other_invitations">（同意將自動拒絕其他邀請）</string>
+    <string name="invite_you_to_enter_into_cp_relationship">邀請你達成CP關系，是否同意？</string>
+    <string name="at_best_can_only_choose">最多只能选择</string>
+    <string name="nape">项</string>
+    <string name="the_furnace_is_full">試煉爐已滿!</string>
+    <string name="caught_the_sprite_yet">你還未捕捉到該精靈</string>
+    <string name="not_enough_sprites">精靈數量不足</string>
+    <string name="has_been_sent_to_a_friend">已向好友發送索要信息</string>
+    <string name="gift_success">贈送成功!</string>
+    <string name="definite_send_out">確定送出</string>
+    <string name="relationship_with_the_ta">禮物與Ta結成CP關系嗎？</string>
+    <string name="the_diamond_will_be_returned">（若對方拒接或24小時未同意，鉆石將會返還）</string>
+    <string name="diamond_balance_is_insufficient">鉆石余額不足，請前去充值！</string>
+    <string name="please_enter_the_amount_of_diamonds_exchanged">請輸入兌換的鉆石數量 (最多可兌換%1$s)</string>
+    <string name="empty_diamond">0鉆石</string>
+    <string name="summon_at_primary_level_in_the_raiders">\u3000在奪寶精靈中初級召喚\u3000</string>
+    <string name="epic_call_in_the_raider_of_the_treasure">\u3000在奪寶精靈中史詩召喚\u3000</string>
+    <string name="called_in_the_legend_of_the_raiders">\u3000在奪寶精靈中傳說召喚\u3000</string>
+    <string name="residue_degree">剩餘次數</string>
+    <string name="not_use_the_loudspeaker_within_1_minute">發布後，1分鐘內不可使用小喇叭～</string>
+    <string name="you_can_use_the_loudspeaker_again">後可再次使用喇叭喊話~</string>
+    <string name="congratulations_on_becoming">恭喜你成為</string>
+    <string name="want_to_keep_the_original_dress">！當前已自動佩戴該等級裝扮，是否保留原有裝扮？</string>
+    <string name="god">男神</string>
+    <string name="goddess">女神</string>
+    <string name="place">位</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt
index 68649177a..3d76ef7d6 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt
@@ -37,7 +37,12 @@ class SuperAdminAddActivity : BaseViewBindingActivity<ActivitySuperAdminAddBindi
         rvDelegate = RVDelegate.Builder<SuperAdminInfo>()
             .setLayoutManager(LinearLayoutManager(context))
             .setRecyclerView(binding.recyclerView)
-            .setEmptyView(EmptyViewHelper.createEmptyTextView(context, ResUtil.getString(R.string.hall_activity_superadminaddactivity_01)))
+            .setEmptyView(
+                EmptyViewHelper.createEmptyTextView(
+                    context,
+                    ResUtil.getString(R.string.hall_activity_superadminaddactivity_01)
+                )
+            )
             .setAdapter(adminAdapter)
             .build()
 
@@ -45,7 +50,11 @@ class SuperAdminAddActivity : BaseViewBindingActivity<ActivitySuperAdminAddBindi
             if (view.id == R.id.tv_set) {
                 adminAdapter.getItem(position)?.let {
                     dialogManager.showOkCancelDialog(
-                        "確定要添加用戶 ${it.nick} (PekoID:${it.erbanNo})為公會超級管理員嗎?",
+                        "${getString(R.string.make_sure_you_want_to_add_a_user)} ${it.nick} (PekoID:${it.erbanNo})${
+                            getString(
+                                R.string.is_he_the_super_administrator_of_the_guild
+                            )
+                        }",
                         true
                     ) {
                         SuperAdminRoomSetActivity.start(this, clanId, it.uid)
@@ -58,7 +67,7 @@ class SuperAdminAddActivity : BaseViewBindingActivity<ActivitySuperAdminAddBindi
         binding.tvSearch.setOnClickListener {
             val id = binding.searchEdit.text?.toString()?.toLongOrNull()
             if (id == null) {
-                "請輸入ID!".toast()
+                getString(R.string.please_input_id).toast()
             } else {
                 searchId = id
                 loadData()
@@ -85,7 +94,7 @@ class SuperAdminAddActivity : BaseViewBindingActivity<ActivitySuperAdminAddBindi
         HallModel.get().searchSuperAdminInfo(searchId)
             .compose(bindToLifecycle())
             .subscribe({
-                rvDelegate.setNewData(listOf(it).filter {data -> data.erbanNo?.isNotEmpty() == true })
+                rvDelegate.setNewData(listOf(it).filter { data -> data.erbanNo?.isNotEmpty() == true })
             }, {
                 it.message.toast()
             })
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminManageActivity.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminManageActivity.kt
index aea931684..004291a49 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminManageActivity.kt
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminManageActivity.kt
@@ -49,7 +49,12 @@ class SuperAdminManageActivity : BaseViewBindingActivity<ActivitySuperAdminManeg
             .setLayoutManager(LinearLayoutManager(context))
             .setRecyclerView(binding.recyclerView)
             .setPageSize(pageSize)
-            .setEmptyView(EmptyViewHelper.createEmptyTextView(context, ResUtil.getString(R.string.hall_activity_superadminmanageactivity_02)))
+            .setEmptyView(
+                EmptyViewHelper.createEmptyTextView(
+                    context,
+                    ResUtil.getString(R.string.hall_activity_superadminmanageactivity_02)
+                )
+            )
             .setAdapter(adminAdapter)
             .build()
 
@@ -96,13 +101,19 @@ class SuperAdminManageActivity : BaseViewBindingActivity<ActivitySuperAdminManeg
             popupWindow.dismiss()
         }
         contentView.findViewById<View>(R.id.tv_remove).setOnClickListener {
-            dialogManager.showOkCancelDialog("確定要移除 ${superAdminInfo.nick} 的公會超級管理員身份嗎?",true) {
+            dialogManager.showOkCancelDialog(
+                "${getString(R.string.make_sure_to_remove)}${superAdminInfo.nick}${
+                    getString(
+                        R.string.super_administrator_of_the_guild
+                    )
+                }", true
+            ) {
                 popupWindow.dismiss()
                 HallModel.get().removeSuperAdmin(superAdminInfo.uid)
                     .compose(bindToLifecycle())
                     .subscribe({
                         adminAdapter.remove(position)
-                        "移除成功".toast()
+                        getString(R.string.remove_success).toast()
                     }, {
                         it.message.toast()
                     })
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageSuperAdminAdapter.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageSuperAdminAdapter.kt
index b59396135..75a92d302 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageSuperAdminAdapter.kt
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageSuperAdminAdapter.kt
@@ -32,7 +32,7 @@ class ManageSuperAdminAdapter :
                     )
                 )
                 .setRecyclerView(rvRoom)
-                .setEmptyView(EmptyViewHelper.createEmptyTextView(mContext, "暫無管理的房間"))
+                .setEmptyView(EmptyViewHelper.createEmptyTextView(mContext, mContext.getString(R.string.unmanaged_rooms)))
                 .setAdapter(ManageRoomAdapter())
                 .build()
         }
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java
index 3e2f42cd6..1b04de172 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java
@@ -260,9 +260,9 @@ public class HallMsgViewHolder extends MsgViewHolderBase {
                     @Override
                     public void onErrorMsg(String error) {
                         SingleToastUtil.showToast(error);
-                        if (error.equals("消息已過期")) {
+                        if (error.equals(context.getString(R.string.message_expired))) {
                             info.setType(HallImMsgInfo.MSG_TYPE_OUT_OF_DATE);
-                        } else if (error.equals("消息已處理")) {
+                        } else if (error.equals(context.getString(R.string.message_processed))) {
                             info.setType(HallImMsgInfo.MSG_TYPE_HAS_HANDLE);
                         }
                         setMsgTypeView(info, second);
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java
index f94b09cc5..254f71339 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java
@@ -118,7 +118,7 @@ public class DayIncomeFragment extends BaseMvpFragment<IIncomeView, IncomePresen
             mIncomeAdapter.setNewData(incomeTotalInfo.getVos());
             mIncomeAdapter.notifyDataSetChanged();
         } else {
-            showNoData("暫無數據～");
+            showNoData(getString(R.string.empty_data_what));
         }
 
     }
@@ -126,7 +126,7 @@ public class DayIncomeFragment extends BaseMvpFragment<IIncomeView, IncomePresen
     @Override
     public void incomeTotalFail(String message) {
         hideStatus();
-        showNoData("暫無數據～");
+        showNoData(getString(R.string.empty_data_what));
         setTotal(0);
         mIncomeAdapter.setNewData(null);
         mIncomeAdapter.notifyDataSetChanged();
diff --git a/app/src/module_labour_union/res/values/strings.xml b/app/src/module_labour_union/res/values/strings.xml
index 79cba6b82..4bb1cfbee 100644
--- a/app/src/module_labour_union/res/values/strings.xml
+++ b/app/src/module_labour_union/res/values/strings.xml
@@ -26,4 +26,11 @@
     <string name="lu_hteam_has_mute_num">已禁言人數 : %d人</string>
     <string name="lu_hteam_manager_num">群管理人數 : %d人</string>
 
+    <string name="make_sure_you_want_to_add_a_user">確定要添加用戶\u3000</string>
+    <string name="is_he_the_super_administrator_of_the_guild">為公會超級管理員嗎?</string>
+    <string name="please_input_id">請輸入ID!</string>
+    <string name="make_sure_to_remove">確定要移除\u3000</string>
+    <string name="super_administrator_of_the_guild">\u3000的公會超級管理員身份嗎?</string>
+    <string name="remove_success">移除成功</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/test/java/com/yizhuan/erban/ExampleUnitTest.java b/app/src/test/java/com/yizhuan/erban/ExampleUnitTest.java
index 979f5711d..acbf4d2a3 100644
--- a/app/src/test/java/com/yizhuan/erban/ExampleUnitTest.java
+++ b/app/src/test/java/com/yizhuan/erban/ExampleUnitTest.java
@@ -159,7 +159,7 @@ public class ExampleUnitTest {
 
     private void unicodeToUtf16Fun2() {
         print(ResUtil.getString(R.string.yizhuan_erban_exampleunittest_09));
-        String emojiUnico = "1F601ResUtil.getString(R.string.yizhuan_erban_exampleunittest_010)\uD83D\uDE01"
+        String emojiUnico = "1F601ResUtil.getString(R.string.yizhuan_erban_exampleunittest_010)\uD83D\uDE01";
         int hexVaild = 0x1f601;
         printBinaryString(Integer.toBinaryString(hexVaild));
         hexVaild = hexVaild - 0x10000;
@@ -207,7 +207,7 @@ public class ExampleUnitTest {
         final int HighOffset = Integer.valueOf("D7C0", 16);
         // low offset
         final int LowOffset = Integer.valueOf("DC00", 16);
-        String emojiUnico = "1F601ResUtil.getString(R.string.yizhuan_erban_exampleunittest_014)\uD83D\uDE01"
+        String emojiUnico = "1F601ResUtil.getString(R.string.yizhuan_erban_exampleunittest_014)\uD83D\uDE01";
         int value = Integer.valueOf(emojiUnico, 16);
         print(ResUtil.getString(R.string.yizhuan_erban_exampleunittest_015) + value);
         String binaryString = Integer.toBinaryString(value);
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
index d57c71f10..df40dcac5 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
+++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
@@ -1328,13 +1328,13 @@ public final class IMNetEaseManager {
                         if (second == CUSTOM_MSG_LUCKY_SEA_GIFT_ROOM_NOTIFY) {
                             addMessages(msg);
                             noticeRoomEvent(msg, RoomEvent.LUCKY_SEA_GIFT_ROOM_NOTIFY);
-                        }else if(second == CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_NOTIFY){
+                        } else if (second == CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_NOTIFY) {
                             addMessages(msg);
                             noticeRoomEvent(msg, RoomEvent.LUCKY_SEA_GIFT_SERVER_NOTIFY);
                         }
                         break;
                     case ROOM_FREE_GIFT:
-                        if(second == ROOM_FREE_GIFT_CHANGE){
+                        if (second == ROOM_FREE_GIFT_CHANGE) {
                             RoomFreeGiftAttachment freeGiftAttachment = (RoomFreeGiftAttachment) attachment;
                             RoomFreeGiftMsgBean bean = freeGiftAttachment.getRoomFreeGiftMsgInfo();
                             EventBus.getDefault().post(new UpdateKnapFreeGiftDataEvent(bean));
@@ -1919,7 +1919,7 @@ public final class IMNetEaseManager {
         chatRoomMessage.setNIMAntiSpamOption(antiSpamOption);
         if (AntiSpamUtil.checkLocalAntiSpam(chatRoomMessage)) {
             EventBus.getDefault().post(new AntiSpamEvent());
-            return Single.error(new AntiSpamHitException("檢測到敏感詞，需要過濾，不能發送"));
+            return Single.error(new AntiSpamHitException(ResUtil.getString(R.string.sensitive_word_detected)));
         } else {
             return sendChatRoomMessage(chatRoomMessage, false);
         }
@@ -2057,7 +2057,7 @@ public final class IMNetEaseManager {
 
                                 @Override
                                 public void onFailed(int code) {
-                                    e.onError(new Exception("錯誤碼: " + code));
+                                    e.onError(new Exception(ResUtil.getString(R.string.error_code) + code));
                                 }
 
                                 @Override
@@ -2170,9 +2170,9 @@ public final class IMNetEaseManager {
                     @Override
                     public void onFailed(int i) {
                         if (i == 417) {
-                            SingleToastUtil.showToast("重復操作~");
+                            SingleToastUtil.showToast(ResUtil.getString(R.string.repetitive_operation));
                         } else {
-                            SingleToastUtil.showToast(BasicConfig.INSTANCE.getAppContext(), "操作失敗，請重試");
+                            SingleToastUtil.showToast(BasicConfig.INSTANCE.getAppContext(), ResUtil.getString(R.string.please_try_again));
                         }
                         if (callBack != null) {
                             callBack.onFail(i, "");
@@ -2181,7 +2181,7 @@ public final class IMNetEaseManager {
 
                     @Override
                     public void onException(Throwable throwable) {
-                        SingleToastUtil.showToast(BasicConfig.INSTANCE.getAppContext(), "操作失敗，請重試");
+                        SingleToastUtil.showToast(BasicConfig.INSTANCE.getAppContext(), ResUtil.getString(R.string.please_try_again));
                         if (callBack != null) {
                             callBack.onFail(-1, throwable.getMessage());
                         }
@@ -2211,9 +2211,9 @@ public final class IMNetEaseManager {
                     @Override
                     public void onFailed(int i) {
                         if (i == 417) {
-                            SingleToastUtil.showToast(mark ? "對方已經是管理員了" : "移除管理員成功");
+                            SingleToastUtil.showToast(mark ? ResUtil.getString(R.string.already_the_administrator) : ResUtil.getString(R.string.succeeded_in_removing_an_administrator));
                         } else {
-                            SingleToastUtil.showToast("操作失敗，請重試");
+                            SingleToastUtil.showToast(ResUtil.getString(R.string.please_try_again));
                         }
                         if (callBack != null) {
                             callBack.onFail(i, "");
@@ -2222,7 +2222,7 @@ public final class IMNetEaseManager {
 
                     @Override
                     public void onException(Throwable throwable) {
-                        SingleToastUtil.showToast(BasicConfig.INSTANCE.getAppContext(), "操作失敗，請重試");
+                        SingleToastUtil.showToast(BasicConfig.INSTANCE.getAppContext(), ResUtil.getString(R.string.please_try_again));
                         if (callBack != null) {
                             callBack.onFail(-1, throwable.getMessage());
                         }
@@ -2246,7 +2246,7 @@ public final class IMNetEaseManager {
                     @Override
                     public void onSuccess(Entry<String, String> stringStringEntry) {
                         if (callBack != null)
-                            callBack.onSuccess("下麥成功");
+                            callBack.onSuccess(ResUtil.getString(R.string.successful_harvest));
 
                         //下麥接口
                         GiftValueMrg.get().requestDownMic(micPosition, downMicUid);
@@ -2256,14 +2256,14 @@ public final class IMNetEaseManager {
                     @Override
                     public void onFailed(int i) {
                         if (callBack != null) {
-                            callBack.onFail(-1, "下麥失敗");
+                            callBack.onFail(-1, ResUtil.getString(R.string.failure_to_harvest_wheat));
                         }
                     }
 
                     @Override
                     public void onException(Throwable throwable) {
                         if (callBack != null) {
-                            callBack.onFail(-1, "下麥異常:" + throwable.getMessage());
+                            callBack.onFail(-1, ResUtil.getString(R.string.abnormal_wheat_harvest) + throwable.getMessage());
                         }
                     }
                 });
@@ -2287,9 +2287,9 @@ public final class IMNetEaseManager {
                     if (result.exception != null)
                         e.onError(result.exception);
                     else if (result.code != BaseMvpModel.RESULT_OK)
-                        e.onError(new Throwable("錯誤碼: " + result.code));
+                        e.onError(new Throwable(ResUtil.getString(R.string.error_code) + result.code));
                     else {
-                        e.onSuccess("下麥回調成功");
+                        e.onSuccess(ResUtil.getString(R.string.the_wheat_callback_succeeded));
                     }
                 }).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
                 .doOnSuccess(s -> GiftValueMrg.get().requestDownMic(micPosition, downMicUid));
@@ -2341,9 +2341,9 @@ public final class IMNetEaseManager {
             if (result.exception != null)
                 e.onError(result.exception);
             else if (result.code != BaseMvpModel.RESULT_OK)
-                e.onError(new Exception("錯誤碼: " + result.code));
+                e.onError(new Exception(ResUtil.getString(R.string.error_code) + result.code));
             else {
-                e.onSuccess("黑名單處理回調成功");
+                e.onSuccess(ResUtil.getString(R.string.the_blacklist_processing_callback_succeeded));
             }
         }).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread());
     }
@@ -2367,12 +2367,12 @@ public final class IMNetEaseManager {
                         .setCallback(new RequestCallback<Void>() {
                             @Override
                             public void onSuccess(Void param) {
-                                e.onSuccess("踢人出房間回調成功");
+                                e.onSuccess(ResUtil.getString(R.string.kick_out_of_room_callback_successful));
                             }
 
                             @Override
                             public void onFailed(int code) {
-                                e.onError(new Exception("錯誤碼: " + code));
+                                e.onError(new Exception(ResUtil.getString(R.string.error_code) + code));
                             }
 
                             @Override
@@ -2537,7 +2537,7 @@ public final class IMNetEaseManager {
             String level = (String) NobleUtil.getResource(NobleResourceType.KEY_LEVEL, roomQueueInfo.mChatRoomMember);
             String name = NobleUtil.getNobleName(level);
             if (!NobleUtil.canKickMicroOrNot(level)) {
-                return Single.error(new Exception(name + "不能被踢下麥"));
+                return Single.error(new Exception(name + ResUtil.getString(R.string.get_kicked_off_the_mic)));
             }
         }
         return sendChatRoomMessage(message, false);
@@ -2663,7 +2663,7 @@ public final class IMNetEaseManager {
 
                         @Override
                         public void onFailed(int code) {
-                            e.onError(new Exception("錯誤碼: " + code));
+                            e.onError(new Exception(ResUtil.getString(R.string.error_code) + code));
                         }
 
                         @Override
@@ -2778,7 +2778,7 @@ public final class IMNetEaseManager {
 
                         @Override
                         public void onFailed(int code) {
-                            e.onError(new Exception("錯誤碼: " + code));
+                            e.onError(new Exception(ResUtil.getString(R.string.error_code) + code));
                         }
 
                         @Override
@@ -2806,7 +2806,7 @@ public final class IMNetEaseManager {
 
                         @Override
                         public void onFailed(int code) {
-                            e.onError(new Exception("錯誤碼: " + code));
+                            e.onError(new Exception(ResUtil.getString(R.string.error_code) + code));
                         }
 
                         @Override
@@ -2901,10 +2901,10 @@ public final class IMNetEaseManager {
         }
         UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
         inAppSharingRoomInfo.setInfo(currentRoomInfo);
-        inAppSharingRoomInfo.setTitle(String.format("我想邀請你進入：%1$s, 和我一起愉快的玩耍~",
+        inAppSharingRoomInfo.setTitle(String.format(ResUtil.getString(R.string.like_to_invite_you_in),
                 currentRoomInfo.getTitle()));
         inAppSharingRoomInfo.setAvatar(currentRoomInfo.getAvatar() != null ? currentRoomInfo.getAvatar() : "");
-        inAppSharingRoomInfo.setActionName("立即進入");
+        inAppSharingRoomInfo.setActionName(ResUtil.getString(R.string.immediate_access));
         inAppSharingRoomInfo.setRouterType(RouterType.ROOM);
         inAppSharingRoomInfo.setRouterValue(String.valueOf(currentRoomInfo.getUid()));
         InAppSharingRoomAttachment attachment = new InAppSharingRoomAttachment();
@@ -2936,10 +2936,10 @@ public final class IMNetEaseManager {
         InAppSharingFamilyInfo inAppSharingFamilyInfo = new InAppSharingFamilyInfo();
         UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
         inAppSharingFamilyInfo.setInfo(temp);
-        inAppSharingFamilyInfo.setTitle(String.format("我想邀請你加入：%1$s, 和我一起愉快的玩耍~",
+        inAppSharingFamilyInfo.setTitle(String.format(ResUtil.getString(R.string.like_to_invite_you_in),
                 temp.getFamilyName()));
         inAppSharingFamilyInfo.setAvatar(temp.getFamilyIcon() != null ? temp.getFamilyIcon() : "");
-        inAppSharingFamilyInfo.setActionName("立即加入");
+        inAppSharingFamilyInfo.setActionName(ResUtil.getString(R.string.immediate_access));
         inAppSharingFamilyInfo.setRouterType(RouterType.FAMILY);
         inAppSharingFamilyInfo.setRouterValue(temp.getFamilyId());
         InAppSharingFamilyAttachment attachment = new InAppSharingFamilyAttachment();
@@ -2967,13 +2967,13 @@ public final class IMNetEaseManager {
         String showTitle;
         if (detailInfo.isInWorld() && currentMember != null) {
             String worldName = TextUtils.isEmpty(detailInfo.getName()) ? "" : detailInfo.getName();
-            showTitle = "作為「" + worldName + "」的第" + currentMember.getMemberNo() + "位成員，世界那麼大，我想帶你一起去看看~";
+            showTitle = ResUtil.getString(R.string.as_what) + "「" + worldName + "」" + ResUtil.getString(R.string.control_of) + currentMember.getMemberNo() + ResUtil.getString(R.string.want_to_take_you_to_see);
         } else {
-            showTitle = "世界那麼大，我想帶你一起去看看~";
+            showTitle = ResUtil.getString(R.string.the_world_is_so_big);
         }
         inAppSharingMiniWorldInfo.setTitle(showTitle);
         inAppSharingMiniWorldInfo.setAvatar(TextUtils.isEmpty(detailInfo.getIcon()) ? "" : detailInfo.getIcon());
-        inAppSharingMiniWorldInfo.setActionName("立即加入");
+        inAppSharingMiniWorldInfo.setActionName(ResUtil.getString(R.string.join_immediately));
         inAppSharingMiniWorldInfo.setRouterType(RouterType.MINI_WORLD_DETAIL);
         inAppSharingMiniWorldInfo.setRouterValue(String.valueOf(detailInfo.getId()));
         InAppSharingMiniWorldAttachment attachment = new InAppSharingMiniWorldAttachment();
@@ -2999,10 +2999,10 @@ public final class IMNetEaseManager {
         InAppSharingTeamInfo inAppSharingTeamInfo = new InAppSharingTeamInfo();
         UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
         inAppSharingTeamInfo.setInfo(teamInfo);
-        inAppSharingTeamInfo.setTitle(String.format("我想邀請你加入：%1$s, 和我一起愉快的玩耍~",
+        inAppSharingTeamInfo.setTitle(String.format(ResUtil.getString(R.string.like_to_invite_you_in),
                 teamInfo.getName()));
         inAppSharingTeamInfo.setAvatar(userInfo != null ? userInfo.getAvatar() : "");
-        inAppSharingTeamInfo.setActionName("立即加入");
+        inAppSharingTeamInfo.setActionName(ResUtil.getString(R.string.join_immediately));
         inAppSharingTeamInfo.setRouterType(RouterType.TEAM);
         inAppSharingTeamInfo.setRouterValue(teamInfo.getId());
         InAppSharingTeamAttachment attachment = new InAppSharingTeamAttachment();
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ExchangeGiftInfo.kt b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ExchangeGiftInfo.kt
index 7b46676b4..0de123988 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ExchangeGiftInfo.kt
+++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ExchangeGiftInfo.kt
@@ -1,5 +1,8 @@
 package com.yizhuan.xchat_android_core.treasurefairy
 
+import com.yizhuan.xchat_android_core.R
+import com.yizhuan.xchat_android_library.utils.ResUtil
+
 data class ExchangeGiftInfo(
     val expendNum: Int = 0,
     val itemId: Long = 0,
@@ -18,7 +21,7 @@ data class ExchangeGiftInfo(
 
     fun getPrizeName(): String {
         return if (rewardType == "gift") {
-            "${rewardName}(${rewardShowValue}鉆)"
+            "${rewardName}(${rewardShowValue}${ResUtil.getString(R.string.diamond)})"
         } else {
             "${rewardName}(${rewardNum}${rewardUnit})"
         }
@@ -26,7 +29,7 @@ data class ExchangeGiftInfo(
 
     fun getPrizeUnit(): String {
         return if (rewardType == "gift") {
-            "${rewardShowValue}鉆"
+            "${rewardShowValue}${ResUtil.getString(R.string.diamond)}"
         } else {
             "${rewardNum}${rewardUnit}"
         }
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyModel.java
index 7bf355f09..03a86c161 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyModel.java
@@ -9,6 +9,7 @@ import com.netease.nimlib.sdk.chatroom.constant.MemberQueryType;
 import com.netease.nimlib.sdk.chatroom.constant.MemberType;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
 import com.orhanobut.logger.Logger;
+import com.yizhuan.xchat_android_core.R;
 import com.yizhuan.xchat_android_core.auth.AuthModel;
 import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
 import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
@@ -24,6 +25,7 @@ import com.yizhuan.xchat_android_core.utils.net.RxHelper;
 import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
 import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack;
 import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
 import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
 
 import java.util.List;
@@ -89,7 +91,7 @@ public class HomePartyModel extends RoomBaseModel implements IHomePartyModel {
                 .setCallback(new RequestCallbackWrapper<Void>() {
                     @Override
                     public void onResult(int i, Void aVoid, Throwable throwable) {
-                        Logger.i("%1$s房間更新麥序%2$s成功", roomId, key);
+                        Logger.i(ResUtil.getString(R.string.the_room_is_updated_with_wheat), roomId, key);
                     }
                 });
     }
@@ -164,7 +166,7 @@ public class HomePartyModel extends RoomBaseModel implements IHomePartyModel {
             String resource = (String) NobleUtil.getResource(NobleResourceType.KEY_LEVEL, roomQueueInfo.mChatRoomMember);
             if (!TextUtils.isEmpty(resource)) {
                 if (!NobleUtil.canKickMicroOrNot(Integer.valueOf(resource))) {
-                    String tips = "不能禁麥" + NobleUtil.getNobleName(Integer.valueOf(resource)) + "陛下哦";
+                    String tips = ResUtil.getString(R.string.wheat_cannot_be_banned) + NobleUtil.getNobleName(Integer.valueOf(resource)) + ResUtil.getString(R.string.your_majesty);
                     SingleToastUtil.showToastShort(tips);
                     return Single.error(new Throwable(tips));
                 }
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java
index 7259bcb1e..96d34cd8a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java
@@ -167,7 +167,7 @@ public class ShareModel extends BaseModel implements IShareModel {
                         try {
                             ClipboardManager cm = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
                             cm.setPrimaryClip(ClipData.newPlainText("text", siteUrl));
-                            emitter.onSuccess("已複製");
+                            emitter.onSuccess(ResUtil.getString(R.string.have_copy));
                         } catch (Exception e) {
                             Logger.info("copyText", String.valueOf(e));
                             emitter.onError(new Throwable(String.valueOf(e)));
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 5f232858e..5462cc8f9 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -666,4 +666,30 @@
     <string name="wechat_share_content">Find and join the best groups,talk with strangers</string>
     <string name="data_parsing_exception">數據解析異常</string>
     <string name="parameter_error">參數錯誤</string>
+    <string name="sensitive_word_detected">檢測到敏感詞，需要過濾，不能發送</string>
+    <string name="error_code">錯誤碼:\u3000</string>
+    <string name="repetitive_operation">重復操作~</string>
+    <string name="please_try_again">操作失敗，請重試</string>
+    <string name="already_the_administrator">對方已經是管理員了</string>
+    <string name="succeeded_in_removing_an_administrator">移除管理員成功</string>
+    <string name="failure_to_harvest_wheat">下麥失敗</string>
+    <string name="abnormal_wheat_harvest">下麥異常:</string>
+    <string name="successful_harvest">下麥成功</string>
+    <string name="the_wheat_callback_succeeded">下麥回調成功</string>
+    <string name="the_blacklist_processing_callback_succeeded">黑名單處理回調成功</string>
+    <string name="kick_out_of_room_callback_successful">踢人出房間回調成功</string>
+    <string name="get_kicked_off_the_mic">不能被踢下麥</string>
+    <string name="like_to_invite_you_in">我想邀請你進入：%1$s, 和我一起愉快的玩耍~</string>
+    <string name="immediate_access">立即進入</string>
+    <string name="as_what">作為</string>
+    <string name="control_of">的第</string>
+    <string name="want_to_take_you_to_see">位成員，世界那麼大，我想帶你一起去看看~</string>
+    <string name="the_world_is_so_big">世界那麼大，我想帶你一起去看看~</string>
+    <string name="join_immediately">立即加入</string>
+    <string name="the_room_is_updated_with_wheat">%1$s房間更新麥序%2$s成功</string>
+    <string name="wheat_cannot_be_banned">不能禁麥</string>
+    <string name="your_majesty">陛下哦</string>
+    <string name="have_copy">已複製</string>
+    <string name="diamond">鉆</string>
+
 </resources>
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/exception/ExceptionHandle.kt b/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/exception/ExceptionHandle.kt
index 563c77ee8..d8321f6a7 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/exception/ExceptionHandle.kt
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/exception/ExceptionHandle.kt
@@ -2,6 +2,8 @@ package com.yizhuan.xchat_android_library.net.rxnet.exception
 
 import android.util.Log
 import com.google.gson.JsonParseException
+import com.yizhuan.xchat_android_library.R
+import com.yizhuan.xchat_android_library.utils.ResUtil
 import org.json.JSONException
 import retrofit2.HttpException
 import java.net.ConnectException
@@ -16,28 +18,28 @@ class ExceptionHandle {
 
     companion object {
         private const val TAG = "ExceptionHandle"
-        var errorMsg = "請求失敗，請稍後重試"
+        var errorMsg = ResUtil.getString(R.string.request_failure)
 
         fun handleException(e: Throwable): String {
             e.printStackTrace()
             when (e) {
                 is SocketTimeoutException, is ConnectException, is HttpException -> { //均视为网络错误
                     Log.e(TAG, "網絡連接異常: " + e.message)
-                    errorMsg = "網絡異常,請檢查您的網絡再試~"
+                    errorMsg = ResUtil.getString(R.string.network_anomaly)
                 }
                 is JsonParseException, is JSONException, is ParseException -> {   //均视为解析错误
                     Log.e(TAG, "數據解析異常: " + e.message)
-                    errorMsg = "數據解析異常"
+                    errorMsg = ResUtil.getString(R.string.data_parsing_exception)
                 }
                 is ApiException -> {//服务器返回的错误信息
                     errorMsg = e.message.toString()
                 }
                 is UnknownHostException -> {
                     Log.e(TAG, "網絡連接異常: " + e.message)
-                    errorMsg = "網絡異常,請檢查您的網絡再試~"
+                    errorMsg = ResUtil.getString(R.string.network_anomaly)
                 }
                 is IllegalArgumentException -> {
-                    errorMsg = "參數錯誤"
+                    errorMsg = ResUtil.getString(R.string.code_failure)
                 }
                 else -> {//未知错误
                     try {
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/TimeUtils.java b/library/src/main/java/com/yizhuan/xchat_android_library/utils/TimeUtils.java
index 82ede33b9..8fd1e4bcc 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/TimeUtils.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/utils/TimeUtils.java
@@ -413,21 +413,21 @@ public class TimeUtils {
         long s = (seconds % 3600) % 60;        //秒
         if (h > 0) {
             if (m == 0 && s == 0) {
-                return h + "小時";
+                return h + ResUtil.getString(R.string.hour);
             } else if (m != 0 && s == 0) {
-                return h + "小時" + m + "分鐘";
+                return h + ResUtil.getString(R.string.hour) + m + ResUtil.getString(R.string.minute);
             } else {
-                return h + "小時" + m + "分鐘" + s + "秒";
+                return h + ResUtil.getString(R.string.hour) + m + ResUtil.getString(R.string.minute) + s + ResUtil.getString(R.string.second);
             }
         }
         if (m > 0) {
             if (s == 0) {
-                return m + "分鐘";
+                return m + ResUtil.getString(R.string.minute);
             } else {
-                return m + "分鐘" + s + "秒";
+                return m + ResUtil.getString(R.string.minute) + s + ResUtil.getString(R.string.second);
             }
         }
-        return s + "秒";
+        return s + ResUtil.getString(R.string.second);
     }
 
     public static String getChineseMonth(Context context, long millis) {
diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml
index 2daa34962..673d8304c 100644
--- a/library/src/main/res/values/strings.xml
+++ b/library/src/main/res/values/strings.xml
@@ -117,5 +117,18 @@
     <string name="xchat_android_library_utils_ziputils_01">構建zip完整路徑成功: %s</string>
     <string name="widget_xlist_familiardefaultitemdecoration_01">設置底部間距</string>
     <string name="number_w">w</string>
+    <string name="throw_file_provider_authority">\" : 请执行 setFileProviderAuthority()方法\"</string>
+    <string name="cannot_be_greater_than_the_number_of_selections_set">AlbumBuilder: 默认勾选的图片张数不能大于设置的选择数！</string>
+    <string name="selected_by_default">|默认勾选图片张数：</string>
+    <string name="the_number_of_options_set">|设置的选择数：</string>
+    <string name="the_saved_picture_does_not_exist">EasyPhotos拍照保存的图片不存在</string>
+    <string name="watermark_cannot_be_0">AlbumBuilder: 加水印的原图宽或高不能为0！</string>
+    <string name="request_failure">請求失敗，請稍後重試</string>
+    <string name="network_anomaly">網絡異常,請檢查您的網絡再試~</string>
+    <string name="data_parsing_exception">數據解析異常</string>
+    <string name="code_failure">參數錯誤</string>
+    <string name="hour">小時</string>
+    <string name="minute">分鐘</string>
+    <string name="second">秒</string>
 </resources>
 
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/AlbumModel.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/AlbumModel.java
index 8d003de31..c4139b9a1 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/AlbumModel.java
+++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/AlbumModel.java
@@ -20,6 +20,7 @@ import com.yizhuan.xchat_android_library.easyphoto.setting.Setting;
 import com.yizhuan.xchat_android_library.easyphoto.utils.string.StringUtils;
 import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.AlbumItem;
 import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -85,7 +86,7 @@ public class AlbumModel {
     private synchronized void initAlbum(Context context) {
         album.clear();
         if (Setting.selectedPhotos.size() > Setting.count) {
-            throw new RuntimeException("AlbumBuilder: 默认勾选的图片张数不能大于设置的选择数！" + "|默认勾选图片张数：" + Setting.selectedPhotos.size() + "|设置的选择数：" + Setting.count);
+            throw new RuntimeException(ResUtil.getString(R.string.cannot_be_greater_than_the_number_of_selections_set) + ResUtil.getString(R.string.selected_by_default) + Setting.selectedPhotos.size() + ResUtil.getString(R.string.the_number_of_options_set) + Setting.count);
         }
         final String sortOrder = MediaStore.MediaColumns.DATE_MODIFIED + " DESC";
 
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/EasyPhotosActivity.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/EasyPhotosActivity.java
index 3060c81e1..5c15dfd11 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/EasyPhotosActivity.java
+++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/EasyPhotosActivity.java
@@ -268,17 +268,12 @@ public class EasyPhotosActivity extends AppCompatActivity implements AlbumItemsA
      */
     private void launchCamera(int requestCode) {
         if (TextUtils.isEmpty(Setting.fileProviderAuthority))
-            throw new RuntimeException("AlbumBuilder" + " : 请执行 setFileProviderAuthority()方法");
+            throw new RuntimeException("AlbumBuilder" + getString(R.string.throw_file_provider_authority));
         if (!cameraIsCanUse()) {
             permissionView.setVisibility(View.VISIBLE);
             tvPermission.setText(R.string.permissions_die_easy_photos);
-            permissionView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    SettingsUtils.startMyApplicationDetailsForResult(EasyPhotosActivity.this,
-                            getPackageName());
-                }
-            });
+            permissionView.setOnClickListener(view -> SettingsUtils.startMyApplicationDetailsForResult(EasyPhotosActivity.this,
+                    getPackageName()));
             return;
         }
         toAndroidCamera(requestCode);
@@ -406,7 +401,7 @@ public class EasyPhotosActivity extends AppCompatActivity implements AlbumItemsA
                     }
 
                     if (mTempImageFile == null || !mTempImageFile.isFile()) {
-                        throw new RuntimeException("EasyPhotos拍照保存的图片不存在");
+                        throw new RuntimeException(getString(R.string.the_saved_picture_does_not_exist));
                     }
                     onCameraResult();
                     return;
diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/bitmap/BitmapUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/bitmap/BitmapUtils.java
index 261328c1c..0fd5518d0 100644
--- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/bitmap/BitmapUtils.java
+++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/bitmap/BitmapUtils.java
@@ -20,9 +20,11 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.exifinterface.media.ExifInterface;
 
+import com.yizhuan.xchat_android_library.R;
 import com.yizhuan.xchat_android_library.easyphoto.EasyPhotos;
 import com.yizhuan.xchat_android_library.easyphoto.utils.uri.UriUtils;
 import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -79,7 +81,7 @@ public class BitmapUtils {
         int imageWidth = image.getWidth();
         int imageHeight = image.getHeight();
         if (0 == imageWidth || 0 == imageHeight) {
-            throw new RuntimeException("AlbumBuilder: 加水印的原图宽或高不能为0！");
+            throw new RuntimeException(ResUtil.getString(R.string.watermark_cannot_be_0));
         }
         switch (orientation) {
             case 90:
@@ -138,7 +140,7 @@ public class BitmapUtils {
         float imageWidth = image.getWidth();
         float imageHeight = image.getHeight();
         if (0 == imageWidth || 0 == imageHeight) {
-            throw new RuntimeException("AlbumBuilder: 加水印的原图宽或高不能为0！");
+            throw new RuntimeException(ResUtil.getString(R.string.watermark_cannot_be_0));
         }
         switch (orientation) {
             case 90:
diff --git a/nim_uikit/res/values/strings.xml b/nim_uikit/res/values/strings.xml
index 82608d944..a9a56de31 100644
--- a/nim_uikit/res/values/strings.xml
+++ b/nim_uikit/res/values/strings.xml
@@ -430,5 +430,6 @@
     <string name="impl_customization_defaultrecentcustomization_07">[機器人消息]</string>
     <string name="impl_customization_defaultrecentcustomization_08">[自定義消息] </string>
     <string name="xchat_android_core_file_filemodel_01"> 為空或者該文件不存在!</string>
+    <string name="image_file_empty">圖片路徑為空</string>
 
 </resources>
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/helper/SendImageHelper.java b/nim_uikit/src/com/netease/nim/uikit/business/session/helper/SendImageHelper.java
index c0051399a..289d0c24d 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/helper/SendImageHelper.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/helper/SendImageHelper.java
@@ -16,6 +16,7 @@ import com.netease.nim.uikit.common.util.media.ImageUtil;
 import com.netease.nim.uikit.common.util.storage.StorageType;
 import com.netease.nim.uikit.common.util.storage.StorageUtil;
 import com.netease.nim.uikit.common.util.string.MD5;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
 import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
 
 import java.io.File;
@@ -135,7 +136,7 @@ public class SendImageHelper {
                     new Handler(context.getMainLooper()).post(new Runnable() {
                         @Override
                         public void run() {
-                            SingleToastUtil.showToastShort("俺是個發生過");
+                            SingleToastUtil.showToastShort(ResUtil.getString(R.string.image_file_empty));
                         }
                     });
                     return null;