diff --git a/resource/template/special/Listless.png b/resource/template/special/Listless.png
index 86f4e26d07..014335c901 100644
Binary files a/resource/template/special/Listless.png and b/resource/template/special/Listless.png differ
diff --git a/src/MeoAssistance/Assistance.cpp b/src/MeoAssistance/Assistance.cpp
index e898567eee..c6a833e318 100644
--- a/src/MeoAssistance/Assistance.cpp
+++ b/src/MeoAssistance/Assistance.cpp
@@ -418,7 +418,7 @@ void Assistance::working_proc()
 
 		if (!m_thread_idle && !m_tasks_deque.empty())
 		{
-			m_controller_ptr->set_idle(false);
+			//m_controller_ptr->set_idle(false);
 
 			auto start_time = std::chrono::system_clock::now();
 			std::shared_ptr<AbstractTask> task_ptr = m_tasks_deque.front();
@@ -461,7 +461,7 @@ void Assistance::working_proc()
 		else
 		{
 			m_thread_idle = true;
-			m_controller_ptr->set_idle(true);
+			//m_controller_ptr->set_idle(true);
 			m_condvar.wait(lock);
 		}
 	}
diff --git a/src/MeoAssistance/InfrastAbstractTask.cpp b/src/MeoAssistance/InfrastAbstractTask.cpp
index 7fe0116294..ce88393e62 100644
--- a/src/MeoAssistance/InfrastAbstractTask.cpp
+++ b/src/MeoAssistance/InfrastAbstractTask.cpp
@@ -72,16 +72,15 @@ bool asst::InfrastAbstractTask::swipe(bool reverse)
 	DebugTraceFunction;
 
 	//#ifndef LOG_TRACE
-	bool ret = false;
 	if (!reverse) {
-		ret = m_controller_ptr->swipe(m_swipe_begin, m_swipe_end, m_swipe_duration);
+		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);
+		m_controller_ptr->swipe(m_swipe_end, m_swipe_begin, m_swipe_duration);
 		--m_swipe_times;
 	}
-	return ret && sleep(m_swipe_extra_delay);
+	return sleep(m_swipe_extra_delay);
 	//#else
 	//	return sleep(SwipeExtraDelay);
 	//#endif
@@ -101,7 +100,9 @@ bool asst::InfrastAbstractTask::swipe_left()
 		Configer::WindowWidthDefault * 0.1,
 		Configer::WindowHeightDefault * 0.2);
 
-	return m_controller_ptr->swipe(left_rect, right_rect);
+	m_controller_ptr->swipe(left_rect, right_rect);
+
+	return true;
 }
 
 bool asst::InfrastAbstractTask::swipe_right()
@@ -118,7 +119,9 @@ bool asst::InfrastAbstractTask::swipe_right()
 		Configer::WindowWidthDefault * 0.1,
 		Configer::WindowHeightDefault * 0.2);
 
-	return m_controller_ptr->swipe(right_rect, left_rect);
+	m_controller_ptr->swipe(right_rect, left_rect);
+
+	return true;
 }
 
 bool asst::InfrastAbstractTask::append_task_to_back_to_infrast_home()
@@ -362,8 +365,8 @@ bool asst::InfrastAbstractTask::enter_station(const std::vector<std::string>& te
 			}
 		});
 
-	bool ret = m_controller_ptr->click(max_score_reslut.at(index).rect);
-	return ret && sleep(1000);
+	m_controller_ptr->click(max_score_reslut.at(index).rect);
+	return sleep(1000);
 }
 
 bool asst::InfrastAbstractTask::click_first_operator()
diff --git a/src/MeoAssistance/InfrastDormTask.cpp b/src/MeoAssistance/InfrastDormTask.cpp
index 0bdf883768..3fc629a61e 100644
--- a/src/MeoAssistance/InfrastDormTask.cpp
+++ b/src/MeoAssistance/InfrastDormTask.cpp
@@ -74,11 +74,10 @@ bool asst::InfrastDormTask::click_confirm_button()
 	// 点完确定后，如果把工作中的干员撤下来了，会再弹出来一个确认的界面，如果没撤下来则不会弹出。先识别一下再决定要不要点击
 	auto&& [algorithm, score, second_confirm_rect] =
 		m_identify_ptr->find_image(m_controller_ptr->get_image(), "DormConfirm");
