From 453dc3004ae7b3e863c9f2bb05356887cbf99d19 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sat, 28 Aug 2021 01:02:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B9=B2=E5=91=98=E5=90=8D?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E7=9A=84=E5=88=86=E8=BE=A8=E7=8E=87=E7=BC=A9?=
 =?UTF-8?q?=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MeoAssistance/IdentifyOperTask.cpp | 17 +++++++----------
 MeoAssistance/IdentifyOperTask.h   |  2 --
 MeoAssistance/WinMacro.cpp         | 20 ++++++++++----------
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/MeoAssistance/IdentifyOperTask.cpp b/MeoAssistance/IdentifyOperTask.cpp
index 7d1f5fd435..709c4dae7c 100644
--- a/MeoAssistance/IdentifyOperTask.cpp
+++ b/MeoAssistance/IdentifyOperTask.cpp
@@ -117,7 +117,7 @@ std::vector<TextArea> asst::IdentifyOperTask::detect_opers(const cv::Mat& image,
 {
 	// 裁剪出来干员名的一个长条形图片，没必要把整张图片送去识别
 	int cropped_height = image.rows * 0.0417;
-	int cropped_upper_y = image.rows * 0.0483;
+	int cropped_upper_y = image.rows * 0.483;
 	cv::Mat upper_part_name_image = image(cv::Rect(0, cropped_upper_y, image.cols, cropped_height));
 
 	std::vector<TextArea> upper_text_area = ocr_detect(upper_part_name_image);	// 所有文字
@@ -300,11 +300,14 @@ int asst::IdentifyOperTask::detect_elite(const cv::Mat& image, const asst::Rect
 bool IdentifyOperTask::swipe(bool reverse)
 {
 	bool ret = true;
+	auto&& [width, height] = m_view_ptr->getAdbDisplaySize();
+	Rect swipe_begin(width * 0.9, height * 0.5, 0, 0);
+	Rect swipe_end(width * 0.1, height * 0.5, 0, 0);
 	if (!reverse) {
-		ret &= m_control_ptr->swipe(m_swipe_begin, m_swipe_end, m_swipe_duration);
+		ret &= m_control_ptr->swipe(swipe_begin, swipe_end, m_swipe_duration);
 	}
 	else {
-		ret &= m_control_ptr->swipe(m_swipe_end, m_swipe_begin, m_swipe_duration);
+		ret &= m_control_ptr->swipe(swipe_end, swipe_begin, m_swipe_duration);
 	}
 	ret &= sleep(SwipeExtraDelay);
 	return ret;
@@ -314,13 +317,7 @@ bool IdentifyOperTask::keep_swipe(bool reverse)
 {
 	bool ret = true;
 	while (m_keep_swipe && !ret) {
-		if (!reverse) {
-			ret &= m_control_ptr->swipe(m_swipe_begin, m_swipe_end, m_swipe_duration);
-		}
-		else {
-			ret &= m_control_ptr->swipe(m_swipe_end, m_swipe_begin, m_swipe_duration);
-		}
-		ret &= sleep(SwipeExtraDelay);
+		ret = swipe(reverse);
 	}
 	return ret;
 }
\ No newline at end of file
diff --git a/MeoAssistance/IdentifyOperTask.h b/MeoAssistance/IdentifyOperTask.h
index 7fbf254311..c2f899537a 100644
--- a/MeoAssistance/IdentifyOperTask.h
+++ b/MeoAssistance/IdentifyOperTask.h
@@ -30,8 +30,6 @@ namespace asst {
 		virtual bool swipe(bool reverse = false);
 		virtual bool keep_swipe(bool reverse = false);
 
-		Rect m_swipe_begin;
-		Rect m_swipe_end;
 		int m_swipe_duration = 2000;
 		bool m_keep_swipe = false;
 		std::string m_filename;
diff --git a/MeoAssistance/WinMacro.cpp b/MeoAssistance/WinMacro.cpp
index e03fcf3e9b..7d4196f38d 100644
--- a/MeoAssistance/WinMacro.cpp
+++ b/MeoAssistance/WinMacro.cpp
@@ -106,16 +106,6 @@ bool WinMacro::findHandle()
 				DebugTraceError("Connect Adb Error", connect_cmd);
 				return false;
 			}
-			auto&& display_ret = callCmd(StringReplaceAll(m_emulator_info.adb.display, "[Adb]", adb_dir));
-			if (display_ret) {
-				std::string pipe_str = display_ret.value();
-				sscanf_s(pipe_str.c_str(), m_emulator_info.adb.display_regex.c_str(),
-					&m_emulator_info.adb.display_width, &m_emulator_info.adb.display_height);
-			}
-			else {
-				DebugTraceError("Get Display Error");
-				return false;
-			}
 
 			m_click_cmd = StringReplaceAll(m_emulator_info.adb.click, "[Adb]", adb_dir);
 			m_swipe_cmd = StringReplaceAll(m_emulator_info.adb.swipe, "[Adb]", adb_dir);
@@ -129,6 +119,16 @@ bool WinMacro::findHandle()
 				StringReplaceAll(m_emulator_info.adb.pullscreen, "[Adb]", adb_dir),
 				"[Filename]", m_adb_screen_filename);
 		}
+		auto&& display_ret = callCmd(StringReplaceAll(m_emulator_info.adb.display, "[Adb]", adb_dir));
+		if (display_ret) {
+			std::string pipe_str = display_ret.value();
+			sscanf_s(pipe_str.c_str(), m_emulator_info.adb.display_regex.c_str(),
+				&m_emulator_info.adb.display_width, &m_emulator_info.adb.display_height);
+		}
+		else {
+			DebugTraceError("Get Display Error");
+			return false;
+		}
 	}
 	DebugTrace("Handle:", m_handle, "Name:", m_emulator_info.name, "Type:", m_handle_type);