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

fix : 修复bug

Browse Source
This commit is contained in:
eggmanQQQ
2024-12-03 19:32:51 +08:00
parent f6db0c96ab
commit b9dfb3e5ea
9 changed files with 125 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/chwl/app/avroom/dialog/RoomNotifyBoomDialog.kt
View File

@@ -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
import com.chwl.app.common.widget.dialog.DialogManager.OkCancelDialogListener import com.chwl.app.common.widget.dialog.DialogManager.OkCancelDialogListener
import com.chwl.app.databinding.RoomNotifyBoomBinding import com.chwl.app.databinding.RoomNotifyBoomBinding
import com.chwl.app.ui.utils.load
import com.chwl.app.ui.utils.loadImage import com.chwl.app.ui.utils.loadImage
import com.chwl.core.gift.bean.BoomMsgDialogBean import com.chwl.core.gift.bean.BoomMsgDialogBean
import com.chwl.core.manager.AvRoomDataManager import com.chwl.core.manager.AvRoomDataManager
@@ -31,7 +30,7 @@ class RoomNotifyBoomDialog(context: Context) :
mBinding.roomName.text = data.roomTitle mBinding.roomName.text = data.roomTitle
mBinding.boomDes.text = R.string.roomBoomNotify.getString() mBinding.boomDes.text = R.string.roomBoomNotify.getString()
mBinding.root.setOnClickListener { mBinding.clickArea.setOnClickListener {
val activity = GlobalHandleManager.get().activity ?: return@setOnClickListener val activity = GlobalHandleManager.get().activity ?: return@setOnClickListener
val mDialogManager = DialogManager(activity) val mDialogManager = DialogManager(activity)
mDialogManager?.showOkCancelDialog( mDialogManager?.showOkCancelDialog(

3
app/src/main/java/com/chwl/app/avroom/dialog/RoomOperationDialog.java
View File

@@ -661,6 +661,9 @@ public class RoomOperationDialog extends BottomSheetDialog {
boolean isOnMic = AvRoomDataManager.get().isOnMic(AuthModel.get().getCurrentUid()); boolean isOnMic = AvRoomDataManager.get().isOnMic(AuthModel.get().getCurrentUid());
if (!isOnMic) return; if (!isOnMic) return;
boolean isGameRoom = AvRoomDataManager.get().isOpenGame();
if (!isGameRoom) return;
optAdapter.addData(new OptAction(R.drawable.icon_room_operation_music, optAdapter.addData(new OptAction(R.drawable.icon_room_operation_music,
ResUtil.getString(R.string.layout_dialog_voice_seek_02), ResUtil.getString(R.string.layout_dialog_voice_seek_02),
() -> { () -> {

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

@@ -183,7 +183,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P1 : BaseRoomPresenter<V>?> :
protected lateinit var inputEdit: EditText protected lateinit var inputEdit: EditText
protected lateinit var inputSend: ImageView protected lateinit var inputSend: ImageView
protected lateinit var microView: MicroView protected lateinit var microView: MicroView
protected lateinit var mMusicPlayIconView: ImageView protected var mMusicPlayIconView: ImageView? = null
protected lateinit var btnIvConfigEntrance: ImageView protected lateinit var btnIvConfigEntrance: ImageView
protected lateinit var btnIvgame: ImageView protected lateinit var btnIvgame: ImageView
@@ -194,10 +194,10 @@ open class BaseRoomFragment<V : IBaseRoomView?, P1 : BaseRoomPresenter<V>?> :
protected lateinit var boomPro: ImageView protected lateinit var boomPro: ImageView
//---连击时间 需要透明化的view //---连击时间 需要透明化的view
protected lateinit var mPlayTogether:View protected var mPlayTogether:View? = null
protected lateinit var mLayoutDragon:View protected var mLayoutDragon:View? = null
protected lateinit var mIvQueuingMicro:View protected var mIvQueuingMicro:View? = null
protected lateinit var mivTeamPk:View protected var mivTeamPk:View? = null
private var musicPlayerView: MusicPlayerView? = null private var musicPlayerView: MusicPlayerView? = null
private var mVsMusicPlayer: ViewStub? = null private var mVsMusicPlayer: ViewStub? = null
@@ -1405,20 +1405,20 @@ open class BaseRoomFragment<V : IBaseRoomView?, P1 : BaseRoomPresenter<V>?> :
inputLayout.alpha = if (vis) 1f else 0f //input_layout inputLayout.alpha = if (vis) 1f else 0f //input_layout
btnIvConfigEntrance.alpha = if (vis) 1f else 0f //iv_config_entrance btnIvConfigEntrance.alpha = if (vis) 1f else 0f //iv_config_entrance
btnIvgame.alpha = if (vis) 1f else 0f //iv_game btnIvgame.alpha = if (vis) 1f else 0f //iv_game
mivTeamPk.alpha = if (vis) 1f else 0f //iv_team_pk mivTeamPk?.alpha = if (vis) 1f else 0f //iv_team_pk
mIvQueuingMicro.alpha = if (vis) 1f else 0f //iv_queuing_micro mIvQueuingMicro?.alpha = if (vis) 1f else 0f //iv_queuing_micro
mLayoutDragon.alpha = if (vis) 1f else 0f //layout_dragon mLayoutDragon?.alpha = if (vis) 1f else 0f //layout_dragon
mPlayTogether.alpha = if (vis) 1f else 0f //play_together mPlayTogether?.alpha = if (vis) 1f else 0f //play_together
bottomView.isEnabled = vis //bottom_view bottomView.isEnabled = vis //bottom_view
boomLayout.isEnabled = vis //boomLayout boomLayout.isEnabled = vis //boomLayout
inputLayout.isEnabled = vis //input_layout inputLayout.isEnabled = vis //input_layout
btnIvConfigEntrance.isEnabled = vis //iv_config_entrance btnIvConfigEntrance.isEnabled = vis //iv_config_entrance
btnIvgame.isEnabled = vis //iv_game btnIvgame.isEnabled = vis //iv_game
mivTeamPk.isEnabled = vis //iv_team_pk mivTeamPk?.isEnabled = vis //iv_team_pk
mIvQueuingMicro.isEnabled = vis //iv_queuing_micro mIvQueuingMicro?.isEnabled = vis //iv_queuing_micro
mLayoutDragon.isEnabled = vis //layout_dragon mLayoutDragon?.isEnabled = vis //layout_dragon
mPlayTogether.isEnabled = vis //play_together mPlayTogether?.isEnabled = vis //play_together
} }
/** /**

4
app/src/main/java/com/chwl/app/decoration/util/DressUpUtil.kt
View File

@@ -459,7 +459,7 @@ class DressUpUtil {
svgaView?.loadUrl(data.effect,true) svgaView?.loadUrl(data.effect,true)
}else{ }else{
layout.setVis(false) layout.setVis(false,true)
layout.removeAllViews() layout.removeAllViews()
} }
} }
@@ -535,7 +535,7 @@ class DressUpUtil {
svgaView?.loadUrl(data.effect,true) svgaView?.loadUrl(data.effect,true)
}else{ }else{
layout.setVis(false) layout.setVis(false,true)
layout.removeAllViews() layout.removeAllViews()
} }
} }

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

@@ -10,7 +10,7 @@
android:id="@+id/iv_bg" android:id="@+id/iv_bg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp" android:layout_height="70dp"
android:layout_marginTop="@dimen/dp_68" android:layout_marginTop="@dimen/dp_40"
app:autoPlay="true" app:autoPlay="true"
app:clearsAfterDetached="true" app:clearsAfterDetached="true"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"

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

@@ -11,7 +11,7 @@
android:id="@+id/bg" android:id="@+id/bg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="90dp" android:layout_height="90dp"
android:layout_marginTop="@dimen/dp_68" android:layout_marginTop="@dimen/dp_40"
android:layout_marginStart="57dp" android:layout_marginStart="57dp"
android:background="@drawable/ic_room_boom_notify_bg" android:background="@drawable/ic_room_boom_notify_bg"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@@ -36,6 +36,7 @@
app:layout_constraintTop_toTopOf="@+id/bg" /> app:layout_constraintTop_toTopOf="@+id/bg" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/infoLayout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="@+id/bg" app:layout_constraintBottom_toBottomOf="@+id/bg"
@@ -93,4 +94,13 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/bg" /> app:layout_constraintTop_toTopOf="@+id/bg" />
<View
android:id="@+id/clickArea"
app:layout_constraintTop_toTopOf="@+id/infoLayout"
app:layout_constraintBottom_toBottomOf="@+id/infoLayout"
app:layout_constraintStart_toStartOf="@id/avatar"
app:layout_constraintEnd_toEndOf="@id/go"
android:layout_width="0dp"
android:layout_height="0dp"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -15,7 +15,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_82" android:layout_height="@dimen/dp_82"
android:layout_marginHorizontal="@dimen/dp_15" 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" android:background="@drawable/all_service_gift_bg_luck"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />

9
core/src/main/java/com/chwl/core/manager/IMNetEaseManager.java
View File

@@ -137,6 +137,7 @@ import com.chwl.core.utils.LogUtils;
import com.chwl.core.utils.SharedPreferenceUtils; import com.chwl.core.utils.SharedPreferenceUtils;
import com.chwl.core.utils.net.DontWarnObserver; import com.chwl.core.utils.net.DontWarnObserver;
import com.chwl.core.vip.VipBroadcastMsgEvent; 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.net.rxnet.callback.CallBack;
import com.chwl.library.rxbus.RxBus; import com.chwl.library.rxbus.RxBus;
import com.chwl.library.utils.JavaUtil; import com.chwl.library.utils.JavaUtil;
@@ -836,6 +837,7 @@ public final class IMNetEaseManager {
addMessages(msg); addMessages(msg);
} }
}if (customAttachment.getSecond() == CUSTOM_MSG_SUB_TYPE_SEND_ALL_SERVICE_GIFT) { }if (customAttachment.getSecond() == CUSTOM_MSG_SUB_TYPE_SEND_ALL_SERVICE_GIFT) {
OtherExtKt.doLog(" 接收消息 全服礼物 35 - start");
GiftAllServiceAttachment giftAllServiceAttachment = (GiftAllServiceAttachment) attachment; GiftAllServiceAttachment giftAllServiceAttachment = (GiftAllServiceAttachment) attachment;
GiftReceiveInfo giftReceiveInfo = giftAllServiceAttachment.getGiftReceiveInfo(); GiftReceiveInfo giftReceiveInfo = giftAllServiceAttachment.getGiftReceiveInfo();
GiftInfo giftInfo = giftReceiveInfo.getGift(); GiftInfo giftInfo = giftReceiveInfo.getGift();
@@ -846,9 +848,10 @@ public final class IMNetEaseManager {
GiftModel.get().addNewGift(giftInfo); GiftModel.get().addNewGift(giftInfo);
messages.add(msg); messages.add(msg);
gift = true; gift = true;
// if (!giftReceiveInfo.isRoomAlbum() && giftInfo.getGiftType() != GiftType.GIFT_TYPE_SUPER_LUCKY) { // if (!giftReceiveInfo.isRoomAlbum() && giftInfo.getGiftType() != GiftType.GIFT_TYPE_SUPER_LUCKY) {
// addMessages(msg); // addMessages(msg);
// } // }
OtherExtKt.doLog(" 接收消息 全服礼物 35 - end");
} else if (customAttachment.getSecond() == CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_GIFT) { } else if (customAttachment.getSecond() == CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_GIFT) {
messages.add(msg); messages.add(msg);
gift = true; gift = true;

140
mode.json
View File

@@ -1,64 +1,96 @@
{ {
"success": true,
"code": 200, "code": 200,
"message": "success", "message": "success",
"data": [ "data": [
{ {
"uid": 2810, "cardId": 8,
"avatar": "http://beta.img.pekolive.com/FvoEIseKG9glOS4K-t5RBBnY8Irp?imageslim", "name": "公爵",
"roomId": 6080859589, "pic": "https://image.molistar.xyz/v6_info_card.mp4",
"title": "2810&s Room", "used": true,
"partitionId": 1, "expireDays": 10,
"micUsers": [], "comeFrom": 1,
"micUserCount": 0, "hasExpired": false,
"onlineNum": 2, "expireTime": 1734062400000,
"erbanNo": 2503042, "effectType": 0
"isPermitRoom": 2,
"crossPking": false,
"isBanner": false,
"homeRoomType": 0,
"hotValue": 0,
"hourTop": 0,
"isWeekTop1": 0,
"isHourTop1": 0,
"roomBoom": false
}, },
{ {
"uid": 3224, "cardId": 1,
"avatar": "https://image.pekolive.com/bfed3b08-1ebe-42dc-b9a4-619cb2da0e43.gif", "name": "騎士",
"roomId": 6093541254, "pic": "https://image.molistar.xyz/v1_info_card.mp4",
"title": "Molistar的房間", "used": false,
"partitionId": 2, "expireDays": 2,
"micUsers": [ "comeFrom": 1,
{ "hasExpired": false,
"uid": 3184, "expireTime": 1733371200000,
"nick": "hansome", "effectType": 0
"avatar": "https://image.pekolive.com/image/0eaecfbbb78f600a0bbdde3e3a64d66e.gif", },
"gender": 1 {
}, "cardId": 5,
{ "name": "侯爵",
"uid": 3224, "pic": "https://image.molistar.xyz/v5_info_card.mp4",
"nick": "Molistar", "used": false,
"avatar": "https://image.pekolive.com/bfed3b08-1ebe-42dc-b9a4-619cb2da0e43.gif", "expireDays": 0,
"gender": 1 "comeFrom": 1,
} "hasExpired": true,
], "expireTime": 1732334400000,
"micUserCount": 2, "effectType": 0
"lastMicUpTimestamp": 1732618111213, },
"onlineNum": 2, {
"regionFlag": "https://image.molistar.xyz/region_flag_kw.png", "cardId": 10,
"erbanNo": 6228657, "name": "帝王",
"isPermitRoom": 2, "pic": "https://image.molistar.xyz/v8_info_card.mp4",
"crossPking": false, "used": false,
"isBanner": false, "expireDays": 0,
"homeRoomType": 0, "comeFrom": 1,
"hotValue": 0, "hasExpired": true,
"hourTop": 0, "expireTime": 1727582400000,
"isWeekTop1": 0, "effectType": 0
"isHourTop1": 0, },
"roomBoom": true, {
"roomBoomPic": "https://image.molistar.xyz/boomyellow.png", "cardId": 9,
"roomBoomVapUrl": "https://image.molistar.xyz/redboomlv1.mp4" "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
} }