|
@@ -545,10 +545,10 @@ class SkyCallFragment: BaseCallFragment(), CallSession.CallSessionCallback {
|
|
} else if (curTcpModel.getAction() == TcpAction.VoiceAction.CALLING) {
|
|
} else if (curTcpModel.getAction() == TcpAction.VoiceAction.CALLING) {
|
|
//我方呼出,对方通话中
|
|
//我方呼出,对方通话中
|
|
showMessage("对方正在忙线中,暂时无法接听!")
|
|
showMessage("对方正在忙线中,暂时无法接听!")
|
|
- AppTool.Time.delay(1000) {
|
|
|
|
|
|
+ /*AppTool.Time.delay(1000) {
|
|
RingPlayHelper.stopRingTone()
|
|
RingPlayHelper.stopRingTone()
|
|
cancelCall()
|
|
cancelCall()
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
} else if (curTcpModel.getAction() == TcpAction.VoiceAction.SUCCESS) {
|
|
} else if (curTcpModel.getAction() == TcpAction.VoiceAction.SUCCESS) {
|
|
//呼叫成功
|
|
//呼叫成功
|
|
//本机呼叫的时候tcpModel为空,只有呼叫成功的时候才能获得对应tcp相关数据
|
|
//本机呼叫的时候tcpModel为空,只有呼叫成功的时候才能获得对应tcp相关数据
|
|
@@ -580,6 +580,22 @@ class SkyCallFragment: BaseCallFragment(), CallSession.CallSessionCallback {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ Constant.EVENT_CALL_MSG -> {
|
|
|
|
+ //分机呼叫主机时,主机打过来了
|
|
|
|
+ val tcpModel = messageEvent.message as TcpModel
|
|
|
|
+ if (tcpModel.getAction() == TcpAction.VoiceAction.CALL) {
|
|
|
|
+ interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
|
|
|
|
+ fromId = tcpModel.fromId
|
|
|
|
+ Constant.fromId = tcpModel.fromId
|
|
|
|
+ Constant.interactionId = interactionVO?.id
|
|
|
|
+ Constant.CALL_STATE = Constant.CALL_CALLING
|
|
|
|
+
|
|
|
|
+ RingPlayHelper.stopRingTone()
|
|
|
|
+ VoiceUtil.acceptAudioCall(Constant.DEVICE_ID, fromId, interactionVO?.id)
|
|
|
|
+ acceptCall()
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
//外部呼叫按键
|
|
//外部呼叫按键
|
|
Constant.EVENT_SERIAL_EVENT -> {
|
|
Constant.EVENT_SERIAL_EVENT -> {
|
|
if (messageEvent.message is String) {
|
|
if (messageEvent.message is String) {
|
|
@@ -591,7 +607,7 @@ class SkyCallFragment: BaseCallFragment(), CallSession.CallSessionCallback {
|
|
cancelCall()
|
|
cancelCall()
|
|
} else if (serialAction.equals("accept")) {
|
|
} else if (serialAction.equals("accept")) {
|
|
RingPlayHelper.stopRingTone()
|
|
RingPlayHelper.stopRingTone()
|
|
- Constant.CALL_STATE = Constant.CALL_INCOMING
|
|
|
|
|
|
+ Constant.CALL_STATE = Constant.CALL_CALLING
|
|
VoiceUtil.acceptAudioCall(Constant.DEVICE_ID, fromId, interactionVO?.id)
|
|
VoiceUtil.acceptAudioCall(Constant.DEVICE_ID, fromId, interactionVO?.id)
|
|
acceptCall()
|
|
acceptCall()
|
|
} else if (serialAction.equals("handoff")) {
|
|
} else if (serialAction.equals("handoff")) {
|