修改冲突

home/src/main/code/com/wdkl/ncs/android/component/home/service/TcpHandleService.kt

@@ -45,6 +45,7 @@ class TcpHandleService : Service(){
 
             var intent = Intent()
             intent.setClass(this, WatchEventDetailActivity::class.java)
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             //todo: 不优雅的传输，应该直接传递对象
             intent.putExtra("tcpModelStr",tcpModel.toJson())
             startActivity(intent)

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

@@ -101,6 +101,7 @@ public class KeepLiveService extends Service implements IEventListener {
             customConfig.setVoipServerUrl(MLOC.VOIP_SERVER_URL);
             customConfig.setLogEnable(false); //关闭SDK调试日志
 
+
 //            customConfig.setDefConfigAudioSource(XHConstants.XHAudioSourceEnum.MIC);  //音频采集使用mic
 
 //            customConfig.setDefConfigOpenGLESEnable(false);