diff --git a/app/__init__.py b/app/__init__.py index 0c70453..1bf7e18 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -29,7 +29,7 @@ __version__ = "4.2.0" __author__ = "DLmaster361 " __license__ = "GPL-3.0 license" -from .core import AppConfig, QueueConfig, MaaConfig, Task, Task_manager, Main_timer +from .core import AppConfig, QueueConfig, MaaConfig, Task, TaskManager, MainTimer from .models import MaaManager from .services import Notify, Crypto, System from .ui import AUTO_MAA @@ -40,8 +40,8 @@ __all__ = [ "QueueConfig", "MaaConfig", "Task", - "Task_manager", - "Main_timer", + "TaskManager", + "MainTimer", "MaaManager", "Notify", "Crypto", diff --git a/app/ui/dispatch_center.py b/app/ui/dispatch_center.py index e1dc839..fd9b5ec 100644 --- a/app/ui/dispatch_center.py +++ b/app/ui/dispatch_center.py @@ -166,20 +166,31 @@ class DispatchCenter(QWidget): """更新顶栏""" list = [] + queue_numb, member_numb = 0, 0 if (Config.app_path / "config/QueueConfig").exists(): for json_file in (Config.app_path / "config/QueueConfig").glob("*.json"): list.append(f"队列 - {json_file.stem}") + queue_numb += 1 if (Config.app_path / "config/MaaConfig").exists(): for subdir in (Config.app_path / "config/MaaConfig").iterdir(): if subdir.is_dir(): list.append(f"实例 - Maa - {subdir.name}") + member_numb += 1 self.script_list["主调度台"].top_bar.object.clear() self.script_list["主调度台"].top_bar.object.addItems(list) - self.script_list["主调度台"].top_bar.object.setCurrentIndex(-1) - self.script_list["主调度台"].top_bar.mode.setCurrentIndex(-1) + self.script_list["主调度台"].top_bar.mode.clear() + self.script_list["主调度台"].top_bar.mode.addItems(["自动代理", "人工排查"]) + + if queue_numb == 1: + self.script_list["主调度台"].top_bar.object.setCurrentIndex(0) + elif member_numb == 1: + self.script_list["主调度台"].top_bar.object.setCurrentIndex(queue_numb) + else: + self.script_list["主调度台"].top_bar.object.setCurrentIndex(-1) + self.script_list["主调度台"].top_bar.mode.setCurrentIndex(0) class DispatchBox(QWidget): @@ -223,7 +234,6 @@ class DispatchBox(QWidget): self.object = ComboBox() self.object.setPlaceholderText("请选择调度对象") self.mode = ComboBox() - self.mode.addItems(["自动代理", "人工排查"]) self.mode.setPlaceholderText("请选择调度模式") self.button = PushButton("开始任务") diff --git a/resources/version.json b/resources/version.json index 978c640..d30da5b 100644 --- a/resources/version.json +++ b/resources/version.json @@ -1,7 +1,7 @@ { "main_version": "4.2.3.1", "updater_version": "1.1.1.3", - "announcement": "\n## 新增功能\n- 添加`简洁用户列表下相邻两个任务间的切换方式`可选项\n## 修复BUG\n- 修复静默代理标记移除异常情况\n## 程序优化\n- 优化MAA关闭方法\n- 添加高级代理文件校验过程\n- 升级日志监看方法", + "announcement": "\n## 新增功能\n- 添加`简洁用户列表下相邻两个任务间的切换方式`可选项\n## 修复BUG\n- 修复静默代理标记移除异常情况\n## 程序优化\n- 优化MAA关闭方法\n- 添加高级代理文件校验过程\n- 升级日志监看方法\n- 优化部分代码逻辑\n- 优化部分UI显示\n- 优化部分提示信息\n- 优化主调度台默认选项", "proxy_list": [ "", "https://gitproxy.click/",