feat: 整体接口搭建

MaaXYZ · Dec 5, 2024 · a08a0ea · a08a0ea
1 parent e8b94a3
commit a08a0ea
Show file tree

Hide file tree

Showing 33 changed files with 369 additions and 43 deletions.
diff --git a/source/MaaAdbControlUnit/Base/UnitBase.h b/source/MaaAdbControlUnit/Base/UnitBase.h
@@ -76,13 +76,16 @@ class InputBase
     , public ControlUnitSink
 {
 public:
+    using SwipeParam = ControlUnitAPI::SwipeParam;
+
     virtual ~InputBase() override = default;
 
     virtual bool init() = 0;
 
 public:
     virtual bool click(int x, int y) = 0;
     virtual bool swipe(int x1, int y1, int x2, int y2, int duration) = 0;
+    virtual bool multi_swipe(const std::vector<SwipeParam>& swipes) = 0;
 
     virtual bool touch_down(int contact, int x, int y, int pressure) = 0;
     virtual bool touch_move(int contact, int x, int y, int pressure) = 0;

diff --git a/source/MaaAdbControlUnit/EmulatorExtras/MuMuPlayerExtras.cpp b/source/MaaAdbControlUnit/EmulatorExtras/MuMuPlayerExtras.cpp
@@ -142,6 +142,15 @@ bool MuMuPlayerExtras::swipe(int x1, int y1, int x2, int y2, int duration)
     return true;
 }
 
