|
@@ -53,7 +53,7 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
|
|
|
|
|
|
private var visiting: Boolean = false
|
|
private var visiting: Boolean = false
|
|
|
|
|
|
- private var audioCall: Boolean = false
|
|
|
|
|
|
+ private var audioCall: Boolean = true
|
|
|
|
|
|
private var callEnded: Boolean = false
|
|
private var callEnded: Boolean = false
|
|
|
|
|
|
@@ -121,8 +121,6 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
|
|
RingPlayHelper.stopRingTone()
|
|
RingPlayHelper.stopRingTone()
|
|
if (Constant.CALL_STATE == Constant.CALL_CALLING) {
|
|
if (Constant.CALL_STATE == Constant.CALL_CALLING) {
|
|
//结束sip通话
|
|
//结束sip通话
|
|
- //gEngineKit?.endCall()
|
|
|
|
-
|
|
|
|
Constant.CALL_STATE = Constant.CALL_STANDBY
|
|
Constant.CALL_STATE = Constant.CALL_STANDBY
|
|
sky_voice_call_timer.stop()
|
|
sky_voice_call_timer.stop()
|
|
if (visiting) {
|
|
if (visiting) {
|
|
@@ -237,7 +235,7 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
|
|
ll_voice_call.visibility = View.GONE
|
|
ll_voice_call.visibility = View.GONE
|
|
}
|
|
}
|
|
|
|
|
|
- //Constant.CALL_STATE = Constant.CALL_CALLING
|
|
|
|
|
|
+ Constant.CALL_STATE = Constant.CALL_CALLING
|
|
sky_voice_call_calling_text.text = "通话中..."
|
|
sky_voice_call_calling_text.text = "通话中..."
|
|
sky_voice_call_timeout.visibility = View.GONE
|
|
sky_voice_call_timeout.visibility = View.GONE
|
|
cancelTimer()
|
|
cancelTimer()
|
|
@@ -522,9 +520,9 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
|
|
acceptCall()
|
|
acceptCall()
|
|
if (TextUtils.isEmpty(curInteractionVO.toSipId)) {
|
|
if (TextUtils.isEmpty(curInteractionVO.toSipId)) {
|
|
//通话失败,重置并返回主界面
|
|
//通话失败,重置并返回主界面
|
|
- showMessage("targetId为空!")
|
|
|
|
|
|
+ showMessage("targetSipId为空!")
|
|
Constant.CALL_STATE = Constant.CALL_STANDBY
|
|
Constant.CALL_STATE = Constant.CALL_STANDBY
|
|
- VoiceUtil.rejectAudioCall(Constant.DEVICE_ID, fromId, Constant.interactionId)
|
|
|
|
|
|
+ VoiceUtil.handoffAudioCall(Constant.DEVICE_ID, fromId, Constant.interactionId)
|
|
callEnd()
|
|
callEnd()
|
|
}
|
|
}
|
|
} else if (curTcpModel.getAction() == TcpAction.VoiceAction.REJECT) {
|
|
} else if (curTcpModel.getAction() == TcpAction.VoiceAction.REJECT) {
|