Merge pull request #95 from flipped-1121/master

读取消息记录数

app/DataBase/msg.py

@@ -87,6 +87,24 @@ class Msg:
         result.sort(key=lambda x: x[5])
         return result
 
+    def get_messages_length(self):
+        sql = '''
+            select count(*)
+            from MSG
+        '''
+        if not self.open_flag:
+            return None
+        try:
+            lock.acquire(True)
+            self.cursor.execute(sql)
+            result = self.cursor.fetchone()
+        except Exception as e:
+            result = None
+        finally:
+            lock.release()
+        return result[0]
+
+
     def get_message_by_num(self, username_, local_id):
         sql = '''
                 select localId,TalkerId,Type,SubType,IsSender,CreateTime,Status,StrContent,strftime('%Y-%m-%d %H:%M:%S',CreateTime,'unixepoch','localtime') as StrTime

app/components/bubble_message.py

@@ -17,6 +17,8 @@ class TextMessage(QLabel):
     heightSingal = pyqtSignal(int)
 
     def __init__(self, text, is_send=False, parent=None):
+        if isinstance(text, bytes):
+            text = text.decode('utf-8')
         super(TextMessage, self).__init__(text, parent)
         font = QFont('微软雅黑', 12)
         self.setFont(font)

app/ui_pc/chat/chat_info.py

@@ -142,7 +142,7 @@ class ShowChatThread(QThread):
     # heightSingal = pyqtSignal(int)
     def __init__(self, contact):
         super().__init__()
-        self.last_message_id = 9999999
+        self.last_message_id = msg_db.get_messages_length() or 9999999
         self.wxid = contact.wxid
 
     def run(self) -> None: