From af8634876ab5c89a289540eeca9414ada14da887 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Fri, 27 Aug 2021 10:40:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E8=BE=A8=E7=8E=87=E7=BC=A9=E6=94=BE-?=
 =?UTF-8?q?=E4=B8=B4=E6=97=B6=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MeoAssistance/Assistance.cpp       |  2 --
 MeoAssistance/IdentifyOperTask.cpp | 17 +++++++----------
 MeoAssistance/IdentifyOperTask.h   | 12 ++++++------
 MeoAssistance/OpenRecruitTask.cpp  |  5 +++--
 MeoAssistance/WinMacro.cpp         |  8 ++++++++
 MeoAssistance/WinMacro.h           |  1 +
 6 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/MeoAssistance/Assistance.cpp b/MeoAssistance/Assistance.cpp
index 9b99fab3e0..d0d550e680 100644
--- a/MeoAssistance/Assistance.cpp
+++ b/MeoAssistance/Assistance.cpp
@@ -255,8 +255,6 @@ bool asst::Assistance::start_to_identify_opers()
 	std::unique_lock<std::mutex> lock(m_mutex);
 
 	auto task_ptr = std::make_shared<IdentifyOperTask>(task_callback, (void*)this);
-	// TODO 这个参数写到配置文件里，TODO 滑动位置要根据分辨率缩放
-	task_ptr->set_swipe_param(Rect(2400, 800, 0, 0), Rect(400, 800, 0, 0), 2000);
 	task_ptr->set_task_chain("IdentifyOpers");
 	m_tasks_queue.emplace(task_ptr);
 
diff --git a/MeoAssistance/IdentifyOperTask.cpp b/MeoAssistance/IdentifyOperTask.cpp
index f9bb8e07a5..7d1f5fd435 100644
--- a/MeoAssistance/IdentifyOperTask.cpp
+++ b/MeoAssistance/IdentifyOperTask.cpp
@@ -116,9 +116,8 @@ bool asst::IdentifyOperTask::run()
 std::vector<TextArea> asst::IdentifyOperTask::detect_opers(const cv::Mat& image, std::unordered_map<std::string, std::string>& feature_cond, std::unordered_set<std::string>& feature_whatever)
 {
 	// 裁剪出来干员名的一个长条形图片，没必要把整张图片送去识别
-	// TODO，这个参数要根据分辨率调整
-	constexpr static int cropped_height = 60;
-	constexpr static int cropped_upper_y = 695;
+	int cropped_height = image.rows * 0.0417;
+	int cropped_upper_y = image.rows * 0.0483;
 	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);	// 所有文字
@@ -140,8 +139,7 @@ std::vector<TextArea> asst::IdentifyOperTask::detect_opers(const cv::Mat& image,
 	}
 
 	// 下半部分的干员
-	// TODO，这个y参数要根据分辨率调整
-	constexpr static int cropped_lower_y = 1335;
+	int cropped_lower_y = image.rows * 0.927;
 	cv::Mat lower_part_name_image = image(cv::Rect(0, cropped_lower_y, image.cols, cropped_height));
 
 	std::vector<TextArea> lower_text_area = ocr_detect(lower_part_name_image);	// 所有文字
