automas_admin/AUTO-MAS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(ui): 初步添加周计划表

Browse Source
This commit is contained in:
DLmaster361
2025-05-22 23:20:38 +08:00
parent 86df9e7a50
commit 8d69e43f72
7 changed files with 334 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

188
app/ui/Widget.py
View File

@@ -1065,6 +1065,190 @@ class StatusSwitchSetting(SwitchButton):
self.setChecked(isChecked)
class ComboBoxSetting(ComboBox):
def __init__(
self,
texts: List[str],
qconfig: QConfig,
configItem: OptionsConfigItem,
parent=None,
):
super().__init__(parent)
self.qconfig = qconfig
self.configItem = configItem
self.optionToText = {o: t for o, t in zip(configItem.options, texts)}
for text, option in zip(texts, configItem.options):
self.addItem(text, userData=option)
self.setCurrentText(self.optionToText[self.qconfig.get(configItem)])
self.currentIndexChanged.connect(self._onCurrentIndexChanged)
configItem.valueChanged.connect(self.setValue)
def _onCurrentIndexChanged(self, index: int):
self.qconfig.set(self.configItem, self.itemData(index))
def setValue(self, value):
if value not in self.optionToText:
return
self.setCurrentText(self.optionToText[value])
self.qconfig.set(self.configItem, value)
class NoOptionComboBoxSetting(ComboBox):
def __init__(
self,
value: List[str],
texts: List[str],
qconfig: QConfig,
configItem: OptionsConfigItem,
parent=None,
):
super().__init__(parent)
self.qconfig = qconfig
self.configItem = configItem
self.optionToText = {o: t for o, t in zip(value, texts)}
for text, option in zip(texts, value):
self.addItem(text, userData=option)
self.setCurrentText(self.optionToText[self.qconfig.get(configItem)])
self.currentIndexChanged.connect(self._onCurrentIndexChanged)
configItem.valueChanged.connect(self.setValue)
def _onCurrentIndexChanged(self, index: int):
self.qconfig.set(self.configItem, self.itemData(index))
def setValue(self, value):
if value not in self.optionToText:
return
self.setCurrentText(self.optionToText[value])
self.qconfig.set(self.configItem, value)
def reLoadOptions(self, value: List[str], texts: List[str]):
self.currentIndexChanged.disconnect()
self.clear()
self.optionToText = {o: t for o, t in zip(value, texts)}
for text, option in zip(texts, value):
self.addItem(text, userData=option)
self.setCurrentText(self.optionToText[self.qconfig.get(self.configItem)])
self.currentIndexChanged.connect(self._onCurrentIndexChanged)
class EditableComboBoxSetting(EditableComboBox):
def __init__(
self,
value: List[str],
texts: List[str],
qconfig: QConfig,
configItem: OptionsConfigItem,
parent=None,
):
super().__init__(parent)
self.qconfig = qconfig
self.configItem = configItem
self.optionToText = {o: t for o, t in zip(value, texts)}
for text, option in zip(texts, value):
self.addItem(text, userData=option)
if qconfig.get(configItem) not in self.optionToText:
self.optionToText[qconfig.get(configItem)] = qconfig.get(configItem)
self.addItem(qconfig.get(configItem), userData=qconfig.get(configItem))
self.setCurrentText(self.optionToText[qconfig.get(configItem)])
self.currentIndexChanged.connect(self._onCurrentIndexChanged)
configItem.valueChanged.connect(self.setValue)
def _onCurrentIndexChanged(self, index: int):
self.qconfig.set(
self.configItem,
(self.itemData(index) if self.itemData(index) else self.itemText(index)),
)
def setValue(self, value):
if value not in self.optionToText:
self.optionToText[value] = value
if self.findText(value) == -1:
self.addItem(value, userData=value)
else:
self.setItemData(self.findText(value), value)
self.setCurrentText(self.optionToText[value])
self.qconfig.set(self.configItem, value)
def reLoadOptions(self, value: List[str], texts: List[str]):
self.currentIndexChanged.disconnect()
self.clear()
self.optionToText = {o: t for o, t in zip(value, texts)}
for text, option in zip(texts, value):
self.addItem(text, userData=option)
if self.qconfig.get(self.configItem) not in self.optionToText:
self.optionToText[self.qconfig.get(self.configItem)] = self.qconfig.get(
self.configItem
)
self.addItem(
self.qconfig.get(self.configItem),
userData=self.qconfig.get(self.configItem),
)
self.setCurrentText(self.optionToText[self.qconfig.get(self.configItem)])
self.currentIndexChanged.connect(self._onCurrentIndexChanged)
def _onReturnPressed(self):
if not self.text():
return
index = self.findText(self.text())
if index >= 0 and index != self.currentIndex():
self._currentIndex = index
self.currentIndexChanged.emit(index)
elif index == -1:
self.addItem(self.text())
self.setCurrentIndex(self.count() - 1)
self.currentIndexChanged.emit(self.count() - 1)
class SpinBoxSetting(SpinBox):
def __init__(
self,
range: tuple[int, int],
qconfig: QConfig,
configItem: ConfigItem,
parent=None,
):
super().__init__(parent)
self.qconfig = qconfig
self.configItem = configItem
self.setRange(range[0], range[1])
if configItem:
self.set_value(qconfig.get(configItem))
configItem.valueChanged.connect(self.set_value)
self.valueChanged.connect(self.set_value)
def set_value(self, value: int):
if self.configItem:
self.qconfig.set(self.configItem, value)
self.setValue(value)
class HistoryCard(HeaderCardWidget):
def __init__(self, qconfig: QConfig, configItem: ConfigItem, parent=None):
@@ -1184,9 +1368,7 @@ class UrlListSettingCard(ExpandSettingCard):
"""show confirm dialog"""
choice = MessageBox(
"确认",
f"确定要删除 {item.url} 代理网址吗？",
self.window(),
"确认", f"确定要删除 {item.url} 代理网址吗？", self.window()
)
if choice.exec():
self.__removeUrl(item)

