From ce0b85c199da9b97e4af1a466ed41e079edfb35e Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Mon, 13 Sep 2021 01:17:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9identityArea?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84=E6=94=AF=E6=8C=81=EF=BC=8C=E4=BB=85?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E6=8C=87=E5=AE=9A=E5=8C=BA=E5=9F=9F=E3=80=82?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E4=BC=98=E5=8C=96Identity=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/config.json                      |  32 +++++++++-
 resource/operators/Elite1.png             | Bin 36641 -> 0 bytes
 resource/operators/Elite2.png             | Bin 36392 -> 0 bytes
 src/MeoAssistance/AsstAux.h               |   6 ++
 src/MeoAssistance/AsstDef.h               |   1 +
 src/MeoAssistance/Configer.cpp            |   8 +++
 src/MeoAssistance/Identify.cpp            |  68 +++++++++-------------
 src/MeoAssistance/Identify.h              |  21 ++++---
 src/MeoAssistance/IdentifyOperTask.cpp    |  20 +------
 src/MeoAssistance/InfrastAbstractTask.cpp |  14 ++---
 src/MeoAssistance/ProcessTask.cpp         |  27 +++++++--
 11 files changed, 116 insertions(+), 81 deletions(-)
 delete mode 100644 resource/operators/Elite1.png
 delete mode 100644 resource/operators/Elite2.png

diff --git a/resource/config.json b/resource/config.json
index 2d260abdd8..059aed8ad7 100644
--- a/resource/config.json
+++ b/resource/config.json
@@ -284,6 +284,12 @@
             "action": "clickSelf",
             "cache": false,
             "rearDelay": 3000,
+            "identifyArea": [
+                1080,
+                570,
+                195,
+                130
+            ],
             "exceededNext": [
                 "ReturnToMall"
             ],
@@ -298,7 +304,13 @@
             "algorithm": "OcrDetect",
             "text": [ "访问下位" ],
             "action": "clickSelf",
-            "rearDelay": 3000,
+            "rearDelay": 3000,            
+            "identifyArea": [
+                1080,
+                570,
+                195,
+                130
+            ],
             "exceededNext": [
                 "ReturnToMall"
             ],
@@ -366,6 +378,12 @@
             "algorithm": "OcrDetect",
             "text": [ "今日参与", "已达上限" ],
             "action": "doNothing",
+            "identifyArea": [
+                900,
+                50,
+                375,
+                140
+            ],
             "next": [
                 "ReturnToMall"
             ]
