From 522c4a9f6fa55aa6a1f298e7e151d15eaed120e7 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 23 Jan 2024 15:22:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=A3=B0?= =?UTF-8?q?=E7=BD=91=E4=B8=8A=E9=BA=A6=E5=90=8E=E8=87=AA=E5=8A=A8=E5=BC=80?= =?UTF-8?q?=E9=BA=A6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/manager/agora/EngineEventHandler.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/core/src/diff_src_erban/java/com/nnbc123/core/manager/agora/EngineEventHandler.java b/core/src/diff_src_erban/java/com/nnbc123/core/manager/agora/EngineEventHandler.java index 93500ac73..6d0e01a4c 100644 --- a/core/src/diff_src_erban/java/com/nnbc123/core/manager/agora/EngineEventHandler.java +++ b/core/src/diff_src_erban/java/com/nnbc123/core/manager/agora/EngineEventHandler.java @@ -11,6 +11,9 @@ import com.nnbc123.library.utils.SingleToastUtil; import io.agora.rtc2.ClientRoleOptions; import io.agora.rtc2.Constants; import io.agora.rtc2.IRtcEngineEventHandler; +import io.reactivex.Observable; +import io.reactivex.ObservableOnSubscribe; +import io.reactivex.android.schedulers.AndroidSchedulers; /** * @author by 梁馨 on 2020/9/14. @@ -129,7 +132,12 @@ public class EngineEventHandler extends IRtcEngineEventHandler { super.onClientRoleChanged(oldRole, newRole, newRoleOptions); //角色切换 麦克风切换 if (newRole == Constants.CLIENT_ROLE_BROADCASTER) { - RtcEngineManager.get().setMute(RtcEngineManager.get().isMute); + com.chuhai.utils.log.LogUtil.INSTANCE.d(TAG, "onClientRoleChanged() setMute mute:"+RtcEngineManager.get().isMute,false); + Observable.create((ObservableOnSubscribe) emitter -> { + com.chuhai.utils.log.LogUtil.INSTANCE.d(TAG, "onClientRoleChanged() setMute-main mute:"+RtcEngineManager.get().isMute,false); + RtcEngineManager.get().setMute(RtcEngineManager.get().isMute); + emitter.onComplete(); + }).subscribeOn(AndroidSchedulers.mainThread()).subscribe(); } } @@ -151,6 +159,7 @@ public class EngineEventHandler extends IRtcEngineEventHandler { super.onRemoteAudioStats(remoteAudioStats); Logger.t(TAG).d("onRemoteAudioStats uid%d", remoteAudioStats.uid); long uid = (long) remoteAudioStats.uid; + com.chuhai.utils.log.LogUtil.INSTANCE.d(TAG, "onRemoteAudioStats() setRemoteMute mute:"+(!AvRoomDataManager.get().checkIsOnMicByAccount(uid + "")),false); // 如果麦上没有这个人，不接收这个人的声音 RtcEngineManager.get().setRemoteMute(uid, !AvRoomDataManager.get().checkIsOnMicByAccount(uid + "")); From be28ed2509532b6674012975b00994eccd06c8ce Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 24 Jan 2024 16:46:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8DPk=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E5=90=8E=E5=BA=95=E9=83=A8=E9=BA=A6=E5=85=8B=E9=A3=8E=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E7=8A=B6=E6=80=81=E6=97=A0=E6=B3=95=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nnbc123/app/avroom/fragment/BaseRoomFragment.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 96263d0b1..d223414a3 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 @@ -679,7 +679,11 @@ open class BaseRoomFragment?> : .getRoomQueueMemberInfoByAccount(myUid.toString()) if (roomQueueInfo?.mChatRoomMember?.isNoProhibitMic == true && roomQueueInfo.mRoomMicInfo?.isMicMute == false) { bottomView.setMicBtnEnable(true) - bottomView.setMicBtnOpen(true) + if (AudioEngineManager.get().isMute) { + bottomView.setMicBtnOpen(false) + } else { + bottomView.setMicBtnOpen(true) + } } else if (roomQueueInfo?.mChatRoomMember != null && myUid.toString() == roomQueueInfo.mChatRoomMember.account && roomQueueInfo.mRoomMicInfo?.isMicMute == true From f5fc2f9d7998288096e2263a2945cb89b87ad192 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 24 Jan 2024 17:56:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=A6=BB=E5=BC=80?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=E7=AE=A1=E7=90=86=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=B8=BB=E9=BA=A6=E6=93=8D=E4=BD=9C=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=88=E6=94=B9=E4=B8=BA=E7=82=B9=E5=87=BBtoast?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nnbc123/app/avroom/fragment/BaseRoomFragment.kt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 d223414a3..52fb99767 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 @@ -1004,7 +1004,15 @@ open class BaseRoomFragment?> : (roomInfo.isLeaveMode || AvRoomDataManager.get().isSingleRoom) && position == -1 ) { - showUserCardDialog(roomInfo.uid.toString()) + val currentUid = AuthModel.get().currentUid.toString() + if (roomInfo.isLeaveMode && !AvRoomDataManager.get().isSingleRoom && (AvRoomDataManager.get() + .isRoomOwner(currentUid) || AvRoomDataManager.get().isRoomAdmin(currentUid) + || SuperAdminUtil.isSuperAdmin()) + ) { + SingleToastUtil.showToast("请先关闭离开模式") + } else { + showUserCardDialog(roomInfo.uid.toString()) + } } else { val roomQueueInfo = AvRoomDataManager.get() .getRoomQueueMemberInfoByMicPosition(position) From b6524ad94f1a3fd9cb06bdc52db51ddc392d4c1e Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 24 Jan 2024 17:59:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat=EF=BC=9A=E5=88=A0=E9=99=A4=E8=B0=83?= =?UTF-8?q?=E8=AF=95=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nnbc123/core/manager/agora/EngineEventHandler.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/src/diff_src_erban/java/com/nnbc123/core/manager/agora/EngineEventHandler.java b/core/src/diff_src_erban/java/com/nnbc123/core/manager/agora/EngineEventHandler.java index 6d0e01a4c..17c6c969f 100644 --- a/core/src/diff_src_erban/java/com/nnbc123/core/manager/agora/EngineEventHandler.java +++ b/core/src/diff_src_erban/java/com/nnbc123/core/manager/agora/EngineEventHandler.java @@ -132,9 +132,7 @@ public class EngineEventHandler extends IRtcEngineEventHandler { super.onClientRoleChanged(oldRole, newRole, newRoleOptions); //角色切换 麦克风切换 if (newRole == Constants.CLIENT_ROLE_BROADCASTER) { - com.chuhai.utils.log.LogUtil.INSTANCE.d(TAG, "onClientRoleChanged() setMute mute:"+RtcEngineManager.get().isMute,false); Observable.create((ObservableOnSubscribe) emitter -> { - com.chuhai.utils.log.LogUtil.INSTANCE.d(TAG, "onClientRoleChanged() setMute-main mute:"+RtcEngineManager.get().isMute,false); RtcEngineManager.get().setMute(RtcEngineManager.get().isMute); emitter.onComplete(); }).subscribeOn(AndroidSchedulers.mainThread()).subscribe(); @@ -159,7 +157,6 @@ public class EngineEventHandler extends IRtcEngineEventHandler { super.onRemoteAudioStats(remoteAudioStats); Logger.t(TAG).d("onRemoteAudioStats uid%d", remoteAudioStats.uid); long uid = (long) remoteAudioStats.uid; - com.chuhai.utils.log.LogUtil.INSTANCE.d(TAG, "onRemoteAudioStats() setRemoteMute mute:"+(!AvRoomDataManager.get().checkIsOnMicByAccount(uid + "")),false); // 如果麦上没有这个人，不接收这个人的声音 RtcEngineManager.get().setRemoteMute(uid, !AvRoomDataManager.get().checkIsOnMicByAccount(uid + ""));