Merge branch 'watch.1.0.0' of http://git.wdklian.com/allen/ncs_android_frame into watch.1.0.0

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchCallRecordsActivity.kt

@@ -132,7 +132,7 @@ class WatchCallRecordsActivity : BaseActivity<WatchCallRecordsFragmentPresenter,
             tcpModel.setData(data)
             intent.putExtra("tcpModelStr",tcpModel.toJson())
             startActivity(intent)
-
+            finish()
 
         }
 

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

@@ -100,6 +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);