From 00eb27daa894f0de1a8e18ead84eeaae076d74d0 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sun, 12 Sep 2021 22:03:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9F=BA=E5=BB=BA=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=9A=84=E9=80=80=E5=87=BA=E5=88=A4=E6=96=AD=EF=BC=8C?=
 =?UTF-8?q?=E5=92=8C=E9=83=A8=E5=88=86=E5=87=BA=E9=94=99=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E9=87=8D=E8=AF=95=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MeoAssistance/IdentifyOperTask.cpp      |  3 ++
 src/MeoAssistance/InfrastAbstractTask.cpp   | 35 ++++++++----
 src/MeoAssistance/InfrastAbstractTask.h     |  1 +
 src/MeoAssistance/InfrastDormTask.cpp       | 60 +++++++++++++--------
 src/MeoAssistance/InfrastOfficeTask.cpp     | 22 +++++---
 src/MeoAssistance/InfrastPowerTask.cpp      | 26 ++++++---
 src/MeoAssistance/InfrastProductionTask.cpp | 26 +++++----
 src/MeoAssistance/WinMacro.cpp              |  2 +
 8 files changed, 117 insertions(+), 58 deletions(-)

diff --git a/src/MeoAssistance/IdentifyOperTask.cpp b/src/MeoAssistance/IdentifyOperTask.cpp
index 59d72a2bc5..9571233db6 100644
--- a/src/MeoAssistance/IdentifyOperTask.cpp
+++ b/src/MeoAssistance/IdentifyOperTask.cpp
@@ -91,6 +91,9 @@ std::optional<std::unordered_map<std::string, OperInfrastInfo>> asst::IdentifyOp
 	// 一边识别一边滑动，把所有干员名字抓出来
 	// 正向完整滑一遍，再反向完整滑一遍，提高识别率
 	while (true) {
+		if (need_exit()) {
+			return std::nullopt;
+		}
 		const cv::Mat& image = m_controller_ptr->get_image(true);
 
 		// 异步进行滑动操作
diff --git a/src/MeoAssistance/InfrastAbstractTask.cpp b/src/MeoAssistance/InfrastAbstractTask.cpp
index be24585b70..10e4b54123 100644
--- a/src/MeoAssistance/InfrastAbstractTask.cpp
+++ b/src/MeoAssistance/InfrastAbstractTask.cpp
@@ -37,8 +37,10 @@ bool asst::InfrastAbstractTask::swipe_to_the_left()
 	}
 	m_swipe_duration = SwipeDurationDefault;
 	m_swipe_extra_delay = SwipeExtraDelayDefault;
-	sleep(SwipeExtraDelayDefault);
-	return ret;
+	if (!ret) {
+		return false;
+	}
+	return sleep(SwipeExtraDelayDefault);
 }
 
 bool asst::InfrastAbstractTask::click_clear_button()
@@ -70,17 +72,16 @@ bool asst::InfrastAbstractTask::swipe(bool reverse)
 	DebugTraceFunction;
 
 	//#ifndef LOG_TRACE
-	bool ret = true;
+	bool ret = false;
 	if (!reverse) {
-		ret &= m_controller_ptr->swipe(m_swipe_begin, m_swipe_end, m_swipe_duration);
+		ret = m_controller_ptr->swipe(m_swipe_begin, m_swipe_end, m_swipe_duration);
 		++m_swipe_times;
 	}
 	else {
-		ret &= m_controller_ptr->swipe(m_swipe_end, m_swipe_begin, m_swipe_duration);
+		ret = m_controller_ptr->swipe(m_swipe_end, m_swipe_begin, m_swipe_duration);
 		--m_swipe_times;
 	}
-	ret &= sleep(m_swipe_extra_delay);
-	return ret;
+	return ret && sleep(m_swipe_extra_delay);
 	//#else
 	//	return sleep(SwipeExtraDelay);
 	//#endif
