diff --git a/MeoAssistance/include/Assistance.h b/MeoAssistance/include/Assistance.h index 14ec7cfba0..7dcdfcaa4a 100644 --- a/MeoAssistance/include/Assistance.h +++ b/MeoAssistance/include/Assistance.h @@ -76,8 +76,5 @@ namespace asst { std::queue> m_msg_queue; std::mutex m_msg_mutex; std::condition_variable m_msg_condvar; - - }; - } \ No newline at end of file diff --git a/MeoAssistance/include/AsstAux.h b/MeoAssistance/include/AsstAux.h index ffa3b21c39..a6b6f49d4a 100644 --- a/MeoAssistance/include/AsstAux.h +++ b/MeoAssistance/include/AsstAux.h @@ -4,7 +4,6 @@ #include namespace asst { - static std::string GetCurrentDir() { static std::string cur_dir; @@ -80,7 +79,6 @@ namespace asst { return strTemp; } - //template::value>::type> // std::string VectorToString(const std::vector& vector, bool to_gbk = false) { diff --git a/MeoAssistance/include/AsstCaller.h b/MeoAssistance/include/AsstCaller.h index ac7a8b4585..5b057d3248 100644 --- a/MeoAssistance/include/AsstCaller.h +++ b/MeoAssistance/include/AsstCaller.h @@ -5,22 +5,22 @@ #ifdef __cplusplus extern "C" { #endif -namespace asst { - class Assistance; -} -typedef void (MEO_CALL *AsstCallback)(int msg, const char* detail_json, void* custom_arg); + namespace asst { + class Assistance; + } + typedef void (MEO_CALL* AsstCallback)(int msg, const char* detail_json, void* custom_arg); -MEOAPI_PORT asst::Assistance* AsstCreate(); -MEOAPI_PORT asst::Assistance* AsstCreateEx(AsstCallback callback, void* custom_arg); -MEOAPI_PORT void AsstDestory(asst::Assistance* p_asst); -MEOAPI_PORT bool AsstCatchEmulator(asst::Assistance* p_asst); -MEOAPI_PORT void AsstStart(asst::Assistance* p_asst, const char* task); -MEOAPI_PORT void AsstStop(asst::Assistance* p_asst); -MEOAPI_PORT bool AsstSetParam(asst::Assistance* p_asst, const char* type, const char* param, const char* value); -MEOAPI_PORT bool AsstRunOpenRecruit(asst::Assistance* p_asst, const int required_level[], bool set_time); -MEOAPI_PORT bool AsstTestOcr(asst::Assistance* p_asst, const char ** text_array, int array_size, bool need_click); + MEOAPI_PORT asst::Assistance* AsstCreate(); + MEOAPI_PORT asst::Assistance* AsstCreateEx(AsstCallback callback, void* custom_arg); + MEOAPI_PORT void AsstDestory(asst::Assistance* p_asst); + MEOAPI_PORT bool AsstCatchEmulator(asst::Assistance* p_asst); + MEOAPI_PORT void AsstStart(asst::Assistance* p_asst, const char* task); + MEOAPI_PORT void AsstStop(asst::Assistance* p_asst); + MEOAPI_PORT bool AsstSetParam(asst::Assistance* p_asst, const char* type, const char* param, const char* value); + MEOAPI_PORT bool AsstRunOpenRecruit(asst::Assistance* p_asst, const int required_level[], bool set_time); + MEOAPI_PORT bool AsstTestOcr(asst::Assistance* p_asst, const char** text_array, int array_size, bool need_click); -MEOAPI_PORT bool CheckVersionUpdate(char* tag_buffer, int tag_bufsize, char* html_url_buffer, int html_bufsize, char* body_buffer, int body_bufsize); + MEOAPI_PORT bool CheckVersionUpdate(char* tag_buffer, int tag_bufsize, char* html_url_buffer, int html_bufsize, char* body_buffer, int body_bufsize); #ifdef __cplusplus } diff --git a/MeoAssistance/include/AsstDef.h b/MeoAssistance/include/AsstDef.h index 6a0bf3880f..56c544fc81 100644 --- a/MeoAssistance/include/AsstDef.h +++ b/MeoAssistance/include/AsstDef.h @@ -13,7 +13,6 @@ namespace json } namespace asst { - enum class HandleType { Window = 1, @@ -38,8 +37,8 @@ namespace asst { ClickRect = BasicClick | 2, // 点击指定区域 ClickRand = BasicClick | 4, // 点击随机区域 DoNothing = 0x200, // 什么都不做 - Stop = 0x400, // 停止工作线程 - PrintWindow = 0x800 // 截图 + Stop = 0x400, // 停止工作线程 + PrintWindow = 0x800 // 截图 }; enum class AlgorithmType { diff --git a/MeoAssistance/include/Configer.h b/MeoAssistance/include/Configer.h index 2bd600436a..2705c135ba 100644 --- a/MeoAssistance/include/Configer.h +++ b/MeoAssistance/include/Configer.h @@ -8,7 +8,6 @@ #include "AsstDef.h" namespace asst { - class Configer { public: @@ -40,8 +39,8 @@ namespace asst { private: Configer() = default; - Configer(const Configer & rhs) = default; - Configer(Configer && rhs) noexcept = default; + Configer(const Configer& rhs) = default; + Configer(Configer&& rhs) noexcept = default; bool _load(const std::string& filename); }; diff --git a/MeoAssistance/include/Identify.h b/MeoAssistance/include/Identify.h index 22e78fcb72..05416ee847 100644 --- a/MeoAssistance/include/Identify.h +++ b/MeoAssistance/include/Identify.h @@ -11,9 +11,7 @@ #include "AsstDef.h" - namespace asst { - class WinMacro; class Identify @@ -37,13 +35,13 @@ namespace asst { std::optional find_text(const cv::Mat& mat, const std::string& text); std::vector