mirror of
https://github.com/LC044/WeChatMsg
synced 2025-02-23 03:22:17 +08:00
修改初始加载显示页面
This commit is contained in:
parent
844eb9317a
commit
94e5064aa3
2
.gitignore
vendored
2
.gitignore
vendored
@ -5,6 +5,8 @@ data
|
|||||||
sqlcipher-3.0.1
|
sqlcipher-3.0.1
|
||||||
dist
|
dist
|
||||||
venv
|
venv
|
||||||
|
venv_decrypt
|
||||||
|
venv_main_pc
|
||||||
TEST
|
TEST
|
||||||
app/data/avatar
|
app/data/avatar
|
||||||
app/data/image2
|
app/data/image2
|
||||||
|
@ -15,14 +15,17 @@ def merge_databases(source_paths, target_path):
|
|||||||
db = sqlite3.connect(source_path)
|
db = sqlite3.connect(source_path)
|
||||||
cursor = db.cursor()
|
cursor = db.cursor()
|
||||||
sql = '''
|
sql = '''
|
||||||
SELECT TalkerId,MsgsvrID,Type,SubType,IsSender,CreateTime,Sequence,StrTalker,StrContent,DisplayContent
|
SELECT TalkerId,MsgsvrID,Type,SubType,IsSender,CreateTime,Sequence,StrTalker,StrContent,DisplayContent,BytesExtra
|
||||||
FROM MSG;
|
FROM MSG;
|
||||||
'''
|
'''
|
||||||
cursor.execute(sql)
|
cursor.execute(sql)
|
||||||
result = cursor.fetchall()
|
result = cursor.fetchall()
|
||||||
# 附加源数据库
|
# 附加源数据库
|
||||||
target_cursor.executemany(
|
target_cursor.executemany(
|
||||||
"INSERT INTO MSG (TalkerId,MsgsvrID,Type,SubType,IsSender,CreateTime,Sequence,StrTalker,StrContent,DisplayContent) VALUES(?,?,?,?,?,?,?,?,?,?)",
|
"INSERT INTO MSG "
|
||||||
|
"(TalkerId,MsgsvrID,Type,SubType,IsSender,CreateTime,Sequence,StrTalker,StrContent,DisplayContent,"
|
||||||
|
"BytesExtra)"
|
||||||
|
"VALUES(?,?,?,?,?,?,?,?,?,?,?)",
|
||||||
result)
|
result)
|
||||||
cursor.close()
|
cursor.close()
|
||||||
db.close()
|
db.close()
|
||||||
|
@ -77,6 +77,7 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow):
|
|||||||
self.listWidget.clear()
|
self.listWidget.clear()
|
||||||
self.resize(QSize(800, 600))
|
self.resize(QSize(800, 600))
|
||||||
self.action_desc.triggered.connect(self.about)
|
self.action_desc.triggered.connect(self.about)
|
||||||
|
self.load_flag = False
|
||||||
self.load_data()
|
self.load_data()
|
||||||
self.load_num = 0
|
self.load_num = 0
|
||||||
self.label = QLabel(self)
|
self.label = QLabel(self)
|
||||||
@ -96,6 +97,7 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow):
|
|||||||
me.wx_dir = dic.get('wx_dir')
|
me.wx_dir = dic.get('wx_dir')
|
||||||
print('wx_dir', me.wx_dir)
|
print('wx_dir', me.wx_dir)
|
||||||
self.set_my_info(wxid)
|
self.set_my_info(wxid)
|
||||||
|
self.load_flag = True
|
||||||
else:
|
else:
|
||||||
QMessageBox.information(
|
QMessageBox.information(
|
||||||
self,
|
self,
|
||||||
@ -120,14 +122,11 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow):
|
|||||||
chat_item = QListWidgetItem(Icon.Chat_Icon, '聊天', self.listWidget)
|
chat_item = QListWidgetItem(Icon.Chat_Icon, '聊天', self.listWidget)
|
||||||
contact_item = QListWidgetItem(Icon.Contact_Icon, '好友', self.listWidget)
|
contact_item = QListWidgetItem(Icon.Contact_Icon, '好友', self.listWidget)
|
||||||
myinfo_item = QListWidgetItem(Icon.MyInfo_Icon, '我的', self.listWidget)
|
myinfo_item = QListWidgetItem(Icon.MyInfo_Icon, '我的', self.listWidget)
|
||||||
|
|
||||||
tool_window = ToolWindow()
|
tool_window = ToolWindow()
|
||||||
tool_window.get_info_signal.connect(self.set_my_info)
|
tool_window.get_info_signal.connect(self.set_my_info)
|
||||||
tool_window.decrypt_success_signal.connect(self.load_data)
|
tool_window.decrypt_success_signal.connect(self.load_data)
|
||||||
tool_window.load_finish_signal.connect(self.loading)
|
tool_window.load_finish_signal.connect(self.loading)
|
||||||
self.stackedWidget.addWidget(tool_window)
|
self.stackedWidget.addWidget(tool_window)
|
||||||
self.listWidget.setCurrentRow(0)
|
|
||||||
self.stackedWidget.setCurrentIndex(0)
|
|
||||||
self.chat_window = ChatWindow()
|
self.chat_window = ChatWindow()
|
||||||
# chat_window = QWidget()
|
# chat_window = QWidget()
|
||||||
self.stackedWidget.addWidget(self.chat_window)
|
self.stackedWidget.addWidget(self.chat_window)
|
||||||
@ -185,6 +184,12 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow):
|
|||||||
self.okSignal.emit(True)
|
self.okSignal.emit(True)
|
||||||
self.listWidget.setVisible(True)
|
self.listWidget.setVisible(True)
|
||||||
self.stackedWidget.setVisible(True)
|
self.stackedWidget.setVisible(True)
|
||||||
|
if self.load_flag:
|
||||||
|
self.listWidget.setCurrentRow(1)
|
||||||
|
self.stackedWidget.setCurrentIndex(1)
|
||||||
|
else:
|
||||||
|
self.listWidget.setCurrentRow(0)
|
||||||
|
self.stackedWidget.setCurrentIndex(0)
|
||||||
|
|
||||||
def output(self):
|
def output(self):
|
||||||
if self.sender() == self.action_output_CSV:
|
if self.sender() == self.action_output_CSV:
|
||||||
|
@ -38,10 +38,6 @@ class ViewController(QWidget):
|
|||||||
start = time.time()
|
start = time.time()
|
||||||
self.viewMainWIndow = mainview.MainWinController(username=username)
|
self.viewMainWIndow = mainview.MainWinController(username=username)
|
||||||
self.viewMainWIndow.setWindowTitle("Chat")
|
self.viewMainWIndow.setWindowTitle("Chat")
|
||||||
# print(username)
|
|
||||||
self.viewMainWIndow.username = username
|
|
||||||
# self.viewMainWIn.exitSignal.connect(self.loadDecryptView) # 不需要回到登录界面可以省略
|
|
||||||
|
|
||||||
self.viewMainWIndow.show()
|
self.viewMainWIndow.show()
|
||||||
end = time.time()
|
end = time.time()
|
||||||
print('ok', end - start)
|
print('ok', end - start)
|
||||||
|
Loading…
Reference in New Issue
Block a user