diff --git a/MeoAssistance/AbstractTask.cpp b/MeoAssistance/AbstractTask.cpp index 9a63825a61..11ecf772c3 100644 --- a/MeoAssistance/AbstractTask.cpp +++ b/MeoAssistance/AbstractTask.cpp @@ -80,19 +80,19 @@ cv::Mat AbstractTask::get_format_image(bool raw) bool asst::AbstractTask::set_control_scale(double scale) { - m_control_ptr->setControlScale(scale, true); - return true; -} - -bool AbstractTask::set_control_scale(int cur_width, int cur_height) -{ - double scale_width = static_cast(cur_width) / Configer::DefaultWindowWidth; - double scale_height = static_cast(cur_height) / Configer::DefaultWindowHeight; - double scale = (std::max)(scale_width, scale_height); m_control_ptr->setControlScale(scale); return true; } +//bool AbstractTask::set_control_scale(int cur_width, int cur_height) +//{ +// double scale_width = static_cast(cur_width) / Configer::DefaultWindowWidth; +// double scale_height = static_cast(cur_height) / Configer::DefaultWindowHeight; +// double scale = (std::max)(scale_width, scale_height); +// m_control_ptr->setControlScale(scale); +// return true; +//} + bool AbstractTask::sleep(unsigned millisecond) { if (need_exit()) { diff --git a/MeoAssistance/AbstractTask.h b/MeoAssistance/AbstractTask.h index 76d8028d50..4639e38580 100644 --- a/MeoAssistance/AbstractTask.h +++ b/MeoAssistance/AbstractTask.h @@ -57,7 +57,6 @@ namespace asst { protected: virtual cv::Mat get_format_image(bool raw = false); // 参数raw:原图 virtual bool set_control_scale(double scale); - virtual bool set_control_scale(int cur_width, int cur_height); virtual bool sleep(unsigned millisecond); virtual bool print_window(const std::string& dir); virtual bool need_exit() const noexcept; diff --git a/MeoAssistance/WinMacro.cpp b/MeoAssistance/WinMacro.cpp index 3744e1e698..9810e01bfa 100644 --- a/MeoAssistance/WinMacro.cpp +++ b/MeoAssistance/WinMacro.cpp @@ -367,19 +367,18 @@ bool asst::WinMacro::swipe(const Rect& r1, const Rect& r2, int duration) return swipe(randPointInRect(r1), randPointInRect(r2), duration); } -void asst::WinMacro::setControlScale(double scale, bool real) +void asst::WinMacro::setControlScale(double scale) { - if (real) { - m_control_scale = scale; - } - else { - if (m_is_adb) { - m_control_scale = scale * scale * m_emulator_info.adb.display_width / Configer::DefaultWindowWidth; - } - else { - m_control_scale = scale / getScreenScale(); - } - } + m_control_scale = scale; + + //else { + // if (m_is_adb) { + // m_control_scale = scale * scale * m_emulator_info.adb.display_width / Configer::DefaultWindowWidth; + // } + // else { + // m_control_scale = scale / getScreenScale(); + // } + //} } Rect WinMacro::getWindowRect() diff --git a/MeoAssistance/WinMacro.h b/MeoAssistance/WinMacro.h index 38017df2d2..d2dfff8129 100644 --- a/MeoAssistance/WinMacro.h +++ b/MeoAssistance/WinMacro.h @@ -28,8 +28,8 @@ namespace asst { bool click(const Rect& rect); bool swipe(const Point& p1, const Point& p2, int duration = 0); bool swipe(const Rect& r1, const Rect& r2, int duration = 0); - void setControlScale(double scale, bool real = false); - cv::Mat getImage(const Rect& rect); // 通过Win32 Api对窗口截图 + void setControlScale(double scale); + [[ deprecated ]] cv::Mat getImage(const Rect& rect); // 通过Win32 Api对窗口截图 cv::Mat getAdbImage(); // 通过Adb截图,会高清一点,但是比较慢(通过adb pull出来,有io操作) Rect getWindowRect(); const EmulatorInfo& getEmulatorInfo() const noexcept { return m_emulator_info; }