@@ -373,6 +391,12 @@
         "VisitNextBlack": {
             "template": "VisitNextBlack.png",
             "action": "doNothing",
+            "identifyArea": [
+                1080,
+                570,
+                195,
+                130
+            ],
             "next": [
                 "ReturnToMall"
             ]
@@ -557,6 +581,12 @@
             "text": [ "可收获", "订单交付", "信赖" ],
             "rearDelay": 1000,
             "action": "clickSelf",
+            "identifyArea": [
+                0,
+                600,
+                800,
+                118
+            ],
             "next": [
                 "InfrastReward",
                 "InfrastExitReward"
diff --git a/resource/operators/Elite1.png b/resource/operators/Elite1.png
deleted file mode 100644
index 5a9012c1ea09c5af4c78feb16ee75b9dc8b7b87a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36641
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%0DTB0=bA3Wf^>
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
C(_91q

diff --git a/resource/operators/Elite2.png b/resource/operators/Elite2.png
deleted file mode 100644
index 5a05862ea27851bd26ddc6f20d7152794a9b65de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36392
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
E3&f7O!~g&Q

diff --git a/src/MeoAssistance/AsstAux.h b/src/MeoAssistance/AsstAux.h
index 1987402b86..3b7c792752 100644
--- a/src/MeoAssistance/AsstAux.h
+++ b/src/MeoAssistance/AsstAux.h
@@ -79,6 +79,12 @@ namespace asst {
 		return strTemp;
 	}
 
+	template<typename RetTy, typename ArgType>
+	constexpr inline RetTy make_rect(const ArgType& rect) 
+	{
+		return RetTy{ rect.x, rect.y, rect.width, rect.height };
+	}
+
 	//template<typename T,
 	//	typename = typename std::enable_if<std::is_constructible<T, std::string>::value>::type>
 	//	std::string VectorToString(const std::vector<T>& vector, bool to_gbk = false) {
diff --git a/src/MeoAssistance/AsstDef.h b/src/MeoAssistance/AsstDef.h
index f5eb4ce2aa..afb96c5fa0 100644
--- a/src/MeoAssistance/AsstDef.h
+++ b/src/MeoAssistance/AsstDef.h
@@ -134,6 +134,7 @@ namespace asst {
 		int pre_delay = 0;								// 执行该任务前的延时
 		int rear_delay = 0;								// 执行该任务后的延时
 		int retry_times = INT_MAX;						// 未找到图像时的重试次数
+		Rect identify_area;								// 要识别的区域，若为0则全图识别
 	};
 
 	// 文字识别任务的信息
diff --git a/src/MeoAssistance/Configer.cpp b/src/MeoAssistance/Configer.cpp
index 673ab60e12..9796032d84 100644
--- a/src/MeoAssistance/Configer.cpp
+++ b/src/MeoAssistance/Configer.cpp
@@ -182,6 +182,14 @@ bool asst::Configer::parse(json::value&& json)
 				task_info_ptr->reduce_other_times.emplace_back(reduce.as_string());
 			}
 		}
+		if (task_json.exist("identifyArea")) {
+			json::array& area_arr = task_json["identifyArea"].as_array();
+			task_info_ptr->identify_area = Rect(
+				area_arr[0].as_integer(),
+				area_arr[1].as_integer(),
+				area_arr[2].as_integer(),
+				area_arr[3].as_integer());
+		}
 
 		json::array& next_arr = task_json["next"].as_array();
 		for (const json::value& next : next_arr) {
diff --git a/src/MeoAssistance/Identify.cpp b/src/MeoAssistance/Identify.cpp
index 3e206c7d9b..961d0c7a39 100644
--- a/src/MeoAssistance/Identify.cpp
+++ b/src/MeoAssistance/Identify.cpp
@@ -17,22 +17,22 @@ using namespace cv::xfeatures2d;
 
 bool Identify::add_image(const std::string& name, const std::string& path)
 {
-	Mat mat = imread(path);
-	if (mat.empty()) {
+	Mat image = imread(path);
+	if (image.empty()) {
 		return false;
 	}
-	m_mat_map.emplace(name, mat);
+	m_mat_map.emplace(name, image);
 	return true;
 }
 
 bool asst::Identify::add_text_image(const std::string& text, const std::string& path)
 {
-	Mat mat = imread(path);
-	if (mat.empty()) {
+	Mat image = imread(path);
+	if (image.empty()) {
 		return false;
 	}
 
-	m_feature_map.emplace(text, surf_detect(mat));
+	m_feature_map.emplace(text, surf_detect(image));
 
 	return true;
 }
@@ -73,21 +73,11 @@ double Identify::image_hist_comp(const cv::Mat& src, const cv::MatND& hist)
 	return 1 - compareHist(image_2_hist(src), hist, CV_COMP_BHATTACHARYYA);
 }
 
-asst::Rect asst::Identify::cvrect_2_rect(const cv::Rect& cvRect)
-{
-	return asst::Rect(cvRect.x, cvRect.y, cvRect.width, cvRect.height);
-}
-
-cv::Rect asst::Identify::rect_2_cvrect(const asst::Rect& rect)
-{
-	return cv::Rect(rect.x, rect.y, rect.width, rect.height);
-}
-
-std::pair<std::vector<cv::KeyPoint>, cv::Mat> asst::Identify::surf_detect(const cv::Mat& mat)
+std::pair<std::vector<cv::KeyPoint>, cv::Mat> asst::Identify::surf_detect(const cv::Mat& image)
 {
 	// 灰度图转换
 	cv::Mat mat_gray;
-	cv::cvtColor(mat, mat_gray, cv::COLOR_RGB2GRAY);
+	cv::cvtColor(image, mat_gray, cv::COLOR_RGB2GRAY);
 
 	constexpr int min_hessian = 400;
 	// SURF特征点检测
@@ -243,9 +233,9 @@ std::optional<asst::Rect> asst::Identify::feature_match(
 	return std::nullopt;
 }
 
-std::vector<TextArea> asst::Identify::ocr_detect(const cv::Mat& mat)
+std::vector<TextArea> asst::Identify::ocr_detect(const cv::Mat& image)
 {
-	OcrResult ocr_results = m_ocr_lite.detect(mat,
+	OcrResult ocr_results = m_ocr_lite.detect(image,
 		50, 0,
 		0.2f, 0.3f,
 		2.0f, false, false);
@@ -294,7 +284,7 @@ asst::Identify::FindImageResult asst::Identify::find_image(
 	if (m_use_cache && m_cache_map.find(templ_name) != m_cache_map.cend()) {
 		const auto& [raw_rect, hist] = m_cache_map.at(templ_name);
 		double value = image_hist_comp(image(raw_rect), hist);
-		Rect dst_rect = cvrect_2_rect(raw_rect);
+		Rect dst_rect = make_rect<asst::Rect>(raw_rect);
 		if (rect_zoom) {
 			dst_rect = dst_rect.center_zoom(0.8);
 		}
@@ -307,7 +297,7 @@ asst::Identify::FindImageResult asst::Identify::find_image(
 		if (m_use_cache && value >= add_cache_thres) {
 			m_cache_map.emplace(templ_name, std::make_pair(raw_rect, image_2_hist(image(raw_rect))));
 		}
-		Rect dst_rect = cvrect_2_rect(raw_rect);
+		Rect dst_rect = make_rect<asst::Rect>(raw_rect);
 		if (rect_zoom) {
 			dst_rect = dst_rect.center_zoom(0.8);
 		}
@@ -370,7 +360,7 @@ std::vector<asst::Identify::FindImageResult> asst::Identify::find_all_images(
 #ifdef LOG_TRACE
 	cv::Mat draw_mat = image.clone();
 	for (const auto& info : results) {
-		cv::rectangle(draw_mat, rect_2_cvrect(info.rect), cv::Scalar(0, 0, 255), 1);
+		cv::rectangle(draw_mat, make_rect<cv::Rect>(info.rect), cv::Scalar(0, 0, 255), 1);
 		cv::putText(draw_mat, std::to_string(info.score), cv::Point(info.rect.x, info.rect.y), 1, 1.0, cv::Scalar(0, 0, 255));
 	}
 #endif
@@ -378,26 +368,26 @@ std::vector<asst::Identify::FindImageResult> asst::Identify::find_all_images(
 	return results;
 }
 
-std::optional<TextArea> asst::Identify::feature_match(const cv::Mat& mat, const std::string& key)
+std::optional<TextArea> asst::Identify::feature_match(const cv::Mat& image, const std::string& templ_name)
 {
 	//DebugTraceFunction;
 
-	if (m_feature_map.find(key) == m_feature_map.cend()) {
+	if (m_feature_map.find(templ_name) == m_feature_map.cend()) {
 		return std::nullopt;
 	}
-	auto&& [query_keypoints, query_mat_vector] = m_feature_map[key];
-	auto&& [train_keypoints, train_mat_vector] = surf_detect(mat);
+	auto&& [query_keypoints, query_mat_vector] = m_feature_map[templ_name];
+	auto&& [train_keypoints, train_mat_vector] = surf_detect(image);
 
 #ifdef LOG_TRACE
-	cv::Mat query_mat = cv::imread(GetResourceDir() + "operators\\" + Utf8ToGbk(key) + ".png");
+	cv::Mat query_mat = cv::imread(GetResourceDir() + "operators\\" + Utf8ToGbk(templ_name) + ".png");
 	auto&& ret = feature_match(query_keypoints, query_mat_vector, train_keypoints, train_mat_vector,
-		query_mat, mat);
+		query_mat, image);
 #else
 	auto&& ret = feature_match(query_keypoints, query_mat_vector, train_keypoints, train_mat_vector);
 #endif
 	if (ret) {
 		TextArea dst;
-		dst.text = key;
+		dst.text = templ_name;
 		dst.rect = std::move(ret.value());
 		return dst;
 	}
@@ -440,9 +430,9 @@ bool asst::Identify::ocr_init_models(const std::string& dir)
 	return false;
 }
 
-std::optional<asst::Rect> asst::Identify::find_text(const cv::Mat& mat, const std::string& text)
+std::optional<asst::Rect> asst::Identify::find_text(const cv::Mat& image, const std::string& text)
 {
-	std::vector<TextArea> results = ocr_detect(mat);
+	std::vector<TextArea> results = ocr_detect(image);
 	for (const TextArea& res : results) {
 		if (res.text == text) {
 			return res.rect;
@@ -451,10 +441,10 @@ std::optional<asst::Rect> asst::Identify::find_text(const cv::Mat& mat, const st
 	return std::nullopt;
 }
 
-std::vector<TextArea> asst::Identify::find_text(const cv::Mat& mat, const std::vector<std::string>& texts)
+std::vector<TextArea> asst::Identify::find_text(const cv::Mat& image, const std::vector<std::string>& texts)
 {
 	std::vector<TextArea> dst;
-	std::vector<TextArea> detect_result = ocr_detect(mat);
+	std::vector<TextArea> detect_result = ocr_detect(image);
 	for (TextArea& res : detect_result) {
 		for (const std::string& t : texts) {
 			if (res.text == t) {
@@ -465,10 +455,10 @@ std::vector<TextArea> asst::Identify::find_text(const cv::Mat& mat, const std::v
 	return dst;
 }
 
-std::vector<TextArea> asst::Identify::find_text(const cv::Mat& mat, const std::unordered_set<std::string>& texts)
+std::vector<TextArea> asst::Identify::find_text(const cv::Mat& image, const std::unordered_set<std::string>& texts)
 {
 	std::vector<TextArea> dst;
-	std::vector<TextArea> detect_result = ocr_detect(mat);
+	std::vector<TextArea> detect_result = ocr_detect(image);
 	for (TextArea& res : detect_result) {
 		for (const std::string& t : texts) {
 			if (res.text == t) {
@@ -482,10 +472,10 @@ std::vector<TextArea> asst::Identify::find_text(const cv::Mat& mat, const std::u
 /*
 std::pair<double, asst::Rect> Identify::findImageWithFile(const cv::Mat& cur, const std::string& filename)
 {
-	Mat mat = imread(filename);
-	if (mat.empty()) {
+	Mat image = imread(filename);
+	if (image.empty()) {
 		return { 0, asst::Rect() };
 	}
-	return findImage(cur, mat);
+	return findImage(cur, image);
 }
 */
\ No newline at end of file
diff --git a/src/MeoAssistance/Identify.h b/src/MeoAssistance/Identify.h
index 47d17433f3..0431abc6a9 100644
--- a/src/MeoAssistance/Identify.h
+++ b/src/MeoAssistance/Identify.h
@@ -41,27 +41,26 @@ namespace asst {
 			const cv::Mat& image, const std::string& templ_name, double add_cache_thres = NotAddCache, bool rect_zoom = true);
 		std::vector<FindImageResult> find_all_images(
 			const cv::Mat& image, const std::string& templ_name, double threshold = 0, bool rect_zoom = true) const;
-
-		// return pair< suitability, raw opencv::point>
-		std::pair<double, cv::Point> match_template(const cv::Mat& cur, const cv::Mat& templ);
-
-		std::optional<TextArea> feature_match(const cv::Mat& mat, const std::string& key);
+		
+		std::optional<TextArea> feature_match(const cv::Mat& image, const std::string& key);
 
 		void clear_cache();
 
 		/*** OcrLite package ***/
 		void set_ocr_param(int gpu_index, int thread_number);
 		bool ocr_init_models(const std::string& dir);
-		std::optional<Rect> find_text(const cv::Mat& mat, const std::string& text);
-		std::vector<TextArea> find_text(const cv::Mat& mat, const std::vector<std::string>& texts);
-		std::vector<TextArea> find_text(const cv::Mat& mat, const std::unordered_set<std::string>& texts);
 
-		std::vector<TextArea> ocr_detect(const cv::Mat& mat);
+		std::vector<TextArea> ocr_detect(const cv::Mat& image);
+
+		[[deprecated]] std::optional<Rect> find_text(const cv::Mat& image, const std::string& text);
+		[[deprecated]] std::vector<TextArea> find_text(const cv::Mat& image, const std::vector<std::string>& texts);
+		[[deprecated]] std::vector<TextArea> find_text(const cv::Mat& image, const std::unordered_set<std::string>& texts);
+
 	private:
 		cv::Mat image_2_hist(const cv::Mat& src);
 		double image_hist_comp(const cv::Mat& src, const cv::MatND& hist);
-		static asst::Rect cvrect_2_rect(const cv::Rect& cvRect);
-		static cv::Rect rect_2_cvrect(const asst::Rect& rect);
+		// return pair< suitability, raw opencv::point>
+		std::pair<double, cv::Point> match_template(const cv::Mat& image, const cv::Mat& templ);
 
 		// return pair<特征点s，特征点描述子（向量）>
 		std::pair<std::vector<cv::KeyPoint>, cv::Mat> surf_detect(const cv::Mat& mat);
diff --git a/src/MeoAssistance/IdentifyOperTask.cpp b/src/MeoAssistance/IdentifyOperTask.cpp
index 9571233db6..aa94754c61 100644
--- a/src/MeoAssistance/IdentifyOperTask.cpp
+++ b/src/MeoAssistance/IdentifyOperTask.cpp
@@ -161,24 +161,8 @@ int asst::IdentifyOperTask::detect_elite(const cv::Mat& image, const asst::Rect
 	elite_rect.height = image.rows * 0.1;
 	cv::Mat elite_mat = image(elite_rect);
 
-	// for debug
-	// 这两个图是在2560*1440下截的，准备做模板匹配，所以要缩放一下
-	// TODO：后面再弄完整的工程化，先简单缩放下
-	static cv::Mat elite1 = cv::imread(GetResourceDir() + "operators\\Elite1.png");
-	static cv::Mat elite2 = cv::imread(GetResourceDir() + "operators\\Elite2.png");
-	static bool scaled = false;
-	if (!scaled) {
-		scaled = true;
-
-		double ratio = image.rows / 1440.0;
-		cv::Size size1(elite1.size().width * ratio, elite1.size().height * ratio);
-		cv::resize(elite1, elite1, size1);
-		cv::Size size2(elite2.size().width * ratio, elite2.size().height * ratio);
-		cv::resize(elite2, elite2, size2);
-	}
-
-	auto&& [score1, point1] = m_identify_ptr->match_template(elite_mat, elite1);
-	auto&& [score2, point2] = m_identify_ptr->match_template(elite_mat, elite2);
+	auto&& [algorithm1, score1, point1] = m_identify_ptr->find_image(elite_mat, "Elite1");
+	auto&& [algorithm2, score2, point2] = m_identify_ptr->find_image(elite_mat, "Elite2");
 	if (score1 > score2 && score1 > 0.7) {
 		return 1;
 	}
diff --git a/src/MeoAssistance/InfrastAbstractTask.cpp b/src/MeoAssistance/InfrastAbstractTask.cpp
index 87fe4876f4..7fe0116294 100644
--- a/src/MeoAssistance/InfrastAbstractTask.cpp
+++ b/src/MeoAssistance/InfrastAbstractTask.cpp
@@ -240,9 +240,9 @@ std::vector<TextArea> asst::InfrastAbstractTask::detect_operators_name(
 				if (magnified_area.y + magnified_area.height >= image.rows) {
 					magnified_area.height = image.rows - magnified_area.y - 1;
 				}
-				cv::Rect cv_rect(magnified_area.x, magnified_area.y, magnified_area.width, magnified_area.height);
 				// key是关键字而已，真正要识别的是value
-				auto&& ret = OcrAbstractTask::m_identify_ptr->feature_match(image(cv_rect), value);
+				auto&& ret = OcrAbstractTask::m_identify_ptr->feature_match(
+					image(make_rect<cv::Rect>(magnified_area)), value);
 				if (ret) {
 					// 匹配上了下次就不用再匹配这个了，直接删了
 					all_opers_textarea.emplace_back(value, textarea.rect);
@@ -271,9 +271,8 @@ std::vector<TextArea> asst::InfrastAbstractTask::detect_operators_name(
 		if (upper_ret) {
 			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);
 			// 注意这里是浅拷贝，原图image也会被涂黑
-			cv::rectangle(upper_part_name_image, draw_rect, cv::Scalar(0, 0, 0), -1);
+			cv::rectangle(upper_part_name_image, make_rect<cv::Rect>(temp.rect), cv::Scalar(0, 0, 0), -1);
 #endif
 			// 因为图片是裁剪过的，所以对应原图的坐标要加上裁剪的参数
 			temp.rect.y += cropped_upper_y;
@@ -287,9 +286,8 @@ std::vector<TextArea> asst::InfrastAbstractTask::detect_operators_name(
 		if (lower_ret) {
 			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);
 			// 注意这里是浅拷贝，原图image也会被涂黑
-			cv::rectangle(lower_part_name_image, draw_rect, cv::Scalar(0, 0, 0), -1);
+			cv::rectangle(lower_part_name_image, make_rect<cv::Rect>(temp.rect), cv::Scalar(0, 0, 0), -1);
 #endif
 			// 因为图片是裁剪过的，所以对应原图的坐标要加上裁剪的参数
 			temp.rect.y += cropped_lower_y;
@@ -327,7 +325,7 @@ bool asst::InfrastAbstractTask::enter_station(const std::vector<std::string>& te
 		}
 		Rect& rect = cur_result.at(0).rect;
 		callback_json["value"] = cur_result.at(0).score;
-		callback_json["rect"] = json::array({ rect.x, rect.y, rect.width, rect.height });
+		callback_json["rect"] = make_rect<json::array>(rect);
 		m_callback(AsstMsg::ImageFindResult, callback_json, m_callback_arg);
 
 		if (max_score_reslut.empty()
@@ -345,7 +343,7 @@ bool asst::InfrastAbstractTask::enter_station(const std::vector<std::string>& te
 	Rect& rect = max_score_reslut.at(0).rect;
 	callback_json["size"] = max_score_reslut.size();
 	callback_json["value"] = max_score_reslut.at(0).score;
-	callback_json["rect"] = json::array({ rect.x, rect.y, rect.width, rect.height });
+	callback_json["rect"] = make_rect<json::array>(rect);
 	m_callback(AsstMsg::ImageMatched, callback_json, m_callback_arg);
 
 	if (index >= max_score_reslut.size()) {
diff --git a/src/MeoAssistance/ProcessTask.cpp b/src/MeoAssistance/ProcessTask.cpp
index d9a2bcb33c..cc98d552a8 100644
--- a/src/MeoAssistance/ProcessTask.cpp
+++ b/src/MeoAssistance/ProcessTask.cpp
@@ -157,9 +157,18 @@ std::shared_ptr<TaskInfo> ProcessTask::match_image(Rect* matched_rect)
 			double templ_threshold = process_task_info_ptr->templ_threshold;
 			double hist_threshold = process_task_info_ptr->hist_threshold;
 			double add_cache_thres = process_task_info_ptr->cache ? templ_threshold : Identify::NotAddCache;
-
-			auto&& [algorithm, score, temp_rect] = m_identify_ptr->find_image(cur_image, task_name, add_cache_thres);
+			cv::Mat identify_image;
+			const auto& identify_area = task_info_ptr->identify_area;
+			if (identify_area.width == 0) {
+				identify_image = cur_image;
+			}
+			else {
+				identify_image = cur_image(make_rect<cv::Rect>(task_info_ptr->identify_area));
+			}
+			auto&& [algorithm, score, temp_rect] = m_identify_ptr->find_image(identify_image, task_name, add_cache_thres);
 			rect = std::move(temp_rect);
+			rect.x += identify_area.x;
+			rect.y += identify_area.y;
 			callback_json["value"] = score;
 
 			if (algorithm == AlgorithmType::MatchTemplate) {
@@ -185,7 +194,15 @@ std::shared_ptr<TaskInfo> ProcessTask::match_image(Rect* matched_rect)
 		{
 			std::shared_ptr<OcrTaskInfo> ocr_task_info_ptr =
 				std::dynamic_pointer_cast<OcrTaskInfo>(task_info_ptr);
-			std::vector<TextArea> all_text_area = ocr_detect(cur_image);
+			cv::Mat identify_image;
+			const auto& identify_area = task_info_ptr->identify_area;
+			if (identify_area.width == 0) {
+				identify_image = cur_image;
+			}
+			else {
+				identify_image = cur_image(make_rect<cv::Rect>(task_info_ptr->identify_area));
+			}
+			std::vector<TextArea> all_text_area = ocr_detect(identify_image);
 			std::vector<TextArea> match_result;
 			if (ocr_task_info_ptr->need_match) {
 				match_result = text_match(all_text_area,
@@ -200,6 +217,8 @@ std::shared_ptr<TaskInfo> ProcessTask::match_image(Rect* matched_rect)
 			if (!match_result.empty()) {
 				callback_json["text"] = match_result.at(0).text;
 				rect = match_result.at(0).rect;
+				rect.x += identify_area.x;
+				rect.y += identify_area.y;
 				matched = true;
 			}
 		}
@@ -212,7 +231,7 @@ std::shared_ptr<TaskInfo> ProcessTask::match_image(Rect* matched_rect)
 			break;
 		}
 
-		callback_json["rect"] = json::array({ rect.x, rect.y, rect.width, rect.height });
+		callback_json["rect"] = make_rect<json::array>(rect);
 		callback_json["name"] = task_name;
 		if (matched_rect != NULL) {
 			*matched_rect = std::move(rect);