diff --git a/app/src/main/assets/mp4/lucky_bag_gold_open.mp4 b/app/src/main/assets/mp4/lucky_bag_gold_open.mp4 index 18ee772e3..e76e33428 100644 Binary files a/app/src/main/assets/mp4/lucky_bag_gold_open.mp4 and b/app/src/main/assets/mp4/lucky_bag_gold_open.mp4 differ diff --git a/app/src/main/java/com/chwl/app/avroom/dialog/RoomGameListDialog.kt b/app/src/main/java/com/chwl/app/avroom/dialog/RoomGameListDialog.kt index c40f18db5..5e71b950f 100644 --- a/app/src/main/java/com/chwl/app/avroom/dialog/RoomGameListDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/dialog/RoomGameListDialog.kt @@ -261,6 +261,7 @@ class RoomGameListDialog : if (gameInfo.isLuckyBag()) { listener?.onShowLuckyBag() + dismissAllowingStateLoss() } else { dialogManager?.showOkCancelDialog( getString(R.string.room_switch_game_tips) diff --git a/app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagDialog.kt b/app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagDialog.kt index 2821e7fe1..21c777190 100644 --- a/app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagDialog.kt @@ -690,6 +690,7 @@ class RoomLuckyBagDialog : BaseDialogFragment() { giftItems = items }).compose(bindToLifecycle()) .doOnSuccess { + PayModel.get().refreshWalletInfo(true) isSenting = false dismiss() } @@ -709,6 +710,7 @@ class RoomLuckyBagDialog : BaseDialogFragment() { countDownSecond = mGoldTimeSelect }).compose(bindToLifecycle()) .doOnSuccess { + PayModel.get().refreshWalletInfo(true) isSenting = false dismiss() } diff --git a/app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagOpenDialog.kt b/app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagOpenDialog.kt index 3ae08a886..79016ac0a 100644 --- a/app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagOpenDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagOpenDialog.kt @@ -21,6 +21,7 @@ import com.chwl.app.utils.RoomHelperManager import com.chwl.core.auth.AuthModel import com.chwl.core.bean.response.ServiceResult import com.chwl.core.gift.bean.LuckyBagViewOthers +import com.chwl.core.pay.PayModel import com.chwl.core.utils.net.RxHelper import com.chwl.library.common.util.ClickUtils.click import com.chwl.library.common.util.doLog @@ -194,6 +195,7 @@ class RoomLuckyBagOpenDialog : BaseDialogFragment binding.gold.setVis(true) binding.goldHint.setVis(true) binding.gold.text = entity?.currentUserAmount?.toString()?:"0" + PayModel.get().refreshWalletInfo(true) } mActionCallBack?.onAction(1,mData) } diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt index 4e1729bf1..e51660c2f 100644 --- a/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt +++ b/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt @@ -874,6 +874,10 @@ open class BaseRoomFragment?> : } override fun onShowLuckyBag() { + if (UserModel.get().cacheLoginUserInfo?.isRechargeUser == true) { + R.string._ver_23_Lucky_bag_Limit_tips.doToast() + return + } RoomLuckyBagDialog().show(context) } } diff --git a/app/src/main/java/com/chwl/app/avroom/widget/LuckyBagBtn.kt b/app/src/main/java/com/chwl/app/avroom/widget/LuckyBagBtn.kt index c89cc4185..9520145c4 100644 --- a/app/src/main/java/com/chwl/app/avroom/widget/LuckyBagBtn.kt +++ b/app/src/main/java/com/chwl/app/avroom/widget/LuckyBagBtn.kt @@ -10,8 +10,10 @@ import com.chwl.app.avroom.dialog.RoomLuckyBagOpenDialog import com.chwl.app.base.BaseDialogFragment import com.chwl.app.databinding.ViewLuckyBagBtnBinding import com.chwl.app.utils.RoomHelperManager +import com.chwl.core.user.UserModel import com.chwl.library.common.util.ClickUtils.click import com.chwl.library.common.util.doLog +import com.chwl.library.common.util.doToast import com.chwl.library.common.util.isVerify import com.chwl.library.common.util.postSafe import com.chwl.library.common.util.setVis @@ -46,6 +48,10 @@ class LuckyBagBtn : FrameLayout{ private fun onClick() { + if (UserModel.get().cacheLoginUserInfo?.isRechargeUser == true) { + R.string._ver_23_Lucky_bag_Limit_tips.doToast() + return + } mData.isVerify(0){ mOpenDialog = RoomLuckyBagOpenDialog() mOpenDialog?.mData = it diff --git a/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java b/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java index 573d354b8..c3b5a923c 100644 --- a/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java @@ -1718,7 +1718,7 @@ public class MessageView extends FrameLayout { String nickName = (data.uid == AuthModel.get().getCurrentUid()) ? ResUtil.getString(R.string.avroom_widget_messageview_0116) : data.nick; text.append(nickName, new ForegroundColorSpan(greyColor)).append(": ", new ForegroundColorSpan(getResources().getColor(R.color.white))); - ImageLoadUtils.loadRoundedImage(avatar,data.getPicUrl(),20); + ImageLoadUtils.load(data.getPicUrl(),avatar); avatar.setOnClickListener(v -> { ShowPhotoActivity.start(v.getContext(),data.getPicUrl()); @@ -1886,11 +1886,7 @@ public class MessageView extends FrameLayout { if (data.isCpInRoom()) { - if (OtherExtKt.isRtl(getContext())) { - message = ResourcesKtxKt.getString(R.string._ver_24_cpInRoomTips, cpNickStr, nickStr,cpNameStr); - } else { - message = ResourcesKtxKt.getString(R.string._ver_24_cpInRoomTips, cpNickStr,cpNameStr, nickStr); - } + message = ResourcesKtxKt.getString(R.string._ver_24_cpInRoomTips, cpNickStr,cpNameStr, nickStr); tvCpContent.setBackgroundResource(R.drawable.ic_msg_room_msg_cp_bg_enter); textStyles.add(cpNick); diff --git a/app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt index 18a67529d..caefb2efa 100644 --- a/app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt +++ b/app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt @@ -16,6 +16,8 @@ import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator import com.chwl.app.utils.HomeUIManager import com.chwl.core.DemoCache +import com.chwl.library.common.util.doLog +import com.example.lib_utils.ktx.getString /** 首页 @@ -47,6 +49,26 @@ class HomeFragment : BaseViewBindingFragment(), View.OnClic // } // GiftDialog(it,3224,false,false,false).show() + var message = "" + var cpNickStr = "cp_Nick_Str" + var cpNameStr = "cpName_Str" + var nickStr = "my_Nick_Str" + message = R.string._ver_24_cpUpMicTips.getString( + cpNameStr, + nickStr, + cpNickStr + ) + message.doLog() + + message = R.string._ver_24_cpInRoomTips.getString( + cpNickStr, + cpNameStr, + nickStr + ) + message.doLog() + + + } } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 0d85ca689..dee0020b5 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -5406,8 +5406,8 @@ أرسلت حقيبة الحظ دقائق - لقد دخل %s %s من %s إلى الغرفة. - %1$s %2$s & %3$s كلاهما على الميكروفون! + " %1$s %2$s %3$s لقد دخل إلى الغرفة " + %1$s %3$s & %2$s كلاهما على الميكروفون! نرسل حقيبة الحظ عملة! تعال وانضم إلينا! ثنائي رائع ثنائي ديناميكي @@ -5436,4 +5436,5 @@ إجمالي مبلغ تحويل الراتب تم وضع الكونزات في المحفظة! تم وضع الهدايا في الحقيبة! + لا يمكنك استخدام هذه الميزة. \ No newline at end of file diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 127ce8661..4dad39ae6 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -5230,4 +5230,5 @@ Toplam imza alın, ilgili ödülü alın ÜS Hesaplaşmasının Toplam Miktarı Cüzdana paralar konuldu! Çantaya hediyeler konuldu! + Bu özelliği kullanamazsınız. diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index f6f3e7ff2..4baef7097 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -5378,5 +5378,6 @@ 代發薪 硬幣已放入錢包! 禮物已放入背包! + 您無法使用此功能。 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ea86cccc8..d624decf0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5474,6 +5474,8 @@ You cannot join again within 24 hours after leaving Coins have been put into the wallet! Gifts have been put into the bag! + Your cannot use this feature. +