From 2d417a258a4d7d46629a01a39fdeba2f02fa11c7 Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Tue, 4 Mar 2025 14:16:44 +0800 Subject: [PATCH] bugfix --- .../chwl/app/avroom/dialog/RoomLuckyBagDialog.kt | 2 ++ .../chwl/app/avroom/fragment/BaseRoomFragment.kt | 9 ++++++++- .../java/com/chwl/app/avroom/widget/LuckyBagBtn.kt | 3 ++- .../com/chwl/app/pay/activity/GiveGoldActivity.kt | 2 +- .../java/com/chwl/app/utils/RoomHelperManager.kt | 2 +- app/src/main/res/layout/dialog_gift_number.xml | 2 +- .../main/res/layout/dialog_room_lucky_bag_open.xml | 3 ++- app/src/main/res/layout/item_give_gold_bili.xml | 2 +- .../main/res/layout/item_room_lucky_bag_bili.xml | 13 ++++++------- .../layout_msg_view_holder_room_lucky_bag.xml | 12 +++++++----- .../layout_msg_view_holder_room_pic_screen.xml | 3 ++- app/src/main/res/values-ar/strings.xml | 4 ++-- app/src/main/res/values-tr/strings.xml | 4 ++-- app/src/main/res/values-zh-rTW/strings.xml | 4 ++-- app/src/main/res/values/strings.xml | 5 +++-- 15 files changed, 42 insertions(+), 28 deletions(-) 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 21c777190..532f85614 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 @@ -44,6 +44,7 @@ import com.chwl.library.common.util.isVerify import com.chwl.library.common.util.postSafe import com.chwl.library.common.util.setAutoSizeModel import com.chwl.library.common.util.setMargin +import com.chwl.library.common.util.setRL import com.chwl.library.common.util.setVis import com.chwl.library.common.util.toColor import com.chwl.library.common.util.toDP @@ -95,6 +96,7 @@ class RoomLuckyBagDialog : BaseDialogFragment() { override fun init() { binding.redBagDesc.text = R.string._ver_24_sendHint.getString(0,0) + binding.giftIndicator.setRL() mGiftAdapter = GiftAdapter() mGiftAdapter.onItemChildClickListener = object : BaseQuickAdapter.OnItemChildClickListener { 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 e51660c2f..f6bb3cd12 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 @@ -944,7 +944,13 @@ open class BaseRoomFragment?> : .doOnSuccess { user-> if (VipHelper.roomPicScreen(user)) { activity?.let { act-> - PhotoPickActivity.startImg(act) + try { + inputEdit.clearFocus() + inputLayout.visibility = View.GONE + KeyBoardUtils.hideKeyBoard(activity, inputEdit) + PhotoPickActivity.startImg(act) + } catch (e: Exception) { + } } } else { dialogManager?.showOkDialog(R.string._ver_24_sentImgVipError.getString()) @@ -2037,6 +2043,7 @@ open class BaseRoomFragment?> : boomLayout.postSafe(3000){ upDateBoomExp() requestGamesData() + checkLuckyBagInfo() } 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 9520145c4..a9fb6d055 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 @@ -11,6 +11,7 @@ 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.core.utils.myutil.MyTimeUtils import com.chwl.library.common.util.ClickUtils.click import com.chwl.library.common.util.doLog import com.chwl.library.common.util.doToast @@ -92,12 +93,12 @@ class LuckyBagBtn : FrameLayout{ mData.isVerify(0){ mBinding.bagImg.setImageResource(if (it.isGift) R.drawable.ic_lucky_bag_btn_gift_pic else R.drawable.ic_lucky_bag_btn_gold_pic) + "开奖时间 = ${MyTimeUtils.millis2Date(it.beginTime)} 开奖倒计时=${it.countDownSecond} 记录的本地时间为=${MyTimeUtils.millis2String(it.countDownTime)} ".doLog() startTimeDown(it.countDownTime,it.countDownSecond) } } } - // b 1739178120 c 1739178000 , 阿拉伯 c 1739178000 private fun startTimeDown(countDownTime: Long,countDownSecond:Int) { val downTime = RoomHelperManager.getTimeDown(countDownTime,countDownSecond) mTimeDownJob?.cancel() diff --git a/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt index 55719c027..8dcce33b9 100644 --- a/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt +++ b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt @@ -209,7 +209,7 @@ class GiveGoldActivity : BaseViewBindingActivity() { binding.enView.setVis(true) } - binding.arGoldUs.text = it.totalGiveGoldUsd.toString() + binding.arGoldUs.text = R.string._ver_23_US_s.getString(it.totalGiveGoldUsd) binding.arGold.text = it.totalGiveGold.toString() binding.enGold.text = it.totalGiveGold.toString() diff --git a/app/src/main/java/com/chwl/app/utils/RoomHelperManager.kt b/app/src/main/java/com/chwl/app/utils/RoomHelperManager.kt index d8e4d1e7f..cdd5f260c 100644 --- a/app/src/main/java/com/chwl/app/utils/RoomHelperManager.kt +++ b/app/src/main/java/com/chwl/app/utils/RoomHelperManager.kt @@ -61,7 +61,7 @@ object RoomHelperManager { val localTime = System.currentTimeMillis() val cSecond = (localTime - countDownTime).coerceAtLeast(0) / 1000 downTime = (countDownSecond - cSecond).coerceAtLeast(0) - "倒计时 计算 localTime=$localTime countDownTime=$countDownTime countDownSecond=$countDownSecond cSecond=$cSecond downTime=$downTime ".doLog() + "倒计时 开奖 计算 localTime=$localTime countDownTime=$countDownTime countDownSecond=$countDownSecond cSecond=$cSecond downTime=$downTime TimeString=${getTimeString(downTime)}".doLog() return downTime } diff --git a/app/src/main/res/layout/dialog_gift_number.xml b/app/src/main/res/layout/dialog_gift_number.xml index 3caf00be4..bd40c0698 100644 --- a/app/src/main/res/layout/dialog_gift_number.xml +++ b/app/src/main/res/layout/dialog_gift_number.xml @@ -154,7 +154,7 @@ @@ -12,23 +12,24 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginEnd="10dp" - android:layout_marginBottom="2dp" android:ellipsize="end" + app:layout_constraintVertical_chainStyle="packed" android:lines="1" + android:layout_marginBottom="4dp" + android:textAlignment="viewStart" android:textColor="@color/color_FFEA5C" android:textSize="14sp" app:layout_constraintBottom_toTopOf="@id/time" app:layout_constraintEnd_toStartOf="@id/item" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:text="111" /> + tools:text="@string/loading" /> + app:layout_constraintBottom_toBottomOf="parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_msg_view_holder_room_lucky_bag.xml b/app/src/main/res/layout/layout_msg_view_holder_room_lucky_bag.xml index 4733a8a98..f8891f795 100644 --- a/app/src/main/res/layout/layout_msg_view_holder_room_lucky_bag.xml +++ b/app/src/main/res/layout/layout_msg_view_holder_room_lucky_bag.xml @@ -8,7 +8,7 @@ @@ -44,12 +44,14 @@ diff --git a/app/src/main/res/layout/layout_msg_view_holder_room_pic_screen.xml b/app/src/main/res/layout/layout_msg_view_holder_room_pic_screen.xml index d23492564..6bdfd641b 100644 --- a/app/src/main/res/layout/layout_msg_view_holder_room_pic_screen.xml +++ b/app/src/main/res/layout/layout_msg_view_holder_room_pic_screen.xml @@ -23,12 +23,13 @@ diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index dee0020b5..ea2aa2795 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -5401,14 +5401,14 @@ حقيبة الحظ التي تم فتحها خلال 24 ساعة سيتم رد أموالها حقيبة الحظ هدية %s! حقيبة الحظ عملة %s! - نرسل حقيبة الحظ هدية! تعال وانضم إلينا! + نرسل حقيبة حظ الهدية! تعال وانضم إلينا! استلمت حقيبة الحظ أرسلت حقيبة الحظ دقائق " %1$s %2$s %3$s لقد دخل إلى الغرفة " %1$s %3$s & %2$s كلاهما على الميكروفون! - نرسل حقيبة الحظ عملة! تعال وانضم إلينا! + نرسل حقيبة حظ الكونزة! تعال وانضم إلينا! ثنائي رائع ثنائي ديناميكي الثنائي المثالي diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 4dad39ae6..0039123de 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -5196,13 +5196,13 @@ Toplam imza alın, ilgili ödülü alın 24 saat içinde açılan Şanslı Çantalar iade edilecektir %s\'ın Hediye Şanslı Çantası! %s\'ın Madeni Para Şanslı Çantası! - Hediye Şanslı Çanta gönderiyoruz! Gel ve katıl! + Hediye Şanslı Çanta gönderiyor! Alınan Şanslı Çanta Gönderilen Şanslı Çanta Dakika %1$s\'ın %2$s %3$s\'si odaya girdi. %1$s %2$s&%3$s ikisi de mikrofonda! - Madeni Para Şanslı Çanta gönderiyoruz! Gel ve katıl! + Coin Lucky Bag gönderiyoruz! Tatlı Çift Enerjik Çift İdeal Çift diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 4baef7097..ba13196fe 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -5344,13 +5344,13 @@ 於24小時內開啟的幸運福袋將會退還 %s 的禮物幸運福袋！ %s 的金币幸運福袋！ - 正在發送禮物幸運福袋！來加入吧！ + 正在發送禮物幸運福袋！ 收到幸運福袋 發出幸運福袋 分鐘 %1$s的%2$s %3$s已進入房間。 %1$s %2$s 和 %3$s 都在麥克風上！ - 正在發送金币幸運福袋！來加入吧！ + 正在發送金币幸運福袋！ 甜蜜雙人組 動感雙人組 理想雙人組 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d624decf0..c1a36c548 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5424,8 +5424,8 @@ You cannot join again within 24 hours after leaving Lucky Bag Numbers Modify - Are sending Gift Lucky Bag! Come and join! - Are sending Coin Lucky Bag! Come and join! + Are Sending Gift Lucky Bag! + Are Sending Coin Lucky Bag! Received Lucky Bag Sent Lucky Bag @@ -5470,6 +5470,7 @@ You cannot join again within 24 hours after leaving Transfer Past 30 days Transfer History "Settlement:%s ÜS " + "%sÜS" Coins have been put into the wallet! Gifts have been put into the bag!