diff --git a/app/src/main/java/com/chwl/app/avroom/dialog/RoomNotifyBoomDialog.kt b/app/src/main/java/com/chwl/app/avroom/dialog/RoomNotifyBoomDialog.kt index 707798498..080860efc 100644 --- a/app/src/main/java/com/chwl/app/avroom/dialog/RoomNotifyBoomDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/dialog/RoomNotifyBoomDialog.kt @@ -8,7 +8,6 @@ import com.chwl.app.avroom.activity.AVRoomActivity import com.chwl.app.common.widget.dialog.DialogManager import com.chwl.app.common.widget.dialog.DialogManager.OkCancelDialogListener import com.chwl.app.databinding.RoomNotifyBoomBinding -import com.chwl.app.ui.utils.load import com.chwl.app.ui.utils.loadImage import com.chwl.core.gift.bean.BoomMsgDialogBean import com.chwl.core.manager.AvRoomDataManager @@ -31,7 +30,7 @@ class RoomNotifyBoomDialog(context: Context) : mBinding.roomName.text = data.roomTitle mBinding.boomDes.text = R.string.roomBoomNotify.getString() - mBinding.root.setOnClickListener { + mBinding.clickArea.setOnClickListener { val activity = GlobalHandleManager.get().activity ?: return@setOnClickListener val mDialogManager = DialogManager(activity) mDialogManager?.showOkCancelDialog( diff --git a/app/src/main/java/com/chwl/app/avroom/dialog/RoomOperationDialog.java b/app/src/main/java/com/chwl/app/avroom/dialog/RoomOperationDialog.java index 99ff617cb..79f2df5b9 100644 --- a/app/src/main/java/com/chwl/app/avroom/dialog/RoomOperationDialog.java +++ b/app/src/main/java/com/chwl/app/avroom/dialog/RoomOperationDialog.java @@ -661,6 +661,9 @@ public class RoomOperationDialog extends BottomSheetDialog { boolean isOnMic = AvRoomDataManager.get().isOnMic(AuthModel.get().getCurrentUid()); if (!isOnMic) return; + boolean isGameRoom = AvRoomDataManager.get().isOpenGame(); + if (!isGameRoom) return; + optAdapter.addData(new OptAction(R.drawable.icon_room_operation_music, ResUtil.getString(R.string.layout_dialog_voice_seek_02), () -> { 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 228c16a8b..7265cf1c1 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 @@ -183,7 +183,7 @@ open class BaseRoomFragment?> : protected lateinit var inputEdit: EditText protected lateinit var inputSend: ImageView protected lateinit var microView: MicroView - protected lateinit var mMusicPlayIconView: ImageView + protected var mMusicPlayIconView: ImageView? = null protected lateinit var btnIvConfigEntrance: ImageView protected lateinit var btnIvgame: ImageView @@ -194,10 +194,10 @@ open class BaseRoomFragment?> : protected lateinit var boomPro: ImageView //---连击时间 需要透明化的view - protected lateinit var mPlayTogether:View - protected lateinit var mLayoutDragon:View - protected lateinit var mIvQueuingMicro:View - protected lateinit var mivTeamPk:View + protected var mPlayTogether:View? = null + protected var mLayoutDragon:View? = null + protected var mIvQueuingMicro:View? = null + protected var mivTeamPk:View? = null private var musicPlayerView: MusicPlayerView? = null private var mVsMusicPlayer: ViewStub? = null @@ -1405,20 +1405,20 @@ open class BaseRoomFragment?> : inputLayout.alpha = if (vis) 1f else 0f //input_layout btnIvConfigEntrance.alpha = if (vis) 1f else 0f //iv_config_entrance btnIvgame.alpha = if (vis) 1f else 0f //iv_game - mivTeamPk.alpha = if (vis) 1f else 0f //iv_team_pk - mIvQueuingMicro.alpha = if (vis) 1f else 0f //iv_queuing_micro - mLayoutDragon.alpha = if (vis) 1f else 0f //layout_dragon - mPlayTogether.alpha = if (vis) 1f else 0f //play_together + mivTeamPk?.alpha = if (vis) 1f else 0f //iv_team_pk + mIvQueuingMicro?.alpha = if (vis) 1f else 0f //iv_queuing_micro + mLayoutDragon?.alpha = if (vis) 1f else 0f //layout_dragon + mPlayTogether?.alpha = if (vis) 1f else 0f //play_together bottomView.isEnabled = vis //bottom_view boomLayout.isEnabled = vis //boomLayout inputLayout.isEnabled = vis //input_layout btnIvConfigEntrance.isEnabled = vis //iv_config_entrance btnIvgame.isEnabled = vis //iv_game - mivTeamPk.isEnabled = vis //iv_team_pk - mIvQueuingMicro.isEnabled = vis //iv_queuing_micro - mLayoutDragon.isEnabled = vis //layout_dragon - mPlayTogether.isEnabled = vis //play_together + mivTeamPk?.isEnabled = vis //iv_team_pk + mIvQueuingMicro?.isEnabled = vis //iv_queuing_micro + mLayoutDragon?.isEnabled = vis //layout_dragon + mPlayTogether?.isEnabled = vis //play_together } /** diff --git a/app/src/main/java/com/chwl/app/decoration/util/DressUpUtil.kt b/app/src/main/java/com/chwl/app/decoration/util/DressUpUtil.kt index 35b6dbda3..d07f6c336 100644 --- a/app/src/main/java/com/chwl/app/decoration/util/DressUpUtil.kt +++ b/app/src/main/java/com/chwl/app/decoration/util/DressUpUtil.kt @@ -459,7 +459,7 @@ class DressUpUtil { svgaView?.loadUrl(data.effect,true) }else{ - layout.setVis(false) + layout.setVis(false,true) layout.removeAllViews() } } @@ -535,7 +535,7 @@ class DressUpUtil { svgaView?.loadUrl(data.effect,true) }else{ - layout.setVis(false) + layout.setVis(false,true) layout.removeAllViews() } } diff --git a/app/src/main/res/layout/layout_template_notify_baishun.xml b/app/src/main/res/layout/layout_template_notify_baishun.xml index c56e0ce46..d877a6cbc 100644 --- a/app/src/main/res/layout/layout_template_notify_baishun.xml +++ b/app/src/main/res/layout/layout_template_notify_baishun.xml @@ -10,7 +10,7 @@ android:id="@+id/iv_bg" android:layout_width="match_parent" android:layout_height="70dp" - android:layout_marginTop="@dimen/dp_68" + android:layout_marginTop="@dimen/dp_40" app:autoPlay="true" app:clearsAfterDetached="true" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/room_notify_boom.xml b/app/src/main/res/layout/room_notify_boom.xml index 7baa22fd7..4676db71e 100644 --- a/app/src/main/res/layout/room_notify_boom.xml +++ b/app/src/main/res/layout/room_notify_boom.xml @@ -11,7 +11,7 @@ android:id="@+id/bg" android:layout_width="match_parent" android:layout_height="90dp" - android:layout_marginTop="@dimen/dp_68" + android:layout_marginTop="@dimen/dp_40" android:layout_marginStart="57dp" android:background="@drawable/ic_room_boom_notify_bg" app:layout_constraintTop_toTopOf="parent" /> @@ -36,6 +36,7 @@ app:layout_constraintTop_toTopOf="@+id/bg" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/room_notify_luck_gift_dlg.xml b/app/src/main/res/layout/room_notify_luck_gift_dlg.xml index 6036aa2d9..6b55df78f 100644 --- a/app/src/main/res/layout/room_notify_luck_gift_dlg.xml +++ b/app/src/main/res/layout/room_notify_luck_gift_dlg.xml @@ -15,7 +15,8 @@ android:layout_width="match_parent" android:layout_height="@dimen/dp_82" android:layout_marginHorizontal="@dimen/dp_15" - app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toTopOf="parent" + android:layout_marginTop="@dimen/dp_40" android:background="@drawable/all_service_gift_bg_luck" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/core/src/main/java/com/chwl/core/manager/IMNetEaseManager.java b/core/src/main/java/com/chwl/core/manager/IMNetEaseManager.java index 9310eaccd..52a1e597e 100644 --- a/core/src/main/java/com/chwl/core/manager/IMNetEaseManager.java +++ b/core/src/main/java/com/chwl/core/manager/IMNetEaseManager.java @@ -137,6 +137,7 @@ import com.chwl.core.utils.LogUtils; import com.chwl.core.utils.SharedPreferenceUtils; import com.chwl.core.utils.net.DontWarnObserver; import com.chwl.core.vip.VipBroadcastMsgEvent; +import com.chwl.library.common.util.OtherExtKt; import com.chwl.library.net.rxnet.callback.CallBack; import com.chwl.library.rxbus.RxBus; import com.chwl.library.utils.JavaUtil; @@ -836,6 +837,7 @@ public final class IMNetEaseManager { addMessages(msg); } }if (customAttachment.getSecond() == CUSTOM_MSG_SUB_TYPE_SEND_ALL_SERVICE_GIFT) { + OtherExtKt.doLog(" 接收消息 全服礼物 35 - start"); GiftAllServiceAttachment giftAllServiceAttachment = (GiftAllServiceAttachment) attachment; GiftReceiveInfo giftReceiveInfo = giftAllServiceAttachment.getGiftReceiveInfo(); GiftInfo giftInfo = giftReceiveInfo.getGift(); @@ -846,9 +848,10 @@ public final class IMNetEaseManager { GiftModel.get().addNewGift(giftInfo); messages.add(msg); gift = true; -// if (!giftReceiveInfo.isRoomAlbum() && giftInfo.getGiftType() != GiftType.GIFT_TYPE_SUPER_LUCKY) { -// addMessages(msg); -// } +// if (!giftReceiveInfo.isRoomAlbum() && giftInfo.getGiftType() != GiftType.GIFT_TYPE_SUPER_LUCKY) { +// addMessages(msg); +// } + OtherExtKt.doLog(" 接收消息 全服礼物 35 - end"); } else if (customAttachment.getSecond() == CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_GIFT) { messages.add(msg); gift = true; diff --git a/mode.json b/mode.json index 451488417..83047186c 100644 --- a/mode.json +++ b/mode.json @@ -1,64 +1,96 @@ { + "success": true, "code": 200, "message": "success", "data": [ { - "uid": 2810, - "avatar": "http://beta.img.pekolive.com/FvoEIseKG9glOS4K-t5RBBnY8Irp?imageslim", - "roomId": 6080859589, - "title": "2810&s Room", - "partitionId": 1, - "micUsers": [], - "micUserCount": 0, - "onlineNum": 2, - "erbanNo": 2503042, - "isPermitRoom": 2, - "crossPking": false, - "isBanner": false, - "homeRoomType": 0, - "hotValue": 0, - "hourTop": 0, - "isWeekTop1": 0, - "isHourTop1": 0, - "roomBoom": false + "cardId": 8, + "name": "公爵", + "pic": "https://image.molistar.xyz/v6_info_card.mp4", + "used": true, + "expireDays": 10, + "comeFrom": 1, + "hasExpired": false, + "expireTime": 1734062400000, + "effectType": 0 }, { - "uid": 3224, - "avatar": "https://image.pekolive.com/bfed3b08-1ebe-42dc-b9a4-619cb2da0e43.gif", - "roomId": 6093541254, - "title": "Molistar的房間", - "partitionId": 2, - "micUsers": [ - { - "uid": 3184, - "nick": "hansome", - "avatar": "https://image.pekolive.com/image/0eaecfbbb78f600a0bbdde3e3a64d66e.gif", - "gender": 1 - }, - { - "uid": 3224, - "nick": "Molistar", - "avatar": "https://image.pekolive.com/bfed3b08-1ebe-42dc-b9a4-619cb2da0e43.gif", - "gender": 1 - } - ], - "micUserCount": 2, - "lastMicUpTimestamp": 1732618111213, - "onlineNum": 2, - "regionFlag": "https://image.molistar.xyz/region_flag_kw.png", - "erbanNo": 6228657, - "isPermitRoom": 2, - "crossPking": false, - "isBanner": false, - "homeRoomType": 0, - "hotValue": 0, - "hourTop": 0, - "isWeekTop1": 0, - "isHourTop1": 0, - "roomBoom": true, - "roomBoomPic": "https://image.molistar.xyz/boomyellow.png", - "roomBoomVapUrl": "https://image.molistar.xyz/redboomlv1.mp4" + "cardId": 1, + "name": "騎士", + "pic": "https://image.molistar.xyz/v1_info_card.mp4", + "used": false, + "expireDays": 2, + "comeFrom": 1, + "hasExpired": false, + "expireTime": 1733371200000, + "effectType": 0 + }, + { + "cardId": 5, + "name": "侯爵", + "pic": "https://image.molistar.xyz/v5_info_card.mp4", + "used": false, + "expireDays": 0, + "comeFrom": 1, + "hasExpired": true, + "expireTime": 1732334400000, + "effectType": 0 + }, + { + "cardId": 10, + "name": "帝王", + "pic": "https://image.molistar.xyz/v8_info_card.mp4", + "used": false, + "expireDays": 0, + "comeFrom": 1, + "hasExpired": true, + "expireTime": 1727582400000, + "effectType": 0 + }, + { + "cardId": 9, + "name": "親王", + "pic": "https://image.molistar.xyz/v7_info_card.mp4", + "used": false, + "expireDays": 0, + "comeFrom": 1, + "hasExpired": true, + "expireTime": 1727582400000, + "effectType": 0 + }, + { + "cardId": 4, + "name": "伯爵", + "pic": "https://image.molistar.xyz/v4_info_card.mp4", + "used": false, + "expireDays": 0, + "comeFrom": 1, + "hasExpired": true, + "expireTime": 1727582400000, + "effectType": 0 + }, + { + "cardId": 3, + "name": "子爵", + "pic": "https://image.molistar.xyz/v3_info_card.mp4", + "used": false, + "expireDays": 0, + "comeFrom": 1, + "hasExpired": true, + "expireTime": 1727582400000, + "effectType": 0 + }, + { + "cardId": 2, + "name": "男爵", + "pic": "https://image.molistar.xyz/v2_info_card.mp4", + "used": false, + "expireDays": 0, + "comeFrom": 1, + "hasExpired": true, + "expireTime": 1727582400000, + "effectType": 0 } ], - "timestamp": 1732618182677 + "timestamp": 1733221943100 }