代码优化

android_host/src/main/java/com/wdkl/ncs/android/component/nursehome/activity/NurseHomeActivity.kt

@@ -1247,7 +1247,6 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNewN
                     //呼出取消
                     Constant.CALL_STATE = Constant.CALL_STANDBY
                     DeviceChannel.calling = false
-                    //VoiceUtil.cancelAudioCall(Constants.ids, Constants.targetDeviceId)
                     EventBus.getDefault().post(MessageEvent("cancel", Constant.EVENT_END_CALL))
                 } else if (Constant.CALL_STATE == Constant.CALL_CALLING) {
                     Constant.CALL_STATE = Constant.CALL_STANDBY

android_host/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/SipCallFragment.kt

@@ -87,11 +87,9 @@ class SipCallFragment: BaseCallFragment() {
                 showCallView(false)
                 Constant.CALL_STATE = Constant.CALL_CALLING
                 DeviceChannel.calling = true
-                    //发送accept消息
+                //发送accept消息
                 val callTcp = VoiceUtil.voiceAccept(tid, Constant.DEVICE_ID, Constant.fromId, Constant.interactionId)
-                 TcpClient.getInstance().sendMsg(callTcp.toJson())
-
-
+                TcpClient.getInstance().sendMsg(callTcp.toJson())
             }
         }
     }
@@ -111,7 +109,6 @@ class SipCallFragment: BaseCallFragment() {
                 showMessage("无响应")
                 DeviceChannel.calling = false
                 Constant.CALL_STATE = Constant.CALL_STANDBY
-                //VoiceUtil.cancelAudioCall(Constants.ids, Constants.targetDeviceId)
                 cancelCall(Constant.DEVICE_ID, Constant.targetDeviceId, Constant.interactionId)
                 callEnd(false)
             }
@@ -125,7 +122,6 @@ class SipCallFragment: BaseCallFragment() {
                 callEnd(true)
             } else {
                 countDownTimer.cancel()
-                //VoiceUtil.cancelAudioCall(Constants.ids, Constants.targetDeviceId)
                 cancelCall(Constant.DEVICE_ID, Constant.targetDeviceId, Constant.interactionId)
                 callEnd(false)
             }
@@ -267,7 +263,6 @@ class SipCallFragment: BaseCallFragment() {
             Constant.CALL_STATE = Constant.CALL_STANDBY
             DeviceChannel.calling = false
             if (handoff) {
-                //VoiceUtil.handoffAudioCall(Constants.ids, Constants.fromId, Constants.interactionId)
                 val callTcp = VoiceUtil.voiceHandoff(tid, Constant.DEVICE_ID, Constant.fromId, Constant.interactionId)
                 TcpClient.getInstance().sendMsg(callTcp.toJson())
             }

android_host/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/SkyCallFragment.kt

@@ -159,6 +159,7 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
                     //接听呼叫
                     acceptCall = true
                 }
+                Constant.CALL_STATE = Constant.CALL_CALLING
             }
         }