-	bool ret = false;
 	if (score >= Configer::TemplThresholdDefault) {
-		ret = m_controller_ptr->click(second_confirm_rect);
+		m_controller_ptr->click(second_confirm_rect);
 	}
-	return ret && sleep(2000);
+	return sleep(2000);
 }
 
 bool asst::InfrastDormTask::enter_next_dorm()
@@ -99,12 +98,11 @@ 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) {
-		ret = m_controller_ptr->click(find_result.rect);
+		m_controller_ptr->click(find_result.rect);
 	}
 
-	ret &= m_controller_ptr->swipe(swipe_down_begin, swipe_down_end, swipe_dwon_duration);
+	m_controller_ptr->swipe(swipe_down_begin, swipe_down_end, swipe_dwon_duration);
 
 	static const Rect double_click_rect(
 		Configer::WindowWidthDefault * 0.4,
@@ -114,10 +112,10 @@ bool asst::InfrastDormTask::enter_next_dorm()
 	);
 
 	// 游戏中的宿舍里，双击可以让当前设施回到正确的位置
-	ret &= m_controller_ptr->click(double_click_rect);
-	ret &= m_controller_ptr->click(double_click_rect);
+	m_controller_ptr->click(double_click_rect);
+	m_controller_ptr->click(double_click_rect);
 
-	return ret;
+	return true;
 }
 
 bool asst::InfrastDormTask::enter_operator_selection()
@@ -165,8 +163,8 @@ bool asst::InfrastDormTask::enter_operator_selection()
 		// TODO 报错
 		return false;
 	}
-	bool ret = m_controller_ptr->click(button_iter->rect);
-	return ret && sleep(2000);
+	m_controller_ptr->click(button_iter->rect);
+	return sleep(2000);
 }
 
 int asst::InfrastDormTask::select_operators(bool need_to_the_left)
@@ -191,7 +189,9 @@ int asst::InfrastDormTask::select_operators(bool need_to_the_left)
 
 	// 识别“注意力涣散”的干员
 	// TODO，这个阈值太低了，不正常，有时间再调整一下模板图片
-	auto listless_result = m_identify_ptr->find_all_images(image, "Listless", 0.6);
+	//auto listless_result = m_identify_ptr->find_all_images(image, "Listless", 0.6);
+	const static std::array<std::string, 1> ListlessKeyword = { "注意力" };
+	auto listless_result = text_search(m_identify_ptr->ocr_detect(image), ListlessKeyword);
 	// 识别正在工作中的干员的心情状态
 	double mood_threshold = Configer::get_instance().m_infrast_options.dorm_threshold;
 	auto work_mood_result = detect_mood_status_at_work(image, mood_threshold);
@@ -267,7 +267,7 @@ std::vector<InfrastDormTask::MoodStatus> InfrastDormTask::detect_mood_status_at_
 #endif
 
 	// 把工作中的那个黄色笑脸全抓出来
-	auto smiley_result = m_identify_ptr->find_all_images(image, "SmileyAtWork", 0.8, false);
+	auto smiley_result = m_identify_ptr->find_all_images(image, "SmileyAtWork", 0.88, false);
 
 	std::vector<MoodStatus> moods_vec;
 	for (const auto& smiley : smiley_result) {
@@ -341,7 +341,7 @@ std::vector<InfrastDormTask::MoodStatus> InfrastDormTask::detect_mood_status_at_
 			cv::Rect on_shift_rect(mood_status.rect.x, mood_status.rect.y - HeightDiff, mood_status.rect.width, OnShiftHeight);
 			// “休息中”的笑脸前面的模板匹配是对不上的，走不到这里，所以这里只匹配“工作中”即可
 			auto find_result = m_identify_ptr->find_image(image(on_shift_rect), "OnShift");
-			if (find_result.score < 0.5) {
+			if (find_result.score < 0.45) {
 				moods_vec.emplace_back(std::move(mood_status));
 			}
 		}
diff --git a/src/MeoAssistance/OcrAbstractTask.h b/src/MeoAssistance/OcrAbstractTask.h
index 378c02c197..223adbfe93 100644
--- a/src/MeoAssistance/OcrAbstractTask.h
+++ b/src/MeoAssistance/OcrAbstractTask.h
@@ -38,6 +38,21 @@ namespace asst {
 			}
 			return dst;
 		}
