修改

home/src/main/code/com/wdkl/ncs/android/component/home/activity/RTCVoipAudioActivity.java

@@ -35,6 +35,7 @@ import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction;
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpType;
 import com.wdkl.ncs.android.middleware.utils.MessageEvent;
 
+import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
@@ -77,6 +78,8 @@ public class RTCVoipAudioActivity extends BaseActivity implements View.OnClickLi
         //todo 设置为通话状态 有其他用户输入时 DeviceChannel设置返回通话中
         DeviceChannel.calling = true;
 
+        EventBus.getDefault().register(this);
+
         starRTCAudioManager = StarRTCAudioManager.create(this.getApplicationContext());
         starRTCAudioManager.start(new StarRTCAudioManager.AudioManagerEvents() {
             @Override
@@ -226,6 +229,7 @@ public class RTCVoipAudioActivity extends BaseActivity implements View.OnClickLi
         removeListener();
         //todo 状态设置为未在通话中
         DeviceChannel.calling = false;
+        EventBus.getDefault().unregister(this);
         super.onDestroy();
     }
 
@@ -380,8 +384,8 @@ public class RTCVoipAudioActivity extends BaseActivity implements View.OnClickLi
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
-    void onMoonEvent(MessageEvent messageEvent) {
-        if (messageEvent.getType() == 2){
+    public void onMoonEvent(MessageEvent messageEvent) {
+        if (messageEvent.getTag() == 2){
             TcpModel tcpModel = (TcpModel) messageEvent.getMessage();
 
             if (tcpModel.getAction() == TcpAction.VoiceAction.ACCEPT){

starRTC/src/main/java/com/starrtc/demo/demo/service/KeepLiveService.java

@@ -100,7 +100,10 @@ public class KeepLiveService extends Service implements IEventListener {
             customConfig.setImServerUrl(MLOC.IM_SERVER_URL);
             customConfig.setVoipServerUrl(MLOC.VOIP_SERVER_URL);
             customConfig.setLogEnable(false); //关闭SDK调试日志
+<<<<<<< HEAD
 //            customConfig.setDefConfigAudioSource(XHConstants.XHAudioSourceEnum.MIC);  //音频采集使用mic
+=======
+>>>>>>> 81297e18df7ba5f7b239ad69a3b62c6b979ce4a7
 //            customConfig.setDefConfigOpenGLESEnable(false);
 //            customConfig.setDefConfigCameraId(1);//设置默认摄像头方向  0后置  1前置
 //            customConfig.setDefConfigVideoSize(XHConstants.XHCropTypeEnum.STAR_VIDEO_CONFIG_360BW_640BH_180SW_320SH);
@@ -115,6 +118,8 @@ public class KeepLiveService extends Service implements IEventListener {
                 }
             },new Handler());
 
+            customConfig.setDefConfigAudioSource(XHConstants.XHAudioSourceEnum.MIC);  //设置默认音源为mic
+
             XHClient.getInstance().getChatManager().addListener(new XHChatManagerListener());
             XHClient.getInstance().getGroupManager().addListener(new XHGroupManagerListener());
             XHClient.getInstance().getVoipManager().addListener(new XHVoipManagerListener());