Compare commits
2 Commits
release_2.
...
develop
Author | SHA1 | Date | |
---|---|---|---|
![]() |
515912b40a | ||
![]() |
bf492ed403 |
@@ -677,14 +677,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
|
||||
} 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
|
||||
) {
|
||||
|
@@ -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());
|
||||
|
@@ -6,8 +6,11 @@
|
||||
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
||||
# Specifies the JVM arguments used for the daemon process.
|
||||
# The setting is particularly useful for tweaking memory settings.
|
||||
org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=2048m
|
||||
org.gradle.daemon=true
|
||||
org.gradle.jvmargs=-Xmx4096m \
|
||||
--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
|
||||
--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
|
||||
--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
|
||||
# When configured, Gradle will run in incubating parallel mode.
|
||||
# This option should only be used with decoupled projects. More details, visit
|
||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||
@@ -28,6 +31,6 @@ COMPILE_SDK_VERSION=32
|
||||
MIN_SDK_VERSION=21
|
||||
TARGET_SDK_VERSION=32
|
||||
|
||||
version_name=2.1.4
|
||||
version_code=2104
|
||||
version_name=2.1.6
|
||||
version_code=2106
|
||||
minify_enabled=false
|
Reference in New Issue
Block a user