+		// 文字匹配，要求相等
+		template<typename FilterArray>
+		std::vector<TextArea> text_match(const std::vector<TextArea>& src,
+			const FilterArray& filter_array)
+		{
+			std::vector<TextArea> dst;
+			for (const TextArea& text_area : src) {
+				for (const auto& text : filter_array) {
+					if (text_area.text == text) {
+						dst.emplace_back(text_area);
+					}
+				}
+			}
+			return dst;
+		}
 
 		// 文字搜索，是子串即可
 		template<typename FilterArray, typename ReplaceMap>
@@ -58,5 +73,19 @@ namespace asst {
 			}
 			return dst;
 		}
+		template<typename FilterArray>
+		std::vector<TextArea> text_search(const std::vector<TextArea>& src,
+			const FilterArray& filter_array)
+		{
+			std::vector<TextArea> dst;
+			for (const TextArea& text_area : src) {
+				for (const auto& text : filter_array) {
+					if (text_area.text.find(text) != std::string::npos) {
+						dst.emplace_back(text, text_area.rect);
+					}
+				}
+			}
+			return dst;
+		}
 	};
 }
\ No newline at end of file
diff --git a/src/MeoAssistance/WinMacro.cpp b/src/MeoAssistance/WinMacro.cpp
index b7f1cc2f00..d3a07f693f 100644
--- a/src/MeoAssistance/WinMacro.cpp
+++ b/src/MeoAssistance/WinMacro.cpp
@@ -52,7 +52,7 @@ asst::WinMacro::~WinMacro()
 	DebugTraceFunction;
 
 	m_thread_exit = true;
-	m_thread_idle = true;
+	//m_thread_idle = true;
 	m_cmd_condvar.notify_all();
 	m_completed_id = UINT_MAX;	// make all WinMacor::wait to exit
 
@@ -81,20 +81,21 @@ void asst::WinMacro::pipe_working_proc()
 			call_command(cmd);
 			++m_completed_id;
 		}
-		else if (!m_thread_idle) {	// 队列中没有任务，又不是闲置的时候，就去截图
-			cmd_queue_lock.unlock();
-			auto start_time = std::chrono::system_clock::now();
-			screencap();
-			cmd_queue_lock.lock();
-			if (!m_cmd_queue.empty()) {
-				continue;
-			}
-			m_cmd_condvar.wait_until(
-				cmd_queue_lock,
-				start_time + std::chrono::milliseconds(1000));	// todo 时间写到配置文件里
-		}
+		//else if (!m_thread_idle) {	// 队列中没有任务，又不是闲置的时候，就去截图
+		//	cmd_queue_lock.unlock();
+		//	auto start_time = std::chrono::system_clock::now();
+		//	screencap();
+		//	cmd_queue_lock.lock();
+		//	if (!m_cmd_queue.empty()) {
+		//		continue;
+		//	}
+		//	m_cmd_condvar.wait_until(
+		//		cmd_queue_lock,
+		//		start_time + std::chrono::milliseconds(1000));	// todo 时间写到配置文件里
+		//}
 		else {
-			m_cmd_condvar.wait(cmd_queue_lock, [&]() -> bool {return !m_thread_idle; });
+			//m_cmd_condvar.wait(cmd_queue_lock, [&]() -> bool {return !m_thread_idle; });
+			m_cmd_condvar.wait(cmd_queue_lock);
 		}
 	}
 }
@@ -202,18 +203,18 @@ bool WinMacro::try_capture(const EmulatorInfo& info)
 	return true;
 }
 
