fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 17:57:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor.完成 Controller 部分的重构

Browse Source
This commit is contained in:
MistEO
2022-02-19 01:17:08 +08:00
parent 3d0362c7b9
commit eba5c715c2
38 changed files with 371 additions and 820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/MeoAssistant/InfrastProductionTask.cpp
View File

@@ -59,11 +59,11 @@ bool asst::InfrastProductionTask::shift_facility_list()
callback(AsstMsg::SubTaskExtraInfo, basic_info_with_what("EnterFacility"));
}
Ctrler.click(tab);
m_ctrler->click(tab);
sleep(tab_task_ptr->rear_delay);
/* 识别当前制造/贸易站有没有添加干员按钮，没有就不换班 */
const auto image = Ctrler.get_image();
const auto image = m_ctrler->get_image();
add_analyzer.set_image(image);
if (!add_analyzer.analyze()) {
Log.info("no add button, just continue");
@@ -105,7 +105,7 @@ bool asst::InfrastProductionTask::shift_facility_list()
}
/* 进入干员选择页面 */
Ctrler.click(add_button);
m_ctrler->click(add_button);
sleep(add_task_ptr->rear_delay);
for (int i = 0; i <= OperSelectRetryTimes; ++i) {
@@ -180,7 +180,7 @@ bool asst::InfrastProductionTask::opers_detect_with_swipe()
size_t asst::InfrastProductionTask::opers_detect()
{
LogTraceFunction;
const auto image = Ctrler.get_image();
const auto image = m_ctrler->get_image();
InfrastOperImageAnalyzer oper_analyzer(image);
oper_analyzer.set_facility(facility_name());
@@ -463,7 +463,7 @@ bool asst::InfrastProductionTask::opers_choose()
if (need_exit()) {
return false;
}
const auto image = Ctrler.get_image();
const auto image = m_ctrler->get_image();
InfrastOperImageAnalyzer oper_analyzer(image);
oper_analyzer.set_facility(facility_name());
@@ -537,7 +537,7 @@ bool asst::InfrastProductionTask::opers_choose()
// 但是如果当前设施只有一个位置，即不存在“上次循环”的情况，说明是清除干员按钮没点到
}
else {
Ctrler.click(find_iter->rect);
m_ctrler->click(find_iter->rect);
}
{
auto avlb_iter = std::find_if(
@@ -620,7 +620,7 @@ bool asst::InfrastProductionTask::facility_list_detect()
LogTraceFunction;
m_facility_list_tabs.clear();
const auto image = Ctrler.get_image();
const auto image = m_ctrler->get_image();
MultiMatchImageAnalyzer mm_analyzer(image);
mm_analyzer.set_task_info("InfrastFacilityListTab" + facility_name());