From 346edaa42ab29e7186c911a99260bfbc264a8387 Mon Sep 17 00:00:00 2001
From: shuaikangzhou <863909694@qq.com>
Date: Mon, 22 Jan 2024 22:21:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=83=A8=E5=88=86ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/DataBase/msg.py                    |  2 +-
 app/decrypt/get_wx_info.py             |  2 +-
 app/resources/data/template.html       | 11 +++++++++--
 app/ui/contact/export/export_dialog.py |  2 +-
 app/ui/mainview.py                     |  6 ++++--
 app/ui/mainwindow.py                   |  4 ++++
 app/web_ui/templates/christmas.html    |  2 +-
 7 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/DataBase/msg.py b/app/DataBase/msg.py
index 1d9b807..8288987 100644
--- a/app/DataBase/msg.py
+++ b/app/DataBase/msg.py
@@ -221,7 +221,7 @@ class Msg:
         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,DisplayContent
                 from MSG
-                where StrTalker = ? and localId < ?
+                where StrTalker = ? and localId < ? and (Type=1 or Type=3)
                 order by CreateTime desc 
                 limit 20
             '''
diff --git a/app/decrypt/get_wx_info.py b/app/decrypt/get_wx_info.py
index d9c0a40..4571ba5 100644
--- a/app/decrypt/get_wx_info.py
+++ b/app/decrypt/get_wx_info.py
@@ -349,7 +349,7 @@ def read_info(version_list, is_logging=False):
     wechat_process = []
     result = []
     error = ""
-    for process in psutil.process_iter(['name', 'exe', 'pid', 'cmdline']):
+    for process in psutil.process_iter(['name', 'exe', 'pid']):
         if process.name() == 'WeChat.exe':
             wechat_process.append(process)
 
diff --git a/app/resources/data/template.html b/app/resources/data/template.html
index 5d5e9bf..8bf2d1a 100644
--- a/app/resources/data/template.html
+++ b/app/resources/data/template.html
@@ -16,8 +16,8 @@ body {
     height: 100vh;
     align-items: center;
     justify-content: center;
-    background-color: #E4E6C5;
-    background-image: url("data:image/svg+xml,%3Csvg width='52' height='26' viewBox='0 0 52 26' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='none' fill-rule='evenodd'%3E%3Cg fill='%2394AB85' fill-opacity='0.4'%3E%3Cpath d='M10 10c0-2.21-1.79-4-4-4-3.314 0-6-2.686-6-6h2c0 2.21 1.79 4 4 4 3.314 0 6 2.686 6 6 0 2.21 1.79 4 4 4 3.314 0 6 2.686 6 6 0 2.21 1.79 4 4 4v2c-3.314 0-6-2.686-6-6 0-2.21-1.79-4-4-4-3.314 0-6-2.686-6-6zm25.464-1.95l8.486 8.486-1.414 1.414-8.486-8.486 1.414-1.414z' /%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
+    background-color: #F5F5F5;
+    //background-image: url("data:image/svg+xml,%3Csvg width='52' height='26' viewBox='0 0 52 26' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='none' fill-rule='evenodd'%3E%3Cg fill='%2394AB85' fill-opacity='0.4'%3E%3Cpath d='M10 10c0-2.21-1.79-4-4-4-3.314 0-6-2.686-6-6h2c0 2.21 1.79 4 4 4 3.314 0 6 2.686 6 6 0 2.21 1.79 4 4 4 3.314 0 6 2.686 6 6 0 2.21 1.79 4 4 4v2c-3.314 0-6-2.686-6-6 0-2.21-1.79-4-4-4-3.314 0-6-2.686-6-6zm25.464-1.95l8.486 8.486-1.414 1.414-8.486-8.486 1.414-1.414z' /%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
 }
 
 ::-webkit-scrollbar {
@@ -698,6 +698,13 @@ input {
                     <div class="bubble bubble-left">很抱歉，由于程序出现未知错误，您的聊天记录未能成功展示。<br/>您可以关注下方微信公众号，<b>回复：联系方式</b>，获取QQ交流群群号，并在群内寻求帮助。
                     </div>
                 </div>
+                <div class="item item-left">
+                    <div class="avatar">
+                        <img src="https://blog.lc044.love/static/img/a774ab7a32635db7b4254c8ff7caaa89.Camera_XHS_16984826124131040g2sg30qo1ggopgqe05oce.webp">
+                    </div>
+                    <div class="bubble bubble-left">您可自行排查问题所在，例如只选择文本或图片，反馈时请说明哪种消息类型出现了问题！！！
+                    </div>
+                </div>
                 <div class="item item-left">
                     <div class="avatar">
                         <img src="https://blog.lc044.love/static/img/a774ab7a32635db7b4254c8ff7caaa89.Camera_XHS_16984826124131040g2sg30qo1ggopgqe05oce.webp"
diff --git a/app/ui/contact/export/export_dialog.py b/app/ui/contact/export/export_dialog.py
index bb354f8..49f01c2 100644
--- a/app/ui/contact/export/export_dialog.py
+++ b/app/ui/contact/export/export_dialog.py
@@ -55,7 +55,7 @@ class ExportDialog(QDialog, Ui_Dialog):
         if file_type == 'html':
             self.export_type = Output.HTML
             self.export_choices = {"文本": True, "图片": True, "语音": False, "视频": False, "表情包": False,
-                                   '音乐与音频': False, '分享卡片': False, '文件': False, '转账': False, '音视频通话': False,
+                                   '音乐与音频': False, '分享卡片': False, '文件': False,  '音视频通话': False,
                                    '拍一拍等系统消息': True}  # 定义导出的数据类型，默认全部选择
         elif file_type == 'csv':
             self.export_type = Output.CSV
diff --git a/app/ui/mainview.py b/app/ui/mainview.py
index 1725ebb..31d9fc6 100644
--- a/app/ui/mainview.py
+++ b/app/ui/mainview.py
@@ -11,8 +11,8 @@ import json
 import os.path
 import traceback
 
-from PyQt5.QtCore import pyqtSignal, QThread, QSize
-from PyQt5.QtGui import QPixmap, QIcon
+from PyQt5.QtCore import pyqtSignal, QThread, QSize, QUrl
+from PyQt5.QtGui import QPixmap, QIcon, QDesktopServices
 from PyQt5.QtWidgets import QMainWindow, QLabel, QMessageBox
 
 from app.DataBase import misc_db, micro_msg_db, close_db
@@ -189,6 +189,8 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow, QCursorGif):
         self.setCursorTimeout(100)
         self.startBusy()
         self.action_update.triggered.connect(self.update)
+        self.action_help_faq.triggered.connect(
+            lambda: QDesktopServices.openUrl(QUrl("https://blog.lc044.love/post/7")))
         self.about_view = AboutDialog(main_window=self, parent=self)
 
     def setCurrentIndex(self, row):
diff --git a/app/ui/mainwindow.py b/app/ui/mainwindow.py
index 55d8c7b..c701914 100644
--- a/app/ui/mainwindow.py
+++ b/app/ui/mainwindow.py
@@ -130,6 +130,8 @@ class Ui_MainWindow(object):
         self.action_batch_export.setObjectName("action_batch_export")
         self.action_update = QtWidgets.QAction(MainWindow)
         self.action_update.setObjectName("action_update")
+        self.action_help_faq = QtWidgets.QAction(MainWindow)
+        self.action_help_faq.setObjectName("action_help_faq")
         self.menu_F.addSeparator()
         self.menu_F.addSeparator()
         self.menu_F.addAction(self.action_3)
@@ -141,6 +143,7 @@ class Ui_MainWindow(object):
         self.menu_2.addAction(self.action_help_decrypt)
         self.menu_2.addAction(self.action_help_chat)
         self.menu_2.addAction(self.action_help_contact)
+        self.menu_2.addAction(self.action_help_faq)
         self.menu_about.addAction(self.action_desc)
         self.menu_about.addAction(self.action_update)
         self.menubar.addAction(self.menu_F.menuAction())
@@ -183,3 +186,4 @@ class Ui_MainWindow(object):
         self.action_output_contacts.setText(_translate("MainWindow", "导出联系人"))
         self.action_batch_export.setText(_translate("MainWindow", "批量导出"))
         self.action_update.setText(_translate("MainWindow", "检查更新"))
+        self.action_help_faq.setText(_translate("MainWindow", "问题解答"))
diff --git a/app/web_ui/templates/christmas.html b/app/web_ui/templates/christmas.html
index dda6d80..d5ca907 100644
--- a/app/web_ui/templates/christmas.html
+++ b/app/web_ui/templates/christmas.html
@@ -242,7 +242,7 @@
 </div>
   <script>
         function confirmUpload() {
-            var userConfirmed = confirm("注意！！！\n本页面将会上传至服务器，别人可通过链接查看该网页，该操作不会上传您的其他任何信息，页面将在下个版本更新之后删除，请注意链接生效时间。\n点击“确认”代表您同意上传至服务器，如不同意请点击取消");
+            var userConfirmed = confirm("注意！！！\n本页面将会上传至云端，别人可通过链接查看该网页，该操作不会上传您的其他任何信息，页面将在下个版本更新之后删除，请注意链接生效时间。\n点击“确认”代表您同意上传，否则请点击“取消");
 
             if (userConfirmed) {
                 // User clicked OK, perform the upload and display QR code