|
@@ -1281,9 +1281,6 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
|
|
Log.d("TCP", "received tcp action: " + tcpModel.action + ", type: " + tcpModel.type)
|
|
Log.d("TCP", "received tcp action: " + tcpModel.action + ", type: " + tcpModel.type)
|
|
if (tcpModel.getType() == TcpType.VOICE) {
|
|
if (tcpModel.getType() == TcpType.VOICE) {
|
|
if (tcpModel.data != null) {
|
|
if (tcpModel.data != null) {
|
|
- if (playing) {
|
|
|
|
- stopBroadcast(false)
|
|
|
|
- }
|
|
|
|
val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
|
|
val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
|
|
if (tcpModel.action == TcpAction.VoiceAction.CALL) {
|
|
if (tcpModel.action == TcpAction.VoiceAction.CALL) {
|
|
Constant.fromId = tcpModel.fromId
|
|
Constant.fromId = tcpModel.fromId
|
|
@@ -1292,6 +1289,10 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
|
|
Constant.CALL_STATE = Constant.CALL_INCOMING
|
|
Constant.CALL_STATE = Constant.CALL_INCOMING
|
|
//通话之前先判断webrtc socket是否连接上,否则不能建立通话
|
|
//通话之前先判断webrtc socket是否连接上,否则不能建立通话
|
|
if (Constant.TCP_CONNECTED && !TextUtils.isEmpty(Constant.SIP_ID)) {
|
|
if (Constant.TCP_CONNECTED && !TextUtils.isEmpty(Constant.SIP_ID)) {
|
|
|
|
+ if (playing) {
|
|
|
|
+ stopBroadcast(false)
|
|
|
|
+ }
|
|
|
|
+
|
|
//来电界面
|
|
//来电界面
|
|
var fragment = SkyCallFragment()
|
|
var fragment = SkyCallFragment()
|
|
var bundle = Bundle()
|
|
var bundle = Bundle()
|