diff --git a/MeoAssistance/Assistance.cpp b/MeoAssistance/Assistance.cpp index 5f76407173..7b2b0cd477 100644 --- a/MeoAssistance/Assistance.cpp +++ b/MeoAssistance/Assistance.cpp @@ -170,15 +170,15 @@ std::optional Assistance::catch_emulator(const std::string& emulato bool asst::Assistance::start_sanity() { - return start_match_task("SanityBegin", ProcessTaskRetryTimesDefault); + return start_process_task("SanityBegin", ProcessTaskRetryTimesDefault); } bool asst::Assistance::start_visit() { - return start_match_task("VisitBegin", ProcessTaskRetryTimesDefault); + return start_process_task("VisitBegin", ProcessTaskRetryTimesDefault); } -bool Assistance::start_match_task(const std::string& task, int retry_times, bool block) +bool Assistance::start_process_task(const std::string& task, int retry_times, bool block) { DebugTraceFunction; DebugTrace("Start |", task, block ? "block" : "non block"); diff --git a/MeoAssistance/Assistance.h b/MeoAssistance/Assistance.h index 895b79a59c..8c4d4f2ac5 100644 --- a/MeoAssistance/Assistance.h +++ b/MeoAssistance/Assistance.h @@ -40,8 +40,8 @@ namespace asst { // 开始全自动基建任务 bool start_infrast(); - // 开始匹配任务,调试用 - bool start_match_task(const std::string& task, int retry_times = ProcessTaskRetryTimesDefault, bool block = true); + // 开始流程任务,应该是private的,调试用临时放到public + bool start_process_task(const std::string& task, int retry_times = ProcessTaskRetryTimesDefault, bool block = true); #ifdef LOG_TRACE // 调试用 bool start_debug_task(); diff --git a/MeoAssistance/AsstCaller.cpp b/MeoAssistance/AsstCaller.cpp index 6b2c35dd3c..cd8cae8624 100644 --- a/MeoAssistance/AsstCaller.cpp +++ b/MeoAssistance/AsstCaller.cpp @@ -43,7 +43,7 @@ asst::Assistance* AsstCreate() return new asst::Assistance(); } -MEOAPI_PORT asst::Assistance* AsstCreateEx(AsstCallback callback, void* custom_arg) +asst::Assistance* AsstCreateEx(AsstCallback callback, void* custom_arg) { // 创建多实例回调会有问题,有空再慢慢整 _callback = callback; @@ -75,13 +75,31 @@ bool AsstCatchEmulator(asst::Assistance* p_asst) } } -bool AsstStart(asst::Assistance* p_asst, const char* task) +bool AsstStartSanity(asst::Assistance* p_asst) { if (p_asst == NULL) { return false; } - return p_asst->start_match_task(task, asst::Assistance::ProcessTaskRetryTimesDefault); + return p_asst->start_sanity(); +} + +bool AsstStartVisit(asst::Assistance* p_asst) +{ + if (p_asst == NULL) { + return false; + } + + return p_asst->start_visit(); +} + +bool AsstStartProcessTask(asst::Assistance* p_asst, const char* task) +{ + if (p_asst == NULL) { + return false; + } + + return p_asst->start_process_task(task, asst::Assistance::ProcessTaskRetryTimesDefault); } void AsstStop(asst::Assistance* p_asst) @@ -102,7 +120,7 @@ bool AsstSetParam(asst::Assistance* p_asst, const char* type, const char* param, return p_asst->set_param(type, param, value); } -bool AsstRunOpenRecruit(asst::Assistance* p_asst, const int required_level[], int required_len, bool set_time) +bool AsstStartOpenRecruit(asst::Assistance* p_asst, const int required_level[], int required_len, bool set_time) { if (p_asst == NULL) { return false; @@ -113,6 +131,15 @@ bool AsstRunOpenRecruit(asst::Assistance* p_asst, const int required_level[], in return true; } +bool AsstStartIndertifyOpers(asst::Assistance* p_asst) +{ + if (p_asst == NULL) { + return false; + } + p_asst->start_to_identify_opers(); + return true; +} + bool AsstStartInfrast(asst::Assistance* p_asst) { if (p_asst == NULL) { @@ -122,16 +149,7 @@ bool AsstStartInfrast(asst::Assistance* p_asst) return true; } -MEOAPI_PORT bool AsstStartIndertifyOpers(asst::Assistance* p_asst) -{ - if (p_asst == NULL) { - return false; - } - p_asst->start_to_identify_opers(); - return true; -} - -bool AsstDebugTask(asst::Assistance* p_asst) +bool AsstStartDebugTask(asst::Assistance* p_asst) { if (p_asst == NULL) { return false; @@ -150,8 +168,8 @@ bool CheckVersionUpdate(char* tag_buffer, int tag_bufsize, char* html_url_buffer return false; } const asst::VersionInfo& info = asst::Updater::get_instance().get_version_info(); - strcpy_s(tag_buffer, tag_bufsize, info.tag_name.c_str()); - strcpy_s(html_url_buffer, html_bufsize, info.html_url.c_str()); - strcpy_s(body_buffer, body_bufsize, info.body.c_str()); + strcpy_s(tag_buffer, tag_bufsize, asst::Utf8ToGbk(info.tag_name).c_str()); + strcpy_s(html_url_buffer, html_bufsize, asst::Utf8ToGbk(info.html_url).c_str()); + strcpy_s(body_buffer, body_bufsize, asst::Utf8ToGbk(info.body).c_str()); return true; } \ No newline at end of file diff --git a/MeoAsstGui/Helper/AsstProxy.cs b/MeoAsstGui/Helper/AsstProxy.cs index 7f64ecc94c..0a2113a423 100644 --- a/MeoAsstGui/Helper/AsstProxy.cs +++ b/MeoAsstGui/Helper/AsstProxy.cs @@ -15,20 +15,22 @@ namespace MeoAsstGui private delegate void ProcCallbckMsg(AsstMsg msg, JObject detail); [DllImport("MeoAssistance.dll")] static private extern IntPtr AsstCreate(); - [DllImport("MeoAssistance.dll")] static private extern IntPtr AsstCreateEx(CallbackDelegate callback, IntPtr custom_arg); - [DllImport("MeoAssistance.dll")] static private extern void AsstDestory(IntPtr ptr); - [DllImport("MeoAssistance.dll")] static private extern bool AsstCatchEmulator(IntPtr ptr); - [DllImport("MeoAssistance.dll")] static private extern bool AsstStart(IntPtr ptr, string task); + [DllImport("MeoAssistance.dll")] static private extern bool AsstStartProcessTask(IntPtr ptr, string task); + [DllImport("MeoAssistance.dll")] static private extern bool AsstStartSanity(IntPtr ptr); + [DllImport("MeoAssistance.dll")] static private extern bool AsstStartVisit(IntPtr ptr); + [DllImport("MeoAssistance.dll")] static private extern bool AsstStartOpenRecruit(IntPtr ptr, int[] required_level, int required_len, bool set_time); + [DllImport("MeoAssistance.dll")] static private extern bool AsstStartIndertifyOpers(IntPtr ptr); + [DllImport("MeoAssistance.dll")] static private extern bool AsstStartInfrast(IntPtr ptr); + [DllImport("MeoAssistance.dll")] static private extern bool AsstStartDebugTask(IntPtr ptr); + [DllImport("MeoAssistance.dll")] static private extern void AsstStop(IntPtr ptr); - [DllImport("MeoAssistance.dll")] static private extern bool AsstSetParam(IntPtr p_asst, string type, string param, string value); - [DllImport("MeoAssistance.dll")] static private extern bool AsstRunOpenRecruit(IntPtr ptr, int[] required_level, int required_len, bool set_time); private CallbackDelegate _callback; @@ -140,7 +142,7 @@ namespace MeoAsstGui break; } ++_retryTimes; - AsstStart("SanityBegin"); + AsstStartSanity(); } else if (taskChain == "VisitBegin") { @@ -152,7 +154,7 @@ namespace MeoAsstGui break; } ++_retryTimes; - AsstStart("VisitBegin"); + AsstStartVisit(); } } break; @@ -229,16 +231,16 @@ namespace MeoAsstGui public bool AsstCatchEmulator() { - if (_ptr == null) - { - return false; - } return AsstCatchEmulator(_ptr); } - public bool AsstStart(string task) + public bool AsstStartSanity() { - return AsstStart(_ptr, task); + return AsstStartSanity(_ptr); + } + public bool AsstStartVisit() + { + return AsstStartVisit(_ptr); } public void AsstSetParam(string type, string param, string value) @@ -246,9 +248,9 @@ namespace MeoAsstGui AsstSetParam(_ptr, type, param, value); } - public bool AsstRunOpenRecruit(int[] required_level, int required_len, bool set_time) + public bool AsstStartOpenRecruit(int[] required_level, int required_len, bool set_time) { - return AsstRunOpenRecruit(_ptr, required_level, required_len, set_time); + return AsstStartOpenRecruit(_ptr, required_level, required_len, set_time); } } diff --git a/MeoAsstGui/ViewModels/MainFunctionViewModel.cs b/MeoAsstGui/ViewModels/MainFunctionViewModel.cs index 1a872b9614..987ad98903 100644 --- a/MeoAsstGui/ViewModels/MainFunctionViewModel.cs +++ b/MeoAsstGui/ViewModels/MainFunctionViewModel.cs @@ -188,7 +188,7 @@ namespace MeoAsstGui var asstProxy = _container.Get(); bool catched = asstProxy.AsstCatchEmulator(); CatchStatus = "捕获模拟器窗口:" + catched; - if (!asstProxy.AsstStart("SanityBegin")) + if (!asstProxy.AsstStartSanity()) { return; } @@ -204,7 +204,7 @@ namespace MeoAsstGui var asstProxy = _container.Get(); bool catched = asstProxy.AsstCatchEmulator(); CatchStatus = "捕获模拟器窗口:" + catched; - if (!asstProxy.AsstStart("VisitBegin")) + if (!asstProxy.AsstStartVisit()) { return; } diff --git a/MeoAsstGui/ViewModels/RecruitViewModel.cs b/MeoAsstGui/ViewModels/RecruitViewModel.cs index 957b4af1ac..84e6bc3618 100644 --- a/MeoAsstGui/ViewModels/RecruitViewModel.cs +++ b/MeoAsstGui/ViewModels/RecruitViewModel.cs @@ -122,7 +122,7 @@ namespace MeoAsstGui levelList.Add(6); } - asstProxy.AsstRunOpenRecruit(levelList.ToArray(), levelList.Count, AutoSetTime); + asstProxy.AsstStartOpenRecruit(levelList.ToArray(), levelList.Count, AutoSetTime); } } } diff --git a/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs b/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs index 32be741ced..6fc4dd0abb 100644 --- a/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs +++ b/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs @@ -47,7 +47,7 @@ namespace MeoAsstGui } } - private string _updateUrl = "www.baidu.com"; + private string _updateUrl = "https://github.com/MistEO/MeoAssistance/releases/latest"; public bool CheckUpdate() { @@ -61,12 +61,8 @@ namespace MeoAsstGui return false; } - byte[] buffer1 = Encoding.Default.GetBytes(body.ToString()); - byte[] buffer2 = Encoding.Convert(Encoding.UTF8, Encoding.Default, buffer1, 0, buffer1.Length); - string strBuffer = Encoding.Default.GetString(buffer2, 0, buffer2.Length); - UpdateTag = "新版本:" + tag; - UpdateInfo = strBuffer; + UpdateInfo = body.ToString(); _updateUrl = html_url.ToString(); return true; diff --git a/Tools/Sanity/main.cpp b/Tools/Sanity/main.cpp index dd8090ccbb..204c65787d 100644 --- a/Tools/Sanity/main.cpp +++ b/Tools/Sanity/main.cpp @@ -1,4 +1,4 @@ -#include "AsstCaller.h" +#include "AsstCaller.h" #include int main(int argc, char** argv) @@ -15,7 +15,7 @@ int main(int argc, char** argv) return -1; } - AsstStart(ptr, "SanityBegin"); + AsstStartSanity(ptr); getchar(); diff --git a/Tools/TestCaller/main.cpp b/Tools/TestCaller/main.cpp index 80303ebd67..3cf9eb249f 100644 --- a/Tools/TestCaller/main.cpp +++ b/Tools/TestCaller/main.cpp @@ -1,12 +1,8 @@ -#include "AsstCaller.h" +#include "AsstCaller.h" #include using namespace asst; -void debug_task(Assistance* ptr); -void test_swipe(Assistance* ptr); -void test_infrast(Assistance* ptr); - int main(int argc, char** argv) { Assistance* ptr = AsstCreate(); @@ -22,8 +18,8 @@ int main(int argc, char** argv) char ch = 0; while (ch != 'q') { - test_infrast(ptr); - //debug_task(ptr); + //AsstStartInfrast(ptr); + AsstStartDebugTask(ptr); ch = getchar(); } @@ -34,14 +30,4 @@ int main(int argc, char** argv) } return 0; -} - -void debug_task(Assistance* ptr) -{ - AsstDebugTask(ptr); -} - -void test_infrast(Assistance* ptr) -{ - AsstStartInfrast(ptr); } \ No newline at end of file diff --git a/include/AsstCaller.h b/include/AsstCaller.h index 0c44f15799..0a9c3d36d9 100644 --- a/include/AsstCaller.h +++ b/include/AsstCaller.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "AsstPort.h" @@ -10,19 +10,23 @@ extern "C" { } 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 bool 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[], int required_len, bool set_time); - MEOAPI_PORT bool AsstStartInfrast(asst::Assistance* p_asst); - MEOAPI_PORT bool AsstStartIndertifyOpers(asst::Assistance* p_asst); - MEOAPI_PORT bool AsstDebugTask(asst::Assistance* p_asst); + MEOAPI_PORT asst::Assistance* MEO_CALL AsstCreate(); + MEOAPI_PORT asst::Assistance* MEO_CALL AsstCreateEx(AsstCallback callback, void* custom_arg); + void MEOAPI AsstDestory(asst::Assistance* p_asst); + bool MEOAPI AsstCatchEmulator(asst::Assistance* p_asst); - MEOAPI_PORT bool CheckVersionUpdate(char* tag_buffer, int tag_bufsize, char* html_url_buffer, int html_bufsize, char* body_buffer, int body_bufsize); + bool MEOAPI AsstStartSanity(asst::Assistance* p_asst); + bool MEOAPI AsstStartVisit(asst::Assistance* p_asst); + bool MEOAPI AsstStartProcessTask(asst::Assistance* p_asst, const char* task); + bool MEOAPI AsstStartOpenRecruit(asst::Assistance* p_asst, const int required_level[], int required_len, bool set_time); + bool MEOAPI AsstStartIndertifyOpers(asst::Assistance* p_asst); + bool MEOAPI AsstStartInfrast(asst::Assistance* p_asst); + bool MEOAPI AsstStartDebugTask(asst::Assistance* p_asst); + + void MEOAPI AsstStop(asst::Assistance* p_asst); + bool MEOAPI AsstSetParam(asst::Assistance* p_asst, const char* type, const char* param, const char* value); + + bool MEOAPI CheckVersionUpdate(char* tag_buffer, int tag_bufsize, char* html_url_buffer, int html_bufsize, char* body_buffer, int body_bufsize); #ifdef __cplusplus } #endif \ No newline at end of file