@@ -49,6 +49,7 @@ class TweCallActivity : BaseIPCActivity<ActivityTweCallBinding>(), IvVoipCallbac
4949
5050 @Volatile
5151 private var initStatus = - 1 // 未初始化 -1, 初始化成功 0, 其他
52+
5253 @Volatile
5354 private var callState = CallState .IDLE
5455 private var condition1 = false
@@ -197,7 +198,12 @@ class TweCallActivity : BaseIPCActivity<ActivityTweCallBinding>(), IvVoipCallbac
197198
198199 if (roomId != null && callState == CallState .INCOMING_CALL ) {
199200 Log .d(TAG , " reject incoming call, roomId: $roomId " )
200- dialog = ProgressDialog .show(this @TweCallActivity, " " , " 拒接来电,roomId: $roomId " , true )
201+ dialog = ProgressDialog .show(
202+ this @TweCallActivity,
203+ " " ,
204+ " 拒接来电,roomId: $roomId " ,
205+ true
206+ )
201207 replyRoomCall(VoipCalledStatus .VOIP_CALLED_STATUS_REFUSE )
202208 tvBeCallStatus.text = getString(R .string.wx_voip_refuse)
203209 updateBeCallUI(false )
@@ -255,7 +261,12 @@ class TweCallActivity : BaseIPCActivity<ActivityTweCallBinding>(), IvVoipCallbac
255261
256262 if (roomId != null && callState == CallState .INCOMING_CALL ) {
257263 Log .d(TAG , " busy action for incoming call, roomId: $roomId " )
258- dialog = ProgressDialog .show(this @TweCallActivity, " " , " 占线来电,roomId: $roomId " , true )
264+ dialog = ProgressDialog .show(
265+ this @TweCallActivity,
266+ " " ,
267+ " 占线来电,roomId: $roomId " ,
268+ true
269+ )
259270 replyRoomCall(VoipCalledStatus .VOIP_CALLED_STATUS_BUSY )
260271 tvBeCallStatus.text = getString(R .string.wx_voip_busy)
261272 updateBeCallUI(false )
@@ -371,8 +382,9 @@ class TweCallActivity : BaseIPCActivity<ActivityTweCallBinding>(), IvVoipCallbac
371382 VoipRecvVRotateType .VOIP_RECV_V_ROTATE_NONE ,
372383 0 , 0
373384 )
385+ val customMsg = " "
374386 val res = VideoNativeInterface .getInstance().doWxCloudVoipCall(
375- modelId, wxaAppId, openId, deviceId,
387+ modelId, wxaAppId, openId, deviceId, customMsg,
376388 callType, videoInfo, true , calleeCameraSwitch
377389 )
378390 val result = when (res) {
@@ -410,14 +422,18 @@ class TweCallActivity : BaseIPCActivity<ActivityTweCallBinding>(), IvVoipCallbac
410422 VoipRecvVRotateType .VOIP_RECV_V_ROTATE_NONE ,
411423 0 , 0
412424 )
425+ val customMsg = " "
413426 val res = VideoNativeInterface .getInstance()
414- .doWxCloudVoipCallV2(openId, callType, videoInfo, true , calleeCameraSwitch)
427+ .doWxCloudVoipCallV2(
428+ openId, customMsg, callType, videoInfo, true , calleeCameraSwitch
429+ )
415430 val result = when (res) {
416431 - 2 -> " 通话中"
417432 0 -> {
418433 callState = CallState .IS_CALLING
419434 " 呼叫成功"
420435 }
436+
421437 else -> " 呼叫失败"
422438 }
423439 Log .i(TAG , " call result: $result , resCode: $res " )
@@ -478,7 +494,8 @@ class TweCallActivity : BaseIPCActivity<ActivityTweCallBinding>(), IvVoipCallbac
478494 VoipRecvVRotateType .VOIP_RECV_V_ROTATE_NONE ,
479495 0 , 0
480496 )
481- val res = VideoNativeInterface .getInstance().doWxCloudVoipJoinV2(roomId, videoInfo, reply)
497+ val res =
498+ VideoNativeInterface .getInstance().doWxCloudVoipJoinV2(roomId, videoInfo, reply)
482499
483500 val result = when (res) {
484501 IvErrCode .IV_ERR_NONE -> " 响应房间成功"
@@ -641,6 +658,7 @@ class TweCallActivity : BaseIPCActivity<ActivityTweCallBinding>(), IvVoipCallbac
641658 CommandType .IV_AVT_COMMAND_CALL_CANCEL -> {
642659 binding.tvBeCallStatus.text = getString(R .string.wx_voip_peer_cancel)
643660 }
661+
644662 CommandType .IV_AVT_COMMAND_CALL_TIMEOUT -> {
645663 binding.tvBeCallStatus.text = getString(R .string.wx_voip_timeout)
646664 }
0 commit comments