From bce5fa0740330a20b693062bdec77ad45450dc8d Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sat, 11 Sep 2021 15:19:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=8A=9E=E5=85=AC=E5=AE=A4?=
 =?UTF-8?q?=E6=8D=A2=E7=8F=AD=E4=BB=BB=E5=8A=A1=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MeoAssistance/Assistance.cpp                  |   9 +++-
 MeoAssistance/InfrastAbstractTask.cpp         |  30 +++++++++++
 MeoAssistance/InfrastAbstractTask.h           |   4 +-
 MeoAssistance/InfrastOfficeTask.cpp           |  47 ++++++++++++++++++
 MeoAssistance/InfrastOfficeTask.h             |  19 +++++++
 MeoAssistance/MeoAssistance.vcxproj           |   2 +
 MeoAssistance/MeoAssistance.vcxproj.filters   |   6 +++
 MeoAssistance/Task.h                          |   3 +-
 .../template/special/ContactSuspended.png     | Bin 0 -> 2857 bytes
 9 files changed, 117 insertions(+), 3 deletions(-)
 create mode 100644 MeoAssistance/InfrastOfficeTask.cpp
 create mode 100644 MeoAssistance/InfrastOfficeTask.h
 create mode 100644 resource/template/special/ContactSuspended.png

diff --git a/MeoAssistance/Assistance.cpp b/MeoAssistance/Assistance.cpp
index d3b4dc7093..cf0e77d8be 100644
--- a/MeoAssistance/Assistance.cpp
+++ b/MeoAssistance/Assistance.cpp
@@ -234,7 +234,7 @@ bool Assistance::start_debug_task()
 	//}
 	{
 		constexpr static const char* InfrastTaskCahin = "Debug";
-		auto shift_task_ptr = std::make_shared<InfrastPowerTask>(task_callback, (void*)this);
+		auto shift_task_ptr = std::make_shared<InfrastOfficeTask>(task_callback, (void*)this);
 		shift_task_ptr->set_task_chain(InfrastTaskCahin);
 		m_tasks_deque.emplace_back(shift_task_ptr);
 	}
@@ -365,6 +365,13 @@ bool asst::Assistance::start_infrast()
 	power_task_ptr->set_task_chain(InfrastTaskCahin);
 	m_tasks_deque.emplace_back(std::move(power_task_ptr));
 
+	// 返回基建的主界面
+	append_match_task(InfrastTaskCahin, { "InfrastBegin" });
+
+	auto office_task_ptr = std::make_shared<InfrastOfficeTask>(task_callback, (void*)this);
+	office_task_ptr->set_task_chain(InfrastTaskCahin);
+	m_tasks_deque.emplace_back(std::move(office_task_ptr));
+
 	// 全操作完之后，再返回基建的主界面
 	append_match_task(InfrastTaskCahin, { "InfrastBegin" });
 
diff --git a/MeoAssistance/InfrastAbstractTask.cpp b/MeoAssistance/InfrastAbstractTask.cpp
index 303c4f7720..8e7a3be8d0 100644
--- a/MeoAssistance/InfrastAbstractTask.cpp
+++ b/MeoAssistance/InfrastAbstractTask.cpp
@@ -86,6 +86,36 @@ bool asst::InfrastAbstractTask::swipe(bool reverse)
 	//#endif
 }
 
