From 29536003a4539f3c3e922fe658c0d31531ef71f0 Mon Sep 17 00:00:00 2001 From: DLmaster Date: Tue, 28 Jan 2025 16:13:12 +0800 Subject: [PATCH] =?UTF-8?q?fix(core):=20=E4=BF=AE=E5=A4=8D=E8=B0=83?= =?UTF-8?q?=E5=BA=A6=E9=98=9F=E5=88=97=E4=B8=BA=E7=A9=BA=E6=97=B6=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E6=89=A7=E8=A1=8C=E8=A2=AB=E5=8F=8D=E5=A4=8D=E8=B0=83?= =?UTF-8?q?=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/task_manager.py | 9 +++++++++ app/core/timer.py | 4 ++-- app/models/MAA.py | 32 +++++++++++++++----------------- app/ui/member_manager.py | 8 ++++---- resources/version.json | 2 +- 5 files changed, 31 insertions(+), 24 deletions(-) diff --git a/app/core/task_manager.py b/app/core/task_manager.py index bcd4870..611d3da 100644 --- a/app/core/task_manager.py +++ b/app/core/task_manager.py @@ -29,6 +29,7 @@ from loguru import logger from PySide6.QtCore import QThread, QObject, Signal from qfluentwidgets import Dialog from pathlib import Path +from datetime import datetime from typing import Dict, Union from .config import Config @@ -261,6 +262,14 @@ class TaskManager(QObject): f"任务名称：{log[0]}，{log[1]["History"].replace("\n","\n ")}\n" ) Config.save_history(name, {"Time": time, "History": history}) + else: + Config.save_history( + name, + { + "Time": datetime.now().strftime("%Y-%m-%d %H:%M:%S"), + "History": "没有任务被执行", + }, + ) self.task_list.pop(name) Config.running_list.remove(name) diff --git a/app/core/timer.py b/app/core/timer.py index efd46f7..67029eb 100644 --- a/app/core/timer.py +++ b/app/core/timer.py @@ -29,7 +29,7 @@ from loguru import logger from PySide6.QtWidgets import QWidget from PySide6.QtCore import QTimer import json -import datetime +from datetime import datetime import pyautogui from .config import Config @@ -73,7 +73,7 @@ class MainTimer(QWidget): if info["Time"][f"TimeEnabled_{_}"] ] # 按时间调起代理任务 - curtime = datetime.datetime.now().strftime("%Y-%m-%d %H:%M") + curtime = datetime.now().strftime("%Y-%m-%d %H:%M") if ( curtime[11:16] in time_set and curtime != history["Time"][:16] diff --git a/app/models/MAA.py b/app/models/MAA.py index c25328b..6d2abf3 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -29,7 +29,7 @@ from loguru import logger from PySide6.QtCore import QObject, Signal, QEventLoop import json import sqlite3 -import datetime +from datetime import datetime, timedelta import subprocess import shutil import time @@ -94,7 +94,7 @@ class MaaManager(QObject): """主进程，运行MAA代理进程""" curdate = self.server_date() - begin_time = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") + begin_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") self.configure() # 检查MAA路径是否可用 @@ -169,7 +169,7 @@ class MaaManager(QObject): # 配置MAA self.set_maa(mode_book[j], user[2]) # 记录当前时间 - start_time = datetime.datetime.now() + start_time = datetime.now() # 创建MAA任务 maa = subprocess.Popen( [self.maa_exe_path], @@ -199,20 +199,20 @@ class MaaManager(QObject): # 判断是否超时 if len(logs) > 0: - latest_time = datetime.datetime.now() + latest_time = datetime.now() for _ in range(-1, 0 - len(logs) - 1, -1): try: - latest_time = datetime.datetime.strptime( + latest_time = datetime.strptime( logs[_][1:20], "%Y-%m-%d %H:%M:%S" ) break except ValueError: pass - now_time = datetime.datetime.now() + now_time = datetime.now() if ( j == 0 and now_time - latest_time - > datetime.timedelta( + > timedelta( minutes=self.set["RunSet"][ "AnnihilationTimeLimit" ] @@ -220,7 +220,7 @@ class MaaManager(QObject): ) or ( j == 1 and now_time - latest_time - > datetime.timedelta( + > timedelta( minutes=self.set["RunSet"]["RoutineTimeLimit"] ) ): @@ -338,7 +338,7 @@ class MaaManager(QObject): self.set_maa("人工排查_仅切换账号", user[2]) # 记录当前时间 - start_time = datetime.datetime.now() + start_time = datetime.now() # 创建MAA任务 maa = subprocess.Popen( [self.maa_exe_path], @@ -432,7 +432,7 @@ class MaaManager(QObject): creationflags=subprocess.CREATE_NO_WINDOW, ) # 记录当前时间 - start_time = datetime.datetime.now() + start_time = datetime.now() # 监测MAA运行状态 while not self.isInterruptionRequested: @@ -487,7 +487,7 @@ class MaaManager(QObject): wait_index = [_[2] for _ in user_list if _[1] == "等待"] # 保存运行日志 - end_time = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") + end_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") end_log = ( f"任务开始时间：{begin_time}，结束时间：{end_time}\n" f"已完成数：{len(over_index)}，未完成数：{len(error_index) + len(wait_index)}\n\n" @@ -550,9 +550,7 @@ class MaaManager(QObject): for entry in f: if not if_log_start: try: - entry_time = datetime.datetime.strptime( - entry[1:20], "%Y-%m-%d %H:%M:%S" - ) + entry_time = datetime.strptime(entry[1:20], "%Y-%m-%d %H:%M:%S") if entry_time > start_time: if_log_start = True logs.append(entry) @@ -1015,7 +1013,7 @@ class MaaManager(QObject): def server_date(self): """获取当前的服务器日期""" - dt = datetime.datetime.now() - if dt.time() < datetime.datetime.min.time().replace(hour=4): - dt = dt - datetime.timedelta(days=1) + dt = datetime.now() + if dt.time() < datetime.min.time().replace(hour=4): + dt = dt - timedelta(days=1) return dt.strftime("%Y-%m-%d") diff --git a/app/ui/member_manager.py b/app/ui/member_manager.py index 3dcff0e..2bfebea 100644 --- a/app/ui/member_manager.py +++ b/app/ui/member_manager.py @@ -52,7 +52,7 @@ from PySide6.QtCore import Qt from functools import partial from pathlib import Path from typing import List -import datetime +from datetime import datetime, timedelta import json import shutil @@ -1623,7 +1623,7 @@ class MaaSettingBox(QWidget): def server_date() -> str: """获取当前的服务器日期""" - dt = datetime.datetime.now() - if dt.time() < datetime.datetime.min.time().replace(hour=4): - dt = dt - datetime.timedelta(days=1) + dt = datetime.now() + if dt.time() < datetime.min.time().replace(hour=4): + dt = dt - timedelta(days=1) return dt.strftime("%Y-%m-%d") diff --git a/resources/version.json b/resources/version.json index d731f54..e5b1d04 100644 --- a/resources/version.json +++ b/resources/version.json @@ -1,7 +1,7 @@ { "main_version": "4.2.1.1", "updater_version": "1.1.0.1", - "announcement": "\n## 新增功能\n- 调度队列上线，支持MAA多开\n- 公告系统上线\n## 修复BUG\n- 修复手机号码不全时引发的混乱\n- 添加了一堆BUG（确信）\n## 程序优化\n- 界面重构，引入`QFluentWidgets`美化界面", + "announcement": "\n## 新增功能\n- 调度队列上线，支持MAA多开 #12\n- 公告系统上线\n## 修复BUG\n- 修复手机号码不全时引发的混乱\n- 添加了一堆BUG（确信）\n## 程序优化\n- 界面重构，引入`QFluentWidgets`美化界面", "proxy_list": [ "", "https://gitproxy.click/",