From a4a8b0cfb062811a8b52eae136f3016ecf3eeebf Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sat, 21 Aug 2021 23:57:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E5=B9=B2=E5=91=98=E5=90=8D?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MeoAssistance/Assistance.cpp       |   2 +-
 MeoAssistance/IdentifyOperTask.cpp |  95 +++++++++++++++++++++++------
 MeoAssistance/IdentifyOperTask.h   |   4 +-
 resource/config.json               |   2 +
 resource/infrast.json              |   4 +-
 resource/operators/空.png          | Bin 0 -> 5061 bytes
 resource/operators/阿.png          | Bin 0 -> 4677 bytes
 7 files changed, 86 insertions(+), 21 deletions(-)
 create mode 100644 resource/operators/空.png
 create mode 100644 resource/operators/阿.png

diff --git a/MeoAssistance/Assistance.cpp b/MeoAssistance/Assistance.cpp
index d081e666ab..56703687a4 100644
--- a/MeoAssistance/Assistance.cpp
+++ b/MeoAssistance/Assistance.cpp
@@ -256,7 +256,7 @@ bool asst::Assistance::start_to_identify_opers()
 
 	auto task_ptr = std::make_shared<IdentifyOperTask>(task_callback, (void*)this);
 	// TODO �������д�������ļ��TODO ����λ��Ҫ���ݷֱ�������
-	task_ptr->set_swipe_param(Rect(800, 600, 0, 0), Rect(600, 600, 0, 0), 200);
+	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 eaa282fa2c..f9bb8e07a5 100644
--- a/MeoAssistance/IdentifyOperTask.cpp
+++ b/MeoAssistance/IdentifyOperTask.cpp
@@ -42,14 +42,17 @@ bool asst::IdentifyOperTask::run()
 	std::unordered_set<std::string> feature_whatever = InfrastConfiger::get_instance().m_oper_name_feat_whatever;
 	std::unordered_set<OperInfrastInfo> detected_opers;
 
+	int times = 0;
+	bool reverse = false;
 	// һ��ʶ��һ�߻����������и�Ա����ץ����
