Merge pull request #450 from zzyyyl/fix/1-7

fix.修复已知的1-7导航失效问题

resource/tasks.json

@@ -213,7 +213,11 @@
         ],
         "action": "clickSelf",
         "next": [
-            "StageThemeChapter3ToChapter2To1-7"
+            "StageThemeChapter3ToChapter2To1-7",
+            "StageThemeChapter2ToChapter1To1-7",
+            "StageThemeEpisode3ToEpisode1To1-7",
+            "StageThemeEpisode2ToEpisode1To1-7",
+            "StageThemeEpisode1To1-7"
         ]
     },
     "StageThemeChapter3ToChapter2To1-7": {
@@ -300,6 +304,7 @@
     "SwipeLeftToStage1-7": {
         "algorithm": "OcrDetect",
         "action": "SlowlySwipeToTheLeft",
+        "fullMatch": true,
         "text": [
             "1-8",
             "TR-10",
@@ -317,12 +322,14 @@
         ],
         "next": [
             "Stage1-7",
-            "SwipeLeftToStage1-7"
+            "SwipeLeftToStage1-7",
+            "SwipeRightToStage1-7"
         ]
     },
     "SwipeRightToStage1-7": {
         "algorithm": "OcrDetect",
         "action": "SlowlySwipeToTheRight",
+        "fullMatch": true,
         "text": [
             "1-1",
             "1-2",
@@ -342,7 +349,8 @@
         ],
         "next": [
             "Stage1-7",
-            "SwipeRightToStage1-7"
+            "SwipeRightToStage1-7",
+            "SwipeLeftToStage1-7"
         ]
     },
     "Stage1-7": {
@@ -2955,7 +2963,7 @@
             100,
             300
         ],
-        "preDelay": 1000,
+        "preDelay": 1500,
         "rearDelay": 300,
         "Doc": "这里的preDelay作为滑动duration使用，rearDelay作为滑动额外延时使用"
     },
@@ -2963,7 +2971,7 @@
         "algorithm": "justReturn",
         "action": "clickRect",
         "specificRect": [
-            700,
+            200,
             200,
             100,
             300

src/MeoAssistant/TaskData.cpp

@@ -89,7 +89,7 @@ bool asst::TaskData::parse(const json::value& json)
             for (const json::value& text : task_json.at("text").as_array()) {
                 ocr_task_info_ptr->text.emplace_back(text.as_string());
             }
-            ocr_task_info_ptr->need_full_match = task_json.get("need_match", false);
+            ocr_task_info_ptr->need_full_match = task_json.get("fullMatch", false);
             if (task_json.contains("ocrReplace")) {
                 for (const json::value& rep : task_json.at("ocrReplace").as_array()) {
                     ocr_task_info_ptr->replace_map.emplace(rep.as_array()[0].as_string(), rep.as_array()[1].as_string());