9
app/ui/main_window.py
View File

@@ -49,6 +49,7 @@ from app.core import Config, TaskManager, MainTimer, MainInfoBar
from app.services import Notify, Crypto, System
from .home import Home
from .member_manager import MemberManager
from .plan_manager import PlanManager
from .queue_manager import QueueManager
from .dispatch_center import DispatchCenter
from .history import History
@@ -81,6 +82,7 @@ class AUTO_MAA(MSFluentWindow):
# 创建主窗口
self.home = Home(self)
self.member_manager = MemberManager(self)
self.plan_manager = PlanManager(self)
self.queue_manager = QueueManager(self)
self.dispatch_center = DispatchCenter(self)
self.history = History(self)
@@ -100,6 +102,13 @@ class AUTO_MAA(MSFluentWindow):
FluentIcon.ROBOT,
NavigationItemPosition.TOP,
)
self.addSubInterface(
self.plan_manager,
FluentIcon.CALENDAR,
"计划管理",
FluentIcon.CALENDAR,
NavigationItemPosition.TOP,
)
self.addSubInterface(
self.queue_manager,
FluentIcon.BOOK_SHELF,

10
app/ui/member_manager.py
View File

@@ -197,11 +197,7 @@ class MemberManager(QWidget):
)
return None
choice = MessageBox(
"确认",
f"确定要删除 {name} 实例吗？",
self.window(),
)
choice = MessageBox("确认", f"确定要删除 {name} 实例吗？", self.window())
if choice.exec():
self.member_manager.clear_SettingBox()
@@ -866,9 +862,7 @@ class MemberManager(QWidget):
return None
choice = MessageBox(
"确认",
f"确定要删除 {name} 吗？",
self.window(),
"确认", f"确定要删除 {name} 吗？", self.window()
)
if choice.exec():

