Merge branch 'develop' into simulator

app/build.gradle

@@ -23,11 +23,7 @@ android {
 
         ndk {
             //设置支持的SO库架构
-            if (onlyArm64) {
+            abiFilters "x86", "x86_64"
-                abiFilters "arm64-v8a"
-            } else {
-                abiFilters "armeabi-v7a", "arm64-v8a"
-            }
         }
 
         flavorDimensions 'default'

core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRTCEngineAdapter.java

@@ -917,8 +917,7 @@ public class TRTCEngineAdapter extends BaseAdapterImpl {
         if (role == CLIENT_ROLE_BROADCASTER) {
             userRole = TRTCRoleAnchor;
             if (!TRtcEngineManager.get().isMute) {
-                trtcCloud.getDeviceManager().setSystemVolumeType(TXDeviceManager.TXSystemVolumeType.TXSystemVolumeTypeMedia);
+                trtcCloud.startLocalAudio(TRTCCloudDef.TRTC_AUDIO_QUALITY_MUSIC);
-                trtcCloud.startLocalAudio(TRTCCloudDef.TRTC_AUDIO_QUALITY_DEFAULT);
             }
         } else if (role == CLIENT_ROLE_AUDIENCE) {
             userRole = TRTCRoleAudience;
@@ -1009,8 +1008,7 @@ public class TRTCEngineAdapter extends BaseAdapterImpl {
             return -1;
         }
         if (enabled) {
-            trtcCloud.getDeviceManager().setSystemVolumeType(TXDeviceManager.TXSystemVolumeType.TXSystemVolumeTypeMedia);
+            trtcCloud.startLocalAudio(TRTCCloudDef.TRTC_AUDIO_QUALITY_MUSIC);
-            trtcCloud.startLocalAudio(TRTCCloudDef.TRTC_AUDIO_QUALITY_DEFAULT);
         } else {
             trtcCloud.stopLocalAudio();
         }