From 424f72a874349fe26358b09073ad52f7a0dc1a48 Mon Sep 17 00:00:00 2001
From: STDquantum <405720329@qq.com>
Date: Thu, 7 Dec 2023 23:23:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BAhtml=E6=97=B6=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E8=A7=86=E9=A2=91=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/DataBase/output_pc.py | 88 +++++++++++++++++++++++++++------------
1 file changed, 62 insertions(+), 26 deletions(-)
diff --git a/app/DataBase/output_pc.py b/app/DataBase/output_pc.py
index 30090bb..62b244f 100644
--- a/app/DataBase/output_pc.py
+++ b/app/DataBase/output_pc.py
@@ -607,6 +607,11 @@ class ChildThread(QThread):
height: 42px;
border-radius: 50%;
}
+ .chat-video video{
+ margin-right: 18px;
+ margin-left: 18px;
+ max-width: 350px;
+ }
.input-area{
border-top:0.5px solid #e0e0e0;
height: 150px;
@@ -914,6 +919,17 @@ const chatMessages = [
f.write(
f'''{{ type:{type_}, text: '{image_path}',is_send:{is_send},avatar_path:'{avatar}'}},'''
)
+ elif type_ == 43:
+ video_path = hard_link_db.get_video(content=str_content, thumb=False)
+ video_path = f'file:///{path.wx_path()}/{MePC().wxid}/{video_path}'
+ video_path = video_path.replace('\\', '/')
+ if self.is_5_min(timestamp):
+ f.write(
+ f'''{{ type:0, text: '{str_time}',is_send:0,avatar_path:''}},'''
+ )
+ f.write(
+ f'''{{ type:{type_}, text: '{video_path}',is_send:{is_send},avatar_path:'{avatar}'}},'''
+ )
elif type_ == 10000:
str_content = escape_js_and_html(str_content.lstrip('').rstrip(''))
f.write(
@@ -926,13 +942,13 @@ const chatMessages = [
const messageElement = document.createElement('div');
if (message.type == 1){
if (message.is_send == 1){
- messageElement.className = "item item-right";
- messageElement.innerHTML = `${message.text}
`
- }
- else if(message.is_send==0){
- messageElement.className = "item item-left";
- messageElement.innerHTML = `${message.text}
`
- }
+ messageElement.className = "item item-right";
+ messageElement.innerHTML = `${message.text}
`
+ }
+ else if(message.is_send==0){
+ messageElement.className = "item item-left";
+ messageElement.innerHTML = `${message.text}
`
+ }
}
else if(message.type == 0){
messageElement.className = "item item-center";
@@ -940,13 +956,23 @@ const chatMessages = [
}
else if (message.type == 3){
if (message.is_send == 1){
- messageElement.className = "item item-right";
- messageElement.innerHTML = ``
- }
- else if(message.is_send==0){
- messageElement.className = "item item-left";
- messageElement.innerHTML = ``
+ messageElement.className = "item item-right";
+ messageElement.innerHTML = ``
+ }
+ else if(message.is_send==0){
+ messageElement.className = "item item-left";
+ messageElement.innerHTML = ``
+ }
}
+ else if (message.type == 43) {
+ if (message.is_send == 1){
+ messageElement.className = "item item-right";
+ messageElement.innerHTML = ``
+ }
+ else if(message.is_send==0){
+ messageElement.className = "item item-left";
+ messageElement.innerHTML = ``
+ }
}
chatContainer.appendChild(messageElement);
}
@@ -970,13 +996,13 @@ const chatMessages = [
const messageElement = document.createElement('div');
if (message.type == 1){
if (message.is_send == 1){
- messageElement.className = "item item-right";
- messageElement.innerHTML = `${message.text}
`
- }
- else if(message.is_send==0){
- messageElement.className = "item item-left";
- messageElement.innerHTML = `${message.text}
`
- }
+ messageElement.className = "item item-right";
+ messageElement.innerHTML = `${message.text}
`
+ }
+ else if(message.is_send==0){
+ messageElement.className = "item item-left";
+ messageElement.innerHTML = `${message.text}
`
+ }
}
else if(message.type == 0){
messageElement.className = "item item-center";
@@ -984,13 +1010,23 @@ const chatMessages = [
}
else if (message.type == 3){
if (message.is_send == 1){
- messageElement.className = "item item-right";
- messageElement.innerHTML = ``
- }
- else if(message.is_send==0){
- messageElement.className = "item item-left";
- messageElement.innerHTML = ``
+ messageElement.className = "item item-right";
+ messageElement.innerHTML = ``
+ }
+ else if(message.is_send==0){
+ messageElement.className = "item item-left";
+ messageElement.innerHTML = ``
+ }
}
+ else if (message.type == 43) {
+ if (message.is_send == 1){
+ messageElement.className = "item item-right";
+ messageElement.innerHTML = ``
+ }
+ else if(message.is_send==0){
+ messageElement.className = "item item-left";
+ messageElement.innerHTML = ``
+ }
}
chatContainer.appendChild(messageElement);
}