From db7983e6f29b69fa7ce35f69abed113ffae63eb9 Mon Sep 17 00:00:00 2001 From: MistEO Date: Tue, 18 Jan 2022 21:50:18 +0800 Subject: [PATCH] =?UTF-8?q?chore.=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=E3=80=81=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E6=9B=B4=E6=96=B0=E4=BA=86=E4=B8=80=E4=BA=9B=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/AbstractImageAnalyzer.cpp | 3 +-- src/MeoAssistant/Assistant.cpp | 16 ++++++++-------- src/MeoAssistant/AsstUtils.hpp | 6 +++--- src/MeoAssistant/Controller.cpp | 6 +++--- src/MeoAssistant/InfrastProductionTask.h | 1 - src/MeoAssistant/RuntimeStatus.cpp | 2 +- src/MeoAssistant/Version.h | 2 +- tools/build_release.bat | 4 +++- tools/screen.bat | 4 +++- tools/update_resource_deb.bat | 4 +++- tools/update_resource_rel.bat | 4 +++- tools/zip_release.bat | 4 +++- 12 files changed, 32 insertions(+), 24 deletions(-) diff --git a/src/MeoAssistant/AbstractImageAnalyzer.cpp b/src/MeoAssistant/AbstractImageAnalyzer.cpp index 27aedc783f..50c01e587d 100644 --- a/src/MeoAssistant/AbstractImageAnalyzer.cpp +++ b/src/MeoAssistant/AbstractImageAnalyzer.cpp @@ -9,8 +9,7 @@ asst::AbstractImageAnalyzer::AbstractImageAnalyzer(const cv::Mat image) , m_image_draw(image.clone()) #endif -{ -} +{} asst::AbstractImageAnalyzer::AbstractImageAnalyzer(const cv::Mat image, const Rect& roi) : m_image(image), diff --git a/src/MeoAssistant/Assistant.cpp b/src/MeoAssistant/Assistant.cpp index ee27c57c8b..eff6b1c544 100644 --- a/src/MeoAssistant/Assistant.cpp +++ b/src/MeoAssistant/Assistant.cpp @@ -463,17 +463,17 @@ void asst::Assistant::set_penguin_id(const std::string& id) else { opt.penguin_report.extra_param = "-H \"authorization: PenguinID " + id + "\""; } -} - -std::vector asst::Assistant::get_image() const +} + +std::vector asst::Assistant::get_image() const { - return Ctrler.get_image_encode(); -} - -bool asst::Assistant::ctrler_click(int x, int y, bool block) + return Ctrler.get_image_encode(); +} + +bool asst::Assistant::ctrler_click(int x, int y, bool block) { Ctrler.click(Point(x, y), block); - return true; + return true; } bool asst::Assistant::start(bool block) diff --git a/src/MeoAssistant/AsstUtils.hpp b/src/MeoAssistant/AsstUtils.hpp index 458705d081..c280da76c7 100644 --- a/src/MeoAssistant/AsstUtils.hpp +++ b/src/MeoAssistant/AsstUtils.hpp @@ -262,10 +262,10 @@ namespace asst close(pipe_in[PIPE_WRITE]); close(pipe_out[PIPE_READ]); close(pipe_out[PIPE_WRITE]); - } + } #endif return pipe_str; - } + } //template::value>::type> @@ -307,5 +307,5 @@ namespace asst // } // return str; //} -} + } } diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index 92dd6ca6bd..7b41adede6 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -101,7 +101,7 @@ asst::Controller::~Controller() close(m_pipe_out[PIPE_READ]); close(m_pipe_out[PIPE_WRITE]); #endif -} + } bool asst::Controller::connect_adb(const std::string & address) { @@ -594,9 +594,9 @@ bool asst::Controller::screencap() size_t header_size = unzip_data.size() - std_size; Log.trace("header size:", header_size); - bool is_all_zero = std::all_of(unzip_data.data() + header_size, unzip_data.data() + std_size, + bool is_all_zero = std::all_of(unzip_data.data() + header_size, unzip_data.data() + std_size, [](uchar uch) -> bool { - return uch == 0; + return uch == 0; }); if (is_all_zero) { return false; diff --git a/src/MeoAssistant/InfrastProductionTask.h b/src/MeoAssistant/InfrastProductionTask.h index 34b4754bed..05a96689f1 100644 --- a/src/MeoAssistant/InfrastProductionTask.h +++ b/src/MeoAssistant/InfrastProductionTask.h @@ -15,7 +15,6 @@ namespace asst InfrastProductionTask& set_uses_of_drone(std::string uses_of_drones) noexcept; - protected: bool shift_facility_list(); bool facility_list_detect(); diff --git a/src/MeoAssistant/RuntimeStatus.cpp b/src/MeoAssistant/RuntimeStatus.cpp index 1d02b77f39..384cc345c1 100644 --- a/src/MeoAssistant/RuntimeStatus.cpp +++ b/src/MeoAssistant/RuntimeStatus.cpp @@ -1 +1 @@ -#include "RuntimeStatus.h" +#include "RuntimeStatus.h" diff --git a/src/MeoAssistant/Version.h b/src/MeoAssistant/Version.h index 9dc3eea140..7efa678b3c 100644 --- a/src/MeoAssistant/Version.h +++ b/src/MeoAssistant/Version.h @@ -2,5 +2,5 @@ namespace asst { - constexpr static const char* Version = "v2.7.7"; + constexpr static const char* Version = "v2.7.8"; } diff --git a/tools/build_release.bat b/tools/build_release.bat index e096171266..0de8399902 100644 --- a/tools/build_release.bat +++ b/tools/build_release.bat @@ -1 +1,3 @@ -MSBuild.exe ..\MeoAssistantArknights.sln /p:Configuration=Release /p:Platform=x64 /t:Rebuild \ No newline at end of file +MSBuild.exe ..\MeoAssistantArknights.sln /p:Configuration=Release /p:Platform=x64 /t:Rebuild + +pause diff --git a/tools/screen.bat b/tools/screen.bat index 8703f937d2..862e9a58ce 100644 --- a/tools/screen.bat +++ b/tools/screen.bat @@ -2,4 +2,6 @@ set port=5555 adb connect 127.0.0.1:%port% adb -s 127.0.0.1:%port% shell screencap /sdcard/screen.png -adb -s 127.0.0.1:%port% pull /sdcard/screen.png . \ No newline at end of file +adb -s 127.0.0.1:%port% pull /sdcard/screen.png . + +pause diff --git a/tools/update_resource_deb.bat b/tools/update_resource_deb.bat index 1cead31c63..fa9c3c7929 100644 --- a/tools/update_resource_deb.bat +++ b/tools/update_resource_deb.bat @@ -1 +1,3 @@ -sh ./update_resource.sh ../x64/RelWithDebInfo \ No newline at end of file +sh ./update_resource.sh ../x64/RelWithDebInfo + +pause diff --git a/tools/update_resource_rel.bat b/tools/update_resource_rel.bat index 9b901151ce..21a225c27c 100644 --- a/tools/update_resource_rel.bat +++ b/tools/update_resource_rel.bat @@ -1 +1,3 @@ -sh ./update_resource.sh ../x64/Release \ No newline at end of file +sh ./update_resource.sh ../x64/Release + +pause diff --git a/tools/zip_release.bat b/tools/zip_release.bat index 42897f3087..8137c46abf 100644 --- a/tools/zip_release.bat +++ b/tools/zip_release.bat @@ -1 +1,3 @@ -sh ./zip_release.sh \ No newline at end of file +sh ./zip_release.sh + +pause