From 1ccc102b38407dc6e25bec16d4447b7d1ea98cc9 Mon Sep 17 00:00:00 2001
From: Horror Proton <107091537+horror-proton@users.noreply.github.com>
Date: Fri, 2 Aug 2024 13:13:38 +0800
Subject: [PATCH] feat: merge Waydroid config

---
 resource/config.json | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/resource/config.json b/resource/config.json
index 8731fe55d7..d32a01b822 100644
--- a/resource/config.json
+++ b/resource/config.json
@@ -149,21 +149,11 @@
             "stop": "[Adb] -s [AdbSerial] shell 'PACKAGE_NAME=$(dumpsys activity activities 2>/dev/null | grep -E \"(packageName|Activities)=[^\\n]+rknights\" 2>/dev/null | grep -i -o -E \"[^= ]*rknights[^ /\\n]*\" | head -n 1); if [ -n \"$PACKAGE_NAME\" ]; then echo \"Closing $PACKAGE_NAME\"; am force-stop $PACKAGE_NAME; else echo \"app not running or arknights package name not found\"; fi'"
         },
         {
-            "configName": "GeneralWithoutScreencapErr",
-            "baseConfig": "General",
-            "screencapRawWithGzip": "[Adb] -s [AdbSerial] exec-out \"screencap 2>/dev/null | gzip -1\"",
-            "screencapEncode": "[Adb] -s [AdbSerial] exec-out \"screencap -p 2>/dev/null\""
-        },
-        {
-            "configName": "CompatPOSIXShellWithoutScreencapErr",
-            "baseConfig": "CompatPOSIXShell",
-            "screencapRawWithGzip": "[Adb] -s [AdbSerial] exec-out \"screencap 2>/dev/null | gzip -1\"",
-            "screencapEncode": "[Adb] -s [AdbSerial] exec-out \"screencap -p 2>/dev/null\""
-        },
-		{
             "configName": "Waydroid",
-            "baseConfig": "General",
-            "start": "[Adb] -s [AdbSerial] shell am start --windowingMode 4 -n [Intent]"
-		}
+            "baseConfig": "CompatPOSIXShell",
+            "start": "[Adb] -s [AdbSerial] shell am start --windowingMode 4 -n [Intent]",
+            "screencapRawWithGzip": "[Adb] -s [AdbSerial] exec-out \"screencap 2>/dev/null | gzip -1\"",
+            "screencapEncode": "[Adb] -s [AdbSerial] exec-out \"screencap -p 2>/dev/null\""
+        }
     ]
 }