optimize service coe

android/build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     ext.kotlin_version = '1.7.10'
     repositories {
-        // google()
+        google()
         mavenCentral()
     }
 
@@ -13,7 +13,7 @@ buildscript {
 
 allprojects {
     repositories {
-        // google()
+         google()
         mavenCentral()
     }
 }

android/gradle.properties

@@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
 
-systemProp.http.proxyHost=localhost
-systemProp.http.proxyPort=4781
-
-systemProp.https.proxyHost=localhost
-systemProp.https.proxyPort=4781
+#systemProp.http.proxyHost=localhost
+#systemProp.http.proxyPort=4780
+#
+#systemProp.https.proxyHost=localhost
+#systemProp.https.proxyPort=4780

lib/constant/enums.dart

@@ -1,5 +1,6 @@
 /// 消息类型
 enum MsgType {
+  heartbeat(0, '心跳检测'),
   loginMsg(1, '登录消息'),
   txtMsg(2, '文本'),
   picMsg(3, '图片'),

lib/model/chat_record.dart

@@ -18,6 +18,8 @@ part 'chat_record.g.dart';
 class ChatRecord {
   int? id;
 
+  int? uid;
+
   int? targetId;
 
   String? targetName;
@@ -42,6 +44,7 @@ class ChatRecord {
 
   ChatRecord({
     this.id,
+    this.uid,
     this.targetId,
     this.targetName,
     this.fromId,

lib/store/chat_store.dart

@@ -1,6 +1,7 @@
 import 'package:flutter_cim_plus/constant/enums.dart';
 import 'package:flutter_cim_plus/http/apiservice/api_service.dart';
 import 'package:flutter_cim_plus/model/chat_record.dart';
+import 'package:flutter_cim_plus/model/friend_info.dart';
 import 'package:flutter_cim_plus/utils/database_helper.dart';
 import 'package:get/get.dart';
 
@@ -48,6 +49,17 @@ class ChatStore extends GetxController {
 
   /// 监听消息记录
   Future<void> receiveMsg(ChatRecord record) async {
+    // 从库里面获取对应的对象用户信息
+    if (record.chatType == ChatType.p2p.code) {
+      List<FriendInfo> existFriend =
+          await DatabaseHelper().getFriendList(uid: record.uid);
+      if (existFriend.isNotEmpty) {
+        FriendInfo info = existFriend[0];
+        record.fromId = info.userId;
+        record.fromName = info.nickname;
+        record.fromAvatar = info.avatar;
+      }
+    }
     await DatabaseHelper().insertRecord(record);
     _chatList.clear();
     loadChatList(page, size, LogicType.normal.code);

lib/style/refresh_constants.dart

@@ -0,0 +1,16 @@
+import 'package:easy_refresh/easy_refresh.dart';
+
+class RefreshConstants {
+  static ClassicHeader buildZhHeaders() {
+    return const ClassicHeader(
+      dragText: '下拉开始刷新',
+      armedText: '松开开始刷新',
+      readyText: '准备开始刷新',
+      processedText: '刷新完成',
+      processingText: '拼命加载中...',
+      failedText: 'GG，刷新失败',
+      messageText: '上次更新时间%T',
+      noMoreText: '已经没有更多数据啦！',
+    );
+  }
+}

lib/style/txt_style.dart

@@ -0,0 +1,18 @@
+import 'package:flutter/material.dart';
+
+class TxtStyle {
+  static TextStyle? titleS({
+    double size = 17,
+    FontWeight fWeight = FontWeight.w600,
+  }) {
+    return TextStyle(fontSize: size, fontWeight: fWeight);
+  }
+
+  static TextStyle? contentS({
+    double size = 13,
+    FontWeight fWeight = FontWeight.w400,
+    Color? color,
+  }) {
+    return TextStyle(fontSize: size, fontWeight: fWeight, color: color);
+  }
+}

lib/utils/database_helper.dart

@@ -4,6 +4,7 @@ import 'package:sqflite/sqflite.dart';
 
 import '../constant/enums.dart';
 import '../model/chat_record.dart';
+import '../model/friend_info.dart';
 
 class DatabaseHelper {
   static final DatabaseHelper _instance = DatabaseHelper._internal();
@@ -21,6 +22,7 @@ class DatabaseHelper {
   }
 
   /// id:消息记录id
+  /// uid:对话对象的id
   /// targetId：对象id，可以是用户id，群id
   /// targetName: 对象名称，可以是用户名称，群名称
   /// avatar： 头像
@@ -35,9 +37,18 @@ class DatabaseHelper {
   static Future<Database> initializeDatabase() async {
     String path = join(await getDatabasesPath(), 'cim-plus.db');
     return openDatabase(path, version: 1, onCreate: (db, version) async {
+      await db.execute("""
+      CREATE TABLE friends (
+       userId INTEGER PRIMARY KEY,
+       nickname TEXT NOT NULL,
+       remark TEXT,
+       avatar TEXT
+      );
+      """);
       await db.execute("""
         CREATE TABLE chat_records (
           id INTEGER PRIMARY KEY AUTOINCREMENT,
+          uid INTEGER NOT NULL,
           targetId INTEGER NOT NULL,
           targetName TEXT NOT NULL,
           avatar TEXT,
@@ -68,8 +79,8 @@ class DatabaseHelper {
     record.logicType = LogicType.normal.code;
     // 删除旧的逻辑数据并插入新的数据
     await db.delete('chat_records',
-        where: 'targetId = ? and logicType = ?',
-        whereArgs: [record.targetId, record.logicType]);
+        where: 'uid = ? and logicType = ?',
+        whereArgs: [record.uid, record.logicType]);
     await db.insert('chat_records', record.toJson());
   }
 
@@ -93,14 +104,15 @@ class DatabaseHelper {
 
   /// 获取指定用户的对话记录
   Future<List<ChatRecord>> getConversionList(
-      int page, int size, int userId) async {
+    int page,
+    int size,
+    int userId, {
+    LogicType logicType = LogicType.friend,
+  }) async {
     final db = await database;
     final List<Map<String, dynamic>> maps = await db.query('chat_records',
-        where: 'logicType = 1 and (targetId = ? or fromId = ?)',
-        whereArgs: [
-          userId,
-          userId,
-        ],
+        where: 'logicType = ? and uid = ?',
+        whereArgs: [logicType.code, userId],
         orderBy: 'createTime DESC',
         limit: size,
         offset: (page - 1) * size);
@@ -122,4 +134,38 @@ class DatabaseHelper {
     );
     LogI("清除消息成功！清除消息条数：$num");
   }
+
+  /// ------------------同步数据到本地数据库----------------------
+  /// 插入朋友信息列表到数据库
+  Future<void> insertFriendList(List<FriendInfo>? infos) async {
+    if (infos != null && infos.isNotEmpty) {
+      final db = await database;
+      // 先清空所有数据
+      db.delete('friends');
+      // 发起批量插入
+      Batch batch = db.batch();
+      for (FriendInfo info in infos) {
+        batch.insert('friends', info.toMap());
+      }
+      batch.commit(noResult: true);
+    }
+  }
+
+  /// 批量获取好友信息
+  Future<List<FriendInfo>> getFriendList({int? uid}) async {
+    final db = await database;
+    final List<Map<String, dynamic>> maps;
+    if (uid == null) {
+      maps = await db.query('friends', orderBy: 'nickname desc');
+    } else {
+      maps = await db.query(
+        'friends',
+        where: 'userId = ?',
+        whereArgs: [uid],
+        orderBy: 'nickname desc',
+      );
+    }
+    return List.generate(
+        maps.length, (index) => FriendInfo.fromJson(maps[index]));
+  }
 }

lib/utils/time_util.dart

@@ -0,0 +1,18 @@
+class TimeUtil {
+  static String formatTimeAgo(int timestamp) {
+    DateTime now = DateTime.now();
+    DateTime targetTime = DateTime.fromMillisecondsSinceEpoch(timestamp);
+
+    Duration difference = now.difference(targetTime);
+
+    if (difference.inDays > 0) {
+      return '${difference.inDays} 天前';
+    } else if (difference.inHours > 0) {
+      return '${difference.inHours} 小时前';
+    } else if (difference.inMinutes > 0) {
+      return '${difference.inMinutes} 分钟前';
+    } else {
+      return '刚刚';
+    }
+  }
+}

lib/view/chat/chat_page.dart

@@ -2,6 +2,9 @@ import 'package:easy_refresh/easy_refresh.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bounce/flutter_bounce.dart';
 import 'package:flutter_cim_plus/model/chat_record.dart';
+import 'package:flutter_cim_plus/style/refresh_constants.dart';
+import 'package:flutter_cim_plus/style/txt_style.dart';
+import 'package:flutter_cim_plus/utils/time_util.dart';
 import 'package:flutter_cim_plus/view/chat/chat_controller.dart';
 import 'package:flutter_cim_plus/widget/net_image_cached.dart';
 import 'package:get/get.dart';
@@ -15,13 +18,11 @@ class ChatPage extends GetView<ChatController> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
-        title: const Text('聊天'),
-        centerTitle: true,
-      ),
+      appBar: AppBar(title: const Text('聊天'), centerTitle: true),
       body: GetX<ChatController>(
         builder: (controller) => EasyRefresh(
           controller: controller.refreshController,
+          header: RefreshConstants.buildZhHeaders(),
           onRefresh: () => controller.initChatRecords(LogicType.normal.code),
           child: _buildFriendItems(),
         ),
@@ -33,13 +34,46 @@ class ChatPage extends GetView<ChatController> {
     return ListView.separated(
       itemBuilder: (_, index) {
         ChatRecord record = ChatStore.to.chatList[index];
+        bool isFrom = record.uid == record.fromId;
         return Bounce(
           duration: const Duration(milliseconds: 200),
           onPressed: () => controller.toDetail(record),
-          child: ListTile(
-            leading: netImageCached(record.avatar ?? ''),
-            title: Text(record.targetName ?? ''),
-            subtitle: Text(record.content ?? ''),
+          child: Container(
+            decoration: const BoxDecoration(border: Border()),
+            padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+            child: Row(
+              children: [
+                netImageCached(
+                    isFrom ? record.fromAvatar ?? '' : record.avatar ?? ''),
+                const SizedBox(width: 10),
+                Expanded(
+                  child: SizedBox(
+                    height: 50,
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Text(
+                          isFrom
+                              ? record.fromName ?? ''
+                              : record.targetName ?? '',
+                          style: TxtStyle.titleS(),
+                        ),
+                        Text(
+                          record.content ?? '',
+                          style: TxtStyle.contentS(),
+                          maxLines: 1,
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+                Text(
+                  TimeUtil.formatTimeAgo(record.createTime!),
+                  style: TxtStyle.contentS(color: Colors.white30),
+                )
+              ],
+            ),
           ),
         );
       },

lib/view/chat/detail/chat_view.dart

@@ -72,6 +72,7 @@ class _ChatViewState extends State<ChatView> {
     LogI(editViewController.text);
     ChatRecord record = ChatRecord(
       avatar: widget.avatar,
+      uid: int.parse(widget.id),
       targetId: int.parse(widget.id),
       targetName: widget.title,
       content: editViewController.text,

lib/view/friend/friend_controller.dart

@@ -1,7 +1,9 @@
 import 'package:easy_refresh/easy_refresh.dart';
 import 'package:flutter_cim_plus/http/apiservice/api_service.dart';
 import 'package:flutter_cim_plus/model/base_entity.dart';
+import 'package:flutter_cim_plus/utils/database_helper.dart';
 import 'package:flutter_cim_plus/utils/log_utils.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 
 import '../../model/friend_info.dart';
@@ -21,10 +23,22 @@ class FriendController extends GetxController {
     super.onInit();
   }
 
-  Future<void> initFriendData() async {
+  Future<void> refreshFriends() async {
     BaseEntity<List<FriendInfo>> res = await ApiService().getMyFriends();
     if (res.code == 0 && res.data != null && res.data!.isNotEmpty) {
       friendList.value = res.data!;
+      // 开始同步数据到本地数据库
+      DatabaseHelper().insertFriendList(res.data);
+    }
+    Fluttertoast.showToast(msg: '刷新成功！');
+  }
+
+  Future<void> initFriendData() async {
+    List<FriendInfo> friends = await DatabaseHelper().getFriendList();
+    if (friends.isNotEmpty) {
+      friendList.value = friends;
+    } else {
+      refreshFriends();
     }
   }
 

lib/view/friend/friend_page.dart

@@ -1,6 +1,7 @@
 import 'package:easy_refresh/easy_refresh.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bounce/flutter_bounce.dart';
+import 'package:flutter_cim_plus/style/refresh_constants.dart';
 import 'package:flutter_cim_plus/widget/net_image_cached.dart';
 import 'package:get/get.dart';
 
@@ -33,7 +34,8 @@ class FriendPage extends GetView<FriendController> {
       ),
       body: GetX<FriendController>(
         builder: (controller) => EasyRefresh(
-          onRefresh: controller.initFriendData,
+          header: RefreshConstants.buildZhHeaders(),
+          onRefresh: controller.refreshFriends,
           child: ListView.separated(
             itemBuilder: (item, index) {
               FriendInfo info = controller.friendList[index];