@@ -274,14 +272,13 @@ int asst::IdentifyOperTask::detect_elite(const cv::Mat& image, const asst::Rect
 {
 	cv::Rect elite_rect;
 	// 因为有的名字长有的名字短，但是右对齐的，所以跟着右边走
-	// TODO，这些长宽的参数要跟着分辨率缩放，最好放到配置文件里
-	elite_rect.x = name_rect.x + name_rect.width - 250;
-	elite_rect.y = name_rect.y - 200;
+	elite_rect.x = name_rect.x + name_rect.width - image.cols * 0.1;
+	elite_rect.y = name_rect.y - image.rows * 0.14;
 	if (elite_rect.x < 0 || elite_rect.y < 0) {
 		return -1;
 	}
-	elite_rect.width = 100;
-	elite_rect.height = 150;
+	elite_rect.width = image.cols * 0.04;
+	elite_rect.height = image.rows * 0.1;
 	cv::Mat elite_mat = image(elite_rect);
 
 	// for debug
diff --git a/MeoAssistance/IdentifyOperTask.h b/MeoAssistance/IdentifyOperTask.h
index f350231c3b..7fbf254311 100644
--- a/MeoAssistance/IdentifyOperTask.h
+++ b/MeoAssistance/IdentifyOperTask.h
@@ -11,11 +11,11 @@ namespace asst {
 		virtual ~IdentifyOperTask() = default;
 
 		virtual bool run() override;
-		virtual void set_swipe_param(Rect begin, Rect end, int duration) {
-			m_swipe_begin = std::move(begin);
-			m_swipe_end = std::move(end);
-			m_swipe_duration = duration;
-		}
+		//virtual void set_swipe_param(Rect begin, Rect end, int duration) {
+		//	m_swipe_begin = std::move(begin);
+		//	m_swipe_end = std::move(end);
+		//	m_swipe_duration = duration;
+		//}
 		void set_filename(const std::string& filename) {
 			m_filename = filename;
 		}
@@ -32,7 +32,7 @@ namespace asst {
 
 		Rect m_swipe_begin;
 		Rect m_swipe_end;
-		int m_swipe_duration = 0;
+		int m_swipe_duration = 2000;
 		bool m_keep_swipe = false;
 		std::string m_filename;
 	};
diff --git a/MeoAssistance/OpenRecruitTask.cpp b/MeoAssistance/OpenRecruitTask.cpp
index aceac919d9..dd2f1d0f17 100644
--- a/MeoAssistance/OpenRecruitTask.cpp
+++ b/MeoAssistance/OpenRecruitTask.cpp
@@ -46,7 +46,6 @@ bool OpenRecruitTask::run()
 	}
 	json::value all_tags_json;
 	all_tags_json["tags"] = json::array(all_tags_json_vector);
-	m_callback(AsstMsg::RecruitTagsDetected, all_tags_json, m_callback_arg);
 
 	/* 过滤tags数量不足的情况（可能是识别漏了） */
 	if (all_tags.size() != RecruitConfiger::CorrectNumberOfTags) {
@@ -54,6 +53,8 @@ bool OpenRecruitTask::run()
 		m_callback(AsstMsg::OcrResultError, all_tags_json, m_callback_arg);
 		return false;
 	}
+	
+	m_callback(AsstMsg::RecruitTagsDetected, all_tags_json, m_callback_arg);
 
 	/* 设置招募时间9小时，加入任务队列*/
 	if (m_set_time) {
@@ -206,7 +207,7 @@ bool OpenRecruitTask::run()
 		task_json["type"] = "ClickTask";
 		for (const TextArea& text_area : all_tags) {
 			if (std::find(final_tags_name.cbegin(), final_tags_name.cend(), text_area.text) != final_tags_name.cend()) {
-				task_json["elite_rect"] = json::array({ text_area.rect.x, text_area.rect.y, text_area.rect.width, text_area.rect.height });
+				task_json["rect"] = json::array({ text_area.rect.x, text_area.rect.y, text_area.rect.width, text_area.rect.height });
 				task_json["retry_times"] = m_retry_times;
 				task_json["task_chain"] = m_task_chain;
 				m_callback(AsstMsg::AppendTask, task_json, m_callback_arg);
diff --git a/MeoAssistance/WinMacro.cpp b/MeoAssistance/WinMacro.cpp
index 9810e01bfa..e03fcf3e9b 100644
--- a/MeoAssistance/WinMacro.cpp
+++ b/MeoAssistance/WinMacro.cpp
@@ -394,6 +394,14 @@ Rect WinMacro::getWindowRect()
 	return Rect{ rect.left, rect.top,
 		static_cast<int>((rect.right - rect.left) * getScreenScale()),
 		static_cast<int>((rect.bottom - rect.top) * getScreenScale()) };
+}
+
+std::pair<int, int> asst::WinMacro::getAdbDisplaySize()
+{
+	static std::pair<int, int> size = std::make_pair(m_emulator_info.adb.display_width, m_emulator_info.adb.display_height);
+	return size;
+
+	//return std::make_pair(m_emulator_info.adb.display_width, m_emulator_info.adb.display_height);
 }
 
 cv::Mat WinMacro::getImage(const Rect& rect)
diff --git a/MeoAssistance/WinMacro.h b/MeoAssistance/WinMacro.h
index d2dfff8129..2462ab683e 100644
--- a/MeoAssistance/WinMacro.h
+++ b/MeoAssistance/WinMacro.h
@@ -32,6 +32,7 @@ namespace asst {
 		[[ deprecated ]] cv::Mat getImage(const Rect& rect);	// 通过Win32 Api对窗口截图
 		cv::Mat getAdbImage();				// 通过Adb截图，会高清一点，但是比较慢（通过adb pull出来，有io操作）
 		Rect getWindowRect();
+		std::pair<int, int> getAdbDisplaySize();
 		const EmulatorInfo& getEmulatorInfo() const noexcept { return m_emulator_info; }
 		const HandleType& getHandleType() const noexcept { return m_handle_type; }