-	// �첽���л�������
-	m_keep_swipe = true;
-	std::future<bool> swipe_future = std::async(
-		std::launch::async, &IdentifyOperTask::keep_swipe, this, false);
+	// ����������һ�飬�ٷ���������һ�飬���ʶ����
 	while (true) {
 		const cv::Mat& image = OcrAbstractTask::get_format_image(true);
 
+		// �첽���л�������
+		std::future<bool> swipe_future = std::async(
+			std::launch::async, &IdentifyOperTask::swipe, this, reverse);
+
 		auto cur_name_textarea = detect_opers(image, feature_cond, feature_whatever);
 
 		int oper_numer = detected_opers.size();
@@ -77,17 +80,35 @@ bool asst::IdentifyOperTask::run()
 		opers_json["all"] = json::array(opers_json_vec);
 		m_callback(AsstMsg::InfrastOpers, opers_json, m_callback_arg);
 
-		// ˵������ʶ��һ���µĶ�ûʶ�𵽣�Ӧ���ǻ���������ˣ�ֱ�ӽ���ѭ��
-		if (oper_numer == detected_opers.size()) {
-			break;
+		// ���򻬶���ʱ��
+		if (!reverse) {
+			++times;
+			// ˵������ʶ��һ���µĶ�ûʶ�𵽣�Ӧ���ǻ���������ˣ�ֱ�ӽ���ѭ��
+			if (oper_numer == detected_opers.size()) {
+				reverse = true;
+			}
 		}
-		if (need_exit()) {
+		else {	// ���򻬶���ʱ��
+			if (--times <= 0) {
+				break;
+			}
+		}
+		// �����ȴ����λ�������
+		if (!swipe_future.get()) {
 			return false;
 		}
 	}
-	// �ȴ���������
-	m_keep_swipe = false;
-	swipe_future.wait();
+#ifdef LOG_TRACE
+	for (const std::string& name : InfrastConfiger::get_instance().m_all_opers_name) {
+		auto iter = std::find_if(detected_opers.cbegin(), detected_opers.cend(), 
+			[&](const OperInfrastInfo& oper) -> bool {
+				return oper.name == name;
+			});
+		if (iter == detected_opers.cend()) {
+			std::cout << "δ��⵽��" << Utf8ToGbk(name) << std::endl;
+		}
+	}
+#endif // LOG_TRACE
 
 	return true;
 }
@@ -96,8 +117,8 @@ std::vector<TextArea> asst::IdentifyOperTask::detect_opers(const cv::Mat& image,
 {
 	// �ü�������Ա����һ��������ͼƬ��û��Ҫ������ͼƬ��ȥʶ��
 	// TODO���������Ҫ���ݷֱ��ʵ���
-	constexpr static int cropped_height = 100;
-	constexpr static int cropped_upper_y = 665;
+	constexpr static int cropped_height = 60;
+	constexpr static int cropped_upper_y = 695;
 	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);	// ��������
@@ -110,11 +131,19 @@ std::vector<TextArea> asst::IdentifyOperTask::detect_opers(const cv::Mat& image,
 		upper_text_area,
 		InfrastConfiger::get_instance().m_all_opers_name,
 		Configer::get_instance().m_infrast_ocr_replace);
+	// ����һ��Ϳ�ڣ�������汻����������ʶ����
+	cv::Mat draw_image = image;
+	for (const TextArea& textarea : upper_part_names) {
+		cv::Rect rect(textarea.rect.x, textarea.rect.y, textarea.rect.width, textarea.rect.height);
+		// ע��������dz������ԭͼimageҲ�ᱻͿ��
+		cv::rectangle(draw_image, rect, cv::Scalar(0, 0, 0), -1);
+	}
 
 	// �°벿�ֵĸ�Ա
 	// TODO�����y����Ҫ���ݷֱ��ʵ���
-	constexpr static int cropped_lower_y = 1300;
+	constexpr static int cropped_lower_y = 1335;
 	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);	// ��������
 	// ��ΪͼƬ�Dzü����ģ����Զ�Ӧԭͼ������Ҫ���ϲü��IJ���
 	for (TextArea& textarea : lower_text_area) {
@@ -125,6 +154,12 @@ std::vector<TextArea> asst::IdentifyOperTask::detect_opers(const cv::Mat& image,
 		lower_text_area,
 		InfrastConfiger::get_instance().m_all_opers_name,
 		Configer::get_instance().m_infrast_ocr_replace);
+	// ����һ��Ϳ�ڣ�������汻����������ʶ����
+	for (const TextArea& textarea : lower_part_names) {
+		cv::Rect rect(textarea.rect.x, textarea.rect.y, textarea.rect.width, textarea.rect.height);
+		// ע��������dz������ԭͼimageҲ�ᱻͿ��
+		cv::rectangle(draw_image, rect, cv::Scalar(0, 0, 0), -1);
+	}
 
 	// ����������ʶ�����ϲ�
 	std::vector<TextArea> all_text_area = std::move(upper_text_area);
@@ -188,6 +223,9 @@ std::vector<TextArea> asst::IdentifyOperTask::detect_opers(const cv::Mat& image,
 					if (whatever_iter != feature_whatever.end()) {
 						feature_whatever.erase(whatever_iter);
 					}
+					// ˳����Ϳ���ˣ�������汻whatever����������ʶ��
+					// ע��������dz������ԭͼimageҲ�ᱻͿ��
+					cv::rectangle(draw_image, cv_rect, cv::Scalar(0, 0, 0), -1);
 				}
 			}
 		}
