From 09bcc0407871c0704a863c033e4debfbec2113a1 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Thu, 29 Jul 2021 23:45:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=9B=BF=E6=8D=A2OCR?=
 =?UTF-8?q?=E5=B8=B8=E8=A7=81=E7=9A=84=E8=AF=86=E5=88=AB=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E7=82=B9=E5=87=BB9=E5=B0=8F?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MeoAssistance/include/Configer.h        |   1 +
 MeoAssistance/include/Identify.h        |   4 +--
 MeoAssistance/src/Assistance.cpp        |  36 ++++++++++++++++++++++--
 MeoAssistance/src/Configer.cpp          |   4 +++
 resource/config.json                    |  14 ++++++++-
 resource/template/RecruitTimeReduce.png | Bin 0 -> 42483 bytes
 6 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 resource/template/RecruitTimeReduce.png

diff --git a/MeoAssistance/include/Configer.h b/MeoAssistance/include/Configer.h
index d109c7710d..73dc391b91 100644
--- a/MeoAssistance/include/Configer.h
+++ b/MeoAssistance/include/Configer.h
@@ -36,6 +36,7 @@ namespace asst {
 		Options m_options;
 		std::unordered_map<std::string, TaskInfo> m_tasks;
 		std::unordered_map<std::string, EmulatorInfo> m_handles;
+		std::unordered_map<std::string, std::string> m_ocr_replace;
 
 	private:
 		bool _load(const std::string& filename);
diff --git a/MeoAssistance/include/Identify.h b/MeoAssistance/include/Identify.h
index 1c25fdb965..9ee22aae83 100644
--- a/MeoAssistance/include/Identify.h
+++ b/MeoAssistance/include/Identify.h
@@ -37,14 +37,14 @@ namespace asst {
 		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);
 	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) { 
 			return asst::Rect(cvRect.x, cvRect.y, cvRect.width, cvRect.height); 
 		}
-		std::vector<TextArea> ocr_detect(const cv::Mat& mat);
 
 		// return pair< suitability, raw opencv::point>
 		std::pair<double, cv::Point> match_template(const cv::Mat& cur, const cv::Mat& templ);
