From ce954c5dcca6b2f667e4148768fef1efe25f0d8c Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Mon, 21 Feb 2022 09:30:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9F=B3=E8=A7=86=E9=A2=91=E5=91=BC=E5=8F=AB?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                            |  4 ++--
 manifest.json                      | 18 ++++++++++++++----
 pages/im/components/sentPopups.vue |  2 +-
 pages/im/friends/info.vue          |  2 +-
 pages/im/group/chat.vue            |  8 +++-----
 pages/im/private/call.nvue         | 18 ++++++++++++++----
 6 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/App.vue b/App.vue
index 59c9b0c..7055846 100644
--- a/App.vue
+++ b/App.vue
@@ -5,7 +5,7 @@
     import im from '@/utils/im/index.js'
 
     export default {
-        onLaunch: function() {
+        onLaunch: function() {
             im.initIm('lmxuhwaglu76d')
             return
             //#ifdef APP-PLUS
@@ -29,7 +29,7 @@
                                     uni.downloadFile({
                                         url: res.info.download,
                                         success: apkPick => {
-                                            plus.runtime.install(apkPick 
+                                            plus.runtime.install(apkPick
                                                 .tempFilePath, '',
                                                 installRES => {
                                                     // 安装完成用于提示新版本引导，暂时无用
diff --git a/manifest.json b/manifest.json
index b375e89..a3dbfea 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "ZH-HEALTH",
     "appid" : "__UNI__C29473D",
     "description" : "ZH-HEALTH，您手上的健康管理专家",
-    "versionName" : "1.0.10",
-    "versionCode" : 110,
+    "versionName" : "1.0.11",
+    "versionCode" : 111,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -24,7 +24,9 @@
             "SQLite" : {},
             "VideoPlayer" : {},
             "Geolocation" : {},
-            "Fingerprint" : {}
+            "Fingerprint" : {},
+            "Maps" : {},
+            "Push" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -80,7 +82,9 @@
                     }
                 },
                 "ad" : {},
-                "push" : {},
+                "push" : {
+                    "unipush" : {}
+                },
                 "geolocation" : {
                     "amap" : {
                         "__platform__" : [ "android" ],
@@ -90,6 +94,12 @@
                     "system" : {
                         "__platform__" : [ "android" ]
                     }
+                },
+                "maps" : {
+                    "amap" : {
+                        "appkey_ios" : "",
+                        "appkey_android" : "05b7f32ca9c897c8b63c505d92cd654b"
+                    }
                 }
             },
             "icons" : {
diff --git a/pages/im/components/sentPopups.vue b/pages/im/components/sentPopups.vue
index 2acc6e8..fb84f54 100644
--- a/pages/im/components/sentPopups.vue
+++ b/pages/im/components/sentPopups.vue
@@ -72,7 +72,7 @@
         methods: {
             singleCall(e) {
                 uni.navigateTo({
-                    url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type
+                    url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type + '&isCall=true'
                 })
             },
             onPopupsItem(type) {
diff --git a/pages/im/friends/info.vue b/pages/im/friends/info.vue
index 46b0f87..d1bec3d 100644
--- a/pages/im/friends/info.vue
+++ b/pages/im/friends/info.vue
@@ -229,7 +229,7 @@
             },
             singleCall(e) {
                 uni.redirectTo({
-                    url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type
+                    url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type + '&isCall=true'
                 })
             }
         }
diff --git a/pages/im/group/chat.vue b/pages/im/group/chat.vue
index 3dfff98..f6d5cd5 100644
--- a/pages/im/group/chat.vue
+++ b/pages/im/group/chat.vue
@@ -74,9 +74,10 @@
         onLoad(e) {
             this.targetId = e.targetId
             // 获取群成员数量
-            getGroupBase(this.targetId).then(res => {
+            getGroupBase(this.targetId).then(res => {
+                console.log(res);
                 uni.setNavigationBarTitle({
-                    title: this.groupInfo.name + `(${res.members})`
+                    title: res.name + `(${res.members})`
                 })
             })
             // 获取历史消息列表
@@ -100,9 +101,6 @@
                 this.$refs.messageBar.onHidePopus()
             },
             toUser(item) {
-                if (item.senderUserId == '__system__') {
-                    return
-                }
                 if (item.messageDirection == 1) {
                     uni.navigateTo({
                         url: '/pages/im/friends/mine?targetId=' + item.senderUserId
diff --git a/pages/im/private/call.nvue b/pages/im/private/call.nvue
index e92287c..9afd7aa 100644
--- a/pages/im/private/call.nvue
+++ b/pages/im/private/call.nvue
@@ -31,7 +31,7 @@
                 </view>
                 <text class="text">挂断</text>
             </view>
-            <view class="btn" v-if="!connected" @click="accept">
+            <view class="btn" v-if="!connected && this.isCall == false" @click="accept">
                 <view class="icon">
                     <u-icon name="checkmark" color="#ffffff" size="30" />
                 </view>
@@ -62,14 +62,24 @@
                 micStatus: false,
                 speStatus: false,
                 remoteRinging: false,
-                ring: null
+                ring: null,
+                isCall: false
             }
         },
         onLoad(e) {
             this.targetId = e.targetId
             this.mediaType = e.mediaType
+            this.isCall = Boolean(e.isCall)
             // 进入页面开启外呼
-            CallLib.startSingleCall(this.targetId, this.mediaType, '');
+            if (this.isCall) {
+                CallLib.startSingleCall(this.targetId, this.mediaType, '');
+                if (this.mediaType == 1) {
+                    const session = CallLib.getCurrentCallSession()
+                    this.$nextTick(() => {
+                        CallLib.setVideoView(session.mine.userId, this.$refs.bigVideoView.ref, 0, false)
+                    })
+                }
+            }
             // 响铃
             this.startRing()
             // 监听通话链接状态
@@ -227,7 +237,7 @@
             align-items: center;
 
             &.hangup {
-                background: $text-price;
+                background-color: $text-price;
             }
 
             .icon {