From 77f6381effb9d0ed6cd16c303e33ef81ceecbae0 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sun, 29 May 2022 21:58:37 +0800
Subject: [PATCH] no message

---
 resources/assets/js/App.vue                        |  7 +++----
 resources/assets/js/app.js                         |  4 ++--
 resources/assets/js/components/AudioManager.vue    |  2 +-
 .../js/pages/manage/components/ChatInput/index.vue | 11 +++++++++++
 resources/assets/js/pages/manage/messenger.vue     | 14 ++++++++------
 resources/assets/js/store/actions.js               |  2 +-
 resources/mobile                                   |  2 +-
 7 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue
index 990cba9d9..03562ac6f 100755
--- a/resources/assets/js/App.vue
+++ b/resources/assets/js/App.vue
@@ -95,7 +95,7 @@ export default {
                         }, 6000)
                     }
                     //
-                    if (this.$openVlog) {
+                    if (this.$openLog) {
                         $A.loadScript('js/vconsole.min.js', (e) => {
                             if (e !== null || typeof window.VConsole !== 'function') {
                                 $A.modalAlert("vConsole 组件加载失败！");
@@ -109,7 +109,6 @@ export default {
                                     console.log('vConsole: onClearLog');
                                 }
                             });
-                            console.info('vConsole: Welcome');
                         });
                     }
                 }
@@ -186,14 +185,14 @@ export default {
             }
             // 页面失活
             window.__onPagePause = () => {
-                if (this.$openVlog) {
+                if (this.$openLog) {
                     console.log('onPagePause');
                 }
                 this.$store.dispatch("getBasicData", -1)
             }
             // 页面激活
             window.__onPageResume = (num) => {
-                if (this.$openVlog) {
+                if (this.$openLog) {
                     console.log('onPageResume', num);
                     console.log('ws', this.ws, this.ws ? this.ws.readyState : null);
                 }
diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index 3242be30c..6ee70b5a2 100644
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -136,7 +136,7 @@ $A.isMainElectron = false;
 $A.isSubElectron = false;
 $A.isEEUiApp = isEEUiApp;
 $A.isDesktop = $A.isDesktop();
-$A.openVlog = $A.getStorageString("vlog::open") === "open";
+$A.openLog = $A.getStorageString("log::open") === "open";
 if (isElectron) {
     $A.Electron = electron;
     $A.Platform = /macintosh|mac os x/i.test(navigator.userAgent) ? "mac" : "win";
@@ -151,7 +151,7 @@ Vue.prototype.$isMainElectron = $A.isMainElectron;
 Vue.prototype.$isSubElectron = $A.isSubElectron;
 Vue.prototype.$isEEUiApp = $A.isEEUiApp;
 Vue.prototype.$isDesktop = $A.isDesktop;
-Vue.prototype.$openVlog = $A.openVlog;
+Vue.prototype.$openLog = $A.openLog;
 
 Vue.config.productionTip = false;
 
diff --git a/resources/assets/js/components/AudioManager.vue b/resources/assets/js/components/AudioManager.vue
index 8e006b1c5..b95a613f4 100644
--- a/resources/assets/js/components/AudioManager.vue
+++ b/resources/assets/js/components/AudioManager.vue
@@ -59,7 +59,7 @@ export default {
                 msg = msg == this.audioId
             }
             if (typeof msg === "boolean") {
-                if (!msg && !ended) {
+                if (msg && !ended) {
                     audio.pause()
                 }
                 return
diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue
index 5b592b245..8f08a7eff 100755
--- a/resources/assets/js/pages/manage/components/ChatInput/index.vue
+++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue
@@ -230,6 +230,16 @@ export default {
                 }
             }
         }, 1000)
+        //
+        if (this.$isEEUiApp) {
+            window.__onPermissionRequest = (type, result) => {
+                console.log(type, result);
+                if (type === 'recordAudio' && result === false) {
+                    // Android 录音权限被拒绝了
+                    this.stopRecord(true);
+                }
+            }
+        }
     },
     beforeDestroy() {
         if (this.quill) {
@@ -675,6 +685,7 @@ export default {
                             this.recordRec.close();
                         }
                     }, (msg) => {
+                        this.recordState = "stop";
                         $A.messageError(msg || '打开录音失败')
                     });
                 })
diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue
index 139a4f4f4..1df6211a7 100644
--- a/resources/assets/js/pages/manage/messenger.vue
+++ b/resources/assets/js/pages/manage/messenger.vue
@@ -311,14 +311,16 @@ export default {
     watch: {
         dialogKey(val) {
             switch (val) {
-                case 'vlog.open':
-                case 'vlog:open':
-                    $A.setStorage("vlog::open", "open");
+                case 'log.open':
+                case 'log:open':
+                case 'eruda:open':
+                    $A.setStorage("log::open", "open");
                     $A.reloadUrl();
                     break;
-                case 'vlog.close':
-                case 'vlog:close':
-                    $A.setStorage("vlog::open", "close");
+                case 'log.close':
+                case 'log:close':
+                case 'eruda:close':
+                    $A.setStorage("log::open", "close");
                     $A.reloadUrl();
                     break;
             }
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 105b0d970..781a63b2d 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -2256,7 +2256,7 @@ export default {
         url = url.replace("http://", "ws://");
         url += "?action=web&token=" + state.userToken;
         //
-        const wgLog = $A.openVlog;
+        const wgLog = $A.openLog;
         const wsRandom = $A.randomString(16);
         state.wsRandom = wsRandom;
         //
diff --git a/resources/mobile b/resources/mobile
index 5e43f5d24..6b0878b7e 160000
--- a/resources/mobile
+++ b/resources/mobile
@@ -1 +1 @@
-Subproject commit 5e43f5d24edce45158d33acc4c71e9a9f8579cba
+Subproject commit 6b0878b7e6ae7ade39bb8f5dfafdb332e0f022d3