diff --git a/MeoAssistance/src/Assistance.cpp b/MeoAssistance/src/Assistance.cpp
index b40b6a3fca..808ac02e37 100644
--- a/MeoAssistance/src/Assistance.cpp
+++ b/MeoAssistance/src/Assistance.cpp
@@ -202,14 +202,41 @@ void asst::Assistance::find_and_clac_tags(bool need_click)
 {
 	DebugTraceFunction;
 
+	std::unique_lock<std::mutex> lock(m_mutex);
+
 	const cv::Mat& image = get_format_image();
 	set_control_scale(image.cols, image.rows);
 
-	const std::vector<TextArea>& ider_result = m_pIder->find_text(image, m_recruit_configer.m_all_tags);
+	lock.unlock();
+
+	if (need_click) {
+		start("RecruitTime");
+	}
+
+	std::vector<TextArea> ider_result = m_pIder->ocr_detect(image);
+	std::vector<TextArea> filt_result;
+	std::string ider_str;
+	for (TextArea& res : ider_result) {
+		// 替换一些常见的文字识别错误
+		// TODO: 这块时间复杂度有点高，待优化
+		for (const auto& [src, cor] : m_configer.m_ocr_replace) {
+			res.text = StringReplaceAll(res.text, src, cor);
+		}
+		ider_str += res.text + " ,";
+		for (const std::string& t : m_recruit_configer.m_all_tags) {
+			if (res.text == t) {
+				filt_result.emplace_back(std::move(res));
+			}
+		}
+	}
+	if (ider_str.back() == ',') {
+		ider_str.pop_back();
+	}
+	DebugTrace("All ocr text: ", Utf8ToGbk(ider_str));
 
 	std::vector<std::string> tags;
 	std::string tags_str;
-	for (const TextArea& t_a : ider_result) {
+	for (const TextArea& t_a : filt_result) {
 		tags.emplace_back(t_a.text);
 		tags_str += t_a.text + " ,";
 	}
@@ -321,13 +348,16 @@ void asst::Assistance::find_and_clac_tags(bool need_click)
 	if (need_click && !result_vector.empty()) {
 		const std::vector<std::string>& final_tags = result_vector[0].first;
 		std::vector<TextArea> final_text_areas;
-		for (const TextArea& text_area : ider_result) {
+
+		lock.lock();
+		for (const TextArea& text_area : filt_result) {
 			if (std::find(final_tags.cbegin(), final_tags.cend(), text_area.text) != final_tags.cend()) {
 				final_text_areas.emplace_back(text_area);
 				m_pCtrl->click(text_area.rect);
 				Sleep(300);
 			}
 		}
+		lock.unlock();
 	}
 }
 
diff --git a/MeoAssistance/src/Configer.cpp b/MeoAssistance/src/Configer.cpp
index fc2fe8d30c..87de4b62e2 100644
--- a/MeoAssistance/src/Configer.cpp
+++ b/MeoAssistance/src/Configer.cpp
@@ -235,6 +235,10 @@ bool asst::Configer::_load(const std::string& filename)
 
 			m_handles.emplace(name, std::move(emulator_info));
 		}
+
+		for (json::value& rep : root["ocrReplace"].as_array()) {
+			m_ocr_replace.emplace(rep.as_array()[0].as_string(), rep.as_array()[1].as_string());
+		}
 	}
 	catch (json::exception& e) {
 		DebugTraceError("Load config json error!", e.what());
diff --git a/resource/config.json b/resource/config.json
index 90a224dacd..0352fd91d0 100644
--- a/resource/config.json
+++ b/resource/config.json
@@ -18,9 +18,14 @@
         "controlDelayRange_Doc": "鐐瑰嚮闅忔満寤舵椂锛氭瘡娆＄偣鍑绘搷浣滀細杩涜闅忔満寤舵椂锛岄檷浣庡皝鍙烽闄╋紙濂藉儚涔熸病鍚杩囪皝琚皝鍙风殑锛夈�傛牸寮忎负 [ 鏈�灏忓欢鏃�, 鏈�澶у欢鏃� ]锛屽崟浣嶄负姣銆備緥濡傛兂璁剧疆3~5绉掑欢鏃讹紝鍗充慨鏀逛负[ 3000, 5000 ]锛岄粯璁�0~0",
         "ocrGpuIndex": -1,
         "ocrGpuIndex_Doc": "OcrLite浣跨敤GPU缂栧彿锛�-1(浣跨敤CPU)/0(浣跨敤GPU0)/1(浣跨敤GPU1)/...锛孏PU閫夋嫨澶辫触鏃讹紝鍒欎娇鐢–PU杩涜璁＄畻銆傞粯璁�-1",
-        "ocrThreadNumber": 4,
+        "ocrThreadNumber": 16,
         "ocrThreadNumber_Doc": "OcrLite绾跨▼鏁伴噺銆傞粯璁�4"
     },
+    "ocrReplace": [
+        [ "鍗冨憳", "骞插憳" ],
+        [ "娌嚮", "鐙欏嚮" ],
+        [ "娉嚮", "鐙欏嚮" ]
+    ],
     "handle_Doc": "涓嬮潰鐨勫拰妯℃嫙鍣ㄧ獥鍙ｆ崟鑾烽�昏緫鏈夊叧锛屼笉闇�瑕佷慨鏀�",
     "handle": {
         "BlueStacks": {
@@ -476,6 +481,13 @@
             "threshold": 0,
             "type": "stop",
             "next": []
+        },
+        "RecruitTime": {
+            "template": "RecruitTimeReduce.png",
+            "type": "clickSelf",
+            "next": [
+                "Stop"
+            ]
         }
     }
 }
\ No newline at end of file
diff --git a/resource/template/RecruitTimeReduce.png b/resource/template/RecruitTimeReduce.png
new file mode 100644
index 0000000000000000000000000000000000000000..b89e870d47946173639238b41301c502a1673551
GIT binary patch
literal 42483
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
Re!|lwGv^oWobmJD{|BG(ojm{m

literal 0
HcmV?d00001