refactor: 重构启动和关闭森空岛

MaaXYZ · Sep 16, 2023 · 97bb774 · 97bb774
1 parent c2fe4bb
commit 97bb774
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/assets/resource/pipeline/skland.json b/assets/resource/pipeline/skland.json
@@ -24,13 +24,11 @@
     },
     "Sub_StartSkland": {
         "is_sub": true,
-        "action": "StartApp",
-        "package": "com.hypergryph.skland/com.hypergryph.skland.SplashActivity"
+        "action": "StartApp"
     },
     "CloseSkland": {
         "enabled": false,
-        "action": "StopApp",
-        "package": "com.hypergryph.skland"
+        "action": "StopApp"
     },
     "IgnoreUpdates": {
         "recognition": "OCR",

diff --git a/source/cli/main.cpp b/source/cli/main.cpp
@@ -9,6 +9,8 @@ int main(int argc, char** argv)
     bool debug = false;
 	std::string adb;
 	std::string adb_address;
+    std::string package = "com.hypergryph.skland";
+    std::string activity = "com.hypergryph.skland/com.hypergryph.skland.SplashActivity";
 	TaskList tasks;
 	MaaAdbControllerType control_type = 0;
 
@@ -57,6 +59,8 @@ int main(int argc, char** argv)
     MaaBindController(maa_handle, controller_handle);
     int height = 720;
     MaaControllerSetOption(controller_handle, MaaCtrlOption_ScreenshotTargetShortSide, reinterpret_cast<void*>(&height), sizeof(int));
+    MaaControllerSetOption(controller_handle, MaaCtrlOption_DefaultAppPackageEntry, (void*)activity.c_str(), activity.size());
+    MaaControllerSetOption(controller_handle, MaaCtrlOption_DefaultAppPackage, (void*)package.c_str(), package.size());
 
     auto resource_id = MaaResourcePostPath(resource_handle, resource_dir.c_str());
     auto connection_id = MaaControllerPostConnection(controller_handle);