diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue index b34424d8b..2ac6306ea 100755 --- a/resources/assets/js/App.vue +++ b/resources/assets/js/App.vue @@ -126,6 +126,8 @@ export default { data() { return { appInter: null, + appActivated: true, + countDown: Math.min(30, 60 - $A.daytz().second()), lastCheckUpgradeYmd: $A.daytz().format('YYYY-MM-DD'), } @@ -615,6 +617,7 @@ export default { $A.eeuiAppHideWebviewSnapshot() // APP进入前台 window.__onAppActive = () => { + this.appActivated = true this.autoTheme() $A.updateTimezone() $A.IDBTest() @@ -628,7 +631,20 @@ export default { } // APP进入后台 window.__onAppDeactive = () => { - $A.eeuiAppGetWebviewSnapshot(ok => ok && $A.eeuiAppShowWebviewSnapshot()); + this.appActivated = false + setTimeout(() => { + if (this.appActivated) { + // 如果APP处于激活状态,则不显示快照 + return; + } + $A.eeuiAppGetWebviewSnapshot(ok => { + if (!ok || this.appActivated) { + // 如果获取快照失败,或者APP处于激活状态,则不显示快照 + return; + } + $A.eeuiAppShowWebviewSnapshot() + }); + }, 500); } // 页面失活 window.__onPagePause = () => { diff --git a/resources/mobile b/resources/mobile index 494233074..cbb7f4208 160000 --- a/resources/mobile +++ b/resources/mobile @@ -1 +1 @@ -Subproject commit 494233074d001a8049b6b2cab9006fd517cd3ed4 +Subproject commit cbb7f4208aee524f27a178655a261796ab39f94a