diff --git a/pages/im/friends/info.vue b/pages/im/friends/info.vue
index b9c505a..16dd7d5 100644
--- a/pages/im/friends/info.vue
+++ b/pages/im/friends/info.vue
@@ -104,7 +104,8 @@
callShow: false
}
},
- onLoad(e) {
+ onLoad(e) {
+ console.log(e);
this.targetId = e.targetId
getFriendInfo(e.targetId).then(res => {
this.userInfo = res
@@ -243,16 +244,14 @@
})
},
singleCall(e) {
- CallLib.startSingleCall(this.targetId, e.type, '');
- uni.redirectTo({
- url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type,
- success: (err) => {
- console.log('跳转视频通话成功');
- },
- fail: (err) => {
- console.log('跳转视频页失败', err);
- }
+ uni.showToast({
+ icon: 'none',
+ title: '功能正在开发中'
})
+ // CallLib.startSingleCall(this.targetId, e.type, '');
+ // uni.redirectTo({
+ // url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type
+ // })
}
}
}
diff --git a/pages/im/friends/mine.vue b/pages/im/friends/mine.vue
index a7070d1..de6672a 100644
--- a/pages/im/friends/mine.vue
+++ b/pages/im/friends/mine.vue
@@ -1,183 +1,191 @@
-
-
-
-
-
-
- {{infoObj.name}}
- 地址:{{infoObj.address}}
-
-
-
-
-
-
- 保密
- 男
- 女
-
-
-
- {{infoObj.hash}}
-
-
-
-
-
-
- ZH-HEALTH扫一扫上面的二维码
- 添加我的好友
-
-
-
-
-
-
-
-
diff --git a/pages/im/index.vue b/pages/im/index.vue
index 81d01a4..4be35a2 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -56,7 +56,7 @@
{{item}}
-
+
@@ -74,7 +74,9 @@
import * as RongIMLib from "@/uni_modules/RongCloud-IMWrapper/js_sdk/index"
import im from '@/utils/im/index.js'
import userAuth from '@/public/userAuth'
- import { getImToken } from '@/apis/interfaces/im.js'
+ import {
+ getImToken
+ } from '@/apis/interfaces/im.js'
export default {
data() {
return {
@@ -202,9 +204,6 @@
// 进入聊天的详情页面,清理未读消息数量
toDetail(item) {
this.hidePop()
- // uni.navigateTo({
- // url: '/pages/im/private/call?targetId=' + item.targetId + '&mediaType=1'
- // })
uni.navigateTo({
url: '/pages/im/private/index?targetId=' + item.targetId + '&conversationType=' + item
.conversationType
@@ -229,10 +228,8 @@
scanQrCode() {
uni.scanCode({
success: (res) => {
- // "result": "ADDFRIEND|10010",
if (res.scanType == 'QR_CODE') {
res.result.substr(0, 10) == 'ADDFRIEND|'
- // 跳转到添加好友页面
uni.navigateTo({
url: '/pages/im/friends/info?targetId=' + res.result.substr(10)
})
diff --git a/utils/im/index.js b/utils/im/index.js
index b86a154..4cfaafb 100644
--- a/utils/im/index.js
+++ b/utils/im/index.js
@@ -8,7 +8,7 @@ import {
const initIm = (KEY) => {
RongIMLib.init(KEY)
- CallLib.init({})
+ CallLib.init()
addListeners()
}
@@ -89,7 +89,7 @@ function inArray(search, array) {
const addListeners = () => {
// 添加连接状态监听函数
RongIMLib.addConnectionStatusListener((res) => {
- console.log('连接状态监', res.data.status);
+ console.log('连接状态监听', res.data.status);
store.dispatch('updateConnectionStatus', res.data.status)
})
// 添加消息监听函数
@@ -104,7 +104,8 @@ const addListeners = () => {
CallLib.onCallReceived(({
data
}) => {
- console.log('onCallReceived');
+ console.log('onCallReceived', data)
+
uni.navigateTo({
url: '/pages/im/private/call?targetId=' + data.targetId + '&mediaType=' +
data.mediaType