fix: bugfix

2025-03-03 18:43:44 +08:00
parent 47aa4a078b
commit 288aaebc3b
12 changed files with 46 additions and 8 deletions
--- a/app/src/main/assets/mp4/lucky_bag_gold_open.mp4
+++ b/app/src/main/assets/mp4/lucky_bag_gold_open.mp4
--- 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)
--- 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<DialogRoomLuckyBagBinding>() {
            giftItems = items
        }).compose(bindToLifecycle())
            .doOnSuccess {
+                PayModel.get().refreshWalletInfo(true)
                isSenting = false
                dismiss()
            }
@@ -709,6 +710,7 @@ class RoomLuckyBagDialog : BaseDialogFragment<DialogRoomLuckyBagBinding>() {
            countDownSecond = mGoldTimeSelect
        }).compose(bindToLifecycle())
            .doOnSuccess {
+                PayModel.get().refreshWalletInfo(true)
                isSenting = false
                dismiss()
            }
--- 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<DialogRoomLuckyBagOpenBinding>
            binding.gold.setVis(true)
            binding.goldHint.setVis(true)
            binding.gold.text = entity?.currentUserAmount?.toString()?:"0"
+            PayModel.get().refreshWalletInfo(true)
        }
        mActionCallBack?.onAction(1,mData)
    }
--- 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<V : IBaseRoomView?, P1 : BaseRoomPresenter<V>?> :
                    }

                    override fun onShowLuckyBag() {
+                        if (UserModel.get().cacheLoginUserInfo?.isRechargeUser == true) {
+                            R.string._ver_23_Lucky_bag_Limit_tips.doToast()
+                            return
+                        }
                        RoomLuckyBagDialog().show(context)
                    }
                }
--- 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
--- 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);
--- 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<FragmentHomeBinding>(), 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()
+
+
+
                    }
                }
            }
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -5406,8 +5406,8 @@
    <string name="_ver_24_lucky_bag_bili_sent">أرسلت حقيبة الحظ</string>
    <string name="_ver_24_Mins_s">دقائق</string>

-    <string name="_ver_24_cpInRoomTips">لقد دخل %s %s من  %s إلى الغرفة.</string>
-    <string name="_ver_24_cpUpMicTips">%1$s  %2$s &amp; %3$s كلاهما على الميكروفون!</string>
+    <string name="_ver_24_cpInRoomTips">" %1$s  %2$s  %3$s لقد دخل إلى الغرفة "</string>
+    <string name="_ver_24_cpUpMicTips">%1$s  %3$s &amp; %2$s كلاهما على الميكروفون!</string>
    <string name="_ver_24_lucky_bag_room_notify_coin">نرسل حقيبة الحظ عملة! تعال وانضم إلينا!</string>
    <string name="Sweet_Duo">ثنائي رائع</string>
    <string name="Dynamic_Duo">ثنائي ديناميكي</string>
@@ -5436,4 +5436,5 @@
    <string name="_ver_23_Total_Amount_of_Transfer_Us">إجمالي مبلغ تحويل الراتب</string>
    <string name="_ver_23_gold_in_wallet">تم وضع الكونزات في المحفظة!</string>
    <string name="_ver_23_gift_in_bag">تم وضع الهدايا في الحقيبة!</string>
+    <string name="_ver_23_Lucky_bag_Limit_tips">لا يمكنك استخدام هذه الميزة.</string>
 </resources>
--- 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
    <string name="_ver_23_Total_Amount_of_Transfer_Us">ÜS Hesaplaşmasının Toplam Miktarı</string>
    <string name="_ver_23_gold_in_wallet">Cüzdana paralar konuldu!</string>
    <string name="_ver_23_gift_in_bag">Çantaya hediyeler konuldu!</string>
+    <string name="_ver_23_Lucky_bag_Limit_tips">Bu özelliği kullanamazsınız.</string>
 </resources>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -5378,5 +5378,6 @@
    <string name="_ver_23_Total_Amount_of_Transfer_Us">代發薪</string>
    <string name="_ver_23_gold_in_wallet">硬幣已放入錢包！</string>
    <string name="_ver_23_gift_in_bag">禮物已放入背包！</string>
+    <string name="_ver_23_Lucky_bag_Limit_tips">您無法使用此功能。</string>

 </resources>
--- 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</string>
    <string name="_ver_23_gold_in_wallet">Coins have been put into the wallet!</string>
    <string name="_ver_23_gift_in_bag">Gifts have been put into the bag!</string>

+    <string name="_ver_23_Lucky_bag_Limit_tips">Your cannot use this feature.</string>
+


 <!--    <string name="_ver_23_">xxxx</string>-->