修改 腕表可能不会返回 占线的bug

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

@@ -72,7 +72,6 @@ class WebRTCVoipAudioActivity : Activity(), View.OnClickListener {
 //        window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
 //                WindowManager.LayoutParams.FLAG_FULLSCREEN)
         setContentView(R.layout.activity_web_rtc_voip_audio)
-
         if (!EventBus.getDefault().isRegistered(this)) {
             EventBus.getDefault().register(this)
         }

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

@@ -189,6 +189,7 @@ class WebRTCVoipAudioRingingActivity : Activity(), View.OnClickListener {
 
     override fun onDestroy() {
         super.onDestroy()
+        DeviceChannel.calling = false
         isAnswerOrHangUp = false
         if (countDownTimer != null) {
             countDownTimer?.cancel()

middleware/src/main/code/com/wdkl/ncs/android/middleware/tcp/channel/DeviceChannel.java

@@ -34,7 +34,12 @@ public class DeviceChannel {
 
         if (tcpModel.getType()== TcpType.VOICE && tcpModel.getAction()==TcpAction.VoiceAction.SUCCESS){
             EventBus.getDefault().post(new MessageEvent(tcpModel, 1));
-        } else if ((tcpModel.getType()== TcpType.VOICE && tcpModel.getAction() == TcpAction.VoiceAction.ACCEPT)  //我方呼出，对方接受
+        } else if(tcpModel.getType()== TcpType.VOICE && tcpModel.getAction() == TcpAction.VoiceAction.CALL &&calling){
+            InteractionVO interactionVO = new Gson().fromJson(tcpModel.getData().toString(), InteractionVO.class);
+            responseTcpModel = VoiceUtil.voiceCalling(Integer.parseInt(Constants.Companion.getIds()), tcpModel.getFromId(),interactionVO.getId());
+            //todo 给服务器发送正在通话中 tcp
+            return responseTcpModel;
+        }else if ((tcpModel.getType()== TcpType.VOICE && tcpModel.getAction() == TcpAction.VoiceAction.ACCEPT)  //我方呼出，对方接受
             //todo:调用通话中界面；建立数据通话
             || (tcpModel.getType()== TcpType.VOICE && tcpModel.getAction() == TcpAction.VoiceAction.REJECT) //我方呼出，对方拒绝
             //todo: 清掉呼出的TcpModel，通话中界面更新 --- 显示对方拒绝并停留3秒，结束至正常界面