+bool MuMuPlayerExtras::multi_swipe(const std::vector<SwipeParam>& swipes)
+{
+    LogInfo << VAR(swipes.size());
+
+    // TODO
+
+    return false;
+}
+
 bool MuMuPlayerExtras::touch_down(int contact, int x, int y, int pressure)
 {
     if (!input_event_touch_down_func_) {

diff --git a/source/MaaAdbControlUnit/EmulatorExtras/MuMuPlayerExtras.h b/source/MaaAdbControlUnit/EmulatorExtras/MuMuPlayerExtras.h
@@ -30,6 +30,7 @@ class MuMuPlayerExtras
 public: // from InputBase
     virtual bool click(int x, int y) override;
     virtual bool swipe(int x1, int y1, int x2, int y2, int duration) override;
+    virtual bool multi_swipe(const std::vector<SwipeParam>& swipes) override;
 
     virtual bool touch_down(int contact, int x, int y, int pressure) override;
     virtual bool touch_move(int contact, int x, int y, int pressure) override;

diff --git a/source/MaaAdbControlUnit/Input/AdbShellInput.cpp b/source/MaaAdbControlUnit/Input/AdbShellInput.cpp
@@ -59,6 +59,12 @@ bool AdbShellInput::swipe(int x1, int y1, int x2, int y2, int duration)
     return output_opt && output_opt->empty();
 }
 
+bool AdbShellInput::multi_swipe(const std::vector<SwipeParam>& swipes)
+{
+    LogError << "AdbShellInput not supports" << VAR(swipes.size());
+    return false;
+}
+
 bool AdbShellInput::touch_down(int contact, int x, int y, int pressure)
 {
     LogError << "AdbShellInput not supports" << VAR(contact) << VAR(x) << VAR(y) << VAR(pressure);

diff --git a/source/MaaAdbControlUnit/Input/AdbShellInput.h b/source/MaaAdbControlUnit/Input/AdbShellInput.h
@@ -17,6 +17,7 @@ class AdbShellInput : public InputBase
 
     virtual bool click(int x, int y) override;
     virtual bool swipe(int x1, int y1, int x2, int y2, int duration) override;
+    virtual bool multi_swipe(const std::vector<SwipeParam>& swipes) override;
 
     virtual bool touch_down(int contact, int x, int y, int pressure) override;
     virtual bool touch_move(int contact, int x, int y, int pressure) override;

diff --git a/source/MaaAdbControlUnit/Input/MtouchHelper.cpp b/source/MaaAdbControlUnit/Input/MtouchHelper.cpp
@@ -142,6 +142,15 @@ bool MtouchHelper::swipe(int x1, int y1, int x2, int y2, int duration)
     return ret;
 }
 
+bool MtouchHelper::multi_swipe(const std::vector<SwipeParam>& swipes)
+{
+    LogInfo << VAR(swipes.size());
+
+    // TODO
+
+    return false;
+}
+
 bool MtouchHelper::touch_down(int contact, int x, int y, int pressure)
 {
     if (!pipe_ios_) {

diff --git a/source/MaaAdbControlUnit/Input/MtouchHelper.h b/source/MaaAdbControlUnit/Input/MtouchHelper.h
@@ -18,6 +18,7 @@ class MtouchHelper : public InputBase
 public: // from InputBase
     virtual bool click(int x, int y) override;
     virtual bool swipe(int x1, int y1, int x2, int y2, int duration) override;
+    virtual bool multi_swipe(const std::vector<SwipeParam>& swipes) override;
 
     virtual bool touch_down(int contact, int x, int y, int pressure) override;
     virtual bool touch_move(int contact, int x, int y, int pressure) override;

diff --git a/source/MaaAdbControlUnit/Manager/ControlUnitMgr.cpp b/source/MaaAdbControlUnit/Manager/ControlUnitMgr.cpp
@@ -167,6 +167,16 @@ bool ControlUnitMgr::swipe(int x1, int y1, int x2, int y2, int duration)
     return input_->swipe(x1, y1, x2, y2, duration);
 }
 
+bool ControlUnitMgr::multi_swipe(const std::vector<SwipeParam>& swipes)
+{
+    if (!input_) {
+        LogError << "input_ is null";
+        return false;
+    }
+
+    return input_->multi_swipe(swipes);
+}
+
 bool ControlUnitMgr::touch_down(int contact, int x, int y, int pressure)
 {
     if (!input_) {

diff --git a/source/MaaAdbControlUnit/Manager/ControlUnitMgr.h b/source/MaaAdbControlUnit/Manager/ControlUnitMgr.h
@@ -41,6 +41,7 @@ class ControlUnitMgr
 
     virtual bool click(int x, int y) override;
     virtual bool swipe(int x1, int y1, int x2, int y2, int duration) override;
+    virtual bool multi_swipe(const std::vector<SwipeParam>& swipes) override;
 
     virtual bool touch_down(int contact, int x, int y, int pressure) override;
     virtual bool touch_move(int contact, int x, int y, int pressure) override;

diff --git a/source/MaaAdbControlUnit/Manager/InputAgent.cpp b/source/MaaAdbControlUnit/Manager/InputAgent.cpp
@@ -135,6 +135,16 @@ bool InputAgent::swipe(int x1, int y1, int x2, int y2, int duration)
     return active_unit_->swipe(x1, y1, x2, y2, duration);
 }
 
+bool InputAgent::multi_swipe(const std::vector<SwipeParam>& swipes)
+{
+    if (!active_unit_) {
+        LogError << "No available input method" << VAR(active_unit_);
+        return false;
+    }
+
+    return active_unit_->multi_swipe(swipes);
+}
+
 bool InputAgent::touch_down(int contact, int x, int y, int pressure)
 {
     if (!active_unit_) {

diff --git a/source/MaaAdbControlUnit/Manager/InputAgent.h b/source/MaaAdbControlUnit/Manager/InputAgent.h
@@ -28,6 +28,7 @@ class InputAgent : public InputBase
 
     virtual bool click(int x, int y) override;
     virtual bool swipe(int x1, int y1, int x2, int y2, int duration) override;
+    virtual bool multi_swipe(const std::vector<SwipeParam>& swipes) override;
 
     virtual bool touch_down(int contact, int x, int y, int pressure) override;
     virtual bool touch_move(int contact, int x, int y, int pressure) override;

diff --git a/source/MaaDbgControlUnit/CarouselImage/CarouselImage.cpp b/source/MaaDbgControlUnit/CarouselImage/CarouselImage.cpp
@@ -109,6 +109,13 @@ bool CarouselImage::swipe(int x1, int y1, int x2, int y2, int duration)
     return true;
 }
 
+bool CarouselImage::multi_swipe(const std::vector<SwipeParam>& swipes)
+{
+    std::ignore = swipes;
+
+    return true;
+}
+
 bool CarouselImage::touch_down(int contact, int x, int y, int pressure)
 {
     std::ignore = contact;

diff --git a/source/MaaDbgControlUnit/CarouselImage/CarouselImage.h b/source/MaaDbgControlUnit/CarouselImage/CarouselImage.h
@@ -32,6 +32,7 @@ class CarouselImage : public ControlUnitAPI
 
     virtual bool click(int x, int y) override;
     virtual bool swipe(int x1, int y1, int x2, int y2, int duration) override;
+    virtual bool multi_swipe(const std::vector<SwipeParam>& swipes) override;
 
     virtual bool touch_down(int contact, int x, int y, int pressure) override;
     virtual bool touch_move(int contact, int x, int y, int pressure) override;

diff --git a/source/MaaDbgControlUnit/ReplayRecording/Record.h b/source/MaaDbgControlUnit/ReplayRecording/Record.h
@@ -40,6 +40,7 @@ struct Record
         int x2 = 0;
         int y2 = 0;
         int duration = 0;
+        int starting = 0;
     };
 
     struct TouchParam
@@ -72,7 +73,7 @@ struct Record
     };
 
     using Param = std::
-        variant<std::monostate, ConnectParam, ClickParam, SwipeParam, TouchParam, PressKeyParam, InputTextParam, AppParam, ScreencapParam>;
+        variant<std::monostate, ConnectParam, ClickParam, SwipeParam, std::vector<SwipeParam>, TouchParam, PressKeyParam, InputTextParam, AppParam, ScreencapParam>;
 
     struct Action
     {
@@ -82,6 +83,7 @@ struct Record
             connect,
             click,
             swipe,
+            multi_swipe,
             touch_down,
             touch_move,
             touch_up,
@@ -124,6 +126,9 @@ inline std::ostream& operator<<(std::ostream& os, Record::Action::Type type)
     case Record::Action::Type::swipe:
         os << "swipe";
         break;
+    case Record::Action::Type::multi_swipe:
+        os << "multi_swipe";
+        break;
     case Record::Action::Type::touch_down:
         os << "touch_down";
         break;

diff --git a/source/MaaDbgControlUnit/ReplayRecording/RecordParser.cpp b/source/MaaDbgControlUnit/ReplayRecording/RecordParser.cpp
@@ -73,11 +73,11 @@ std::optional<Record> RecordParser::parse_record(const json::value& record_json,
     std::string type_str = record_json.get("type", std::string());
     static const std::unordered_map<std::string, Record::Action::Type> kTypeMap = {
         { "connect", Record::Action::Type::connect },       { "click", Record::Action::Type::click },
-        { "swipe", Record::Action::Type::swipe },           { "touch_down", Record::Action::Type::touch_down },
-        { "touch_move", Record::Action::Type::touch_move }, { "touch_up", Record::Action::Type::touch_up },
-        { "press_key", Record::Action::Type::press_key },   { "input_text", Record::Action::Type::input_text },
-        { "screencap", Record::Action::Type::screencap },   { "start_app", Record::Action::Type::start_app },
-        { "stop_app", Record::Action::Type::stop_app },
+        { "swipe", Record::Action::Type::swipe },           { "multi_swipe", Record::Action::Type::multi_swipe },
+        { "touch_down", Record::Action::Type::touch_down }, { "touch_move", Record::Action::Type::touch_move },
+        { "touch_up", Record::Action::Type::touch_up },     { "press_key", Record::Action::Type::press_key },
+        { "input_text", Record::Action::Type::input_text }, { "screencap", Record::Action::Type::screencap },
+        { "start_app", Record::Action::Type::start_app },   { "stop_app", Record::Action::Type::stop_app },
     };
 
     auto it = kTypeMap.find(type_str);
@@ -99,6 +99,9 @@ std::optional<Record> RecordParser::parse_record(const json::value& record_json,
     case Record::Action::Type::swipe:
         action_opt = parse_swipe(record_json);
         break;
+    case Record::Action::Type::multi_swipe:
+        action_opt = parse_multi_swipe(record_json);
+        break;
     case Record::Action::Type::touch_down:
     case Record::Action::Type::touch_move:
     case Record::Action::Type::touch_up:
@@ -224,6 +227,26 @@ std::optional<Record::Param> RecordParser::parse_swipe(const json::value& record
     return result;
 }
 
+std::optional<Record::Param> RecordParser::parse_multi_swipe(const json::value& record_json)
+{
+    auto swipes_opt = record_json.find<json::array>("swipes");
+    if (!swipes_opt) {
+        LogError << "Failed to find swipes:" << VAR(record_json);
+        return std::nullopt;
+    }
+
+    std::vector<Record::SwipeParam> result;
+    for (const json::value& swipe : *swipes_opt) {
+        auto s_opt = parse_swipe(swipe);
+        if (!s_opt) {
+            return std::nullopt;
+        }
+        auto s = std::get<Record::SwipeParam>(*std::move(s_opt));
+        result.emplace_back(std::move(s));
+    }
+    return result;
+}
+
 std::optional<Record::Param> RecordParser::parse_touch(const json::value& record_json)
 {
     Record::TouchParam result;

diff --git a/source/MaaDbgControlUnit/ReplayRecording/RecordParser.h b/source/MaaDbgControlUnit/ReplayRecording/RecordParser.h
@@ -18,6 +18,7 @@ class RecordParser
     static std::optional<Record::Param> parse_connect(const json::value& record_json);
     static std::optional<Record::Param> parse_click(const json::value& record_json);
     static std::optional<Record::Param> parse_swipe(const json::value& record_json);
+    static std::optional<Record::Param> parse_multi_swipe(const json::value& record_json);
     static std::optional<Record::Param> parse_touch(const json::value& record_json);
     static std::optional<Record::Param> parse_press_key(const json::value& record_json);
     static std::optional<Record::Param> parse_input_text(const json::value& record_json);

diff --git a/source/MaaDbgControlUnit/ReplayRecording/ReplayRecording.cpp b/source/MaaDbgControlUnit/ReplayRecording/ReplayRecording.cpp
@@ -186,6 +186,28 @@ bool ReplayRecording::swipe(int x1, int y1, int x2, int y2, int duration)
     return record.success;
 }
 
+bool ReplayRecording::multi_swipe(const std::vector<SwipeParam>& swipes)
+{    
+    LogInfo << VAR(swipes.size());
+
+    if (record_index_ >= recording_.records.size()) {
+        LogError << "record index out of range" << VAR(record_index_) << VAR(recording_.records.size());
+        return false;
+    }
+
+    const Record& record = recording_.records.at(record_index_);
+    if (record.action.type != Record::Action::Type::multi_swipe) {
+        LogError << "record type is not swipe" << VAR(record.action.type) << VAR(record.raw_data);
+        return false;
+    }
+
+    // TODO: 现在点击的点是随机区域，没法直接检查
+
+    sleep(record.cost);
+    ++record_index_;
+    return record.success;
+}
+
 bool ReplayRecording::touch_down(int contact, int x, int y, int pressure)
 {
     LogInfo << VAR(contact) << VAR(x) << VAR(y) << VAR(pressure);

diff --git a/source/MaaDbgControlUnit/ReplayRecording/ReplayRecording.h b/source/MaaDbgControlUnit/ReplayRecording/ReplayRecording.h
@@ -33,6 +33,7 @@ class ReplayRecording : public ControlUnitAPI
 
     virtual bool click(int x, int y) override;
     virtual bool swipe(int x1, int y1, int x2, int y2, int duration) override;
+    virtual bool multi_swipe(const std::vector<SwipeParam>& swipes) override;
 
     virtual bool touch_down(int contact, int x, int y, int pressure) override;
     virtual bool touch_move(int contact, int x, int y, int pressure) override;