chore:调整jvm配置（解决butterknife导致打包失败问题）

fix：移除BaseRoomFragment中更新麦克风状态的某些判断（isNoProhibitMic），不知道之前为何加这段判断，但这段判断风险较大，某些情况导致麦克风状态一直显示未关闭（去掉后经测试验收，未发现问题）
）

app/src/main/java/com/nnbc123/app/avroom/fragment/BaseRoomFragment.kt

@@ -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
                 ) {

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());

core/src/main/java/com/nnbc123/core/file/FileModel.java

@@ -14,6 +14,7 @@ import com.nnbc123.library.net.rxnet.RxNet;
 import java.io.File;
 import java.util.UUID;
 import io.reactivex.Single;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import retrofit2.http.GET;
 
 public class FileModel extends BaseModel implements IFileModel {
@@ -52,7 +53,8 @@ public class FileModel extends BaseModel implements IFileModel {
         }
         File finalFile = file;
         String outName = UUID.randomUUID().toString() + PathUtils.INSTANCE.getSuffixType(finalFile.getName());
-        return getCosToken().flatMap(token -> CosClient.INSTANCE.upload(AppUtils.getApp(), finalFile, outName, token).map(cosXmlResult -> cosXmlResult.accessUrl));
+        return getCosToken().flatMap(token -> CosClient.INSTANCE.upload(AppUtils.getApp(), finalFile, outName, token).map(cosXmlResult -> cosXmlResult.accessUrl))
+                .observeOn(AndroidSchedulers.mainThread());
     }
 
     @Override

gradle.properties

@@ -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.3
-version_code=2103
+version_name=2.1.6
+version_code=2106
 minify_enabled=false