@@ -88,6 +89,8 @@ bool asst::InfrastAbstractTask::swipe(bool reverse)
 
 bool asst::InfrastAbstractTask::swipe_left()
 {
+	DebugTraceFunction;
+
 	const static Rect right_rect(Configer::WindowWidthDefault * 0.8,
 		Configer::WindowHeightDefault * 0.4,
 		Configer::WindowWidthDefault * 0.1,
@@ -103,6 +106,8 @@ bool asst::InfrastAbstractTask::swipe_left()
 
 bool asst::InfrastAbstractTask::swipe_right()
 {
+	DebugTraceFunction;
+
 	const static Rect right_rect(Configer::WindowWidthDefault * 0.8,
 		Configer::WindowHeightDefault * 0.4,
 		Configer::WindowWidthDefault * 0.1,
@@ -116,6 +121,16 @@ bool asst::InfrastAbstractTask::swipe_right()
 	return m_controller_ptr->swipe(right_rect, left_rect);
 }
 
+bool asst::InfrastAbstractTask::append_task_to_back_to_infrast_home()
+{
+	const static json::value append_json = json::object{
+		{ "task", "InfrastBegin" },
+		{ "task_chain", m_task_chain }
+	};
+	m_callback(AsstMsg::AppendProcessTask, append_json, m_callback_arg);
+	return true;
+}
+
 std::vector<TextArea> asst::InfrastAbstractTask::detect_operators_name(
 	const cv::Mat& image,
 	std::unordered_map<std::string,
@@ -324,10 +339,8 @@ bool asst::InfrastAbstractTask::enter_station(const std::vector<std::string>& te
 			}
 		});
 
-	m_controller_ptr->click(max_score_reslut.at(index).rect);
-	sleep(1000);
-
-	return false;
+	bool ret = m_controller_ptr->click(max_score_reslut.at(index).rect);
+	return ret && sleep(1000);
 }
 
 bool asst::InfrastAbstractTask::click_first_operator()
diff --git a/src/MeoAssistance/InfrastAbstractTask.h b/src/MeoAssistance/InfrastAbstractTask.h
index 984b48d645..f0e2810c56 100644
--- a/src/MeoAssistance/InfrastAbstractTask.h
+++ b/src/MeoAssistance/InfrastAbstractTask.h
@@ -18,6 +18,7 @@ namespace asst {
 		virtual bool swipe(bool reverse = false);
 		virtual bool swipe_left();          // 往左划（只滑一下）
 		virtual bool swipe_right();         // 往右划（只滑一下）
+		virtual bool append_task_to_back_to_infrast_home();	// 添加返回主界面的任务
 
 		// 检测干员名
 		virtual std::vector<TextArea> detect_operators_name(const cv::Mat& image,
diff --git a/src/MeoAssistance/InfrastDormTask.cpp b/src/MeoAssistance/InfrastDormTask.cpp
index 7119d0e4b4..0b4bed80c9 100644
--- a/src/MeoAssistance/InfrastDormTask.cpp
+++ b/src/MeoAssistance/InfrastDormTask.cpp
@@ -20,16 +20,20 @@ bool asst::InfrastDormTask::run()
 		return false;
 	}
 
-	// for debug
-	//m_select_with_swipe = true;
-
-	enter_station({ "Dorm", "DormMini" }, m_dorm_begin, 0.8);
+	bool ret = enter_station({ "Dorm", "DormMini" }, m_dorm_begin, 0.8);
+	if (!ret) {
+		append_task_to_back_to_infrast_home();
+		return false;
+	}
 
 	int dorm_index = m_dorm_begin;
 	for (; dorm_index < DormNum; ++dorm_index) {
+		if (need_exit()) {
+			return false;
+		}
 		bool to_left = false;
 		if (dorm_index != m_dorm_begin) {
-			enter_next_dorm();
+			ret = enter_next_dorm();
 			to_left = false;
 		}
 		else {
@@ -37,28 +41,34 @@ bool asst::InfrastDormTask::run()
 		}
 		enter_operator_selection();
 		int selected = select_operators(to_left);
-		if (selected < MaxOperNumInDorm) {	// 如果选不满5个人，说明没有更多需要休息的了，直接结束宿舍任务
+		if (selected == -1) {
+			ret = false;
+			break;
+		}
+		else if (selected < MaxOperNumInDorm) {	// 如果选不满5个人，说明没有更多需要休息的了，直接结束宿舍任务
 			break;
 		}
 	}
 	m_dorm_begin = dorm_index;
 
-	return true;
+	return ret;
 }
 
 bool asst::InfrastDormTask::click_confirm_button()
 {
 	InfrastAbstractTask::click_confirm_button();
-	sleep(300);
+	if (!sleep(300)) {
+		return false;
+	}
 
 	// 点完确定后，如果把工作中的干员撤下来了，会再弹出来一个确认的界面，如果没撤下来则不会弹出。先识别一下再决定要不要点击
 	auto&& [algorithm, score, second_confirm_rect] =
 		m_identify_ptr->find_image(m_controller_ptr->get_image(), "DormConfirm");
+	bool ret = false;
 	if (score >= Configer::TemplThresholdDefault) {
-		m_controller_ptr->click(second_confirm_rect);
+		ret = m_controller_ptr->click(second_confirm_rect);
 	}
-	sleep(2000);
-	return true;
+	return ret && sleep(2000);
 }
 
 bool asst::InfrastDormTask::enter_next_dorm()
@@ -79,11 +89,12 @@ bool asst::InfrastDormTask::enter_next_dorm()
 	// 游戏bug，宿舍中如果“进驻信息”已被选中，直接进行滑动会被滑的很远
 	// 所以这里先检查一下，如果进驻信息被选中了，就先把它关了，再进行滑动
 	auto find_result = m_identify_ptr->find_image(m_controller_ptr->get_image(), "StationInfoSelected");
+	bool ret = false;
 	if (find_result.score >= 0.75) {
-		m_controller_ptr->click(find_result.rect);
+		ret = m_controller_ptr->click(find_result.rect);
 	}
 
-	m_controller_ptr->swipe(swipe_down_begin, swipe_down_end, swipe_dwon_duration);
+	ret &= m_controller_ptr->swipe(swipe_down_begin, swipe_down_end, swipe_dwon_duration);
 
 	static const Rect double_click_rect(
 		Configer::WindowWidthDefault * 0.4,
@@ -93,10 +104,10 @@ bool asst::InfrastDormTask::enter_next_dorm()
 	);
 
 	// 游戏中的宿舍里，双击可以让当前设施回到正确的位置
-	m_controller_ptr->click(double_click_rect);
-	m_controller_ptr->click(double_click_rect);
+	ret &= m_controller_ptr->click(double_click_rect);
+	ret &= m_controller_ptr->click(double_click_rect);
 
-	return true;
+	return ret;
 }
 
 bool asst::InfrastDormTask::enter_operator_selection()
@@ -124,7 +135,9 @@ bool asst::InfrastDormTask::enter_operator_selection()
 				return textarea.text == station_info;
 			});
 		m_controller_ptr->click(station_info_iter->rect);
