fix: snapshotAction

gkd-kit · Dec 6, 2024 · 72c7999 · 72c7999
1 parent b82355c
commit 72c7999
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 13 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -200,7 +200,12 @@
         <service
             android:name=".debug.SnapshotActionService"
             android:exported="true"
-            tools:ignore="ExportedService" />
+            android:foregroundServiceType="specialUse"
+            tools:ignore="ExportedService">
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="Provide an interface for third-party applications to actively invoke snapshot capturing." />
+        </service>
 
         <!--  remove useless -->
         <activity

diff --git a/app/src/main/kotlin/li/songe/gkd/debug/SnapshotActionService.kt b/app/src/main/kotlin/li/songe/gkd/debug/SnapshotActionService.kt
@@ -3,9 +3,9 @@ package li.songe.gkd.debug
 import android.app.Service
 import android.content.Intent
 import android.os.Binder
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 import li.songe.gkd.appScope
+import li.songe.gkd.notif.notifyService
+import li.songe.gkd.notif.snapshotActionNotif
 import li.songe.gkd.util.launchTry
 
 /**
@@ -15,12 +15,13 @@ class SnapshotActionService : Service() {
     override fun onBind(intent: Intent?): Binder? = null
     override fun onCreate() {
         super.onCreate()
-        appScope.launch {
-            delay(1000)
-            stopSelf()
-        }
+        snapshotActionNotif.notifyService(this)
         appScope.launchTry {
-            SnapshotExt.captureSnapshot()
+            try {
+                SnapshotExt.captureSnapshot()
+            } finally {
+                stopSelf()
+            }
         }
     }
 }
diff --git a/app/src/main/kotlin/li/songe/gkd/notif/Notif.kt b/app/src/main/kotlin/li/songe/gkd/notif/Notif.kt
@@ -67,4 +67,14 @@ val snapshotNotif by lazy {
         autoCancel = true,
         uri = "gkd://page/2",
     )
+}
+
+val snapshotActionNotif by lazy {
+    Notif(
+        channel = snapshotActionChannel,
+        id = 105,
+        text = "快照服务正在运行",
+        ongoing = true,
+        autoCancel = false,
+    )
 }
diff --git a/app/src/main/kotlin/li/songe/gkd/notif/NotifChannel.kt b/app/src/main/kotlin/li/songe/gkd/notif/NotifChannel.kt
@@ -34,11 +34,21 @@ val snapshotChannel by lazy {
         id = "snapshot", name = "快照通知", desc = "捕获快照后发出通知"
     )
 }
+val snapshotActionChannel by lazy {
+    NotifChannel(
+        id = "snapshotAction", name = "快照服务", desc = "供其他程序调用的快照服务"
+    )
+}
 
 fun initChannel() {
-    createChannel(app, defaultChannel)
-    createChannel(app, floatingChannel)
-    createChannel(app, screenshotChannel)
-    createChannel(app, httpChannel)
-    createChannel(app, snapshotChannel)
+    arrayOf(
+        defaultChannel,
+        floatingChannel,
+        screenshotChannel,
+        httpChannel,
+        snapshotChannel,
+        snapshotActionChannel,
+    ).forEach {
+        createChannel(app, it)
+    }
 }