From f6c4ffca67f24adb6b05bb518802e598af2b5f43 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Mon, 24 Jan 2022 19:48:09 +0800
Subject: [PATCH] =?UTF-8?q?fix.=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=85=B3=E5=8D=A1=E6=8E=89=E8=90=BD=E8=AF=86=E5=88=AB=E7=9A=84?=
 =?UTF-8?q?=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MeoAssistant/Controller.cpp           | 13 ++++---------
 src/MeoAssistant/Controller.h             |  2 +-
 src/MeoAssistant/StageDropsTaskPlugin.cpp |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp
index 6aa4c11fc1..fe87849cf4 100644
--- a/src/MeoAssistant/Controller.cpp
+++ b/src/MeoAssistant/Controller.cpp
@@ -467,7 +467,7 @@ std::optional<std::vector<unsigned char>> asst::Controller::call_command(const s
     else {
         // failed to create child process
         return std::nullopt;
-}
+    }
 #endif
 
     Log.trace("Call `", cmd, "` ret", exit_ret, ", output size:", pipe_data.size());
@@ -821,7 +821,7 @@ int asst::Controller::swipe_without_scale(const Rect & r1, const Rect & r2, int
     return swipe_without_scale(rand_point_in_rect(r1), rand_point_in_rect(r2), duration, block, extra_delay, extra_swipe);
 }
 
-cv::Mat asst::Controller::get_image(bool raw)
+cv::Mat asst::Controller::get_image()
 {
     // 有些模拟器adb偶尔会莫名其妙截图失败，多试几次
     for (int i = 0; i != 20; ++i) {
@@ -829,13 +829,8 @@ cv::Mat asst::Controller::get_image(bool raw)
             break;
         }
     }
-    //std::shared_lock<std::shared_mutex> image_lock(m_image_mutex);
-    if (raw) {
-        return m_cache_image;
-    }
-    else {
-        return get_resized_image();
-    }
+
+    return get_resized_image();
 }
 
 std::vector<uchar> asst::Controller::get_image_encode()
diff --git a/src/MeoAssistant/Controller.h b/src/MeoAssistant/Controller.h
index bd9e1db43c..0c06954a60 100644
--- a/src/MeoAssistant/Controller.h
+++ b/src/MeoAssistant/Controller.h
@@ -37,7 +37,7 @@ namespace asst
         static void set_dirname(std::string dirname) noexcept;
 
         bool try_capture(const EmulatorInfo& info, bool without_handle = false);
-        cv::Mat get_image(bool raw = false);
+        cv::Mat get_image();
         std::vector<uchar> get_image_encode();
 
         // 点击和滑动都是异步执行，返回该任务的id
diff --git a/src/MeoAssistant/StageDropsTaskPlugin.cpp b/src/MeoAssistant/StageDropsTaskPlugin.cpp
index dcdf5372a1..c82a974af5 100644
--- a/src/MeoAssistant/StageDropsTaskPlugin.cpp
+++ b/src/MeoAssistant/StageDropsTaskPlugin.cpp
@@ -63,7 +63,7 @@ bool asst::StageDropsTaskPlugin::recognize_drops()
     if (need_exit()) {
         return false;
     }
-    cv::Mat image = Ctrler.get_image(true);
+    cv::Mat image = Ctrler.get_image();
     std::string res = Resrc.penguin().recognize(image);
     Log.trace("Results of penguin recognition:\n", res);
     m_cur_drops = json::parse(res).value();