diff --git a/source/MaaDbgControlUnit/CarouselImage/CarouselImage.h b/source/MaaDbgControlUnit/CarouselImage/CarouselImage.h index 6ac2d4f78..e0afc5e6c 100644 --- a/source/MaaDbgControlUnit/CarouselImage/CarouselImage.h +++ b/source/MaaDbgControlUnit/CarouselImage/CarouselImage.h @@ -24,10 +24,10 @@ class CarouselImage : public ControllerAPI virtual bool stop_app(const std::string& intent) override; virtual bool click(int x, int y) override; - virtual bool swipe(int x1, int y1, int x2, int y2, int duration); + virtual bool swipe(int x1, int y1, int x2, int y2, int duration) override; - virtual bool touch_down(int contact, int x, int y, int pressure); - virtual bool touch_move(int contact, int x, int y, int pressure); + 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; virtual bool touch_up(int contact) override; virtual bool press_key(int key) override; diff --git a/source/include/Utils/Logger.h b/source/include/Utils/Logger.h index a7bd9b54d..ee8453196 100644 --- a/source/include/Utils/Logger.h +++ b/source/include/Utils/Logger.h @@ -117,13 +117,11 @@ class MAA_UTILS_API Logger else if constexpr (std::same_as>) { return from_u16(std::forward(value)); } - else if constexpr (has_output_operator && std::same_as>) { - std::stringstream ss; - ss << std::boolalpha << std::forward(value); - return std::move(ss).str(); - } else if constexpr (has_output_operator) { std::stringstream ss; + if constexpr (std::same_as>) { + ss << std::boolalpha; + } ss << std::forward(value); return std::move(ss).str(); } diff --git a/test/source/main.cpp b/test/source/main.cpp index 5fb3a1e92..1d30d9e45 100644 --- a/test/source/main.cpp +++ b/test/source/main.cpp @@ -20,7 +20,7 @@ int main([[maybe_unused]] int argc, char** argv) MaaLoggingLevel lv = MaaLoggingLevel_Info; MaaSetGlobalOption(MaaGlobalOption_StdoutLevel, &lv, sizeof(lv)); - if (!run_without_file(testset_dir / "PipelineSmoking" / "Screenshot")) { + if (!run_without_file(testset_dir)) { return -1; } if (!pipeline_smoking(testset_dir)) { @@ -28,4 +28,4 @@ int main([[maybe_unused]] int argc, char** argv) } return 0; -} +} \ No newline at end of file