diff --git a/app/decrypt/version_list.json b/app/decrypt/version_list.json index 79d843a8..076563e1 100644 --- a/app/decrypt/version_list.json +++ b/app/decrypt/version_list.json @@ -712,5 +712,110 @@ 48634496, 0, 0 + ], + "3.8.0.29": [ + 50910714, + 0, + 46060689, + 0, + 0 + ], + "3.9.9.22": [ + 56102304, + 0, + 56102160, + 0, + 0 + ], + "3.9.10.10": [ + 102868520, + 102869856, + 102868328, + 0, + 102869792 + ], + "3.8.0.18": [ + 46043224, + 46044048, + 46043080, + 0, + 0 + ], + "3.9.10.13": [ + 0, + 0, + 95125416, + 0, + 0 + ], + "3.9.10.18": [ + 95129640, + 95130976, + 95129448, + 0, + 0 + ], + "3.9.10.11": [ + 102868456, + 102869792, + 102868264, + 0, + 0 + ], + "3.9.7.14": [ + 0, + 0, + 63478408, + 0, + 63479872 + ], + "3.9.10.19": [ + 95129768, + 0, + 95129576, + 0, + 95131192 + ], + "3.7.6.38": [ + 39016136, + 0, + 39015992, + 0, + 0 + ], + "3.9.10.9": [ + 102868712, + 102870048, + 102868520, + 0, + 102869984 + ], + "3.9.10.16": [ + 71305680, + 71306648, + 71305536, + 0, + 0 + ], + "3.9.0.26": [ + 48405896, + 0, + 48405752, + 0, + 0 + ], + "3.9.7.13": [ + 63474296, + 63475632, + 63474104, + 0, + 63475568 + ], + "3.8.0.15": [ + 46014616, + 0, + 46014472, + 0, + 0 ] } \ No newline at end of file diff --git a/app/resources/data/version_list.json b/app/resources/data/version_list.json index 79d843a8..076563e1 100644 --- a/app/resources/data/version_list.json +++ b/app/resources/data/version_list.json @@ -712,5 +712,110 @@ 48634496, 0, 0 + ], + "3.8.0.29": [ + 50910714, + 0, + 46060689, + 0, + 0 + ], + "3.9.9.22": [ + 56102304, + 0, + 56102160, + 0, + 0 + ], + "3.9.10.10": [ + 102868520, + 102869856, + 102868328, + 0, + 102869792 + ], + "3.8.0.18": [ + 46043224, + 46044048, + 46043080, + 0, + 0 + ], + "3.9.10.13": [ + 0, + 0, + 95125416, + 0, + 0 + ], + "3.9.10.18": [ + 95129640, + 95130976, + 95129448, + 0, + 0 + ], + "3.9.10.11": [ + 102868456, + 102869792, + 102868264, + 0, + 0 + ], + "3.9.7.14": [ + 0, + 0, + 63478408, + 0, + 63479872 + ], + "3.9.10.19": [ + 95129768, + 0, + 95129576, + 0, + 95131192 + ], + "3.7.6.38": [ + 39016136, + 0, + 39015992, + 0, + 0 + ], + "3.9.10.9": [ + 102868712, + 102870048, + 102868520, + 0, + 102869984 + ], + "3.9.10.16": [ + 71305680, + 71306648, + 71305536, + 0, + 0 + ], + "3.9.0.26": [ + 48405896, + 0, + 48405752, + 0, + 0 + ], + "3.9.7.13": [ + 63474296, + 63475632, + 63474104, + 0, + 63475568 + ], + "3.8.0.15": [ + 46014616, + 0, + 46014472, + 0, + 0 ] } \ No newline at end of file diff --git a/app/ui/Icon.py b/app/ui/Icon.py index 454d7e22..b91bbe27 100644 --- a/app/ui/Icon.py +++ b/app/ui/Icon.py @@ -1,4 +1,4 @@ -from PyQt5.QtGui import QIcon, QPixmap +from PyQt5.QtGui import QIcon from app.resources import resource_rc diff --git a/main.py b/main.py index 973eec9b..0e55f174 100644 --- a/main.py +++ b/main.py @@ -2,9 +2,17 @@ import sys import time import traceback +from PyQt5.QtGui import QFont, QPixmap, QIcon +from PyQt5.QtWidgets import * +from PyQt5.QtCore import Qt from app.log.exception_handling import ExceptionHanding, send_error_msg from app.ui.Icon import Icon +from app.DataBase import close_db +from app.log import logger +from app.ui import mainview +from app.ui.tool.pc_decrypt import pc_decrypt +from app.config import version, SEND_LOG_FLAG widget = None @@ -44,15 +52,7 @@ def excepthook(exc_type, exc_value, traceback_): # 设置 excepthook sys.excepthook = excepthook -from PyQt5.QtGui import QFont, QPixmap, QIcon -from PyQt5.QtWidgets import * -from PyQt5.QtCore import Qt -from app.DataBase import close_db -from app.log import logger -from app.ui import mainview -from app.ui.tool.pc_decrypt import pc_decrypt -from app.config import version, SEND_LOG_FLAG ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID("WeChatReport") QApplication.setAttribute(Qt.AA_EnableHighDpiScaling, True)