Merge remote-tracking branch 'origin/wr_202303' into wr_202303

# Conflicts:
#	lib/im/database/hx_database.dart

lib/im/SocketClient.dart

@@ -55,8 +55,9 @@ class SocketClient {
 
   heartbeat() {
     Timer.periodic(const Duration(milliseconds: 30000), (timer) {
-      debugPrint("heartbeat: ${DateTime.now().millisecondsSinceEpoch}");
+      int milliseTime = DateTime.now().millisecondsSinceEpoch;
-      Uint8List data = utf8.encode(jsonEncode({"heartbeat": DateTime.now().millisecondsSinceEpoch}));
+      debugPrint("heartbeat: ${milliseTime}");
+      Uint8List data = utf8.encode(jsonEncode({"heartbeat": milliseTime}));
       MsgData msgData = MsgData(from: userId, type: MsgType.TEXT, data: data);
       final proto2 = Proto(3, 1, msgData.writeToBuffer());
       _socket.add(proto2.toBytes());

lib/im/database/hx_database.dart

@@ -65,7 +65,6 @@ class HxDatabase {
     await _dbIsOpen();
     String sql =
         'SELECT * FROM (SELECT * FROM Message WHERE toId = ? OR fromId = ? ORDER BY time DESC) mm GROUP BY mm.toId,mm.fromId';
-    debugPrint("66666666666$sql");
     return db.rawQuery(sql, [userId, userId]).then((value) {
       return value.map((e) {
         debugPrint("Message: ${e}");
@@ -88,16 +87,13 @@ class HxDatabase {
     });
   }
 
-  Future<Map<String, int>> messageUnreadCount(
+  Future<Map<String, int>> messageUnreadCount(List<String> userIds, String selfUserId) async {
-      List<String> userIds, String selfUserId) async {
     await _dbIsOpen();
-    List<Message> messages = await db
+    String userStr = userIds.join(",");
-        .query("Message",
+    debugPrint("userStr: $userStr");
-            where: 'fromId IN (?) AND toId = ? AND state = 0 AND isDelete = 0',
+    List<Message> messages = await db.rawQuery(
-            whereArgs: []
+      "SELECT * FROM Message WHERE fromId IN ($userStr) AND toId = $selfUserId AND state = 0 AND isDelete = 0",
-              ..addAll(userIds)
+    ).then((value) {
-              ..add(selfUserId))
-        .then((value) {
       return value.map((e) => Message.fromJson(e)).toList();
     }, onError: (error) {
       debugPrint("Message-error: $error");

lib/im/im_view/im_page.dart

@@ -144,6 +144,7 @@ class _IMPage extends State<IMPage> implements OnChatMessage {
   /// update conversation unreadcount
   queryUnreadCount(userIds, userId) async {
     unreadCountMap = await hxDatabase.messageUnreadCount(userIds, userId);
+    debugPrint("unreadCount: $unreadCountMap");
   }
 
   /// update imuser info by mids