From db8a8a5e2148d309569b473eaa402c63c95aa20d Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Thu, 29 Jul 2021 22:39:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=83=A8=E5=88=86auto?=
 =?UTF-8?q?=E6=BB=A5=E7=94=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MeoAssistance/src/Assistance.cpp      |  7 +++----
 MeoAssistance/src/AsstCaller.cpp      |  6 +++---
 MeoAssistance/src/Identify.cpp        | 27 +++++++++++++++------------
 MeoAssistance/src/RecruitConfiger.cpp |  2 +-
 MeoAssistance/src/Updater.cpp         |  8 ++++----
 MeoAssistance/src/WinMacro.cpp        |  6 +++---
 6 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/MeoAssistance/src/Assistance.cpp b/MeoAssistance/src/Assistance.cpp
index d4acfca51c..b40b6a3fca 100644
--- a/MeoAssistance/src/Assistance.cpp
+++ b/MeoAssistance/src/Assistance.cpp
@@ -205,7 +205,7 @@ void asst::Assistance::find_and_clac_tags(bool need_click)
 	const cv::Mat& image = get_format_image();
 	set_control_scale(image.cols, image.rows);
 
-	std::vector<TextArea>&& ider_result = m_pIder->find_text(image, m_recruit_configer.m_all_tags);
+	const std::vector<TextArea>& ider_result = m_pIder->find_text(image, m_recruit_configer.m_all_tags);
 
 	std::vector<std::string> tags;
 	std::string tags_str;
@@ -222,7 +222,6 @@ void asst::Assistance::find_and_clac_tags(bool need_click)
 	std::vector<std::vector<std::string>> all_combs;
 	int len = tags.size();
 	int count = std::pow(2, len);
-
 	for (int i = 0; i < count; ++i) {
 		std::vector<std::string> temp;
 		for (int j = 0, mask = 1; j < len; ++j) {
@@ -369,8 +368,8 @@ void Assistance::working_proc(Assistance* pThis)
 				if (algorithm == AlgorithmType::JustReturn ||
 					(algorithm == AlgorithmType::MatchTemplate && value >= threshold)
 					|| (algorithm == AlgorithmType::CompareHist && value >= cache_threshold)) {
-					matched_task = task_name;
-					matched_rect = rect;
+					matched_task = std::move(task_name);
+					matched_rect = std::move(rect);
 					break;
 				}
 			}
diff --git a/MeoAssistance/src/AsstCaller.cpp b/MeoAssistance/src/AsstCaller.cpp
index d2f3670bb2..9fbed49e5c 100644
--- a/MeoAssistance/src/AsstCaller.cpp
+++ b/MeoAssistance/src/AsstCaller.cpp
@@ -24,7 +24,7 @@ bool AsstCatchEmulator(asst::Assistance* p_asst)
 		return false;
 	}
 
-	auto ret = p_asst->catch_emulator();
+	auto && ret = p_asst->catch_emulator();
 	if (ret) {
 		return true;
 	}