-		sleep(1000);
+		if (!sleep(1000)) { 
+			return false; 
+		}
 		ocr_result = ocr_detect();
 	}
 
@@ -142,16 +155,16 @@ bool asst::InfrastDormTask::enter_operator_selection()
 		// TODO 报错
 		return false;
 	}
-	m_controller_ptr->click(button_iter->rect);
-	sleep(3000);
-
-	return true;
+	bool ret = m_controller_ptr->click(button_iter->rect);
+	return ret && sleep(2000);
 }
 
 int asst::InfrastDormTask::select_operators(bool need_to_the_left)
 {
 	if (need_to_the_left) {
-		swipe_to_the_left();
+		if (!swipe_to_the_left()) {
+			return false;
+		}
 	}
 	cv::Mat image = m_controller_ptr->get_image();
 
@@ -198,6 +211,9 @@ int asst::InfrastDormTask::select_operators(bool need_to_the_left)
 	}
 
 	while (count < MaxOperNumInDorm) {
+		if (need_exit()) {
+			return false;
+		}
 		swipe();
 		image = m_controller_ptr->get_image();
 		work_mood_result = detect_mood_status_at_work(image, mood_threshold);
diff --git a/src/MeoAssistance/InfrastOfficeTask.cpp b/src/MeoAssistance/InfrastOfficeTask.cpp
index 4128c47ced..85b297fbc5 100644
--- a/src/MeoAssistance/InfrastOfficeTask.cpp
+++ b/src/MeoAssistance/InfrastOfficeTask.cpp
@@ -13,8 +13,12 @@ bool asst::InfrastOfficeTask::run()
 		return false;
 	}
 
