diff --git a/pages/im/components/messagePreview.vue b/pages/im/components/messagePreview.vue index 56b48fe..c2806ce 100644 --- a/pages/im/components/messagePreview.vue +++ b/pages/im/components/messagePreview.vue @@ -22,10 +22,10 @@ {{ user.name }}:[位置] - + {{ user.name }}:[语音通话] - + {{ user.name }}:[视频通话] diff --git a/pages/im/components/showCall.vue b/pages/im/components/showCall.vue index 9730e2b..393d541 100644 --- a/pages/im/components/showCall.vue +++ b/pages/im/components/showCall.vue @@ -2,8 +2,12 @@ {{ name }} - 语音通话 - 视频通话 + + {{ message.connected ? '通话时长' + message.duration : '未接通' }} + + + {{ message.connected ? '通话时长' + message.duration : '未接通' }} + @@ -38,8 +42,13 @@ default: true } }, + computed: { + message() { + return JSON.parse(this.msg.message) + } + }, mounted() { - console.log(this.msg); + console.log(this.message); } } diff --git a/pages/im/private/call.nvue b/pages/im/private/call.nvue index 8009f8f..2a564a9 100644 --- a/pages/im/private/call.nvue +++ b/pages/im/private/call.nvue @@ -73,7 +73,9 @@ // 关闭麦克风 micOff: false, // 关闭扬声器 - volumeOff: false + volumeOff: false, + // 通话时长 + duration: 0 } }, onLoad(e) { @@ -84,7 +86,7 @@ // 进入页面开启外呼 if (this.isCall) { CallLib.startSingleCall(this.targetId, this.mediaType, ''); - if (this.mediaType == 1) { + if (this.mediaType == '1') { const session = CallLib.getCurrentCallSession() setTimeout(() => { CallLib.setVideoView(session.mine.userId, this.$refs.bigVideoView.ref, 0, false) @@ -136,8 +138,11 @@ const messageContent = { objectName: 'RC:InfoNtf', userInfo: this.$store.getters.sender, - message: String(this.mediaType), - extra: '这里传接通和时长信息', + message: JSON.stringify({ + mediaType: this.mediaType, + connected: this.connected, + duration: this.duration + }) } const sentTime = 0 // 消息的发送时间 IMLib.insertOutgoingMessage(conversationType, targetId, sentStatus, messageContent, sentTime, @@ -175,7 +180,7 @@ // 设置链接状态 this.connected = true // 视频通话,才开摄像头 - if (this.mediaType == 1) { + if (this.mediaType == '1') { const session = CallLib.getCurrentCallSession() setTimeout(() => { CallLib.setVideoView(session.targetId, this.$refs.bigVideoView.ref, 0, false) diff --git a/pages/im/private/chat.vue b/pages/im/private/chat.vue index 5f6539d..66118e3 100644 --- a/pages/im/private/chat.vue +++ b/pages/im/private/chat.vue @@ -123,7 +123,7 @@ this.conversationType, this.targetId, 0, - 120, + 20, true, (messages) => { this.messages = messages