Merge branch 'master' of https://git.yuzhankeji.cn/TmOct5/ZhHealth

2022-02-17 17:08:31 +08:00
parent 95a2aea698 8d7f248d9b
commit b7cc4d05a0
7 changed files with 40 additions and 34 deletions
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
    "name" : "ZH-HEALTH",
    "appid" : "__UNI__C29473D",
    "description" : "ZH-HEALTH，您手上的健康管理专家",
-    "versionName" : "1.0.8",
-    "versionCode" : 108,
+    "versionName" : "1.0.10",
+    "versionCode" : 110,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
--- a/pages/im/components/groupUserList.vue
+++ b/pages/im/components/groupUserList.vue
@@ -18,7 +18,7 @@

        <view class="loadmore">
            <u-icon name="arrow-right" @click="loadMore" v-if="members > users.length" color="#999" labelColor="#999"
-                label="查看更多群成员" labelPos='left' labelSize='28rpx' size="14" />
+                label="查看更多群成员" labelPos="left" :labelSize="labelSize" :size="iconSize" />
        </view>

        <u-action-sheet :actions="actionMap" :title="actionTitle" cancelText="取消" @close="hideAction"
@@ -30,12 +30,12 @@
    import {
        getGroupUsers,
        getGroupBase,
-
        removeGroupUser,
        setGroupAdmin,
        removeGroupAdmin,
        transferGroupOwner
    } from '@/apis/interfaces/im.js'
+    import utils from '@/utils/index.js'

    export default {
        props: {
@@ -59,7 +59,9 @@
                actionMap: [],
                actionTitle: '',
                currentUser: {},
-                avatarSize: 40
+                avatarSize: 45,
+                labelSize: 14,
+                iconSize: 14
            }
        },
        computed: {
@@ -69,8 +71,10 @@
                }
            }
        },
