Shikong/WeChatMsg
1
0
Fork 0
mirror of https://github.com/LC044/WeChatMsg synced 2025-05-24 09:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

用-1代替最后一个索引

Browse Source
This commit is contained in:
zhiyu 2024-01-22 10:14:23 +08:00
parent a8045930d6
commit 7184fd2c8a
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/DataBase/output.py
View File

@ -124,12 +124,12 @@ class ExporterBase(QThread):
def get_avatar_path(self, is_send, message, is_absolute_path=False) -> str: def get_avatar_path(self, is_send, message, is_absolute_path=False) -> str:
if is_absolute_path: if is_absolute_path:
if self.contact.is_chatroom: if self.contact.is_chatroom:
avatar = message[13].avatar_path avatar = message[-1].avatar_path
else: else:
avatar = Me().avatar_path if is_send else self.contact.avatar_path avatar = Me().avatar_path if is_send else self.contact.avatar_path
else: else:
if self.contact.is_chatroom: if self.contact.is_chatroom:
avatar = message[13].smallHeadImgUrl avatar = message[-1].smallHeadImgUrl
else: else:
avatar = Me().smallHeadImgUrl if is_send else self.contact.smallHeadImgUrl avatar = Me().smallHeadImgUrl if is_send else self.contact.smallHeadImgUrl
return avatar return avatar
@ -139,7 +139,7 @@ class ExporterBase(QThread):
if is_send: if is_send:
display_name = Me().name display_name = Me().name
else: else:
display_name = message[13].remark display_name = message[-1].remark
else: else:
display_name = Me().name if is_send else self.contact.remark display_name = Me().name if is_send else self.contact.remark
return escape_js_and_html(display_name) return escape_js_and_html(display_name)

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

@ -82,17 +82,12 @@ class ChatInfo(QWidget):
return True return True
return False return False
def get_avatar_path(self, is_send, message, is_absolute_path=False) -> str: def get_avatar(self, is_send, message) -> str:
if self.contact.is_chatroom: if self.contact.is_chatroom:
avatar = message[13].smallHeadImgUrl # message[-1].save_avatar()
avatar = message[-1].avatar
else: else:
avatar = Me().smallHeadImgUrl if is_send else self.contact.smallHeadImgUrl avatar = Me().avatar if is_send else self.contact.avatar
if is_absolute_path:
if self.contact.is_chatroom:
# message[13].save_avatar()
avatar = message[13].avatar
else:
avatar = Me().avatar if is_send else self.contact.avatar
return avatar return avatar
def get_display_name(self, is_send, message) -> str: def get_display_name(self, is_send, message) -> str:
@ -100,7 +95,7 @@ class ChatInfo(QWidget):
if is_send: if is_send:
display_name = Me().name display_name = Me().name
else: else:
display_name = message[13].remark display_name = message[-1].remark
else: else:
display_name = None display_name = None
return display_name return display_name
@ -112,7 +107,7 @@ class ChatInfo(QWidget):
str_time = message[8] str_time = message[8]
# print(type_, type(type_)) # print(type_, type(type_))
is_send = message[4] is_send = message[4]
avatar = self.get_avatar_path(is_send, message,True) avatar = self.get_avatar(is_send, message)
display_name = self.get_display_name(is_send, message) display_name = self.get_display_name(is_send, message)
timestamp = message[5] timestamp = message[5]
BytesExtra = message[10] BytesExtra = message[10]