-void asst::WinMacro::set_idle(bool flag)
-{
-	DebugTraceFunction;
-
-	m_thread_idle = flag;
-	if (!flag) {
-		// 开始前，立即截一张图，保证第一张图片非空
-		screencap();
-
-		m_cmd_condvar.notify_one();
-	}
-}
+//void asst::WinMacro::set_idle(bool flag)
+//{
+//	DebugTraceFunction;
+//
+//	m_thread_idle = flag;
+//	if (!flag) {
+//		// 开始前，立即截一张图，保证第一张图片非空
+//		//screencap();
+//
+//		m_cmd_condvar.notify_one();
+//	}
+//}
 
 std::vector<unsigned char> WinMacro::call_command(const std::string& cmd)
 {
@@ -285,6 +286,7 @@ int asst::WinMacro::push_cmd(const std::string& cmd)
 {
 	std::unique_lock<std::mutex> lock(m_cmd_queue_mutex);
 	m_cmd_queue.emplace(cmd);
+	m_cmd_condvar.notify_one();
 	return ++m_push_id;
 }
 
@@ -300,9 +302,11 @@ void asst::WinMacro::screencap()
 	DebugTraceFunction;
 
 	auto data = call_command(m_emulator_info.adb.screencap);
-	cv::Mat temp_image = cv::imdecode(data, cv::IMREAD_COLOR);
-	std::unique_lock<std::shared_mutex> image_lock(m_image_mutex);
-	m_cache_image = std::move(temp_image);
+	m_cache_image = cv::imdecode(data, cv::IMREAD_COLOR);
+
+	//cv::Mat temp_image = cv::imdecode(data, cv::IMREAD_COLOR);
+	////std::unique_lock<std::shared_mutex> image_lock(m_image_mutex);
+	//m_cache_image = std::move(temp_image);
 }
 
 int WinMacro::click(const Point& p, bool block)
@@ -378,7 +382,8 @@ int asst::WinMacro::swipe_without_scale(const Rect& r1, const Rect& r2, int dura
 
 cv::Mat asst::WinMacro::get_image(bool raw)
 {
-	std::shared_lock<std::shared_mutex> image_lock(m_image_mutex);
+	screencap();
+	//std::shared_lock<std::shared_mutex> image_lock(m_image_mutex);
 	if (raw) {
 		return m_cache_image;
 	}
diff --git a/src/MeoAssistance/WinMacro.h b/src/MeoAssistance/WinMacro.h
index 4d9230146c..f7470fa7d9 100644
--- a/src/MeoAssistance/WinMacro.h
+++ b/src/MeoAssistance/WinMacro.h
@@ -25,7 +25,7 @@ namespace asst {
 		~WinMacro();
 
 		bool try_capture(const EmulatorInfo& info);
-		void set_idle(bool flag);
+		//void set_idle(bool flag);
 
 		cv::Mat get_image(bool raw = false);
 
@@ -48,7 +48,7 @@ namespace asst {
 		Point rand_point_in_rect(const Rect& rect);
 
 		bool m_thread_exit = false;
-		bool m_thread_idle = true;
+		//bool m_thread_idle = true;
 		std::thread m_cmd_thread;
 		std::mutex m_cmd_queue_mutex;
 		std::condition_variable m_cmd_condvar;
@@ -56,7 +56,7 @@ namespace asst {
 		std::atomic<unsigned> m_completed_id = 0;
 		unsigned m_push_id = 0;						// push_id的自增总是伴随着queue的push，肯定是要上锁的，所以没必要原子
 
-		std::shared_mutex m_image_mutex;
+		//std::shared_mutex m_image_mutex;
 		cv::Mat m_cache_image;
 
 		constexpr static int PipeBuffSize = 1048576;	// 管道缓冲区大小
diff --git a/tools/TestCaller/main.cpp b/tools/TestCaller/main.cpp
index d07acdf9b8..9d32376c32 100644
--- a/tools/TestCaller/main.cpp
+++ b/tools/TestCaller/main.cpp
@@ -19,12 +19,12 @@ int main(int argc, char** argv)
 	char ch = 0;
 	while (ch != 'q') {
 		//AsstStartIndertifyOpers(ptr);
-		//AsstStartInfrast(ptr);
+		AsstStartInfrast(ptr);
 		//AsstStartDebugTask(ptr);
-		{
-			const int required[] = { 3, 4, 5, 6 };
-			AsstStartOpenRecruit(ptr, required, sizeof(required)/sizeof(int), true);
-		}
+		//{
+		//	const int required[] = { 3, 4, 5, 6 };
+		//	AsstStartOpenRecruit(ptr, required, sizeof(required)/sizeof(int), true);
+		//}
 
 		ch = getchar();
 	}