Shikong/WeChatMsg
1
0
Fork 0
mirror of https://github.com/LC044/WeChatMsg synced 2024-11-14 22:01:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

补充DisplayContent

Browse Source
This commit is contained in:
shuaikangzhou 2024-01-19 19:23:20 +08:00
parent 548d9b18f5
commit 8a0933cfb6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/DataBase/msg.py
View File

@ -219,7 +219,7 @@ class Msg:
def get_message_by_num(self, username_, local_id): def get_message_by_num(self, username_, local_id):
sql = ''' sql = '''
select localId,TalkerId,Type,SubType,IsSender,CreateTime,Status,StrContent,strftime('%Y-%m-%d %H:%M:%S',CreateTime,'unixepoch','localtime') as StrTime,MsgSvrID,BytesExtra,CompressContent select localId,TalkerId,Type,SubType,IsSender,CreateTime,Status,StrContent,strftime('%Y-%m-%d %H:%M:%S',CreateTime,'unixepoch','localtime') as StrTime,MsgSvrID,BytesExtra,CompressContent,DisplayContent
from MSG from MSG
where StrTalker = ? and localId < ? where StrTalker = ? and localId < ?
order by CreateTime desc order by CreateTime desc
@ -246,7 +246,7 @@ class Msg:
start_time, end_time = time_range start_time, end_time = time_range
if year_ == 'all': if year_ == 'all':
sql = f''' sql = f'''
select localId,TalkerId,Type,SubType,IsSender,CreateTime,Status,StrContent,strftime('%Y-%m-%d %H:%M:%S',CreateTime,'unixepoch','localtime') as StrTime,MsgSvrID,BytesExtra,CompressContent select localId,TalkerId,Type,SubType,IsSender,CreateTime,Status,StrContent,strftime('%Y-%m-%d %H:%M:%S',CreateTime,'unixepoch','localtime') as StrTime,MsgSvrID,BytesExtra,CompressContent,DisplayContent
from MSG from MSG
where StrTalker=? and Type=? where StrTalker=? and Type=?
{'AND CreateTime>' + str(start_time) + ' AND CreateTime<' + str(end_time) if time_range else ''} {'AND CreateTime>' + str(start_time) + ' AND CreateTime<' + str(end_time) if time_range else ''}
@ -260,7 +260,7 @@ class Msg:
lock.release() lock.release()
else: else:
sql = ''' sql = '''
select localId,TalkerId,Type,SubType,IsSender,CreateTime,Status,StrContent,strftime('%Y-%m-%d %H:%M:%S',CreateTime,'unixepoch','localtime') as StrTime,MsgSvrID,BytesExtra,CompressContent select localId,TalkerId,Type,SubType,IsSender,CreateTime,Status,StrContent,strftime('%Y-%m-%d %H:%M:%S',CreateTime,'unixepoch','localtime') as StrTime,MsgSvrID,BytesExtra,CompressContent,DisplayContent
from MSG from MSG
where StrTalker=? and Type=? and strftime('%Y', CreateTime, 'unixepoch', 'localtime') = ? where StrTalker=? and Type=? and strftime('%Y', CreateTime, 'unixepoch', 'localtime') = ?
order by CreateTime order by CreateTime

1
app/ui/chat/chat_info.py
View File

@ -166,6 +166,7 @@ class ChatInfo(QWidget):
traceback.print_exc() traceback.print_exc()
class ShowChatThread(QThread): class ShowChatThread(QThread):
showSingal = pyqtSignal(tuple) showSingal = pyqtSignal(tuple)
finishSingal = pyqtSignal(int) finishSingal = pyqtSignal(int)