-	swipe_right();
-	enter_station({ "Office", "OfficeMini" }, 0);
+	bool ret = swipe_right();
+	ret &= enter_station({ "Office", "OfficeMini" }, 0);
+	if (!ret) {
+		append_task_to_back_to_infrast_home();
+		return false;
+	}
 	if (enter_operator_selection()) {
 		select_operators(true);
 	}
@@ -26,8 +30,7 @@ bool asst::InfrastOfficeTask::enter_operator_selection()
 	auto suspended_result = m_identify_ptr->find_image(m_controller_ptr->get_image(), "ContactSuspended");
 	if (suspended_result.score > Configer::TemplThresholdDefault) {
 		m_controller_ptr->click(suspended_result.rect);
-		sleep(1000);
-		return true;
+		return sleep(1000);
 	}
 	else {
 		return false;
@@ -36,12 +39,17 @@ bool asst::InfrastOfficeTask::enter_operator_selection()
 
 int asst::InfrastOfficeTask::select_operators(bool need_to_the_left)
 {
+	bool ret = false;
 	if (need_to_the_left) {
-		swipe_to_the_left();
+		ret = swipe_to_the_left();
 	}
 	// 办公室干员不用做识别，直接选择第一个即可
-	click_first_operator();
-	click_confirm_button();
+	ret &= click_first_operator();
+	ret &= click_confirm_button();
+	if (!ret) {
+		return -1;
+	}
 
+	// 办公室只选了一个人，固定return 1
 	return 1;
 }
\ No newline at end of file
diff --git a/src/MeoAssistance/InfrastPowerTask.cpp b/src/MeoAssistance/InfrastPowerTask.cpp
index 3747cba2b3..8284e02c53 100644
--- a/src/MeoAssistance/InfrastPowerTask.cpp
+++ b/src/MeoAssistance/InfrastPowerTask.cpp
@@ -15,9 +15,11 @@ bool asst::InfrastPowerTask::run()
 
 	bool is_the_left = false;
 	for (int i = 0; i != PowerNum; ++i) {
+		if (need_exit()) {
+			return false;
+		}
 		swipe_left();
 		enter_station({ "Power", "PowerMini" }, i);
-		sleep(1000);
 		if (enter_operator_selection()) {
 			if (is_the_left) {
 				select_operators(false);
@@ -27,9 +29,13 @@ bool asst::InfrastPowerTask::run()
 				is_the_left = true;
 			}
 		}
-		sleep(1000);
+		if (!sleep(1000)) {
+			return false;
+		}
 		click_return_button();
-		sleep(1000);
+		if (!sleep(1000)) {
+			return false;
+		}
 	}
 	return true;
 }
