perf: 优化数字识别

src/MeoAssistant/CreditShoppingTask.cpp

@@ -2,7 +2,6 @@
 
 #include <algorithm>
 #include <vector>
-#include <regex>
 
 #include "Controller.h"
 #include "CreditShopImageAnalyzer.h"
@@ -23,33 +22,42 @@ void asst::CreditShoppingTask::set_white_list(std::vector<std::string> black_lis
     m_is_white_list = true;
 }
 
-std::string asst::CreditShoppingTask::creditOcr()
+std::string asst::CreditShoppingTask::credit_ocr()
 {
     cv::Mat credit_image = m_ctrler->get_image();
     OcrImageAnalyzer credit_analyzer(credit_image);
     credit_analyzer.set_task_info("CreditShop-CreditOcr");
+    credit_analyzer.set_replace(Task.get<OcrTaskInfo>("NumberOcrReplace")->replace_map);
+
     if (!credit_analyzer.analyze()) {
         Log.trace("ERROR:!credit_analyzer.analyze():");
         return "";
     }
+
     std::string credit = credit_analyzer.get_result().front().text;
-    std::regex rule("[^0-9]"); // 只保留数字
-    credit = std::regex_replace(credit, rule, "");
+
+    if (credit.empty() || !ranges::all_of(credit, [](char c) -> bool { return std::isdigit(c); })) {
+        return "";
+    }
+
     Log.trace("credit:", credit);
 
     return credit;
 }
 
-bool asst::CreditShoppingTask::_run()
+bool asst::CreditShoppingTask::credit_shopping(bool white_list_enabled, bool credit_ocr_enabled)
 {
+    Log.trace("CreditShopping: m_is_white_list:", m_is_white_list," credit_ocr_enabled: ", credit_ocr_enabled);
     const cv::Mat image = m_ctrler->get_image();
 
     CreditShopImageAnalyzer shop_analyzer(image);
-    if (m_is_white_list) {
-        shop_analyzer.set_white_list(m_shopping_list);
-    }
-    else {
-        shop_analyzer.set_black_list(m_shopping_list);
+    if (white_list_enabled) {
+        if (m_is_white_list) {
+            shop_analyzer.set_white_list(m_shopping_list);
+        }
+        else {
+            shop_analyzer.set_black_list(m_shopping_list);
+        }
     }
 
     if (!shop_analyzer.analyze()) {
@@ -106,78 +114,33 @@ bool asst::CreditShoppingTask::_run()
         // 这里随便点一下都行，把购买完弹出来物品的界面取消掉
         m_ctrler->click(buy_it_rect);
         sleep(rare_delay);
+
+        if (credit_ocr_enabled) {
+            std::string credit = credit_ocr();
+            if (credit == "" || std::stoi(credit) <= 300) {//信用值不再溢出，停止购物
+                break;
+            }
+        }
+
     }
 
-    if (m_save_credit_enabled) {//识别信用值，防止信用值溢出
-        
-        std::string credit = creditOcr();
+    return true;
+}
 
-        if (credit != "" && atoi(credit.c_str()) > 300) {//信用值溢出
+bool asst::CreditShoppingTask::_run()
+{
+    if (!credit_shopping(true, false)) {
+        return false;
+    }
 
-            const cv::Mat image2 = m_ctrler->get_image();
+    if (m_save_credit_enabled && !m_is_white_list) {//识别信用值，防止信用值溢出
 
-            CreditShopImageAnalyzer shop_analyzer2(image2);
+        std::string credit = credit_ocr();
 
-            if (!shop_analyzer2.analyze()) {
+        if (credit != "" && std::stoi(credit) > 300) {//信用值溢出
+            if (!credit_shopping(false, true)) {
                 return false;
             }
-            const auto& shopping_list2 = shop_analyzer2.get_result();
-
-            for (const Rect& commodity : shopping_list2) {
-                if (need_exit()) {
-                    return false;
-                }
-                m_ctrler->click(commodity);
-
-                static int pre_delay = 1000;
-                static int rare_delay = 1000;
-
-                sleep(pre_delay);
-
-                // “购买商品”按钮
-                static Rect buy_it_rect;
-                if (buy_it_rect.empty()) {
-                    const auto buy_it_task_ptr = Task.get("CreditShop-BuyIt");
-
-                    const cv::Mat buy_image = m_ctrler->get_image();
-                    MatchImageAnalyzer buy_it_analyzer(buy_image);
-
-                    buy_it_analyzer.set_task_info(buy_it_task_ptr);
-                    if (!buy_it_analyzer.analyze()) {
-                        // 没识别到“购买商品”按钮，不应该出现这种情况，TODO 报错
-                        return false;
-                    }
-                    buy_it_rect = buy_it_analyzer.get_result().rect;
-                    pre_delay = buy_it_task_ptr->pre_delay;
-                    rare_delay = buy_it_task_ptr->rear_delay;
-                }
-
-                if (need_exit()) {
-                    return false;
-                }
-                m_ctrler->click(buy_it_rect);
-                sleep(rare_delay);
-
-                // 识别是否信用不足无法购买
-                const cv::Mat prompt_image = m_ctrler->get_image();
-
-                OcrImageAnalyzer prompt_analyzer(prompt_image);
-
-                prompt_analyzer.set_task_info("CreditShop-NoMoney");
-                if (prompt_analyzer.analyze()) {
-                    click_return_button();
-                    break;
-                }
-
-                // 这里随便点一下都行，把购买完弹出来物品的界面取消掉
-                m_ctrler->click(buy_it_rect);
-                sleep(rare_delay);
-
-                credit = creditOcr();
-                if (credit == "" || atoi(credit.c_str()) <= 300) {//信用值不再溢出，停止购物
-                    break;
-                }
-            }
         }
     }
     return true;

src/MeoAssistant/CreditShoppingTask.h

@@ -20,7 +20,8 @@ namespace asst
     protected:
         virtual bool _run() override;
         bool m_save_credit_enabled = true;         // 设置是否防止信用值溢出
-        std::string creditOcr();
+        std::string credit_ocr();
+        bool credit_shopping(bool white_list_enabled, bool credit_ocr_enabled);     
 
         std::vector<std::string> m_shopping_list;
         bool m_is_white_list = false;