-        created() {
-            this.avatarSize = 90 / 750 * wx.getSystemInfoSync().windowWidth
+        created() {
+            this.avatarSize = utils.rpx2px(90)
+            this.labelSize = utils.rpx2px(24)
+            this.iconSize = utils.rpx2px(26)
        },
        mounted() {
            this.initGroupInfo()
--- a/pages/im/components/sentPopups.nvue
+++ b/pages/im/components/sentPopups.nvue
@@ -8,7 +8,7 @@
            <image class="icon" src="@/static/icon/popups-icon-01.png" mode="widthFix"></image>
            <text class="text">拍摄</text>
        </view>
-        <view class="item" @click="onPopupsItem('video')">
+        <view class="item" @click="onPopupsItem('video')" v-if="conversationType == 1">
            <image class="icon" src="@/static/icon/popups-icon-02.png" mode="widthFix"></image>
            <text class="text">视频通话</text>
        </view>
@@ -33,6 +33,7 @@

 <script>
    import im from '@/utils/im/index.js'
+    import * as CallLib from '@/uni_modules/RongCloud-CallWrapper/lib/index'

    export default {
        data() {
@@ -70,14 +71,9 @@
        },
        methods: {
            singleCall(e) {
-                uni.showToast({
-                    icon: 'none',
-                    title: '功能正在开发中'
+                uni.navigateTo({
+                    url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type
                })
-                // CallLib.startSingleCall(this.targetId, e.type, '');
-                // uni.redirectTo({
-                //     url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type
-                // })
            },
            onPopupsItem(type) {
                switch (type) {
--- a/pages/im/private/call.nvue
+++ b/pages/im/private/call.nvue
@@ -10,11 +10,9 @@

        <view class="status" v-if="!connected || mediaType == 0">
            <view class="remote">
-                <u-avatar v-if="userInfo.portraitUrl" :src="userInfo.portraitUrl" shape="square" size="96"
+                <u-avatar :src="contact(targetId).portraitUrl" shape="square" size="96"
                    bgColor="#fff" />
-                <u-avatar size="80" v-if="!userInfo.portraitUrl" shape="square"
-                    :text="userInfo.name ? userInfo.name.substring(0,1) : '未'" font-size="44" randomBgColor />
-                <view><text class="nickname">{{userInfo.name}}</text></view>
+                <view><text class="nickname">{{ contact(targetId).name }}</text></view>
                <view v-if="remoteRinging"><text class="mediaType">等待对方接听</text></view>
                <view v-if="connected"><text class="mediaType">已接通</text></view>
                <view v-else><text class="mediaType">{{ mediaType == 0 ? '邀请您语音通话' : '邀请您视频通话' }}</text></view>
@@ -52,17 +50,14 @@
 </template>

 <script>
-    import {
-        getFriendInfo
-    } from '@/apis/interfaces/im.js'
    import * as CallLib from '@/uni_modules/RongCloud-CallWrapper/lib/index'
+    import * as IMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'

    export default {
        data() {
            return {
                targetId: '',
                mediaType: 0, // 0 语音  1 视频
-                userInfo: {},
                isOut: false,
                connected: false,
                micStatus: false,
@@ -73,10 +68,10 @@
        },
        onLoad(e) {
            this.targetId = e.targetId
-            this.mediaType = e.mediaType
-            getFriendInfo(this.targetId).then(res => {
-                this.userInfo = res
-            })
+            this.mediaType = e.mediaType
+            // 进入页面开启外呼
+            CallLib.startSingleCall(this.targetId, this.mediaType, '');
+            
            this.startRing()
            // 监听通话链接状态
            uni.$once('onCallConnected', this.onCallConnected)
@@ -87,6 +82,9 @@
            uni.$once('onRemoteUserJoined', () => {
                this.remoteRinging = false
            })
+        },
+        beforeDestroy() {
+
        },
        computed: {
            windowWidth() {
@@ -94,6 +92,11 @@
            },
            windowHeight() {
                return uni.getSystemInfoSync().windowHeight
+            },
+            contact() {
+                return function(targetId) {
+                    return this.$store.getters.contactInfo(targetId)
+                }
            }
        },
        methods: {
@@ -130,9 +133,7 @@

                setTimeout(() => {
                    this.downRing()
-                    uni.switchTab({
-                        url: '/pages/im/index'
-                    })
+                    uni.navigateBack()
                }, 200);
            },
            toHome() {
--- a/utils/im/index.js
+++ b/utils/im/index.js
@@ -121,7 +121,7 @@ const triTone = () => {

 export default {
    initIm,
-    connect,
+    connect,
    disconnect,
    setNotifyBadge,
    ...message
--- a/utils/im/listeners.js
+++ b/utils/im/listeners.js
@@ -39,7 +39,6 @@ const notifyMsgTypes = [
 ]

 const imLibListeners = () => {
-    console.log('添加监听');
    // 添加连接状态监听函数 
    IMLib.addConnectionStatusListener((res) => {
        console.log('连接状态监听', res.data.status)
@@ -76,7 +75,8 @@ const imLibListeners = () => {
        } else if (message.objectName === IMLib.ObjectName.GroupNotification) {
            // 解散群
            if (message.content.operation === 'Dismiss') {
-                IMLib.cleanHistoryMessages(message.conversationType, message.targetId, message.sentTime, false)
+                IMLib.cleanHistoryMessages(message.conversationType, message.targetId, message.sentTime,
+                    false)
                // 解散了就删了吧
                IMLib.removeConversation(message.conversationType, message.targetId)
                uni.$emit('onGroupDismiss', message.targetId)
@@ -99,6 +99,7 @@ const callLibListeners = () => {
    CallLib.onCallReceived(({
        data
    }) => {
+        console.log('onCallReceived');
        uni.navigateTo({
            url: '/pages/im/private/call?targetId=' + data.targetId + '&mediaType=' +
                data.mediaType
@@ -110,6 +111,7 @@ const callLibListeners = () => {
    })
    // 外呼
    CallLib.onCallOutgoing((res) => {
+        console.log('onCallOutgoing', res);
        uni.$emit('onCallOutgoing')
    })
    // 远端响铃
@@ -118,6 +120,7 @@ const callLibListeners = () => {
    })
    // 远端加入
    CallLib.onRemoteUserJoined((res) => {
+        console.log('远端接听');
        uni.$emit('onRemoteUserJoined')
    })
    // 断开链接
--- a/utils/index.js
+++ b/utils/index.js
@@ -9,6 +9,9 @@ export default {
        }
        return false
    },
+    rpx2px: (rpx) => {
+        return rpx / 750 * uni.getSystemInfoSync().windowWidth
+    },
    checkPhone: (phone) => {
        let re = /^[0-9]+.?[0-9]*/;
        if (phone.length === 11) {
@@ -81,7 +84,6 @@ export default {
                let days = Math.abs(currentDate.getTime() - valDate.getTime()) / (1000 * 60 * 60 * 24);
                return Math.ceil(days) + '天前';
            }
-
        }
    },
    timeStamp(timestamp, formats) {