From bf492ed4035a7921f1146fcd62cd44e259f85af6 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 15 May 2024 10:25:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5PIKO=E4=BF=AE=E5=A4=8Dbug?= =?UTF-8?q?=EF=BC=88fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E7=9B=B8=E4=BA=B2?= =?UTF-8?q?=E6=88=BF=E9=80=81=E7=A4=BC=E5=AF=BC=E8=87=B4=E9=97=AD=E9=BA=A6?= =?UTF-8?q?=E3=80=81=E7=BB=93=E6=9D=9F=E5=AF=BC=E8=87=B4=E9=97=AD=E9=BA=A6?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=88=E5=8F=AA=E6=98=AF=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E8=A1=A5=E6=95=91=EF=BC=8C=E5=85=B7=E4=BD=93=E7=9C=8B=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=EF=BC=89=20fix=EF=BC=9A=E7=A7=BB=E9=99=A4BaseRoomFrag?= =?UTF-8?q?ment=E4=B8=AD=E6=9B=B4=E6=96=B0=E9=BA=A6=E5=85=8B=E9=A3=8E?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E6=9F=90=E4=BA=9B=E5=88=A4=E6=96=AD?= =?UTF-8?q?=EF=BC=88isNoProhibitMic=EF=BC=89=EF=BC=8C=E4=B8=8D=E7=9F=A5?= =?UTF-8?q?=E9=81=93=E4=B9=8B=E5=89=8D=E4=B8=BA=E4=BD=95=E5=8A=A0=E8=BF=99?= =?UTF-8?q?=E6=AE=B5=E5=88=A4=E6=96=AD=EF=BC=8C=E4=BD=86=E8=BF=99=E6=AE=B5?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=A3=8E=E9=99=A9=E8=BE=83=E5=A4=A7=EF=BC=8C?= =?UTF-8?q?=E6=9F=90=E4=BA=9B=E6=83=85=E5=86=B5=E5=AF=BC=E8=87=B4=E9=BA=A6?= =?UTF-8?q?=E5=85=8B=E9=A3=8E=E7=8A=B6=E6=80=81=E4=B8=80=E7=9B=B4=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=9C=AA=E5=85=B3=E9=97=AD=EF=BC=88=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=90=8E=E7=BB=8F=E6=B5=8B=E8=AF=95=E9=AA=8C=E6=94=B6=EF=BC=8C?= =?UTF-8?q?=E6=9C=AA=E5=8F=91=E7=8E=B0=E9=97=AE=E9=A2=98=EF=BC=89=20?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nnbc123/app/avroom/fragment/BaseRoomFragment.kt | 9 +-------- .../com/nnbc123/core/manager/IMNetEaseManager.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/nnbc123/app/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/nnbc123/app/avroom/fragment/BaseRoomFragment.kt index 52fb99767..08deaca38 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/fragment/BaseRoomFragment.kt +++ b/app/src/main/java/com/nnbc123/app/avroom/fragment/BaseRoomFragment.kt @@ -677,14 +677,7 @@ open class BaseRoomFragment?> : } else { val roomQueueInfo = AvRoomDataManager.get() .getRoomQueueMemberInfoByAccount(myUid.toString()) - if (roomQueueInfo?.mChatRoomMember?.isNoProhibitMic == true && roomQueueInfo.mRoomMicInfo?.isMicMute == false) { - bottomView.setMicBtnEnable(true) - if (AudioEngineManager.get().isMute) { - bottomView.setMicBtnOpen(false) - } else { - bottomView.setMicBtnOpen(true) - } - } else if (roomQueueInfo?.mChatRoomMember != null + if (roomQueueInfo?.mChatRoomMember != null && myUid.toString() == roomQueueInfo.mChatRoomMember.account && roomQueueInfo.mRoomMicInfo?.isMicMute == true ) { diff --git a/core/src/diff_src_erban/java/com/nnbc123/core/manager/IMNetEaseManager.java b/core/src/diff_src_erban/java/com/nnbc123/core/manager/IMNetEaseManager.java index 4705d35dd..5f114b6b6 100644 --- a/core/src/diff_src_erban/java/com/nnbc123/core/manager/IMNetEaseManager.java +++ b/core/src/diff_src_erban/java/com/nnbc123/core/manager/IMNetEaseManager.java @@ -2158,6 +2158,9 @@ public final class IMNetEaseManager { PkModel.get().syncPkList(userInfo, chatRoomMember.getGroupType()); noticePKInfo(); + int oldMicPosition = AvRoomDataManager.get().getMicPosition(AuthModel.get().getCurrentUid()); + boolean oldIsOnMic = AvRoomDataManager.get().isOwnerOnMic(); + int size = mMicQueueMemberMap.size(); if (size > 0) { for (int j = 0; j < size; j++) { @@ -2201,7 +2204,14 @@ public final class IMNetEaseManager { //开麦 AudioEngineManager.get().setRole(Constants.CLIENT_ROLE_BROADCASTER); if (!roomQueueInfo.mChatRoomMember.isNoProhibitMic()) { - AudioEngineManager.get().setMute(roomQueueInfo.mRoomMicInfo.isMicMute() || AvRoomDataManager.get().mIsNeedOpenMic); + /* + 修复相亲房自动闭麦bug + 原因：相亲房的某些麦位状态更新，走的是上麦通道，导致默认闭麦了 + 临时解决：若是相亲房且之前在麦或麦位没变化->不做闭麦操作 + */ + if (!AvRoomDataManager.get().isDatingMode() || (AvRoomDataManager.get().isDatingMode() && (!oldIsOnMic || oldMicPosition != micPosition))) { + AudioEngineManager.get().setMute(roomQueueInfo.mRoomMicInfo.isMicMute() || AvRoomDataManager.get().mIsNeedOpenMic); + } } } noticeUpMic(Integer.parseInt(key), chatRoomMember.getAccount());