|
|
@ -58,21 +58,21 @@ |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
pullPrivateOfflineMessage(minId) { |
|
|
pullPrivateOfflineMessage(minId) { |
|
|
store.commit("loadingPrivateMsg",true) |
|
|
store.commit("loadingPrivateMsg", true) |
|
|
http({ |
|
|
http({ |
|
|
url: "/message/private/pullOfflineMessage?minId=" + minId, |
|
|
url: "/message/private/pullOfflineMessage?minId=" + minId, |
|
|
method: 'GET' |
|
|
method: 'GET' |
|
|
}).catch(()=>{ |
|
|
}).catch(() => { |
|
|
store.commit("loadingPrivateMsg",false) |
|
|
store.commit("loadingPrivateMsg", false) |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
pullGroupOfflineMessage(minId) { |
|
|
pullGroupOfflineMessage(minId) { |
|
|
store.commit("loadingGroupMsg",true) |
|
|
store.commit("loadingGroupMsg", true) |
|
|
http({ |
|
|
http({ |
|
|
url: "/message/group/pullOfflineMessage?minId=" + minId, |
|
|
url: "/message/group/pullOfflineMessage?minId=" + minId, |
|
|
method: 'GET' |
|
|
method: 'GET' |
|
|
}).catch(()=>{ |
|
|
}).catch(() => { |
|
|
store.commit("loadingGroupMsg",false) |
|
|
store.commit("loadingGroupMsg", false) |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
handlePrivateMessage(msg) { |
|
|
handlePrivateMessage(msg) { |
|
|
@ -114,12 +114,12 @@ |
|
|
// #endif |
|
|
// #endif |
|
|
// 被呼叫,弹出视频页面 |
|
|
// 被呼叫,弹出视频页面 |
|
|
let delayTime = 100; |
|
|
let delayTime = 100; |
|
|
if(msg.type == enums.MESSAGE_TYPE.RTC_CALL_VOICE |
|
|
if (msg.type == enums.MESSAGE_TYPE.RTC_CALL_VOICE || |
|
|
|| msg.type == enums.MESSAGE_TYPE.RTC_CALL_VIDEO){ |
|
|
msg.type == enums.MESSAGE_TYPE.RTC_CALL_VIDEO) { |
|
|
let mode = msg.type == enums.MESSAGE_TYPE.RTC_CALL_VIDEO? "video":"voice"; |
|
|
let mode = msg.type == enums.MESSAGE_TYPE.RTC_CALL_VIDEO ? "video" : "voice"; |
|
|
let pages = getCurrentPages(); |
|
|
let pages = getCurrentPages(); |
|
|
let curPage = pages[pages.length-1].route; |
|
|
let curPage = pages[pages.length - 1].route; |
|
|
if(curPage != "pages/chat/chat-private-video"){ |
|
|
if (curPage != "pages/chat/chat-private-video") { |
|
|
const friendInfo = encodeURIComponent(JSON.stringify(friend)); |
|
|
const friendInfo = encodeURIComponent(JSON.stringify(friend)); |
|
|
uni.navigateTo({ |
|
|
uni.navigateTo({ |
|
|
url: `/pages/chat/chat-private-video?mode=${mode}&friend=${friendInfo}&isHost=false` |
|
|
url: `/pages/chat/chat-private-video?mode=${mode}&friend=${friendInfo}&isHost=false` |
|
|
@ -128,8 +128,8 @@ |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
setTimeout(() => { |
|
|
setTimeout(() => { |
|
|
uni.$emit('WS_RTC_PRIVATE',msg); |
|
|
uni.$emit('WS_RTC_PRIVATE', msg); |
|
|
},delayTime) |
|
|
}, delayTime) |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
let chatInfo = { |
|
|
let chatInfo = { |
|
|
@ -149,7 +149,7 @@ |
|
|
handleGroupMessage(msg) { |
|
|
handleGroupMessage(msg) { |
|
|
// 消息加载标志 |
|
|
// 消息加载标志 |
|
|
if (msg.type == enums.MESSAGE_TYPE.LOADING) { |
|
|
if (msg.type == enums.MESSAGE_TYPE.LOADING) { |
|
|
store.commit("loadingGroupMsg",JSON.parse(msg.content)) |
|
|
store.commit("loadingGroupMsg", JSON.parse(msg.content)) |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
// 消息已读处理 |
|
|
// 消息已读处理 |
|
|
@ -191,10 +191,10 @@ |
|
|
// #endif |
|
|
// #endif |
|
|
// 被呼叫,弹出视频页面 |
|
|
// 被呼叫,弹出视频页面 |
|
|
let delayTime = 100; |
|
|
let delayTime = 100; |
|
|
if(msg.type == enums.MESSAGE_TYPE.RTC_GROUP_SETUP){ |
|
|
if (msg.type == enums.MESSAGE_TYPE.RTC_GROUP_SETUP) { |
|
|
let pages = getCurrentPages(); |
|
|
let pages = getCurrentPages(); |
|
|
let curPage = pages[pages.length-1].route; |
|
|
let curPage = pages[pages.length - 1].route; |
|
|
if(curPage != "pages/chat/chat-group-video"){ |
|
|
if (curPage != "pages/chat/chat-group-video") { |
|
|
const userInfos = encodeURIComponent(msg.content); |
|
|
const userInfos = encodeURIComponent(msg.content); |
|
|
const inviterId = msg.sendId; |
|
|
const inviterId = msg.sendId; |
|
|
const groupId = msg.groupId |
|
|
const groupId = msg.groupId |
|
|
@ -207,8 +207,8 @@ |
|
|
} |
|
|
} |
|
|
// 消息转发到chat-group-video页面进行处理 |
|
|
// 消息转发到chat-group-video页面进行处理 |
|
|
setTimeout(() => { |
|
|
setTimeout(() => { |
|
|
uni.$emit('WS_RTC_GROUP',msg); |
|
|
uni.$emit('WS_RTC_GROUP', msg); |
|
|
},delayTime) |
|
|
}, delayTime) |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -272,8 +272,8 @@ |
|
|
// this.audioTip.src = "/static/audio/tip.wav"; |
|
|
// this.audioTip.src = "/static/audio/tip.wav"; |
|
|
// this.audioTip.play(); |
|
|
// this.audioTip.play(); |
|
|
}, |
|
|
}, |
|
|
isExpired(loginInfo){ |
|
|
isExpired(loginInfo) { |
|
|
if(!loginInfo || !loginInfo.expireTime){ |
|
|
if (!loginInfo || !loginInfo.expireTime) { |
|
|
return true; |
|
|
return true; |
|
|
} |
|
|
} |
|
|
return loginInfo.expireTime < new Date().getTime(); |
|
|
return loginInfo.expireTime < new Date().getTime(); |
|
|
@ -311,7 +311,7 @@ |
|
|
uni.switchTab({ |
|
|
uni.switchTab({ |
|
|
url: "/pages/chat/chat" |
|
|
url: "/pages/chat/chat" |
|
|
}) |
|
|
}) |
|
|
} else{ |
|
|
} else { |
|
|
// 跳转到登录页 |
|
|
// 跳转到登录页 |
|
|
// #ifdef H5 |
|
|
// #ifdef H5 |
|
|
uni.navigateTo({ |
|
|
uni.navigateTo({ |
|
|
|