rpc: support adb controller v2

MaaXYZ · Oct 24, 2023 · 9df21f0 · 9df21f0
1 parent 2230e3b
commit 9df21f0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/include/Interface/proto/controller.proto b/include/Interface/proto/controller.proto
@@ -11,6 +11,7 @@ message AdbControllerRequest {
   optional string adb_serial = 3;
   optional uint32 adb_type = 4;
   optional string adb_config = 5;
+  optional string agent_path = 6;
 }
 
 message ControllerSetOptionRequest {

diff --git a/source/MaaRpc/implement/Controller.cpp b/source/MaaRpc/implement/Controller.cpp
@@ -24,9 +24,17 @@ Status ControllerImpl::create_adb(::grpc::ServerContext* context, const ::maarpc
     }
 
     auto id = make_uuid();
-    handles_.add(id,
-                 MaaAdbControllerCreate(request->adb_path().c_str(), request->adb_serial().c_str(), request->adb_type(),
-                                        request->adb_config().c_str(), callback_impl, cb_state.get()));
+
+    if (request->has_agent_path()) {
+        handles_.add(id, MaaAdbControllerCreateV2(request->adb_path().c_str(), request->adb_serial().c_str(),
+                                                  request->adb_type(), request->adb_config().c_str(),
+                                                  request->agent_path().c_str(), callback_impl, cb_state.get()));
+    }
+    else {
+        handles_.add(id, MaaAdbControllerCreate(request->adb_path().c_str(), request->adb_serial().c_str(),
+                                                request->adb_type(), request->adb_config().c_str(), callback_impl,
+                                                cb_state.get()));
+    }
 
     response->set_handle(id);