@@ -67,8 +73,7 @@ bool asst::InfrastPowerTask::enter_operator_selection()
 	// 如果找到了GoIn（“进驻”按钮），进点进去，准备选择干员
 	if (goin_result.score > Configer::TemplThresholdDefault) {
 		m_controller_ptr->click(goin_result.rect);
-		sleep(1000);
-		return true;
+		return sleep(1000);
 	}
 	else {
 		return false;	// 否则说明这个发电站是有人在的，不用换班
@@ -77,12 +82,17 @@ bool asst::InfrastPowerTask::enter_operator_selection()
 
 int asst::InfrastPowerTask::select_operators(bool need_to_the_left)
 {
+	bool ret = false;
 	if (need_to_the_left) {
-		swipe_to_the_left();
+		ret = swipe_to_the_left();
 	}
 	// 发电站干员不用做识别，直接选择第一个即可
-	click_first_operator();
-	click_confirm_button();
+	ret &= click_first_operator();
+	ret &= click_confirm_button();
+	if (!ret) {
+		return -1;
+	}
 
+	// 发电站固定只选择一个干员，return 1
 	return 1;
 }
\ No newline at end of file
diff --git a/src/MeoAssistance/InfrastProductionTask.cpp b/src/MeoAssistance/InfrastProductionTask.cpp
index 2c0c080eaf..30d9d78357 100644
--- a/src/MeoAssistance/InfrastProductionTask.cpp
+++ b/src/MeoAssistance/InfrastProductionTask.cpp
@@ -27,7 +27,7 @@ bool asst::InfrastProductionTask::run()
 
 	cv::Mat image = m_controller_ptr->get_image();
 	// 先识别一下有几个制造站/贸易站
-	const static std::vector<std::string> facility_number_key = { "02", "03", "04", "05" };
+	const static std::array<std::string, 4> facility_number_key = { "02", "03", "04", "05" };
 	std::vector<Rect> facility_number_rect;
 	facility_number_rect.emplace_back(Rect());	// 假装给01 push一个，后面循环好写=。=
 
@@ -41,6 +41,9 @@ bool asst::InfrastProductionTask::run()
 		}
 	}
 	for (size_t i = 0; i != facility_number_rect.size(); ++i) {
+		if (need_exit()) {
+			return false;
+		}
 		if (i != 0) {
 			// 点到这个基建
 			m_controller_ptr->click(facility_number_rect[i]);
@@ -65,7 +68,9 @@ bool asst::InfrastProductionTask::run()
 		//点击添加干员的那个按钮
 		Rect add_rect = score1 >= score2 ? std::move(add_rect1) : std::move(add_rect2);
 		m_controller_ptr->click(add_rect);
-		sleep(2000);
+		if (!sleep(2000)) {
+			return false;
+		}
 
 		click_clear_button();
 		sleep(300);
@@ -77,7 +82,7 @@ bool asst::InfrastProductionTask::run()
 		auto cur_opers_info = std::move(detect_ret.value());
 		// TODO，可以识别一次，把前6个最优解都列出来（最多6个制造站），然后就不用每次都识别并计算最优解了
 		std::list<std::string> optimal_comb = calc_optimal_comb(cur_opers_info);
-		bool select_ret = swipe_and_select(optimal_comb);
+		swipe_and_select(optimal_comb);
 	}
 
 	return true;
@@ -97,6 +102,9 @@ std::optional<std::unordered_map<std::string, OperInfrastInfo>> asst::InfrastPro
 	std::unordered_map<std::string, OperInfrastInfo> cur_opers_info;
 	// 因为有些干员在宿舍休息，或者被其他基建占用了，所以需要重新识别一遍当前可用的干员
 	for (int i = 0; i != SwipeMaxTimes; ++i) {
+		if (need_exit()) {
+			return std::nullopt;
+		}
 		const cv::Mat& image = m_controller_ptr->get_image(true);
 		// 异步进行滑动操作
 		std::future<bool> swipe_future = std::async(
@@ -215,14 +223,13 @@ std::list<std::string> asst::InfrastProductionTask::calc_optimal_comb(
 
 bool asst::InfrastProductionTask::swipe_and_select(std::list<std::string>& name_comb, int swipe_max_times)
 {
-	//if (!swipe_to_the_left()) {
-	//	return false;
-	//}
-
 	std::unordered_map<std::string, std::string> feature_cond = InfrastConfiger::get_instance().m_oper_name_feat;
 	std::unordered_set<std::string> feature_whatever = InfrastConfiger::get_instance().m_oper_name_feat_whatever;
 	// 一边滑动一边点击最优解中的干员
 	for (int i = 0; i != swipe_max_times; ++i) {
+		if (need_exit()) {
+			return false;
+		}
 		const cv::Mat& image = m_controller_ptr->get_image(true);
 		auto cur_name_textarea = detect_operators_name(image, feature_cond, feature_whatever);
 
@@ -244,7 +251,6 @@ bool asst::InfrastProductionTask::swipe_and_select(std::list<std::string>& name_
 		}
 	}
 	// 点击“确定”按钮，确定完要联网加载的，比较慢，多sleep一会
-	m_controller_ptr->click(Rect(1105, 655, 150, 40));
-	sleep(2000);
-	return true;
+	bool ret = click_confirm_button();
+	return ret && sleep(2000);
 }
\ No newline at end of file
diff --git a/src/MeoAssistance/WinMacro.cpp b/src/MeoAssistance/WinMacro.cpp
index 5dec0d26da..e54651b4ab 100644
--- a/src/MeoAssistance/WinMacro.cpp
+++ b/src/MeoAssistance/WinMacro.cpp
@@ -297,6 +297,8 @@ bool asst::WinMacro::swipe_without_scale(const Rect& r1, const Rect& r2, int dur
 
 cv::Mat asst::WinMacro::get_image(bool raw)
 {
+	DebugTraceFunction;
+
 	bool call_ret = call_command(m_emulator_info.adb.screencap, false).has_value()
 		&& call_command(m_emulator_info.adb.pullscreen, false).has_value();