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

bugfix

Browse Source
This commit is contained in:
eggmanQQQ
2025-03-04 14:16:44 +08:00
parent 288aaebc3b
commit 2d417a258a
15 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagDialog.kt
View File

@@ -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<DialogRoomLuckyBagBinding>() {
override fun init() {
binding.redBagDesc.text = R.string._ver_24_sendHint.getString(0,0)
binding.giftIndicator.setRL()
mGiftAdapter = GiftAdapter()
mGiftAdapter.onItemChildClickListener = object : BaseQuickAdapter.OnItemChildClickListener {

9
app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt
View File

@@ -944,7 +944,13 @@ open class BaseRoomFragment<V : IBaseRoomView?, P1 : BaseRoomPresenter<V>?> :
.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<V : IBaseRoomView?, P1 : BaseRoomPresenter<V>?> :
boomLayout.postSafe(3000){
upDateBoomExp()
requestGamesData()
checkLuckyBagInfo()
}

3
app/src/main/java/com/chwl/app/avroom/widget/LuckyBagBtn.kt
View File

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

2
app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt
View File

@@ -209,7 +209,7 @@ class GiveGoldActivity : BaseViewBindingActivity<ActivityGiveGoldBinding>() {
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()

2
app/src/main/java/com/chwl/app/utils/RoomHelperManager.kt
View File

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

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

@@ -154,7 +154,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="all"
android:text="All"
android:gravity="center"
android:textColor="@color/appColor"
android:textSize="@dimen/dp_11"

3
app/src/main/res/layout/dialog_room_lucky_bag_open.xml
View File

@@ -231,6 +231,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_marginBottom="1dp"
tools:visibility="visible"
android:text="@string/_ver_24_View_Others_24"
android:textColor="@color/white_transparent_80"
@@ -242,7 +243,7 @@
<TextView
android:id="@+id/confirm"
android:layout_width="wrap_content"
android:layout_height="46dp"
android:layout_height="45dp"
android:layout_marginBottom="20dp"
android:gravity="center"
android:minWidth="190dp"

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

@@ -12,7 +12,7 @@
android:layout_height="38dp"
android:background="@color/color_F4F4F4"
android:gravity="center_vertical"
android:layout_marginStart="15dp"
android:paddingHorizontal="15dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"

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

@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="55dp"
android:layout_marginBottom="14dp"
tools:background="@color/red_font">
@@ -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" />
<TextView
android:id="@+id/time"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:alpha="0.6"
android:ellipsize="end"
android:lines="1"
@@ -60,10 +61,8 @@
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginTop="11dp"
android:background="#b75a6f"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/time" />
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -8,7 +8,7 @@
<ImageView
android:id="@+id/bg"
android:layout_width="match_parent"
android:minHeight="90dp"
android:minHeight="75dp"
android:scaleType="fitXY"
android:src="@drawable/ic_lucky_bag_msg_gift_bg"
android:layout_height="match_parent" />
@@ -44,12 +44,14 @@
<TextView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="9dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="@id/bg"
android:layout_marginBottom="5dp"
android:maxLines="2"
android:layout_marginStart="9dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="6dp"
android:paddingBottom="13dp"
android:text="@string/loading"
android:lines="2"
android:textColor="@color/color_FFEA5C"
android:textSize="14sp"
app:layout_constraintTop_toBottomOf="@id/avatar" />

3
app/src/main/res/layout/layout_msg_view_holder_room_pic_screen.xml
View File

@@ -23,12 +23,13 @@
<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
app:cardElevation="0dp"
app:cardCornerRadius="8dp"
app:cardCornerRadius="6dp"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/pic"
android:src="@drawable/default_banner"
tools:src="@color/black"
android:scaleType="centerCrop"
android:layout_width="200dp"
android:layout_height="200dp"/>

4
app/src/main/res/values-ar/strings.xml
View File

@@ -5401,14 +5401,14 @@
<string name="_ver_24_View_Others_24">حقيبة الحظ التي تم فتحها خلال 24 ساعة سيتم رد أموالها</string>
<string name="_ver_24_luckBagOpenGiftTitle">حقيبة الحظ هدية %s!</string>
<string name="_ver_24_luckBagOpenCoinTitle">حقيبة الحظ عملة %s!</string>
<string name="_ver_24_lucky_bag_room_notify_gift">نرسل حقيبة الحظ هدية! تعال وانضم إلينا!</string>
<string name="_ver_24_lucky_bag_room_notify_gift">نرسل حقيبة حظ الهدية! تعال وانضم إلينا!</string>
<string name="_ver_24_lucky_bag_bili_received">استلمت حقيبة الحظ</string>
<string name="_ver_24_lucky_bag_bili_sent">أرسلت حقيبة الحظ</string>
<string name="_ver_24_Mins_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="_ver_24_lucky_bag_room_notify_coin">نرسل حقيبة حظ الكونزة! تعال وانضم إلينا!</string>
<string name="Sweet_Duo">ثنائي رائع</string>
<string name="Dynamic_Duo">ثنائي ديناميكي</string>
<string name="Ldeal_Duo">الثنائي المثالي</string>

4
app/src/main/res/values-tr/strings.xml
View File

@@ -5196,13 +5196,13 @@ Toplam imza alın, ilgili ödülü alın
<string name="_ver_24_View_Others_24">24 saat içinde açılan Şanslı Çantalar iade edilecektir</string>
<string name="_ver_24_luckBagOpenGiftTitle">%s\'ın Hediye Şanslı Çantası!</string>
<string name="_ver_24_luckBagOpenCoinTitle">%s\'ın Madeni Para Şanslı Çantası!</string>
<string name="_ver_24_lucky_bag_room_notify_gift">Hediye Şanslı Çanta gönderiyoruz! Gel ve katıl!</string>
<string name="_ver_24_lucky_bag_room_notify_gift">Hediye Şanslı Çanta gönderiyor!</string>
<string name="_ver_24_lucky_bag_bili_received">Alınan Şanslı Çanta</string>
<string name="_ver_24_lucky_bag_bili_sent">Gönderilen Şanslı Çanta</string>
<string name="_ver_24_Mins_s">Dakika</string>
<string name="_ver_24_cpInRoomTips">%1$s\'ın %2$s %3$s\'si odaya girdi.</string>
<string name="_ver_24_cpUpMicTips">%1$s %2$s&amp;%3$s ikisi de mikrofonda!</string>
<string name="_ver_24_lucky_bag_room_notify_coin">Madeni Para Şanslı Çanta gönderiyoruz! Gel ve katıl!</string>
<string name="_ver_24_lucky_bag_room_notify_coin">Coin Lucky Bag gönderiyoruz!</string>
<string name="Sweet_Duo">Tatlı Çift</string>
<string name="Dynamic_Duo">Enerjik Çift</string>
<string name="Ldeal_Duo">İdeal Çift</string>

4
app/src/main/res/values-zh-rTW/strings.xml
View File

@@ -5344,13 +5344,13 @@
<string name="_ver_24_View_Others_24">於24小時內開啟的幸運福袋將會退還</string>
<string name="_ver_24_luckBagOpenGiftTitle">%s 的禮物幸運福袋！</string>
<string name="_ver_24_luckBagOpenCoinTitle">%s 的金币幸運福袋！</string>
<string name="_ver_24_lucky_bag_room_notify_gift">正在發送禮物幸運福袋！來加入吧！</string>
<string name="_ver_24_lucky_bag_room_notify_gift">正在發送禮物幸運福袋！</string>
<string name="_ver_24_lucky_bag_bili_received">收到幸運福袋</string>
<string name="_ver_24_lucky_bag_bili_sent">發出幸運福袋</string>
<string name="_ver_24_Mins_s">分鐘</string>
<string name="_ver_24_cpInRoomTips">%1$s的%2$s %3$s已進入房間。</string>
<string name="_ver_24_cpUpMicTips">%1$s %2$s 和 %3$s 都在麥克風上！</string>
<string name="_ver_24_lucky_bag_room_notify_coin">正在發送金币幸運福袋！來加入吧！</string>
<string name="_ver_24_lucky_bag_room_notify_coin">正在發送金币幸運福袋！</string>
<string name="Sweet_Duo">甜蜜雙人組</string>
<string name="Dynamic_Duo">動感雙人組</string>
<string name="Ldeal_Duo">理想雙人組</string>

5
app/src/main/res/values/strings.xml
View File

@@ -5424,8 +5424,8 @@ You cannot join again within 24 hours after leaving</string>
<string name="_ver_24_Lucky_Bag_Numbers">Lucky Bag Numbers</string>
<string name="_ver_24_Modify">Modify</string>
<string name="_ver_24_lucky_bag_room_notify_gift">Are sending Gift Lucky Bag! Come and join!</string>
<string name="_ver_24_lucky_bag_room_notify_coin">Are sending Coin Lucky Bag! Come and join!</string>
<string name="_ver_24_lucky_bag_room_notify_gift">Are Sending Gift Lucky Bag!</string>
<string name="_ver_24_lucky_bag_room_notify_coin">Are Sending Coin Lucky Bag!</string>
<string name="_ver_24_lucky_bag_bili_received">Received Lucky Bag</string>
<string name="_ver_24_lucky_bag_bili_sent">Sent Lucky Bag</string>
@@ -5470,6 +5470,7 @@ You cannot join again within 24 hours after leaving</string>
<string name="_ver_23_Transfer_Past_30_days">Transfer Past 30 days</string>
<string name="_ver_23_Transfer_History">Transfer History</string>
<string name="_ver_23_Settlement_s">"Settlement:%s ÜS "</string>
<string name="_ver_23_US_s">"%sÜS"</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>