moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Modify]整理中文

Browse Source
This commit is contained in:
wushaocheng
2023-05-04 21:27:44 +08:00
parent bcf486e630
commit c66b314102
152 changed files with 758 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/yizhuan/erban/avroom/adapter/DatingMicroViewAdapter.kt
View File

@@ -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) {

2
app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKSearchAdapter.kt
View File

@@ -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)

4
app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkFinishDialog.kt
View File

@@ -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,

3
app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPkReceivedDialog.kt
View File

@@ -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

15
app/src/main/java/com/yizhuan/erban/avroom/dialog/SendBroadcastDialog.kt
View File

@@ -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()
},

22
app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt
View File

@@ -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))
}
}

8
app/src/main/java/com/yizhuan/erban/avroom/fragment/SingleRoomFragment.kt
View File

@@ -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)

6
app/src/main/java/com/yizhuan/erban/avroom/presenter/BaseRoomPresenter.java
View File

@@ -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);

2
app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageOpenDialog.kt
View File

@@ -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)
}

76
app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt
View File

@@ -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()
}

6
app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchAdapter.kt
View File

@@ -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)
}
}

8
app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkFinishDialog.kt
View File

@@ -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) {

3
app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkReceivedDialog.kt
View File

@@ -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

40
app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java
View File

@@ -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()));
});

2
app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectBoxView.kt
View File

@@ -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()

2
app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt
View File

@@ -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()

5
app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogManager.java
View File

@@ -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) {

2
app/src/main/java/com/yizhuan/erban/decoration/adapter/DecorationCommonAdapter.kt
View File

@@ -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)

4
app/src/main/java/com/yizhuan/erban/earn/activity/ConvertDiamondActivity.kt
View File

@@ -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(

4
app/src/main/java/com/yizhuan/erban/earn/activity/EarnWithdrawActivity.kt
View File

@@ -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,

6
app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinActivity.kt
View File

@@ -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()
}
}
}

8
app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinedActivity.kt
View File

@@ -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()
}

5
app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt
View File

@@ -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()
}

2
app/src/main/java/com/yizhuan/erban/other/dialog/PrivacyAgreementDialog.java
View File

@@ -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);

4
app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSuccessActivity.kt
View File

@@ -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() }
}

5
app/src/main/java/com/yizhuan/erban/relation/cp/CpViewHelper.kt
View File

@@ -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)
}
}

13
app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpInviteRecordActivity.kt
View File

@@ -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)
}

2
app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInviteReplyDialog.kt
View File

@@ -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

2
app/src/main/java/com/yizhuan/erban/skill/adapter/SkillSelectionAdapter.kt
View File

@@ -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

18
app/src/main/java/com/yizhuan/erban/treasurefairy/FairyViewModel.kt
View File

@@ -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(

10
app/src/main/java/com/yizhuan/erban/treasurefairy/HomeFairyActivity.kt
View File

@@ -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

13
app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/MyFairyRecordAdapter.kt
View File

@@ -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)}"
)
}

4
app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/TestFairyRecordAdapter.kt
View File

@@ -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)
}
)

20
app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/ForestFairyDialog.kt
View File

@@ -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)
}
}

3
app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/ForestPrizeDialog.kt
View File

@@ -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)
}

7
app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/MyFairySendDialog.kt
View File

@@ -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()
}

4
app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ExchangeDebrisFragment.kt
View File

@@ -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()
}
}

2
app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ExchangeFairyFragment.kt
View File

@@ -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)
}

7
app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ForestPrizesFragment.kt
View File

@@ -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)

2
app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/TestFairyFragment.kt
View File

@@ -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 ->

7
app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendFragmentCpDelegate.kt
View File

@@ -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())

4
app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.kt
View File

@@ -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))
}
})

25
app/src/main/java/com/yizhuan/erban/ui/wallet/ExchangeGoldActivity.java
View File

@@ -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

24
app/src/main/java/com/yizhuan/erban/utils/MsgBuilder.kt
View File

@@ -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())
)
}

6
app/src/main/java/com/yizhuan/erban/vip/VipBroadcastDialog.kt
View File

@@ -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)}"
}
}
}

3
app/src/main/java/com/yizhuan/erban/vip/VipUpgradeDialog.kt
View File

@@ -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)}"
}
}

BIN
app/src/main/res/drawable-xhdpi/ic_charge_diamond.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_charge_diamond.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 938 B

BIN
app/src/main/res/drawable-xhdpi/treasure_fairy_ic_test_fairy_refresh.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 855 B

BIN
app/src/main/res/drawable-xhdpi/treasure_fairy_ic_test_fairy_refresh.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 790 B

2
app/src/main/res/layout/activity_add_team_member.xml
View File

@@ -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"