236
app/ui/plan_manager.py
View File

@@ -28,49 +28,28 @@ v4.3
from loguru import logger
from PySide6.QtWidgets import (
QWidget,
QFileDialog,
QHBoxLayout,
QVBoxLayout,
QStackedWidget,
QTableWidgetItem,
QHeaderView,
)
from PySide6.QtGui import QIcon
from qfluentwidgets import (
Action,
ScrollArea,
FluentIcon,
MessageBox,
HeaderCardWidget,
CommandBar,
ExpandGroupSettingCard,
PushSettingCard,
TableWidget,
PrimaryToolButton,
)
from PySide6.QtCore import Signal
from datetime import datetime
from functools import partial
from pathlib import Path
from typing import List
import shutil
import json
from app.core import Config, MainInfoBar, TaskManager, MaaPlanConfig, Network
from app.core import Config, MainInfoBar, MaaPlanConfig
from app.services import Crypto
from .downloader import DownloadManager
from .Widget import (
LineEditMessageBox,
LineEditSettingCard,
SpinBoxSettingCard,
ComboBoxMessageBox,
EditableComboBoxSettingCard,
PasswordLineEditSettingCard,
UserLableSettingCard,
ComboBoxSettingCard,
SwitchSettingCard,
PushAndSwitchButtonSettingCard,
PushAndComboBoxSettingCard,
SpinBoxSetting,
EditableComboBoxSetting,
ComboBoxSetting,
PivotArea,
)
@@ -142,7 +121,7 @@ class PlanManager(QWidget):
"Config": maa_plan_config,
}
self.plan_manager.add_MaaSettingBox(index)
self.plan_manager.add_MaaPlanSettingBox(index)
self.plan_manager.switch_SettingBox(index)
logger.success(f"计划管理 计划_{index} 添加成功")
@@ -169,11 +148,7 @@ class PlanManager(QWidget):
)
return None
choice = MessageBox(
"确认",
f"确定要删除 {name} 吗？",
self.window(),
)
choice = MessageBox("确认", f"确定要删除 {name} 吗？", self.window())
if choice.exec():
self.plan_manager.clear_SettingBox()
@@ -185,7 +160,7 @@ class PlanManager(QWidget):
Config.plan_dict[f"计划_{i}"]["Path"].rename(
Config.plan_dict[f"计划_{i}"]["Path"].with_name(f"计划_{i-1}")
)
Config.change_queue(f"计划_{i}", f"计划_{i-1}")
Config.change_plan(f"计划_{i}", f"计划_{i-1}")
self.plan_manager.show_SettingBox(max(int(name[3:]) - 1, 1))
@@ -225,15 +200,15 @@ class PlanManager(QWidget):
Config.plan_dict[name]["Path"].rename(
Config.plan_dict[name]["Path"].with_name("计划_0")
)
Config.change_queue(name, "计划_0")
Config.change_plan(name, "计划_0")
Config.plan_dict[f"计划_{index-1}"]["Path"].rename(
Config.plan_dict[name]["Path"]
)
Config.change_queue(f"计划_{index-1}", name)
Config.change_plan(f"计划_{index-1}", name)
Config.plan_dict[name]["Path"].with_name("计划_0").rename(
Config.plan_dict[f"计划_{index-1}"]["Path"]
)
Config.change_queue("计划_0", f"计划_{index-1}")
Config.change_plan("计划_0", f"计划_{index-1}")
self.plan_manager.show_SettingBox(index - 1)
@@ -273,27 +248,21 @@ class PlanManager(QWidget):
Config.plan_dict[name]["Path"].rename(
Config.plan_dict[name]["Path"].with_name("计划_0")
)
Config.change_queue(name, "计划_0")
Config.change_plan(name, "计划_0")
Config.plan_dict[f"计划_{index+1}"]["Path"].rename(
Config.plan_dict[name]["Path"]
)
Config.change_queue(f"计划_{index+1}", name)
Config.change_plan(f"计划_{index+1}", name)
Config.plan_dict[name]["Path"].with_name("计划_0").rename(
Config.plan_dict[f"计划_{index+1}"]["Path"]
)
Config.change_queue("计划_0", f"计划_{index+1}")
Config.change_plan("计划_0", f"计划_{index+1}")
self.plan_manager.show_SettingBox(index + 1)
logger.success(f"计划表 {name} 右移成功")
MainInfoBar.push_info_bar("success", "操作成功", f"右移计划表 {name}", 3000)
def refresh_dashboard(self):
"""刷新所有计划表的用户仪表盘"""
for script in self.plan_manager.script_list:
script.user_setting.user_manager.user_dashboard.load_info()
class PlanSettingBox(QWidget):
"""计划管理子页面组"""
@@ -331,7 +300,7 @@ class PlanManager(QWidget):
for name, info in Config.plan_dict.items():
if info["Type"] == "Maa":
self.add_MaaSettingBox(int(name[3:]))
self.add_MaaPlanSettingBox(int(name[3:]))
self.switch_SettingBox(index)
@@ -378,20 +347,23 @@ class PlanManager(QWidget):
self.config = Config.plan_dict[f"计划_{uid}"]["Config"]
self.dashboard = TableWidget(self)
self.dashboard.setColumnCount(11)
self.dashboard.setColumnCount(8)
self.dashboard.setRowCount(6)
self.dashboard.setHorizontalHeaderLabels(
["全局", "周一", "周二", "周三", "周四", "周五", "周六", "周日"]
)
self.dashboard.setVerticalHeaderLabels(
[
"吃理智药",
"连战次数",
"关卡选择",
"备选关卡 - 1",
"备选关卡 - 2",
"剩余理智关卡",
"备选 - 1",
"备选 - 2",
"剩余理智",
]
)
self.dashboard.setEditTriggers(TableWidget.NoEditTriggers)
self.dashboard.verticalHeader().setVisible(False)
for col in range(6):
for col in range(8):
self.dashboard.horizontalHeader().setSectionResizeMode(
col, QHeaderView.ResizeMode.Stretch
)
@@ -399,143 +371,33 @@ class PlanManager(QWidget):
self.viewLayout.addWidget(self.dashboard)
self.viewLayout.setContentsMargins(3, 0, 3, 3)
Config.PASSWORD_refreshed.connect(self.load_info)
for col, (group, name_dict) in enumerate(
self.config.config_item_dict.items()
):
def load_info(self):
for row, (name, configItem) in enumerate(name_dict.items()):
self.user_data = Config.plan_dict[self.name]["UserData"]
self.dashboard.setRowCount(len(self.user_data))
for name, info in self.user_data.items():
config = info["Config"]
text_list = []
if not config.get(config.Data_IfPassCheck):
text_list.append("未通过人工排查")
text_list.append(
f"今日已代理{config.get(config.Data_ProxyTimes)}次"
if Config.server_date().strftime("%Y-%m-%d")
== config.get(config.Data_LastProxyDate)
else "今日未进行代理"
)
text_list.append(
"本周剿灭已完成"
if datetime.strptime(
config.get(config.Data_LastAnnihilationDate),
"%Y-%m-%d",
).isocalendar()[:2]
== Config.server_date().isocalendar()[:2]
else "本周剿灭未完成"
)
button = PrimaryToolButton(FluentIcon.CHEVRON_RIGHT, self)
button.setFixedSize(32, 32)
button.clicked.connect(partial(self.switch_to.emit, name))
self.dashboard.setItem(
int(name[3:]) - 1,
0,
QTableWidgetItem(config.get(config.Info_Name)),
)
self.dashboard.setItem(
int(name[3:]) - 1,
1,
QTableWidgetItem(config.get(config.Info_Id)),
)
self.dashboard.setItem(
int(name[3:]) - 1,
2,
QTableWidgetItem(
Crypto.AUTO_decryptor(
config.get(config.Info_Password),
Config.PASSWORD,
if name == "MedicineNumb":
setting_item = SpinBoxSetting(
range=(0, 1024),
qconfig=self.config,
configItem=configItem,
parent=self,
)
if Config.PASSWORD
else "******"
),
)
self.dashboard.setItem(
int(name[3:]) - 1,
3,
QTableWidgetItem(
"启用"
if config.get(config.Info_Status)
and config.get(config.Info_RemainedDay) != 0
else "禁用"
),
)
self.dashboard.setItem(
int(name[3:]) - 1,
4,
QTableWidgetItem(" | ".join(text_list)),
)
self.dashboard.setItem(
int(name[3:]) - 1,
5,
QTableWidgetItem(str(config.get(config.Info_MedicineNumb))),
)
self.dashboard.setItem(
int(name[3:]) - 1,
6,
QTableWidgetItem(
Config.gameid_dict["ALL"]["text"][
Config.gameid_dict["ALL"]["value"].index(
config.get(config.Info_GameId)
)
]
if config.get(config.Info_GameId)
in Config.gameid_dict["ALL"]["value"]
else config.get(config.Info_GameId)
),
)
self.dashboard.setItem(
int(name[3:]) - 1,
7,
QTableWidgetItem(
Config.gameid_dict["ALL"]["text"][
Config.gameid_dict["ALL"]["value"].index(
config.get(config.Info_GameId_1)
)
]
if config.get(config.Info_GameId_1)
in Config.gameid_dict["ALL"]["value"]
else config.get(config.Info_GameId_1)
),
)
self.dashboard.setItem(
int(name[3:]) - 1,
8,
QTableWidgetItem(
Config.gameid_dict["ALL"]["text"][
Config.gameid_dict["ALL"]["value"].index(
config.get(config.Info_GameId_2)
)
]
if config.get(config.Info_GameId_2)
in Config.gameid_dict["ALL"]["value"]
else config.get(config.Info_GameId_2)
),
)
self.dashboard.setItem(
int(name[3:]) - 1,
9,
QTableWidgetItem(
"不使用"
if config.get(config.Info_GameId_Remain) == "-"
else (
(
Config.gameid_dict["ALL"]["text"][
Config.gameid_dict["ALL"]["value"].index(
config.get(config.Info_GameId_Remain)
)
]
)
if config.get(config.Info_GameId_Remain)
in Config.gameid_dict["ALL"]["value"]
else config.get(config.Info_GameId_Remain)
elif name == "SeriesNumb":
setting_item = ComboBoxSetting(
texts=["AUTO", "6", "5", "4", "3", "2", "1", "不选择"],
qconfig=self.config,
configItem=configItem,
parent=self,
)
),
)
self.dashboard.setCellWidget(int(name[3:]) - 1, 10, button)
elif "GameId" in name:
setting_item = EditableComboBoxSetting(
value=Config.gameid_dict[group]["value"],
texts=Config.gameid_dict[group]["text"],
qconfig=self.config,
configItem=configItem,
parent=self,
)
self.dashboard.setCellWidget(row, col, setting_item)

6
app/ui/queue_manager.py
View File

@@ -136,11 +136,7 @@ class QueueManager(QWidget):
)
return None
choice = MessageBox(
"确认",
f"确定要删除 {name} 吗？",
self.window(),
)
choice = MessageBox("确认", f"确定要删除 {name} 吗？", self.window())
if choice.exec():
self.queue_manager.clear_SettingBox()

4
app/ui/setting.py
View File

@@ -252,9 +252,7 @@ class Setting(QWidget):
choice.exec()
else:
choice = MessageBox(
"确认",
"您没有输入管理密钥，是否取消修改管理密钥？",
self.window(),
"确认", "您没有输入管理密钥，是否取消修改管理密钥？", self.window()
)
if choice.exec():
break