@@ -64,7 +64,7 @@ bool AsstGetParam(asst::Assistance* p_asst, const char* type, const char* param,
 	if (p_asst == NULL) {
 		return false;
 	}
-	auto ret = p_asst->get_param(type, param);
+	auto && ret = p_asst->get_param(type, param);
 	if (!ret) {
 		return false;
 	}
@@ -78,7 +78,7 @@ bool CheckVersionUpdate(char* tag_buffer, int tag_bufsize, char* html_url_buffer
 	if (!ret) {
 		return false;
 	}
-	auto && info = asst::Updater::get_instance().get_version_info();
+	const asst::VersionInfo & info = asst::Updater::get_instance().get_version_info();
 	strcpy_s(tag_buffer, tag_bufsize, info.tag_name.c_str());
 	strcpy_s(html_url_buffer, html_bufsize, info.html_url.c_str());
 	strcpy_s(body_buffer, body_bufsize, info.body.c_str());
diff --git a/MeoAssistance/src/Identify.cpp b/MeoAssistance/src/Identify.cpp
index 437752cb4c..2e4ede5fd4 100644
--- a/MeoAssistance/src/Identify.cpp
+++ b/MeoAssistance/src/Identify.cpp
@@ -2,6 +2,8 @@
 
 #include <opencv2/opencv.hpp>
 #include <opencv2/imgproc/types_c.h>
+#include "Logger.hpp"
+#include "AsstAux.h"
 
 using namespace asst;
 using namespace cv;
@@ -60,7 +62,7 @@ std::vector<TextArea> asst::Identify::ocr_detect(const cv::Mat& mat)
 		2.0f, true, true);
 
 	std::vector<TextArea> result;
-	for (auto && text_block : ocr_results.textBlocks) {
+	for (const ocr::TextBlock & text_block : ocr_results.textBlocks) {
 		if (text_block.boxPoint.size() != 4) {
 			continue;
 		}
@@ -100,13 +102,13 @@ std::tuple<AlgorithmType, double, asst::Rect> Identify::find_image(const Mat& cu
 
 	// 有缓存，用直方图比较，CPU占用会低很多，但要保证每次按钮图片的位置不变
 	if (m_use_cache && m_cache_map.find(templ) != m_cache_map.cend()) {
-		auto&& [rect, hist] = m_cache_map.at(templ);
+		const auto& [rect, hist] = m_cache_map.at(templ);
 		double value = image_hist_comp(cur(rect), hist);
 		return { AlgorithmType::CompareHist, value, cvrect_2_rect(rect).center_zoom(0.8) };
 	}
 	else {	// 没缓存就模板匹配
-		auto&& templ_mat = m_mat_map.at(templ);
-		auto&& [value, point] = match_template(cur, templ_mat);
+		const cv::Mat& templ_mat = m_mat_map.at(templ);
+		const auto& [value, point] = match_template(cur, templ_mat);
 		cv::Rect raw_rect(point.x, point.y, templ_mat.cols, templ_mat.rows);
 		
 		if (m_use_cache && value >= threshold) {
@@ -140,8 +142,8 @@ bool asst::Identify::ocr_init_models(const std::string& dir)
 
 std::optional<asst::Rect> asst::Identify::find_text(const cv::Mat& mat, const std::string& text)
 {
-	auto results = ocr_detect(mat);
-	for (const auto& res : results) {
+	std::vector<TextArea> results = ocr_detect(mat);
+	for (const TextArea& res : results) {
 		if (res.text == text) {
 			return res.rect;
 		}
@@ -152,9 +154,9 @@ std::optional<asst::Rect> asst::Identify::find_text(const cv::Mat& mat, const st
 std::vector<TextArea> asst::Identify::find_text(const cv::Mat& mat, const std::vector<std::string>& texts)
 {
 	std::vector<TextArea> dst;
-	auto detect_result = ocr_detect(mat);
-	for (const auto& res : detect_result) {
-		for (const auto& t : texts) {
+	std::vector<TextArea> detect_result = ocr_detect(mat);
+	for (const TextArea& res : detect_result) {
+		for (const std::string& t : texts) {
 			if (res.text == t) {
 				dst.emplace_back(res);
 			}
@@ -166,9 +168,10 @@ std::vector<TextArea> asst::Identify::find_text(const cv::Mat& mat, const std::v
 std::vector<TextArea> asst::Identify::find_text(const cv::Mat& mat, const std::unordered_set<std::string>& texts)
 {
 	std::vector<TextArea> dst;
-	auto detect_result = ocr_detect(mat);
-	for (const auto& res : detect_result) {
-		for (const auto& t : texts) {
+	std::vector<TextArea> detect_result = ocr_detect(mat);
+	for (const TextArea& res : detect_result) {
+		DebugTrace("detect", Utf8ToGbk(res.text));
+		for (const std::string& t : texts) {
 			if (res.text == t) {
 				dst.emplace_back(res);
 			}
diff --git a/MeoAssistance/src/RecruitConfiger.cpp b/MeoAssistance/src/RecruitConfiger.cpp
index d512190f40..dc0c51eec3 100644
--- a/MeoAssistance/src/RecruitConfiger.cpp
+++ b/MeoAssistance/src/RecruitConfiger.cpp
@@ -15,7 +15,7 @@ bool RecruitConfiger::load(const std::string& filename)
 	DebugTrace("RecruitConfiger::load | ", filename);
 
 	RecruitConfiger temp;
-	if (_load(filename)) {
+	if (temp._load(filename)) {
 		std::sort(temp.m_opers.begin(), temp.m_opers.end(), [](
 			const auto& lhs,
 			const auto& rhs)
diff --git a/MeoAssistance/src/Updater.cpp b/MeoAssistance/src/Updater.cpp
index 012739f435..4c463f67b6 100644
--- a/MeoAssistance/src/Updater.cpp
+++ b/MeoAssistance/src/Updater.cpp
@@ -22,18 +22,18 @@ Updater& Updater::get_instance()
 
 bool Updater::has_new_version()
 {
-	auto req_ret = request_github_api();
+	auto && req_ret = request_github_api();
 	if (!req_ret) {
 		DebugTraceInfo("Requeset Error");
 		return false;
 	}
-	auto parse_ret = json::parser::parse(req_ret.value());
+	auto && parse_ret = json::parser::parse(req_ret.value());
 	if (!parse_ret) {
 		DebugTraceInfo("Parse Error");
 		return false;
 	}
 
-	json::value root = std::move(parse_ret).value();
+	json::value root = parse_ret.value();
 
 	std::unique_lock<std::mutex> lock(m_mutex);
 	try {
@@ -43,7 +43,7 @@ bool Updater::has_new_version()
 		m_lastest_version.created_time = root["created_at"].as_string();
 		m_lastest_version.body = root["body"].as_string();
 
-		auto assets = root["assets"].as_array();
+		json::array& assets = root["assets"].as_array();
 		if (assets.size() == 1) {
 			m_lastest_version.down_url = assets[0]["browser_download_url"].as_string();
 		}
diff --git a/MeoAssistance/src/WinMacro.cpp b/MeoAssistance/src/WinMacro.cpp
index 8e91892754..95ff0b2733 100644
--- a/MeoAssistance/src/WinMacro.cpp
+++ b/MeoAssistance/src/WinMacro.cpp
@@ -53,7 +53,7 @@ bool WinMacro::findHandle()
 	}
 
 	m_handle = NULL;
-	for (auto&& handle_info : handle_vec)
+	for (const HandleInfo& handle_info : handle_vec)
 	{
 		wchar_t* class_wbuff = NULL;
 		if (!handle_info.class_name.empty()) {
@@ -103,9 +103,9 @@ bool WinMacro::findHandle()
 			DebugTraceError("Connect Adb Error");
 			return false;
 		}
-		auto display_ret = callCmd(adb_dir + m_emulator_info.adb.display);
+		auto&& display_ret = callCmd(adb_dir + m_emulator_info.adb.display);
 		if (display_ret) {
-			std::string pipe_str = std::move(display_ret).value();
+			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);
 		}