13
app/src/main/res/layout/activity_add_team_member_search_list.xml
View File

@@ -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" />

12
app/src/main/res/layout/activity_bill_gift_income_group.xml
View File

@@ -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"/>

15
app/src/main/res/layout/activity_bills.xml
View File

@@ -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" />

14
app/src/main/res/layout/activity_bills_gift.xml
View File

@@ -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"/>

16
app/src/main/res/layout/activity_bind_withdraw_msg.xml
View File

@@ -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"

8
app/src/main/res/layout/activity_binder_alipay.xml
View File

@@ -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

6
app/src/main/res/layout/activity_cd_key_charge.xml
View File

@@ -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>

18
app/src/main/res/layout/activity_create_pk.xml
View File

@@ -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" />

4
app/src/main/res/layout/activity_decoration_store.xml
View File

@@ -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"

53
app/src/main/res/layout/activity_exchange_gold.xml
View File

@@ -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>

2
app/src/main/res/layout/activity_family_text_input.xml
View File

@@ -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"

2
app/src/main/res/layout/activity_my_recommend_card.xml
View File

@@ -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"

12
app/src/main/res/layout/activity_my_voice.xml
View File

@@ -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"

1
app/src/main/res/layout/activity_new_user_list.xml
View File

@@ -30,7 +30,6 @@
android:paddingRight="15dp"
android:paddingBottom="12dp" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</com.yizhuan.erban.common.widget.StatusLayout>

5
app/src/main/res/layout/activity_show_photo.xml
View File

@@ -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>

4
app/src/main/res/layout/activity_withdraw_rule.xml
View File

@@ -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>

2
app/src/main/res/layout/dialog_bottom_magic.xml
View File

@@ -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"

6
app/src/main/res/layout/dialog_exit_room.xml
View File

@@ -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"

2
app/src/main/res/layout/dialog_first_charge_prize.xml
View File

@@ -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>

2
app/src/main/res/layout/dialog_gift_all_service_level_three.xml
View File

@@ -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>

2
app/src/main/res/layout/dialog_gift_all_service_level_two.xml
View File

@@ -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>

4
app/src/main/res/layout/dialog_loading.xml
View File

@@ -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"

10
app/src/main/res/layout/dialog_monster.xml
View File

@@ -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}"/>

4
app/src/main/res/layout/dialog_monster_escape.xml
View File

@@ -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" />

2
app/src/main/res/layout/dialog_new_user_charge_prize.xml
View File

@@ -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>

2
app/src/main/res/layout/dialog_pk_select_people.xml
View File

@@ -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>

2
app/src/main/res/layout/dialog_pub_room_shutup.xml
View File

@@ -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" />

2
app/src/main/res/layout/dialog_quit_monster_hunting.xml
View File

@@ -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

10
app/src/main/res/layout/dialog_room_impose.xml
View File

@@ -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" />

4
app/src/main/res/layout/dialog_room_pk_force_finish.xml
View File

@@ -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"

2
app/src/main/res/layout/dialog_room_pk_rule.xml
View File

@@ -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" />

5
app/src/main/res/layout/dialog_single_room_pk_force_finish.xml
View File

@@ -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>

4
app/src/main/res/layout/dialog_vip_broadcast.xml
View File

@@ -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" />

7
app/src/main/res/layout/fragment_dialog_open_noble.xml
View File

@@ -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

21
app/src/main/res/layout/fragment_family.xml
View File

@@ -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>

2
app/src/main/res/layout/fragment_recycler_view_bind_no_bg.xml
View File

@@ -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>

8
app/src/main/res/layout/fragment_voice_card.xml
View File

@@ -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"

6
app/src/main/res/layout/item_banner.xml
View File

@@ -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"

2
app/src/main/res/layout/item_erban_grid_empty.xml
View File

@@ -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" />

4
app/src/main/res/layout/item_erban_top_message.xml
View File

@@ -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>

4
app/src/main/res/layout/item_exit_room.xml
View File

@@ -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>

5
app/src/main/res/layout/item_family_currency_bill_date.xml
View File

@@ -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"

2
app/src/main/res/layout/item_family_currency_empty.xml
View File

@@ -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>

2
app/src/main/res/layout/item_family_game_list.xml
View File

@@ -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>

4
app/src/main/res/layout/item_family_list.xml
View File

@@ -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>

5
app/src/main/res/layout/item_family_manage_rv.xml
View File

@@ -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>

4
app/src/main/res/layout/item_fans_team_task.xml
View File

@@ -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"

4
app/src/main/res/layout/item_friend_black_list_manage.xml
View File

@@ -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>

2
app/src/main/res/layout/treasure_fairy_dialog_exchange.xml
View File

@@ -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"

Some files were not shown because too many files have changed in this diff Show More