呼叫优化

conversion_box/src/main/java/com/wdkl/app/ncs/conversion_box/activity/MainActivity.kt

@@ -891,19 +891,19 @@ class MainActivity :BaseActivity<MainActivityPresenter, MainActivityLayoutBindin
                             //}
                         } else if (tcpModel.getAction() == TcpAction.VoiceAction.CALLING) {
                             //我方呼出，对方通话中
-                            //val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
-                            /*if (curInteractionVO!!.id == interactionVO.id) {
-                                callTimer.cancel()
+                            val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
+                            //if (curInteractionVO!!.id == interactionVO.id) {
+                                //callTimer.cancel()
                                 Constant.CALL_STATE = Constant.CALL_STANDBY
                                 updateCallText("待机中")
-                            }*/
+                            //}
                             showMessage("对方忙线中")
                             //关闭分机呼叫和门灯
-                            //SerialPortHelper.closeSoundChannel(interactionVO.fromEthMac)
-                            //val doorAddr = getDoorLightAddr(interactionVO.fromEthMac)
-                            //if (!TextUtils.isEmpty(doorAddr)) {
-                            //    SerialPortHelper.closeDoorLight(doorAddr)
-                            //}
+                            SerialPortHelper.closeSoundChannel(interactionVO.fromEthMac)
+                            val doorAddr = getDoorLightAddr(interactionVO.fromEthMac)
+                            if (!TextUtils.isEmpty(doorAddr)) {
+                                SerialPortHelper.closeDoorLight(doorAddr)
+                            }
                         } else if (tcpModel.getAction() == TcpAction.VoiceAction.FAILED) {
                             //我方呼出，对方不在线，设备离线或其它错误
                             //callTimer.cancel()

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

@@ -45,8 +45,6 @@ public class DeviceChannel {
                         // 当前待机状态，返回呼叫成功，并切换到呼叫界面
                         Constant.CALL_STATE = Constant.CALL_INCOMING;
                         EventBus.getDefault().post(new MessageEvent(tcpModel, EVENT_TCP_MSG));
-                        //responseTcpModel = VoiceUtil.voiceSuccess(Constant.DEVICE_ID, tcpModel.getFromId());
-                        //return responseTcpModel;
                     }
                 } else {
                     //tcpModel.getAction()==TcpAction.VoiceAction.ACCEPT