From 7cb542ef5218cc6511afa4571c170f76b4a975bd Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Tue, 7 Sep 2021 21:26:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9F=BA=E5=BB=BA=E5=AE=BF?=
 =?UTF-8?q?=E8=88=8D=E4=BC=9A=E5=A4=9A=E6=AC=A1=E9=80=89=E6=8B=A9=E6=B3=A8?=
 =?UTF-8?q?=E6=84=8F=E5=8A=9B=E6=B6=A3=E6=95=A3=E5=B9=B2=E5=91=98=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MeoAssistance/InfrastDormTask.cpp | 5 ++++-
 resource/config.json              | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/MeoAssistance/InfrastDormTask.cpp b/MeoAssistance/InfrastDormTask.cpp
index afb3aeb436..0435fb43a2 100644
--- a/MeoAssistance/InfrastDormTask.cpp
+++ b/MeoAssistance/InfrastDormTask.cpp
@@ -301,7 +301,10 @@ std::vector<InfrastDormTask::MoodStatus> InfrastDormTask::detect_mood_status_at_
 		cv::rectangle(draw_image, cv_actual_rect, cv::Scalar(0, 0, 255), 1);
 		cv::putText(draw_image, std::to_string(mood_status.process), cv::Point(cv_actual_rect.x, cv_actual_rect.y), cv::FONT_HERSHEY_PLAIN, 1, cv::Scalar(0, 0, 255));
 #endif
-		if (mood_status.process <= process_threshold) {	// 心情小于阈值的直接加入结果
+		if (mood_status.process == 0) {
+			// 值为0说明是“注意力涣散”，红色哭脸被错误的识别成黄色笑脸了，这里直接忽略这个值
+		}
+		else if (mood_status.process <= process_threshold) {	// 心情小于阈值的直接加入结果
 			moods_vec.emplace_back(std::move(mood_status));
 		}
 		else {
diff --git a/resource/config.json b/resource/config.json
index 14d07d2aca..3c0b24a98f 100644
--- a/resource/config.json
+++ b/resource/config.json
@@ -580,7 +580,7 @@
         },
         "InfrastReward": {
             "algorithm": "OcrDetect",
-            "text": [ "鍙敹鑾�", "璁㈠崟浜や粯", "骞插憳淇¤禆" ],
+            "text": [ "鍙敹鑾�", "璁㈠崟浜や粯", "淇¤禆" ],
             "rearDelay": 1000,
             "action": "clickSelf",
             "next": [