From aed1de2c4b8cd30dd62a84883864a5fec5403dc2 Mon Sep 17 00:00:00 2001
From: STDquantum <405720329@qq.com>
Date: Sun, 17 Dec 2023 19:37:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=87=AA=E5=B7=B1?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E9=A1=B5=E9=9D=A2=E5=87=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E7=9A=84bug=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=8D=95?=
 =?UTF-8?q?=E4=BA=BA=E5=AF=BC=E5=87=BA=E6=97=B6=E5=A4=B4=E5=83=8F=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/DataBase/output_pc.py | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/app/DataBase/output_pc.py b/app/DataBase/output_pc.py
index fdac261..de349ac 100644
--- a/app/DataBase/output_pc.py
+++ b/app/DataBase/output_pc.py
@@ -187,7 +187,7 @@ class ChildThread(QThread):
         if is_chatroom:
             avatar = f"./avatar/{message[12].wxid}.png"
         else:
-            avatar = "./avatar/" + ('myhead.png' if is_send else 'tahead.png')
+            avatar = f"./avatar/{MePC().wxid if is_send else self.contact.wxid}.png"
         if is_chatroom:
             if is_send:
                 displayname = MePC().name
@@ -227,7 +227,7 @@ class ChildThread(QThread):
         if is_chatroom:
             avatar = f"./avatar/{message[12].wxid}.png"
         else:
-            avatar = "./avatar/" + ('myhead.png' if is_send else 'tahead.png')
+            avatar = f"./avatar/{MePC().wxid if is_send else self.contact.wxid}.png"
         if is_chatroom:
             if is_send:
                 displayname = MePC().name
@@ -278,7 +278,7 @@ class ChildThread(QThread):
         if is_chatroom:
             avatar = f"./avatar/{message[12].wxid}.png"
         else:
-            avatar = "./avatar/" + ('myhead.png' if is_send else 'tahead.png')
+            avatar = f"./avatar/{MePC().wxid if is_send else self.contact.wxid}.png"
         if is_chatroom:
             if is_send:
                 displayname = MePC().name
@@ -320,7 +320,7 @@ class ChildThread(QThread):
         if is_chatroom:
             avatar = f"./avatar/{message[12].wxid}.png"
         else:
-            avatar = "./avatar/" + ('myhead.png' if is_send else 'tahead.png')
+            avatar = f"./avatar/{MePC().wxid if is_send else self.contact.wxid}.png"
         if is_chatroom:
             if is_send:
                 displayname = MePC().name
@@ -374,7 +374,7 @@ class ChildThread(QThread):
         if is_chatroom:
             avatar = f"./avatar/{message[12].wxid}.png"
         else:
-            avatar = "./avatar/" + ('myhead.png' if is_send else 'tahead.png')
+            avatar = f"./avatar/{MePC().wxid if is_send else self.contact.wxid}.png"
         if is_chatroom:
             if is_send:
                 displayname = MePC().name
@@ -442,7 +442,7 @@ class ChildThread(QThread):
         if is_chatroom:
             avatar = f"./avatar/{message[12].wxid}.png"
         else:
-            avatar = "./avatar/" + ('myhead.png' if is_send else 'tahead.png')
+            avatar = f"./avatar/{MePC().wxid if is_send else self.contact.wxid}.png"
         if is_chatroom:
             if is_send:
                 displayname = MePC().name
@@ -801,7 +801,7 @@ body{
     word-break:normal;
 }
 .chat-refer-right {
-    margin-right: 55px;
+    margin-right: 15px;
 }
 .chat-refer-left{
     margin-left: 15px;
@@ -867,9 +867,16 @@ body{
 .content-wrapper {
     display: flex;
     flex-direction: column;
+}
+
+.content-wrapper-left {
     align-items: baseline;
 }
 
+.content-wrapper-right {
+    align-items: flex-end;
+}
+
 .displayname {
     margin-left: 13px;
     margin-left: 13px;
@@ -1133,7 +1140,7 @@ html_end = '''
             const side = message.is_send ? "right" : "left";
             if (message.type == 1) {
                 // displayname 和 bubble
-                messageContent.className = "content-wrapper";
+                messageContent.className = `content-wrapper content-wrapper-${side}`;
                 if (message.is_chatroom && !message.is_send) {
                     messageContent.appendChild(displayNameBox(message));
                 }
@@ -1150,7 +1157,7 @@ html_end = '''
             }
             else if (message.type == 3) {
                 // displayname 和 img
-                messageContent.className = "content-wrapper";
+                messageContent.className = `content-wrapper content-wrapper-${side}`;
                 if (message.is_chatroom && !message.is_send) {
                     messageContent.appendChild(displayNameBox(message));
                 }
@@ -1163,7 +1170,7 @@ html_end = '''
             }
             else if (message.type == 43) {
                 // displayname 和 video
-                messageContent.className = "content-wrapper";
+                messageContent.className = `content-wrapper content-wrapper-${side}`;
                 if (message.is_chatroom && !message.is_send) {
                     messageContent.appendChild(displayNameBox(message));
                 }
@@ -1177,7 +1184,7 @@ html_end = '''
             else if (message.type == 49) {
                 if (message.sub_type == 57) {
                     // displayname 和 bubble 和 refer
-                    messageContent.className = "content-wrapper";
+                    messageContent.className = `content-wrapper content-wrapper-${side}`;
                     if (message.is_chatroom && !message.is_send) {
                         messageContent.appendChild(displayNameBox(message));
                     }
@@ -1194,7 +1201,7 @@ html_end = '''
             }
             else if (message.type == 34) {
                 // displayname 和 转的文字 和 audio
-                messageContent.className = "content-wrapper";
+                messageContent.className = `content-wrapper content-wrapper-${side}`;
                 if (message.is_chatroom && !message.is_send) {
                     messageContent.appendChild(displayNameBox(message));
                 }