From d3b33e3c264b4cce22d3e5c410a138c57341fb63 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Fri, 25 Feb 2022 15:03:47 +0800
Subject: [PATCH 1/3] permission

---
 App.vue                              |   2 +-
 manifest.json                        |  10 +++++++++-
 uni_modules/onemue-USQLite/.DS_Store | Bin 6148 -> 6148 bytes
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/App.vue b/App.vue
index c6f6389..6445058 100644
--- a/App.vue
+++ b/App.vue
@@ -7,7 +7,7 @@
     export default {
         onLaunch: function() {
             im.initIm('lmxuhwaglu76d')
-            // return
+            return
             //#ifdef APP-PLUS
             // 获取系统版本号
             getVersions({
diff --git a/manifest.json b/manifest.json
index e6b69ab..d0ca453 100644
--- a/manifest.json
+++ b/manifest.json
@@ -59,7 +59,15 @@
                 "autoSdkPermissions" : true
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "privacyDescription" : {
+                    "NSMicrophoneUsageDescription" : "发送语音消息以及音视频通话",
+                    "NSCameraUsageDescription" : "发送图文消息以及视频通话",
+                    "NSPhotoLibraryUsageDescription" : "发送图文消息",
+                    "NSPhotoLibraryAddUsageDescription" : "保存图片消息",
+                    "NSLocationWhenInUseUsageDescription" : "发送当前位置信息"
+                }
+            },
             /* SDK配置 */
             "sdkConfigs" : {
                 "oauth" : {
diff --git a/uni_modules/onemue-USQLite/.DS_Store b/uni_modules/onemue-USQLite/.DS_Store
index d6105570b28da67a9c99543c257272a49602978c..af6e6c24eb5716d944967b644a0ff575980a397f 100644
GIT binary patch
delta 296
zcmZoMXfc=|#>B`mu~2NHo}wrd0|Nsi1A_nqLkdH7Qh9MfQcix-#Er`*8;G#fvoT~b
z6f?vFF_I)u!;YkaoXp}91A}XfOw25-Z0sED9NZkS!5R7G!6k_$rNvH(MbRK$NPd1!
z5{#Xg6qcD<9xou`oS#>cn3<Pa1lEw5k_uE36P}rul3(tWUz(Rv4AvW*83dN$;N;+p
z7m%o~wlFf#Q7|_(t<_Pewgj<FjLm9mIXOg?^{s>AvvYFu^1FbJ0|G{%kHCNzO2eq`
ojXmmYo7p+|Ie;OsapQO9$^0U^JRn(+js_s!>?5*+d13<#05#uCvH$=8

delta 88
zcmZoMXfc=|#>CJzu~2NHo}wrt0|NsP3otOGFl3hn7v<&T=cP|9RA*$|{D4uNZL<JV
n2;*jU4t@@xmd%Vz-<c=#i|BHKbR7U<hRHTO(wk#MmM{YVrZyB}


From e9184b90c177967a8557efd7ca4e688b8e4a4af0 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Fri, 25 Feb 2022 15:05:11 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=BE=A4=E9=80=9A=E7=9F=A5=EF=BC=8C?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BE=A4=E6=B6=88=E6=81=AF=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/im/listeners.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/utils/im/listeners.js b/utils/im/listeners.js
index bad1d7a..62c6efc 100644
--- a/utils/im/listeners.js
+++ b/utils/im/listeners.js
@@ -87,11 +87,13 @@ const imLibListeners = () => {
                 IMLib.cleanHistoryMessages(1, message.targetId, message.sentTime, false)
                 // 解散了就删了吧
                 IMLib.removeConversation(1, message.targetId)
-                // 刷新会话列表
+                // 刷新会话列表
                 uni.$emit('onUserDelete_' + message.targetId)
                 uni.$emit('onReceiveMessage', message)
             }
         } else if (message.objectName === IMLib.ObjectName.GroupNotification) {
+            // 这个是为了更新消息列表页的
+            uni.$emit('onReceiveMessage_' + message.targetId, message)
             // 解散群
             if (message.content.operation === 'Dismiss') {
                 IMLib.cleanHistoryMessages(3, message.targetId, message.sentTime,

From c69722491c4588dd1f85caca7a2ce1b4ffe952e7 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Fri, 25 Feb 2022 15:07:04 +0800
Subject: [PATCH 3/3] ...

---
 store/modules/im.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/store/modules/im.js b/store/modules/im.js
index 10bfeac..01e2b92 100644
--- a/store/modules/im.js
+++ b/store/modules/im.js
@@ -47,14 +47,10 @@ export default {
                 name: contactInfo.name,
                 portraitUrl: contactInfo.portraitUrl
             }
-<<<<<<< HEAD
-        }
-=======
         },
         setContactRemark(state, contactInfo) {
             Vue.set(state.contacts, contactInfo.targetId, contactInfo)
         }
->>>>>>> 013c030963aef06a00ac33d5f767cbd97ef2ceac
     },
     actions: {
         setContactRemark({