@@ -198,8 +236,13 @@ std::vector<TextArea> asst::IdentifyOperTask::detect_opers(const cv::Mat& image,
 		// �ϰ벿�ֳ����ε�ͼƬ
 		auto&& upper_ret = OcrAbstractTask::m_identify_ptr->feature_match(upper_part_name_image, *iter);
 		if (upper_ret) {
-			// ��ΪͼƬ�Dzü����ģ����Զ�Ӧԭͼ������Ҫ���ϲü��IJ���
 			TextArea temp = std::move(upper_ret.value());
+#ifdef LOG_TRACE	// Ҳ˳��Ϳ��һ�£����㿴˭û��ʶ�����
+			cv::Rect draw_rect(temp.rect.x, temp.rect.y, temp.rect.width, temp.rect.height);
+			// ע��������dz������ԭͼimageҲ�ᱻͿ��
+			cv::rectangle(upper_part_name_image, draw_rect, cv::Scalar(0, 0, 0), -1);
+#endif
+			// ��ΪͼƬ�Dzü����ģ����Զ�Ӧԭͼ������Ҫ���ϲü��IJ���
 			temp.rect.y += cropped_upper_y;
 			all_opers_textarea.emplace_back(std::move(temp));
 			iter = feature_whatever.erase(iter);
@@ -209,8 +252,13 @@ std::vector<TextArea> asst::IdentifyOperTask::detect_opers(const cv::Mat& image,
 		// �°벿�ֳ����ε�ͼƬ
 		auto&& lower_ret = OcrAbstractTask::m_identify_ptr->feature_match(lower_part_name_image, *iter);
 		if (lower_ret) {
-			// ��ΪͼƬ�Dzü����ģ����Զ�Ӧԭͼ������Ҫ���ϲü��IJ���
 			TextArea temp = std::move(lower_ret.value());
+#ifdef LOG_TRACE	// Ҳ˳��Ϳ��һ�£����㿴˭û��ʶ�����
+			cv::Rect draw_rect(temp.rect.x, temp.rect.y, temp.rect.width, temp.rect.height);
+			// ע��������dz������ԭͼimageҲ�ᱻͿ��
+			cv::rectangle(lower_part_name_image, draw_rect, cv::Scalar(0, 0, 0), -1);
+#endif
+			// ��ΪͼƬ�Dzü����ģ����Զ�Ӧԭͼ������Ҫ���ϲü��IJ���
 			temp.rect.y += cropped_lower_y;
 			all_opers_textarea.emplace_back(std::move(temp));
 			iter = feature_whatever.erase(iter);
@@ -252,9 +300,22 @@ int asst::IdentifyOperTask::detect_elite(const cv::Mat& image, const asst::Rect
 	}
 }
 
+bool IdentifyOperTask::swipe(bool reverse)
+{
+	bool ret = true;
+	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);
+	return ret;
+}
+
 bool IdentifyOperTask::keep_swipe(bool reverse)
 {
-	bool ret = false;
+	bool ret = true;
 	while (m_keep_swipe && !ret) {
 		if (!reverse) {
 			ret &= m_control_ptr->swipe(m_swipe_begin, m_swipe_end, m_swipe_duration);
diff --git a/MeoAssistance/IdentifyOperTask.h b/MeoAssistance/IdentifyOperTask.h
index 46d956e20c..f350231c3b 100644
--- a/MeoAssistance/IdentifyOperTask.h
+++ b/MeoAssistance/IdentifyOperTask.h
@@ -22,12 +22,14 @@ namespace asst {
 	protected:
 		constexpr static int SwipeExtraDelay = 0;
 
-		virtual bool keep_swipe(bool reverse = false);
 		std::vector<TextArea> detect_opers(const cv::Mat& image,
 			std::unordered_map<std::string, std::string>& feature_cond,
 			std::unordered_set<std::string>& feature_whatever);
 		int detect_elite(const cv::Mat& image, const asst::Rect name_rect);
 
+		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 = 0;
diff --git a/resource/config.json b/resource/config.json
index 749dcf7fcd..c4428df5c5 100644
--- a/resource/config.json
+++ b/resource/config.json
@@ -36,6 +36,8 @@
         [ "莱思哈特", "莱恩哈特" ],
         [ "深能", "深靛" ],
         [ "叫米", "古米" ],
+        [ "叶米", "古米" ],
+        [ "节草", "苇草" ],
         [ "粹兰", "梓兰" ],
         [ "艾丝菜尔", "艾丝黛尔" ],
         [ "艾丝莱尔", "艾丝黛尔" ],
diff --git a/resource/infrast.json b/resource/infrast.json
index 5f8a216517..a78bf31cf1 100644
--- a/resource/infrast.json
+++ b/resource/infrast.json
@@ -63,7 +63,7 @@
         [ "狮", "狮蝎" ]
     ],
     "featureWhatever_Doc": "这里面的无论如何都进行特征检测",
-    "featureWhatever": [ "砾", "煌", "山", "黑", "W", "夕", "红", "芬", "梅", "宴", "孑", "吽" ],
+    "featureWhatever": [ "砾", "煌", "山", "黑", "W", "夕", "红", "芬", "梅", "宴", "孑", "吽", "空", "阿" ],
     "allNames": [
         "桃金娘",
         "食铁兽",
@@ -190,7 +190,7 @@
         "玫兰莎",
         "空爆",
         "安德切尔",
-        "安塞尔",
+        "安赛尔",
         "芙蓉",
         "翎羽",
         "梓兰",
diff --git a/resource/operators/空.png b/resource/operators/空.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4f41bb5ea86cda335da16ab8355cee5756bb984
GIT binary patch
literal 5061
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
BVl@B&

literal 0
HcmV?d00001

diff --git a/resource/operators/阿.png b/resource/operators/阿.png
new file mode 100644
index 0000000000000000000000000000000000000000..05973b37bb26e1274a9fe44f4c82986ba5ccd16d
GIT binary patch
literal 4677
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

literal 0
HcmV?d00001