<修复bug>

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

@@ -1,5 +1,6 @@
 package com.wdkl.ncs.android.component.home.activity;
 
+import android.app.Activity;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.SystemClock;
@@ -18,6 +19,7 @@ import com.starrtc.demo.database.HistoryBean;
 import com.starrtc.demo.demo.BaseActivity;
 import com.starrtc.demo.demo.MLOC;
 import com.starrtc.demo.utils.AEvent;
+import com.starrtc.demo.utils.IEventListener;
 import com.starrtc.starrtcsdk.api.XHClient;
 import com.starrtc.starrtcsdk.api.XHConstants;
 import com.starrtc.starrtcsdk.api.XHVoipManager;
@@ -44,7 +46,7 @@ import org.greenrobot.eventbus.ThreadMode;
 import java.text.SimpleDateFormat;
 import java.util.Set;
 
-public class RTCVoipAudioActivity extends BaseActivity implements View.OnClickListener {
+public class RTCVoipAudioActivity extends Activity implements View.OnClickListener, IEventListener {
     private String TAG = RTCVoipAudioActivity.class.getSimpleName();
 
     private XHVoipManager voipManager;
@@ -269,7 +271,7 @@ public class RTCVoipAudioActivity extends BaseActivity implements View.OnClickLi
 
     @Override
     public void dispatchEvent(String aEventID, boolean success, final Object eventObj) {
-        super.dispatchEvent(aEventID, success, eventObj);
+        //super.dispatchEvent(aEventID, success, eventObj);
         switch (aEventID) {
             case AEvent.AEVENT_VOIP_REV_BUSY:
                 MLOC.d("", "对方线路忙");

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

@@ -1,5 +1,6 @@
 package com.wdkl.ncs.android.component.home.activity;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
@@ -14,6 +15,7 @@ import com.starrtc.demo.database.HistoryBean;
 import com.starrtc.demo.demo.BaseActivity;
 import com.starrtc.demo.demo.MLOC;
 import com.starrtc.demo.utils.AEvent;
+import com.starrtc.demo.utils.IEventListener;
 import com.starrtc.starrtcsdk.api.XHClient;
 import com.starrtc.starrtcsdk.apiInterface.IXHResultCallback;
 import com.wdkl.ncs.android.component.home.R;
@@ -34,7 +36,7 @@ import org.greenrobot.eventbus.ThreadMode;
 
 import java.text.SimpleDateFormat;
 
-public class RTCVoipAudioRingingActivity extends BaseActivity implements View.OnClickListener {
+public class RTCVoipAudioRingingActivity extends Activity implements View.OnClickListener, IEventListener {
 
     private String targetId;
     private InteractionVO interactionVO = new InteractionVO();
@@ -97,7 +99,7 @@ public class RTCVoipAudioRingingActivity extends BaseActivity implements View.On
 
     @Override
     public void dispatchEvent(final String aEventID, boolean success, final Object eventObj) {
-        super.dispatchEvent(aEventID,success,eventObj);
+        //super.dispatchEvent(aEventID,success,eventObj);
         switch (aEventID){
             case AEvent.AEVENT_VOIP_REV_HANGUP:
                 MLOC.d("","对方已挂断");

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

@@ -36,7 +36,9 @@ import java.util.Random;
 public class KeepLiveService extends Service implements IEventListener {
     private String TAG = KeepLiveService.class.getSimpleName();
 
+    private XHCustomConfig customConfig;
     private String DeviceSipId = "";
+
     @Nullable
     @Override
     public IBinder onBind(Intent intent) {
@@ -93,7 +95,7 @@ public class KeepLiveService extends Service implements IEventListener {
             }
             addListener();
 
-            XHCustomConfig customConfig =  XHCustomConfig.getInstance(this);
+            customConfig =  XHCustomConfig.getInstance(this);
             customConfig.setChatroomServerUrl(MLOC.CHATROOM_SERVER_URL);
             customConfig.setLiveSrcServerUrl(MLOC.LIVE_SRC_SERVER_URL);
             customConfig.setLiveVdnServerUrl(MLOC.LIVE_VDN_SERVER_URL);
@@ -107,7 +109,7 @@ public class KeepLiveService extends Service implements IEventListener {
 //            customConfig.setDefConfigOpenGLESEnable(false);
 //            customConfig.setDefConfigCameraId(1);//设置默认摄像头方向  0后置  1前置
 //            customConfig.setDefConfigVideoSize(XHConstants.XHCropTypeEnum.STAR_VIDEO_CONFIG_360BW_640BH_180SW_320SH);
-            customConfig.setLogDirPath(Environment.getExternalStorageDirectory().getPath()+"/starrtcLog");
+//            customConfig.setLogDirPath(Environment.getExternalStorageDirectory().getPath()+"/starrtcLog");
 //            customConfig.setDefConfigCamera2Enable(false);
 //            StarCamera.setFrameBufferEnable(false);
             customConfig.initSDKForFree(MLOC.userId, new IXHErrorCallback() {
@@ -118,7 +120,6 @@ 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());
@@ -132,6 +133,8 @@ public class KeepLiveService extends Service implements IEventListener {
                 public void success(Object data) {
                     MLOC.d("KeepLiveService","loginSuccess");
                     isLogin = true;
+                    customConfig.setDefConfigAudioSource(XHConstants.XHAudioSourceEnum.MIC);  //设置默认音源为mic
+                    customConfig.setDefConfigAudioBitRate(128);  //设置码率
                 }
                 @Override
                 public void failed(final String errMsg) {