From 4af871597f94631e18cc03a35bedea2679e14d9f Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 27 Feb 2026 16:44:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 uniapps/work-app/src/App.vue |   25 ++++++++++---------------
 1 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/uniapps/work-app/src/App.vue b/uniapps/work-app/src/App.vue
index 26f2086..241db70 100644
--- a/uniapps/work-app/src/App.vue
+++ b/uniapps/work-app/src/App.vue
@@ -4,7 +4,7 @@
 import { useGlobalWS } from '@/hooks/useGlobalWS.js'
 // #ifdef APP-PLUS
 import { keepAliveStart, requestIgnoreBatteryOptimization, isIgnoringBatteryOptimizations } from '@/uni_modules/keep-app'
-import { openDialog, allowFloat, getBatteryCapacity } from '@/uni_modules/lgh-dialog'
+import { openDialog, allowFloat, getBatteryCapacity, allowBackgroundPopup, allowLockScreen } from '@/uni_modules/lgh-dialog'
 // #endif
 
 const appStore = useAppStore()
@@ -22,15 +22,6 @@
 // 	}, 1000)
 // }
 // testKeep()
-
-// 开启悬浮窗
-// allowFloat()
-// 假设五秒后来电
-// #endif
-
-// #ifdef APP-PLUS
-//显示悬浮窗权限
-allowFloat()
 // #endif
 
 useGlobalWS()
@@ -58,12 +49,16 @@
 function setKeepFun() {
 	// #ifdef APP-PLUS
 	keepAliveStart()
+
+	//显示悬浮窗权限
+	setTimeout(allowFloat, 5000)
 	// 请求用户允许忽略电池优化(重要:用于保活)
-	setTimeout(() => {
-		if (!isIgnoringBatteryOptimizations()) {
-			requestIgnoreBatteryOptimization()
-		}
-	}, 10000)
+	setTimeout(requestIgnoreBatteryOptimization, 10000)
+	// 引导用户开启「后台弹出界面」权限
+	setTimeout(allowBackgroundPopup, 15000)
+	//  引导用户开启「锁屏显示」权限
+	setTimeout(allowLockScreen, 20000)
+
 	// #endif
 }
 

--
Gitblit v1.9.3