+bool asst::InfrastAbstractTask::swipe_left()
+{
+	const static Rect right_rect(Configer::WindowWidthDefault * 0.8,
+		Configer::WindowHeightDefault * 0.4,
+		Configer::WindowWidthDefault * 0.1,
+		Configer::WindowHeightDefault * 0.2);
+
+	const static Rect left_rect(Configer::WindowWidthDefault * 0.1,
+		Configer::WindowHeightDefault * 0.4,
+		Configer::WindowWidthDefault * 0.1,
+		Configer::WindowHeightDefault * 0.2);
+
+	return m_controller_ptr->swipe(left_rect, right_rect);
+}
+
+bool asst::InfrastAbstractTask::swipe_right()
+{
+	const static Rect right_rect(Configer::WindowWidthDefault * 0.8,
+		Configer::WindowHeightDefault * 0.4,
+		Configer::WindowWidthDefault * 0.1,
+		Configer::WindowHeightDefault * 0.2);
+
+	const static Rect left_rect(Configer::WindowWidthDefault * 0.1,
+		Configer::WindowHeightDefault * 0.4,
+		Configer::WindowWidthDefault * 0.1,
+		Configer::WindowHeightDefault * 0.2);
+
+	return m_controller_ptr->swipe(right_rect, left_rect);
+}
+
 std::vector<TextArea> asst::InfrastAbstractTask::detect_operators_name(
 	const cv::Mat& image,
 	std::unordered_map<std::string,
diff --git a/MeoAssistance/InfrastAbstractTask.h b/MeoAssistance/InfrastAbstractTask.h
index 58413f68ea..b2005feac1 100644
--- a/MeoAssistance/InfrastAbstractTask.h
+++ b/MeoAssistance/InfrastAbstractTask.h
@@ -11,11 +11,13 @@ namespace asst {
         virtual ~InfrastAbstractTask() = default;
         virtual bool run() = 0;
     protected:
-        virtual bool swipe_to_the_left();
+        virtual bool swipe_to_the_left();   // 滑动到最左侧
         virtual bool click_clear_button();
         virtual bool click_confirm_button();
         virtual bool click_return_button();
         virtual bool swipe(bool reverse = false);
+        virtual bool swipe_left();          // 往左划（只滑一下）
+        virtual bool swipe_right();         // 往右划（只滑一下）
 
         // 检测干员名
         virtual std::vector<TextArea> detect_operators_name(const cv::Mat& image,
diff --git a/MeoAssistance/InfrastOfficeTask.cpp b/MeoAssistance/InfrastOfficeTask.cpp
new file mode 100644
index 0000000000..de93c65772
--- /dev/null
+++ b/MeoAssistance/InfrastOfficeTask.cpp
@@ -0,0 +1,47 @@
+#include "InfrastOfficeTask.h"
+
+#include "Configer.h"
+#include "Identify.h"
+#include "WinMacro.h"
+
+bool asst::InfrastOfficeTask::run()
+{
+	if (m_controller_ptr == nullptr
+		|| m_identify_ptr == nullptr)
+	{
+		m_callback(AsstMsg::PtrIsNull, json::value(), m_callback_arg);
+		return false;
+	}
+
+	swipe_right();
+	enter_station({ "Office", "OfficeMin" }, 0);
+	if (enter_operator_selection()) {
+		select_operators(true);
+	}
+	return true;
+}
+
+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;
+	}
+	else {
+		return false;
+	}
+}
+
+int asst::InfrastOfficeTask::select_operators(bool need_to_the_left)
+{
+	if (need_to_the_left) {
+		swipe_to_the_left();
+	}
+	// 办公室干员不用做识别，直接选择第一个即可
+	click_first_operator();
+	click_confirm_button();
+
+	return 1;
+}
diff --git a/MeoAssistance/InfrastOfficeTask.h b/MeoAssistance/InfrastOfficeTask.h
new file mode 100644
index 0000000000..73cb7a47ba
--- /dev/null
+++ b/MeoAssistance/InfrastOfficeTask.h
@@ -0,0 +1,19 @@
+#pragma once
+#include "InfrastAbstractTask.h"
+
+namespace asst {
+    class InfrastOfficeTask : public InfrastAbstractTask
+    {
+    public:
+        using InfrastAbstractTask::InfrastAbstractTask;
+        virtual ~InfrastOfficeTask() = default;
+
+        virtual bool run() override;
+    protected:
+        // 进入干员选择界面
+        bool enter_operator_selection();
+        // 选择干员，返回本次选择了几个干员，DuckType，办公室固定返回 1
+        int select_operators(bool need_to_the_left = false);
+    };
+
+}
\ No newline at end of file
diff --git a/MeoAssistance/MeoAssistance.vcxproj b/MeoAssistance/MeoAssistance.vcxproj
index 42605ab5ff..7974cb468a 100644
--- a/MeoAssistance/MeoAssistance.vcxproj
+++ b/MeoAssistance/MeoAssistance.vcxproj
@@ -25,6 +25,7 @@
     <ClInclude Include="InfrastAbstractTask.h" />
     <ClInclude Include="InfrastConfiger.h" />
     <ClInclude Include="InfrastDormTask.h" />
+    <ClInclude Include="InfrastOfficeTask.h" />
     <ClInclude Include="InfrastPowerTask.h" />
     <ClInclude Include="InfrastProductionTask.h" />
     <ClInclude Include="Logger.hpp" />
@@ -48,6 +49,7 @@
     <ClCompile Include="Configer.cpp" />
     <ClCompile Include="Identify.cpp" />
     <ClCompile Include="InfrastDormTask.cpp" />
+    <ClCompile Include="InfrastOfficeTask.cpp" />
     <ClCompile Include="InfrastPowerTask.cpp" />
     <ClCompile Include="InfrastProductionTask.cpp" />
     <ClCompile Include="OcrAbstractTask.cpp" />
diff --git a/MeoAssistance/MeoAssistance.vcxproj.filters b/MeoAssistance/MeoAssistance.vcxproj.filters
index 1ecec518b0..987dd05193 100644
--- a/MeoAssistance/MeoAssistance.vcxproj.filters
+++ b/MeoAssistance/MeoAssistance.vcxproj.filters
@@ -117,6 +117,9 @@
     <ClInclude Include="InfrastPowerTask.h">
       <Filter>澶存枃浠禱Task</Filter>
     </ClInclude>
+    <ClInclude Include="InfrastOfficeTask.h">
+      <Filter>澶存枃浠禱Task</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="WinMacro.cpp">
@@ -173,6 +176,9 @@
     <ClCompile Include="InfrastPowerTask.cpp">
       <Filter>婧愭枃浠禱Task</Filter>
     </ClCompile>
+    <ClCompile Include="InfrastOfficeTask.cpp">
+      <Filter>婧愭枃浠禱Task</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\resource\config.json">
diff --git a/MeoAssistance/Task.h b/MeoAssistance/Task.h
index 0039c57ea3..68042ed41d 100644
--- a/MeoAssistance/Task.h
+++ b/MeoAssistance/Task.h
@@ -5,4 +5,5 @@
 #include "IdentifyOperTask.h"
 #include "InfrastProductionTask.h"
 #include "InfrastDormTask.h"
-#include "InfrastPowerTask.h"
\ No newline at end of file
+#include "InfrastPowerTask.h"
+#include "InfrastOfficeTask.h"
\ No newline at end of file
diff --git a/resource/template/special/ContactSuspended.png b/resource/template/special/ContactSuspended.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4195717cbfdd02d869db0109e8bf2e2d0c4e306
GIT binary patch
literal 2857
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
Hu0mjf!H|p*

literal 0
HcmV?d00001