1. 修改首页分页逻辑。

2. 修改好友列表。
3. 修改IM整体逻辑

lib/controller/home/home_controller.dart

@@ -125,23 +125,27 @@ class HomeController extends GetxController {
     
     try {
       recommendIsLoading.value = true;
-      recommendPage.value++;
+      final nextPage = recommendPage.value + 1;
+      print('推荐列表加载更多 - 当前页: ${recommendPage.value}, 下一页: $nextPage');
       
       // 获取推荐数据 (type=0)
       final result = await _fetchMarriageData(
-        pageNum: recommendPage.value,
+        pageNum: nextPage,
         type: 0,
       );
       
+      // 更新页码
+      recommendPage.value = nextPage;
+      
       // 更新推荐列表
       recommendFeed.addAll(result['records']);
       
       // 根据返回的分页信息判断是否还有更多数据
-      final int currentPage = result['current'] ?? recommendPage.value;
-      final int totalPages = result['pages'] ?? recommendPage.value;
+      final int currentPage = result['current'] as int;
+      final int totalPages = result['pages'] as int;
       recommendHasMore.value = currentPage < totalPages;
+      print('推荐列表加载更多完成 - 当前页: $currentPage, 总页数: $totalPages, 还有更多: ${recommendHasMore.value}');
     } catch (e) {
-      recommendPage.value--; // 回退页码
       _handleError('加载推荐更多异常', e, '加载更多失败');
     } finally {
       recommendIsLoading.value = false;
@@ -154,23 +158,27 @@ class HomeController extends GetxController {
     
     try {
       nearbyIsLoading.value = true;
-      nearbyPage.value++;
+      final nextPage = nearbyPage.value + 1;
+      print('同城列表加载更多 - 当前页: ${nearbyPage.value}, 下一页: $nextPage');
       
       // 获取同城数据 (type=1)
       final result = await _fetchMarriageData(
-        pageNum: nearbyPage.value,
+        pageNum: nextPage,
         type: 1,
       );
       
+      // 更新页码
+      nearbyPage.value = nextPage;
+      
       // 更新同城列表
       nearbyFeed.addAll(result['records']);
       
       // 根据返回的分页信息判断是否还有更多数据
-      final int currentPage = result['current'] ?? nearbyPage.value;
-      final int totalPages = result['pages'] ?? nearbyPage.value;
+      final int currentPage = result['current'] as int;
+      final int totalPages = result['pages'] as int;
       nearbyHasMore.value = currentPage < totalPages;
+      print('同城列表加载更多完成 - 当前页: $currentPage, 总页数: $totalPages, 还有更多: ${nearbyHasMore.value}');
     } catch (e) {
-      nearbyPage.value--; // 回退页码
       _handleError('加载同城更多异常', e, '加载更多失败');
     } finally {
       nearbyIsLoading.value = false;
@@ -270,6 +278,7 @@ class HomeController extends GetxController {
     required int type,
   }) async {
     try {
+      print('_fetchMarriageData - pageNum: $pageNum, pageSize: $pageSize, type: $type');
       // 调用API获取数据
       var response = await _homeApi.getMarriageList(
         pageNum: pageNum,
@@ -297,6 +306,8 @@ class HomeController extends GetxController {
             .map((item) => MarriageData.fromJson(item as Map<String, dynamic>))
             .toList();
         
+        print('_fetchMarriageData 返回 - 请求页码: $pageNum, 返回当前页: ${paginatedData.current}, 总页数: ${paginatedData.pages}, 记录数: ${records.length}');
+        
         return {
           'records': records,
           'current': paginatedData.current,

lib/controller/message/chat_controller.dart

@@ -64,20 +64,39 @@ class ChatController extends GetxController {
   /// 发送消息
   Future<bool> sendMessage(String content) async {
     try {
+      // 先创建消息对象（即使发送失败也要显示在列表中）
+      final tempMessage = EMMessage.createTxtSendMessage(
+        targetId: userId,
+        content: content,
+      );
+      
+      // 将消息添加到列表开头（显示发送中状态）
+      messages.insert(0, tempMessage);
+      update();
+
+      // 尝试发送消息
       final message = await IMManager.instance.sendTextMessage(content, userId);
       if (message != null) {
-        // 发送成功后将消息添加到列表开头
-        messages.insert(0, message);
+        // 发送成功，替换临时消息
+        final index = messages.indexWhere((msg) => msg.msgId == tempMessage.msgId);
+        if (index != -1) {
+          messages[index] = message;
+        }
         update();
         // 更新会话列表
         _refreshConversationList();
         return true;
+      } else {
+        // 发送失败，消息状态会自动变为FAIL
+        update();
+        SmartDialog.showToast('消息发送失败，请点击重发');
+        return false;
       }
-      return false;
     } catch (e) {
       if (Get.isLogEnable) {
         Get.log('发送消息失败: $e');
       }
+      SmartDialog.showToast('消息发送失败: $e');
       return false;
     }
   }
@@ -85,23 +104,43 @@ class ChatController extends GetxController {
   /// 发送图片消息
   Future<bool> sendImageMessage(String imagePath) async {
     try {
+      // 先创建消息对象（即使发送失败也要显示在列表中）
+      final tempMessage = EMMessage.createImageSendMessage(
+        targetId: userId,
+        filePath: imagePath,
+        sendOriginalImage: false,
+      );
+      
+      // 将消息添加到列表开头（显示发送中状态）
+      messages.insert(0, tempMessage);
+      update();
+
+      // 尝试发送消息
       final message = await IMManager.instance.sendImageMessage(
         imagePath,
         userId,
       );
       if (message != null) {
-        // 发送成功后将消息添加到列表开头
-        messages.insert(0, message);
+        // 发送成功，替换临时消息
+        final index = messages.indexWhere((msg) => msg.msgId == tempMessage.msgId);
+        if (index != -1) {
+          messages[index] = message;
+        }
         update();
         // 更新会话列表
         _refreshConversationList();
         return true;
+      } else {
+        // 发送失败，消息状态会自动变为FAIL
+        update();
+        SmartDialog.showToast('图片发送失败，请点击重发');
+        return false;
       }
-      return false;
     } catch (e) {
       if (Get.isLogEnable) {
         Get.log('发送图片消息失败: $e');
       }
+      SmartDialog.showToast('图片发送失败: $e');
       return false;
     }
   }
@@ -109,24 +148,44 @@ class ChatController extends GetxController {
   /// 发送语音消息
   Future<bool> sendVoiceMessage(String filePath, int seconds) async {
     try {
+      // 先创建消息对象（即使发送失败也要显示在列表中）
+      final tempMessage = EMMessage.createVoiceSendMessage(
+        targetId: userId,
+        filePath: filePath,
+        duration: seconds,
+      );
+      
+      // 将消息添加到列表开头（显示发送中状态）
+      messages.insert(0, tempMessage);
+      update();
+
+      // 尝试发送消息
       final message = await IMManager.instance.sendVoiceMessage(
         filePath,
         userId,
         seconds,
       );
       if (message != null) {
-        // 发送成功后将消息添加到列表开头
-        messages.insert(0, message);
+        // 发送成功，替换临时消息
+        final index = messages.indexWhere((msg) => msg.msgId == tempMessage.msgId);
+        if (index != -1) {
+          messages[index] = message;
+        }
         update();
         // 更新会话列表
         _refreshConversationList();
         return true;
+      } else {
+        // 发送失败，消息状态会自动变为FAIL
+        update();
+        SmartDialog.showToast('语音发送失败，请点击重发');
+        return false;
       }
-      return false;
     } catch (e) {
       if (Get.isLogEnable) {
         Get.log('发送语音消息失败: $e');
       }
+      SmartDialog.showToast('语音发送失败: $e');
       return false;
     }
   }
@@ -209,6 +268,14 @@ class ChatController extends GetxController {
   /// 获取消息列表
   Future<void> fetchMessages({bool loadMore = false}) async {
     try {
+      // 如果加载更多但没有游标，说明已经加载完所有消息
+      if (loadMore && _cursor == null) {
+        if (Get.isLogEnable) {
+          Get.log('没有更多消息了');
+        }
+        return;
+      }
+
       final List<EMMessage?> fetchedMessages = await IMManager.instance
           .getMessages(
             userId,
@@ -222,24 +289,43 @@ class ChatController extends GetxController {
           .toList();
 
       if (loadMore) {
-        // 加载更多时添加到列表末尾
-        messages.addAll(validMessages);
+        // 加载更多时，需要去重并添加到列表末尾
+        // 因为ListView是reverse的，所以末尾是更旧的消息
+        final existingMsgIds = messages.map((msg) => msg.msgId).toSet();
+        final newMessages = validMessages
+            .where((msg) => !existingMsgIds.contains(msg.msgId))
+            .toList();
+        
+        if (newMessages.isNotEmpty) {
+          messages.addAll(newMessages);
+          // 更新游标为最旧的消息ID（列表末尾）
+          _cursor = newMessages.last.msgId;
+          if (Get.isLogEnable) {
+            Get.log('加载更多消息成功，新增: ${newMessages.length} 条，总数量: ${messages.length}');
+          }
+        } else {
+          // 没有新消息，说明已经加载完所有消息
+          _cursor = null;
+          if (Get.isLogEnable) {
+            Get.log('没有更多消息了');
+          }
+        }
       } else {
         // 刷新时替换整个列表
         messages.assignAll(validMessages);
+        // 更新游标为最旧的消息ID（列表末尾）
+        if (validMessages.isNotEmpty) {
+          _cursor = validMessages.last.msgId;
+        } else {
+          _cursor = null;
+        }
+        if (Get.isLogEnable) {
+          Get.log('刷新消息成功，数量: ${validMessages.length}');
+        }
       }
 
       // 通知UI更新
       update();
-
-      // 更新游标
-      if (validMessages.isNotEmpty) {
-        _cursor = validMessages.last.msgId;
-      }
-
-      if (Get.isLogEnable) {
-        Get.log('获取消息成功，数量: ${validMessages.length}');
-      }
     } catch (e) {
       if (Get.isLogEnable) {
         Get.log('获取消息失败: $e');
@@ -254,6 +340,11 @@ class ChatController extends GetxController {
     }
   }
 
+  /// 检查是否还有更多消息可以加载
+  bool hasMoreMessages() {
+    return _cursor != null;
+  }
+
   /// 添加接收到的消息
   void addReceivedMessage(EMMessage message) {
     // 检查消息是否已存在（避免重复添加）
@@ -270,6 +361,195 @@ class ChatController extends GetxController {
     }
   }
 
+  /// 撤回消息
+  Future<bool> recallMessage(EMMessage message) async {
+    try {
+      final success = await IMManager.instance.recallMessage(message);
+      if (success) {
+        // 从消息列表中移除或更新消息
+        final index = messages.indexWhere((msg) => msg.msgId == message.msgId);
+        if (index != -1) {
+          // 可以保留消息但标记为已撤回，或者直接移除
+          // 这里选择移除消息
+          messages.removeAt(index);
+          update();
+        }
+        // 更新会话列表
+        _refreshConversationList();
+        SmartDialog.showToast('消息已撤回');
+        return true;
+      }
+      return false;
+    } catch (e) {
+      if (Get.isLogEnable) {
+        Get.log('撤回消息失败: $e');
+      }
+      SmartDialog.showToast('撤回消息失败');
+      return false;
+    }
+  }
+
+  /// 删除消息
+  Future<bool> deleteMessage(EMMessage message, {bool deleteRemote = false}) async {
+    try {
+      final conversationId = message.conversationId ?? userId;
+      final messageId = message.msgId;
+      if (messageId.isEmpty) {
+        if (Get.isLogEnable) {
+          Get.log('消息ID为空，无法删除');
+        }
+        return false;
+      }
+      final success = await IMManager.instance.deleteMessage(conversationId, messageId, deleteRemote: deleteRemote);
+      if (success) {
+        // 从消息列表中移除
+        final index = messages.indexWhere((msg) => msg.msgId == message.msgId);
+        if (index != -1) {
+          messages.removeAt(index);
+          update();
+        }
+        // 更新会话列表
+        _refreshConversationList();
+        SmartDialog.showToast('消息已删除');
+        return true;
+      }
+      return false;
+    } catch (e) {
+      if (Get.isLogEnable) {
+        Get.log('删除消息失败: $e');
+      }
+      SmartDialog.showToast('删除消息失败');
+      return false;
+    }
+  }
+
+  /// 标记消息为已读
+  Future<bool> markMessageAsRead(String messageId) async {
+    try {
+      final success = await IMManager.instance.markMessageAsRead(userId, messageId);
+      if (success) {
+        // 更新消息的已读状态
+        final index = messages.indexWhere((msg) => msg.msgId == messageId);
+        if (index != -1) {
+          update();
+        }
+        // 更新会话列表
+        _refreshConversationList();
+        return true;
+      }
+      return false;
+    } catch (e) {
+      if (Get.isLogEnable) {
+        Get.log('标记消息为已读失败: $e');
+      }
+      return false;
+    }
+  }
+
+  /// 标记会话所有消息为已读
+  Future<bool> markAllMessagesAsRead() async {
+    try {
+      final success = await IMManager.instance.markAllMessagesAsRead(userId);
+      if (success) {
+        // 更新所有消息的已读状态
+        update();
+        // 更新会话列表
+        _refreshConversationList();
+        return true;
+      }
+      return false;
+    } catch (e) {
+      if (Get.isLogEnable) {
+        Get.log('标记所有消息为已读失败: $e');
+      }
+      return false;
+    }
+  }
+
+  /// 处理消息撤回通知
+  void handleMessageRecalled(EMMessage message) {
+    try {
+      // 从消息列表中移除或更新消息
+      final index = messages.indexWhere((msg) => msg.msgId == message.msgId);
+      if (index != -1) {
+        messages.removeAt(index);
+        update();
+      }
+      // 更新会话列表
+      _refreshConversationList();
+      if (Get.isLogEnable) {
+        Get.log('处理消息撤回: ${message.msgId}');
+      }
+    } catch (e) {
+      if (Get.isLogEnable) {
+        Get.log('处理消息撤回失败: $e');
+      }
+    }
+  }
+
+  /// 更新消息状态
+  void updateMessageStatus(EMMessage message, MessageStatus status) {
+    try {
+      final index = messages.indexWhere((msg) => msg.msgId == message.msgId);
+      if (index != -1) {
+        // 更新消息状态
+        update();
+        if (Get.isLogEnable) {
+          Get.log('更新消息状态: ${message.msgId}, status=$status');
+        }
+      }
+    } catch (e) {
+      if (Get.isLogEnable) {
+        Get.log('更新消息状态失败: $e');
+      }
+    }
+  }
+
+  /// 检查消息是否发送失败
+  bool isMessageFailed(EMMessage message) {
+    return message.status == MessageStatus.FAIL;
+  }
+
+  /// 重发消息
+  Future<bool> resendMessage(EMMessage failedMessage) async {
+    try {
+      if (Get.isLogEnable) {
+        Get.log('🔄 [ChatController] 开始重发消息: ${failedMessage.msgId}');
+      }
+
+      // 调用IMManager的重发方法
+      final newMessage = await IMManager.instance.resendMessage(failedMessage);
+      if (newMessage != null) {
+        // 找到原消息并替换
+        final index = messages.indexWhere((msg) => msg.msgId == failedMessage.msgId);
+        if (index != -1) {
+          messages[index] = newMessage;
+          update();
+          if (Get.isLogEnable) {
+            Get.log('✅ [ChatController] 消息重发成功');
+          }
+          // 更新会话列表
+          _refreshConversationList();
+          SmartDialog.showToast('消息已重发');
+          return true;
+        }
+      } else {
+        if (Get.isLogEnable) {
+          Get.log('❌ [ChatController] 消息重发失败');
+        }
+        SmartDialog.showToast('消息重发失败，请重试');
+        return false;
+      }
+      return false;
+    } catch (e) {
+      if (Get.isLogEnable) {
+        Get.log('❌ [ChatController] 重发消息异常: $e');
+      }
+      SmartDialog.showToast('重发消息失败: $e');
+      return false;
+    }
+  }
+
   /// 刷新会话列表
   void _refreshConversationList() {
     try {

lib/controller/message/conversation_controller.dart

@@ -1,5 +1,4 @@
 import 'package:get/get.dart';
-import 'package:get_storage/get_storage.dart';
 import 'package:im_flutter_sdk/im_flutter_sdk.dart';
 import '../../im/im_manager.dart';
 
@@ -30,7 +29,6 @@ class ConversationController extends GetxController {
       final List<EMConversation> convList = await IMManager.instance.getConversations();
       // 更新会话列表
       conversations.value = convList;
-      await IMManager.instance.sendTextMessage('你好啊啊', '1114267797208305664');
 
       // 使用GetX日志系统
       if (Get.isLogEnable) {
@@ -55,22 +53,17 @@ class ConversationController extends GetxController {
   /// 获取会话的最新消息
   String getLastMessageContent(EMMessage? message) {
     if(message?.body.type == MessageType.TXT){
-      EMTextMessageBody body = message?.body as EMTextMessageBody;
+      final body = message?.body as EMTextMessageBody;
       return body.content;
     }else if(message?.body.type == MessageType.IMAGE){
-      EMImageMessageBody body = message?.body as EMImageMessageBody;
       return '[图片]';
     }else if(message?.body.type == MessageType.VOICE){
-      EMVoiceMessageBody body = message?.body as EMVoiceMessageBody;
       return '[语音]';
     }else if(message?.body.type == MessageType.VIDEO){
-      EMVideoMessageBody body = message?.body as EMVideoMessageBody;
       return '[视频]';
     }else if(message?.body.type == MessageType.FILE){
-      EMFileMessageBody body = message?.body as EMFileMessageBody;
       return '[文件]';
     }else if(message?.body.type == MessageType.LOCATION){
-      EMLocationMessageBody body = message?.body as EMLocationMessageBody;
       return '[位置]';
     }
     return '暂无消息';

lib/im/im_manager.dart

@@ -17,6 +17,11 @@ class IMManager {
   static IMManager get instance => _instance;
 
   bool _isInitialized = false;
+  bool _listenersRegistered = false;
+
+  // 监听器标识符
+  static const String _connectionHandlerKey = 'im_manager_connection_handler';
+  static const String _chatHandlerKey = 'im_manager_chat_handler';
 
   // 存储活跃的 ChatController 实例，key 为 userId
   final Map<String, ChatController> _activeChatControllers = {};
@@ -55,75 +60,77 @@ class IMManager {
   // 注册监听器
   void _registerListeners() {
     try {
-      // 消息监听器
+      // 防止重复注册
+      if (_listenersRegistered) {
+        if (Get.isLogEnable) {
+          Get.log('监听器已注册，跳过重复注册');
+        }
+        return;
+      }
 
       // 连接监听器
       EMClient.getInstance.addConnectionEventHandler(
-        '',
+        _connectionHandlerKey,
         EMConnectionEventHandler(
           onConnected: () {
-            print('Connected to IM server');
+            if (Get.isLogEnable) {
+              Get.log('✅ [IMManager] 已连接到IM服务器');
+            }
           },
           onDisconnected: () {
-            print('Disconnected from IM server:');
+            if (Get.isLogEnable) {
+              Get.log('❌ [IMManager] 与IM服务器断开连接');
+            }
+            // TODO: 可以在这里添加自动重连逻辑
           },
           onTokenDidExpire: () {
-            print('IM token about to expire');
+            if (Get.isLogEnable) {
+              Get.log('⚠️ [IMManager] IM token即将过期');
+            }
+            // TODO: 可以在这里添加自动刷新token的逻辑
           },
           onUserKickedByOtherDevice: () {
-            print('User kicked out of IM server');
+            if (Get.isLogEnable) {
+              Get.log('⚠️ [IMManager] 用户被其他设备踢出');
+            }
+            // TODO: 可以在这里添加处理逻辑，如跳转到登录页
           },
         ),
       );
+
+      // 消息监听器
       EMClient.getInstance.chatManager.addEventHandler(
-        // EMChatEventHandler 对应的 key。
-        "",
+        _chatHandlerKey,
         EMChatEventHandler(
           onMessagesReceived: (messages) {
+            if (Get.isLogEnable) {
+              Get.log('📨 [IMManager] 收到 ${messages.length} 条新消息');
+            }
             // 收到新消息时，更新会话列表
             _refreshConversationList();
-
             // 通知对应的 ChatController 更新消息列表
             _notifyChatControllers(messages);
-
-            for (var msg in messages) {
-              switch (msg.body.type) {
-                case MessageType.TXT:
-                  {}
-                  break;
-                case MessageType.IMAGE:
-                  {}
-                  break;
-                case MessageType.VIDEO:
-                  {}
-                  break;
-                case MessageType.LOCATION:
-                  {}
-                  break;
-                case MessageType.VOICE:
-                  {}
-                  break;
-                case MessageType.FILE:
-                  {}
-                  break;
-                case MessageType.CUSTOM:
-                  {}
-                  break;
-                case MessageType.COMBINE:
-                  {}
-                  break;
-                case MessageType.CMD:
-                  {
-                    // 当前回调中不会有 CMD 类型消息，CMD 类型消息通过 `EMChatEventHandler#onCmdMessagesReceived` 回调接收
-                  }
-                  break;
-              }
+          },
+          onCmdMessagesReceived: (cmdMessages) {
+            if (Get.isLogEnable) {
+              Get.log('📨 [IMManager] 收到 ${cmdMessages.length} 条CMD消息');
+            }
+            // 处理CMD消息（如撤回消息等）
+            for (var msg in cmdMessages) {
+              _handleCmdMessage(msg);
             }
           },
         ),
       );
+
+      _listenersRegistered = true;
+      if (Get.isLogEnable) {
+        Get.log('✅ [IMManager] 监听器注册成功');
+      }
     } catch (e) {
-      print('Failed to register listeners: $e');
+      if (Get.isLogEnable) {
+        Get.log('❌ [IMManager] 注册监听器失败: $e');
+      }
     }
   }
 
@@ -187,7 +194,7 @@ class IMManager {
     int duration,
   ) async {
     try {
-      // 创建图片消息
+      // 创建语音消息
       final message = EMMessage.createVoiceSendMessage(
         targetId: toChatUsername,
         filePath: filePath,
@@ -196,10 +203,14 @@ class IMManager {
 
       // 发送消息
       await EMClient.getInstance.chatManager.sendMessage(message);
-      print('Image message sent successfully');
+      if (Get.isLogEnable) {
+        Get.log('✅ [IMManager] 语音消息发送成功');
+      }
       return message;
     } catch (e) {
-      print('Failed to send image message: $e');
+      if (Get.isLogEnable) {
+        Get.log('❌ [IMManager] 发送语音消息失败: $e');
+      }
       return null;
     }
   }
@@ -310,7 +321,7 @@ class IMManager {
     return EMClient.getInstance.chatManager.loadAllConversations();
   }
 
-  /// 获取好有列表
+  /// 获取用户信息（单个用户）
   Future<Map<String, EMUserInfo>> getContacts(String userId) async {
     return await EMClient.getInstance.userInfoManager.fetchUserInfoById([
       userId,
@@ -323,14 +334,44 @@ class IMManager {
     int pageSize = 20,
     String? startMsgId,
   }) async {
-    EMConversationType convType = EMConversationType.Chat;
-    EMCursorResult<EMMessage?> cursor = await EMClient.getInstance.chatManager
-        .fetchHistoryMessagesByOption(
-          conversationId,
-          convType,
-          pageSize: pageSize,
+    try {
+      EMConversationType convType = EMConversationType.Chat;
+      
+      // 获取会话对象
+      final conversation = await EMClient.getInstance.chatManager.getConversation(
+        conversationId,
+        type: convType,
+        createIfNeed: false,
+      );
+      
+      if (conversation == null) {
+        if (Get.isLogEnable) {
+          Get.log('❌ [IMManager] 会话不存在: $conversationId');
+        }
+        return [];
+      }
+      
+      // 如果有startMsgId，从该消息开始加载；否则加载最新消息
+      if (startMsgId != null && startMsgId.isNotEmpty) {
+        // 从指定消息ID开始加载更旧的消息
+        final messages = await conversation.loadMessages(
+          startMsgId: startMsgId,
+          loadCount: pageSize,
+        );
+        return messages.map((msg) => msg as EMMessage?).toList();
+      } else {
+        // 加载最新消息
+        final messages = await conversation.loadMessages(
+          loadCount: pageSize,
         );
-    return cursor.data;
+        return messages.map((msg) => msg as EMMessage?).toList();
+      }
+    } catch (e) {
+      if (Get.isLogEnable) {
+        Get.log('❌ [IMManager] 获取消息失败: $e');
+      }
+      return [];
+    }
   }
 
   /// 获取用户信息
@@ -436,12 +477,336 @@ class IMManager {
     }
   }
 
+  /// 处理CMD消息
+  void _handleCmdMessage(EMMessage cmdMessage) {
+    try {
+      // 这里可以处理各种CMD消息，如撤回消息等
+      if (Get.isLogEnable) {
+        Get.log('处理CMD消息: ${cmdMessage.msgId}');
+      }
+    } catch (e) {
+      if (Get.isLogEnable) {
+        Get.log('处理CMD消息失败: $e');
+      }
+    }
+  }
+
+  // 注意：以下方法保留用于未来扩展，当SDK支持更多回调时可以使用
+  // 目前环信SDK的EMChatEventHandler可能不支持这些回调，所以暂时注释掉
+  /*
+  /// 通知消息已读
+  void _notifyMessageRead(List<EMMessage> messages, String from, String to) {
+    try {
+      // 找到对应的 ChatController 并通知消息已读
+      final controller = _activeChatControllers[from];
+      if (controller != null) {
+        // TODO: 在 ChatController 中添加更新消息已读状态的方法
+        if (Get.isLogEnable) {
+          Get.log('通知消息已读: $from');
+        }
+      }
+    } catch (e) {
+      if (Get.isLogEnable) {
+        Get.log('通知消息已读失败: $e');
+      }
+    }
+  }
+
+  /// 通知消息已送达
+  void _notifyMessageDelivered(List<EMMessage> messages, String to) {
+    try {
+      // 找到对应的 ChatController 并通知消息已送达
+      for (var message in messages) {
+        final targetId = message.to;
+        if (targetId != null) {
+          final controller = _activeChatControllers[targetId];
+          if (controller != null) {
+            // TODO: 在 ChatController 中添加更新消息送达状态的方法
+            if (Get.isLogEnable) {
+              Get.log('通知消息已送达: $targetId');
+            }
+          }
+        }
+      }
+    } catch (e) {
+      if (Get.isLogEnable) {
+        Get.log('通知消息已送达失败: $e');
+      }
+    }
+  }
+
+  /// 通知消息撤回
+  void _notifyMessageRecalled(List<EMMessage> messages) {
+    try {
+      // 通知所有相关的 ChatController 更新消息列表
+      for (var message in messages) {
+        final fromId = message.from;
+        final toId = message.to;
+        
+        // 通知发送方的 ChatController
+        if (fromId != null) {
+          final controller = _activeChatControllers[fromId];
+          if (controller != null) {
+            // TODO: 在 ChatController 中添加处理消息撤回的方法
+            if (Get.isLogEnable) {
+              Get.log('通知消息撤回（发送方）: $fromId');
+            }
+          }
+        }
+        
+        // 通知接收方的 ChatController
+        if (toId != null) {
+          final controller = _activeChatControllers[toId];
+          if (controller != null) {
+            // TODO: 在 ChatController 中添加处理消息撤回的方法
+            if (Get.isLogEnable) {
+              Get.log('通知消息撤回（接收方）: $toId');
+            }
+          }
+        }
+      }
+      
+      // 刷新会话列表
+      _refreshConversationList();
+    } catch (e) {
+      if (Get.isLogEnable) {
+        Get.log('通知消息撤回失败: $e');
+      }
+    }
+  }
+
+  /// 通知消息状态变更
+  void _notifyMessageStatusChanged(EMMessage message, MessageStatus status, EMError? error) {
+    try {
+      final targetId = message.to;
+      if (targetId != null) {
+        final controller = _activeChatControllers[targetId];
+        if (controller != null) {
+          // TODO: 在 ChatController 中添加更新消息状态的方法
+          if (Get.isLogEnable) {
+            Get.log('通知消息状态变更: $targetId, status=$status');
+          }
+        }
+      }
+    } catch (e) {
+      if (Get.isLogEnable) {
+        Get.log('通知消息状态变更失败: $e');
+      }
+    }
+  }
+  */
+
+  /// 撤回消息
+  Future<bool> recallMessage(EMMessage message) async {
+    try {
+      final messageId = message.msgId;
+      if (messageId.isEmpty) {
+        if (Get.isLogEnable) {
+          Get.log('❌ [IMManager] 消息ID为空，无法撤回');
+        }
+        return false;
+      }
+      await EMClient.getInstance.chatManager.recallMessage(messageId);
+      if (Get.isLogEnable) {
+        Get.log('✅ [IMManager] 消息撤回成功: $messageId');
+      }
+      // 刷新会话列表
+      _refreshConversationList();
+      return true;
+    } catch (e) {
+      if (Get.isLogEnable) {
+        Get.log('❌ [IMManager] 消息撤回失败: $e');
+      }
+      return false;
+    }
+  }
+
+  /// 删除消息
+  Future<bool> deleteMessage(String conversationId, String messageId, {bool deleteRemote = false}) async {
+    try {
+      final conversation = await EMClient.getInstance.chatManager.getConversation(
+        conversationId,
+        type: EMConversationType.Chat,
+        createIfNeed: false,
+      );
+      if (conversation != null) {
+        await conversation.deleteMessage(messageId);
+        if (Get.isLogEnable) {
+          Get.log('✅ [IMManager] 消息删除成功: $messageId');
+        }
+        // 刷新会话列表
+        _refreshConversationList();
+        return true;
+      }
+      return false;
+    } catch (e) {
+      if (Get.isLogEnable) {
+        Get.log('❌ [IMManager] 消息删除失败: $e');
+      }
+      return false;
+    }
+  }
+
+  /// 标记消息为已读
+  Future<bool> markMessageAsRead(String conversationId, String messageId) async {
+    try {
+      final conversation = await EMClient.getInstance.chatManager.getConversation(
+        conversationId,
+        type: EMConversationType.Chat,
+        createIfNeed: false,
+      );
+      if (conversation != null) {
+        await conversation.markMessageAsRead(messageId);
+        if (Get.isLogEnable) {
+          Get.log('✅ [IMManager] 消息标记为已读: $messageId');
+        }
+        // 刷新会话列表
+        _refreshConversationList();
+        return true;
+      }
+      return false;
+    } catch (e) {
+      if (Get.isLogEnable) {
+        Get.log('❌ [IMManager] 标记消息为已读失败: $e');
+      }
+      return false;
+    }
+  }
+
+  /// 标记会话所有消息为已读
+  Future<bool> markAllMessagesAsRead(String conversationId) async {
+    try {
+      final conversation = await EMClient.getInstance.chatManager.getConversation(
+        conversationId,
+        type: EMConversationType.Chat,
+        createIfNeed: false,
+      );
+      if (conversation != null) {
+        await conversation.markAllMessagesAsRead();
+        if (Get.isLogEnable) {
+          Get.log('✅ [IMManager] 会话所有消息标记为已读: $conversationId');
+        }
+        // 刷新会话列表
+        _refreshConversationList();
+        return true;
+      }
+      return false;
+    } catch (e) {
+      if (Get.isLogEnable) {
+        Get.log('❌ [IMManager] 标记会话所有消息为已读失败: $e');
+      }
+      return false;
+    }
+  }
+
+  /// 重发消息
+  Future<EMMessage?> resendMessage(EMMessage failedMessage) async {
+    try {
+      final targetId = failedMessage.to ?? failedMessage.conversationId;
+      if (targetId == null || targetId.isEmpty) {
+        if (Get.isLogEnable) {
+          Get.log('❌ [IMManager] 重发消息失败：目标ID为空');
+        }
+        return null;
+      }
+
+      EMMessage? newMessage;
+
+      // 根据消息类型重新创建消息
+      switch (failedMessage.body.type) {
+        case MessageType.TXT:
+          final textBody = failedMessage.body as EMTextMessageBody;
+          newMessage = EMMessage.createTxtSendMessage(
+            targetId: targetId,
+            content: textBody.content,
+          );
+          break;
+
+        case MessageType.IMAGE:
+          final imageBody = failedMessage.body as EMImageMessageBody;
+          final localPath = imageBody.localPath;
+          if (localPath.isEmpty) {
+            if (Get.isLogEnable) {
+              Get.log('❌ [IMManager] 重发图片消息失败：本地路径为空');
+            }
+            return null;
+          }
+          newMessage = EMMessage.createImageSendMessage(
+            targetId: targetId,
+            filePath: localPath,
+            sendOriginalImage: false,
+          );
+          break;
+
+        case MessageType.VOICE:
+          final voiceBody = failedMessage.body as EMVoiceMessageBody;
+          final localPath = voiceBody.localPath;
+          if (localPath.isEmpty) {
+            if (Get.isLogEnable) {
+              Get.log('❌ [IMManager] 重发语音消息失败：本地路径为空');
+            }
+            return null;
+          }
+          newMessage = EMMessage.createVoiceSendMessage(
+            targetId: targetId,
+            filePath: localPath,
+            duration: voiceBody.duration,
+          );
+          break;
+
+        case MessageType.VIDEO:
+          final videoBody = failedMessage.body as EMVideoMessageBody;
+          final localPath = videoBody.localPath;
+          if (localPath.isEmpty) {
+            if (Get.isLogEnable) {
+              Get.log('❌ [IMManager] 重发视频消息失败：本地路径为空');
+            }
+            return null;
+          }
+          newMessage = EMMessage.createVideoSendMessage(
+            targetId: targetId,
+            filePath: localPath,
+            duration: videoBody.duration ?? 0,
+            thumbnailLocalPath: videoBody.thumbnailLocalPath,
+          );
+          break;
+
+        default:
+          if (Get.isLogEnable) {
+            Get.log('❌ [IMManager] 不支持重发该类型的消息: ${failedMessage.body.type}');
+          }
+          return null;
+      }
+
+      // 重新发送消息
+      final result = await EMClient.getInstance.chatManager.sendMessage(newMessage);
+      if (Get.isLogEnable) {
+        Get.log('✅ [IMManager] 消息重发成功: ${newMessage.msgId}');
+      }
+      return result;
+    } catch (e) {
+      if (Get.isLogEnable) {
+        Get.log('❌ [IMManager] 重发消息失败: $e');
+      }
+      return null;
+    }
+  }
+
   /// 清理资源
   void dispose() {
     try {
-      EMClient.getInstance.removeConnectionEventHandler("");
+      if (_listenersRegistered) {
+        EMClient.getInstance.removeConnectionEventHandler(_connectionHandlerKey);
+        EMClient.getInstance.chatManager.removeEventHandler(_chatHandlerKey);
+        _listenersRegistered = false;
+        if (Get.isLogEnable) {
+          Get.log('✅ [IMManager] 资源清理完成');
+        }
+      }
     } catch (e) {
-      print('Failed to dispose resources: $e');
+      if (Get.isLogEnable) {
+        Get.log('❌ [IMManager] 清理资源失败: $e');
+      }
     }
   }
 }

lib/pages/message/chat_page.dart

@@ -37,7 +37,8 @@ class _ChatPageState extends State<ChatPage> {
           _scrollController.position.pixels >=
               _scrollController.position.maxScrollExtent - 100 &&
           !_isLoadingMore &&
-          _controller.messages.isNotEmpty) {
+          _controller.messages.isNotEmpty &&
+          _controller.hasMoreMessages()) {
         _loadMoreMessages();
       }
     });

lib/pages/message/friend_tab.dart

@@ -8,7 +8,43 @@ class FriendTab extends StatefulWidget {
   State<FriendTab> createState() => _FriendTabState();
 }
 
-class _FriendTabState extends State<FriendTab> {
+class _FriendTabState extends State<FriendTab> with TickerProviderStateMixin {
+  late TabController _tabController;
+  
+  // 紫色主题色
+  static const Color _primaryPurple = Color(0xff8E7BF6);
+
+  // 模拟数据 - 我的关注列表
+  final List<Map<String, dynamic>> _followList = [
+    {
+      "id": 1,
+      "name": "叫我大王",
+      "avatar": Assets.imagesAvatarsExample,
+      "age": 30,
+      "location": "广州",
+      "gender": "female",
+      "isFollowed": true,
+    },
+    {
+      "id": 2,
+      "name": "林园园",
+      "avatar": Assets.imagesAvatarsExample,
+      "age": 28,
+      "location": "深圳",
+      "gender": "female",
+      "isFollowed": true,
+    },
+    {
+      "id": 3,
+      "name": "张雪",
+      "avatar": Assets.imagesAvatarsExample,
+      "age": 25,
+      "location": "北京",
+      "gender": "female",
+      "isFollowed": true,
+    },
+  ];
+
   // 模拟数据 - 好友列表
   final List<Map<String, dynamic>> _friendList = [
     {
@@ -49,87 +85,392 @@ class _FriendTabState extends State<FriendTab> {
     },
   ];
 
+  // 模拟数据 - 粉丝列表
+  final List<Map<String, dynamic>> _fansList = [
+    {
+      "id": 1,
+      "name": "李晖",
+      "avatar": Assets.imagesAvatarsExample,
+      "age": 32,
+      "location": "上海",
+      "gender": "male",
+    },
+    {
+      "id": 2,
+      "name": "王强",
+      "avatar": Assets.imagesAvatarsExample,
+      "age": 29,
+      "location": "杭州",
+      "gender": "male",
+    },
+    {
+      "id": 3,
+      "name": "李哲",
+      "avatar": Assets.imagesAvatarsExample,
+      "age": 27,
+      "location": "成都",
+      "gender": "male",
+    },
+  ];
+
+  @override
+  void initState() {
+    super.initState();
+    _tabController = TabController(length: 3, vsync: this, initialIndex: 0);
+    _tabController.addListener(() {
+      setState(() {});
+    });
+  }
+
+  @override
+  void dispose() {
+    _tabController.dispose();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
+    return Column(
+      children: [
+        // 顶部标签栏
+        _buildTabBar(),
+        // 内容区域
+        Expanded(
+          child: TabBarView(
+            controller: _tabController,
+            physics: const NeverScrollableScrollPhysics(), // 禁用手势滑动
+            children: [
+              _buildFollowList(), // 我的关注
+              _buildFriendList(), // 好友
+              _buildFansList(),   // 粉丝
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+
+  // 构建顶部标签栏
+  Widget _buildTabBar() {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+      child: Row(
+        children: [
+          _buildTabButton("我的关注", 0),
+          const SizedBox(width: 16),
+          _buildTabButton("好友", 1),
+          const SizedBox(width: 16),
+          _buildTabButton("粉丝", 2),
+        ],
+      ),
+    );
+  }
+
+  // 构建标签按钮
+  Widget _buildTabButton(String title, int index) {
+    final bool isSelected = _tabController.index == index;
+    return Expanded(
+      child: GestureDetector(
+        onTap: () {
+          if (_tabController.index != index) {
+            _tabController.animateTo(index);
+          }
+        },
+        child: Container(
+          padding: const EdgeInsets.symmetric(vertical: 8),
+          decoration: BoxDecoration(
+            color: isSelected ? _primaryPurple : Colors.white,
+            borderRadius: BorderRadius.circular(20),
+          ),
+          alignment: Alignment.center,
+          child: Text(
+            title,
+            style: TextStyle(
+              fontSize: 14,
+              fontWeight: FontWeight.w500,
+              color: isSelected ? Colors.white : Colors.black87,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  // 构建我的关注列表
+  Widget _buildFollowList() {
+    return ListView.builder(
+      padding: const EdgeInsets.only(top: 8),
+      itemCount: _followList.length,
+      itemBuilder: (context, index) {
+        final item = _followList[index];
+        return _buildFollowItem(item);
+      },
+    );
+  }
+
+  // 构建关注项
+  Widget _buildFollowItem(Map<String, dynamic> item) {
+    return Container(
+      margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(8),
+      ),
+      child: Row(
+        children: [
+          // 头像
+          Container(
+            width: 50,
+            height: 50,
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.circular(25),
+            ),
+            child: ClipRRect(
+              borderRadius: BorderRadius.circular(25),
+              child: Image.asset(item["avatar"], fit: BoxFit.cover),
+            ),
+          ),
+          
+          // 信息
+          Expanded(
+            child: Container(
+              margin: const EdgeInsets.only(left: 12),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Row(
+                    children: [
+                      Text(
+                        item["name"],
+                        style: const TextStyle(
+                          fontWeight: FontWeight.bold,
+                          fontSize: 16,
+                        ),
+                      ),
+                      const SizedBox(width: 4),
+                      // 性别图标
+                      Icon(
+                        item["gender"] == "female" ? Icons.female : Icons.male,
+                        size: 16,
+                        color: item["gender"] == "female" ? Colors.pink : Colors.blue,
+                      ),
+                    ],
+                  ),
+                  const SizedBox(height: 4),
+                  Text(
+                    "${item["age"]}岁·${item["location"]}",
+                    style: const TextStyle(
+                      color: Colors.grey,
+                      fontSize: 12,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+          
+          // 已关注按钮
+          Container(
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6),
+            decoration: BoxDecoration(
+              color: Colors.grey[200],
+              borderRadius: BorderRadius.circular(16),
+            ),
+            child: const Text(
+              "已关注",
+              style: TextStyle(
+                fontSize: 12,
+                color: Colors.grey,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  // 构建好友列表
+  Widget _buildFriendList() {
     return ListView.builder(
       padding: const EdgeInsets.only(top: 8),
       itemCount: _friendList.length,
       itemBuilder: (context, index) {
         final friend = _friendList[index];
-        
-        return Container(
-          margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
-          padding: const EdgeInsets.all(12),
-          decoration: BoxDecoration(
-            color: Colors.white,
-            borderRadius: BorderRadius.circular(8),
-          ),
-          child: Row(
+        return _buildFriendItem(friend);
+      },
+    );
+  }
+
+  // 构建好友项
+  Widget _buildFriendItem(Map<String, dynamic> friend) {
+    return Container(
+      margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(8),
+      ),
+      child: Row(
+        children: [
+          // 头像
+          Stack(
             children: [
-              // 头像
-              Stack(
-                children: [
-                  Container(
-                    width: 50,
-                    height: 50,
+              Container(
+                width: 50,
+                height: 50,
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(25),
+                ),
+                child: ClipRRect(
+                  borderRadius: BorderRadius.circular(25),
+                  child: Image.asset(friend["avatar"], fit: BoxFit.cover),
+                ),
+              ),
+              if (friend["isOnline"] == true)
+                Positioned(
+                  bottom: 0,
+                  right: 0,
+                  child: Container(
+                    width: 12,
+                    height: 12,
                     decoration: BoxDecoration(
-                      borderRadius: BorderRadius.circular(25),
+                      color: Colors.green,
+                      borderRadius: BorderRadius.circular(6),
+                      border: Border.all(color: Colors.white, width: 2),
                     ),
-                    child: ClipRRect(
-                      borderRadius: BorderRadius.circular(25),
-                      child: Image.asset(friend["avatar"], fit: BoxFit.cover),
+                  ),
+                ),
+            ],
+          ),
+          
+          // 信息
+          Expanded(
+            child: Container(
+              margin: const EdgeInsets.only(left: 12),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Text(
+                    friend["name"],
+                    style: const TextStyle(
+                      fontWeight: FontWeight.bold,
                     ),
                   ),
-                  if (friend["isOnline"] == true)
-                    Positioned(
-                      bottom: 0,
-                      right: 0,
-                      child: Container(
-                        width: 12,
-                        height: 12,
-                        decoration: BoxDecoration(
-                          color: Colors.green,
-                          borderRadius: BorderRadius.circular(6),
-                          border: Border.all(color: Colors.white, width: 2),
-                        ),
-                      ),
+                  const SizedBox(height: 4),
+                  Text(
+                    friend["isOnline"] == true ? "在线" : "离线",
+                    style: TextStyle(
+                      color: friend["isOnline"] == true ? Colors.green : Colors.grey,
+                      fontSize: 12,
                     ),
+                  ),
                 ],
               ),
-              
-              // 信息
-              Expanded(
-                child: Container(
-                  margin: const EdgeInsets.only(left: 12),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    mainAxisAlignment: MainAxisAlignment.center,
+            ),
+          ),
+          
+          // 箭头图标
+          const Icon(Icons.arrow_forward_ios, size: 16, color: Colors.grey),
+        ],
+      ),
+    );
+  }
+
+  // 构建粉丝列表
+  Widget _buildFansList() {
+    return ListView.builder(
+      padding: const EdgeInsets.only(top: 8),
+      itemCount: _fansList.length,
+      itemBuilder: (context, index) {
+        final fan = _fansList[index];
+        return _buildFanItem(fan);
+      },
+    );
+  }
+
+  // 构建粉丝项
+  Widget _buildFanItem(Map<String, dynamic> fan) {
+    return Container(
+      margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(8),
+      ),
+      child: Row(
+        children: [
+          // 头像
+          Container(
+            width: 50,
+            height: 50,
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.circular(25),
+            ),
+            child: ClipRRect(
+              borderRadius: BorderRadius.circular(25),
+              child: Image.asset(fan["avatar"], fit: BoxFit.cover),
+            ),
+          ),
+          
+          // 信息
+          Expanded(
+            child: Container(
+              margin: const EdgeInsets.only(left: 12),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Row(
                     children: [
                       Text(
-                        friend["name"],
+                        fan["name"],
                         style: const TextStyle(
                           fontWeight: FontWeight.bold,
+                          fontSize: 16,
                         ),
                       ),
-                      const SizedBox(height: 4),
-                      Text(
-                        friend["isOnline"] == true ? "在线" : "离线",
-                        style: TextStyle(
-                          color: friend["isOnline"] == true ? Colors.green : Colors.grey,
-                          fontSize: 12,
-                        ),
+                      const SizedBox(width: 4),
+                      // 性别图标
+                      Icon(
+                        fan["gender"] == "female" ? Icons.female : Icons.male,
+                        size: 16,
+                        color: fan["gender"] == "female" ? Colors.pink : Colors.blue,
                       ),
                     ],
                   ),
-                ),
+                  const SizedBox(height: 4),
+                  Text(
+                    "${fan["age"]}岁·${fan["location"]}",
+                    style: const TextStyle(
+                      color: Colors.grey,
+                      fontSize: 12,
+                    ),
+                  ),
+                ],
               ),
-              
-              // 箭头图标
-              const Icon(Icons.arrow_forward_ios, size: 16, color: Colors.grey),
-            ],
+            ),
           ),
-        );
-      },
+          
+          // 关注按钮
+          Container(
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6),
+            decoration: BoxDecoration(
+              color: _primaryPurple,
+              borderRadius: BorderRadius.circular(16),
+            ),
+            child: const Text(
+              "关注",
+              style: TextStyle(
+                fontSize: 12,
+                color: Colors.white,
+              ),
+            ),
+          ),
+        ],
+      ),
     );
   }
 }

lib/widget/message/message_item.dart

@@ -1,11 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:im_flutter_sdk/im_flutter_sdk.dart';
+import 'package:get/get.dart';
 
 import 'text_item.dart';
 import 'image_item.dart';
 import 'voice_item.dart';
 import 'video_item.dart';
+import '../../controller/message/chat_controller.dart';
 
 class MessageItem extends StatelessWidget {
   final EMMessage message;
@@ -31,6 +33,16 @@ class MessageItem extends StatelessWidget {
         isSentByMe: isSentByMe,
         showTime: shouldShowTime(),
         formattedTime: formatMessageTime(message.serverTime),
+        message: message,
+        onResend: () {
+          // 通过Get找到ChatController并调用重发方法
+          try {
+            final controller = Get.find<ChatController>();
+            controller.resendMessage(message);
+          } catch (e) {
+            print('重发消息失败: $e');
+          }
+        },
       );
     }
     // 处理图片消息

lib/widget/message/text_item.dart

@@ -10,12 +10,16 @@ class TextItem extends StatelessWidget {
   final bool isSentByMe;
   final bool showTime;
   final String formattedTime;
+  final EMMessage message; // 添加消息对象以获取状态
+  final VoidCallback? onResend; // 添加重发回调
 
   const TextItem({
     required this.textBody,
     required this.isSentByMe,
     required this.showTime,
     required this.formattedTime,
+    required this.message,
+    this.onResend,
     super.key,
   });
 
@@ -61,6 +65,8 @@ class TextItem extends StatelessWidget {
                   emojiSize: 24.w,
                 ),
               ),
+              // 显示发送状态或重发按钮
+              if (isSentByMe) _buildMessageStatus(),
               if (isSentByMe) SizedBox(width: 8.w),
               if (isSentByMe) _buildAvatar(),
             ],
@@ -106,4 +112,52 @@ class TextItem extends StatelessWidget {
       ),
     );
   }
+
+  // 构建消息状态（发送中、已发送、失败重发）
+  Widget _buildMessageStatus() {
+    // 只对发送的消息显示状态
+    if (!isSentByMe) {
+      return SizedBox.shrink();
+    }
+
+    // 检查消息状态
+    final status = message.status;
+    
+    if (status == MessageStatus.FAIL) {
+      // 发送失败，显示重发按钮
+      return GestureDetector(
+        onTap: onResend,
+        child: Container(
+          width: 20.w,
+          height: 20.w,
+          margin: EdgeInsets.only(right: 4.w),
+          decoration: BoxDecoration(
+            color: Colors.red.withOpacity(0.1),
+            shape: BoxShape.circle,
+          ),
+          child: Icon(
+            Icons.refresh,
+            size: 14.w,
+            color: Colors.red,
+          ),
+        ),
+      );
+    } else if (status == MessageStatus.PROGRESS) {
+      // 发送中，显示加载动画
+      return Container(
+        width: 16.w,
+        height: 16.w,
+        margin: EdgeInsets.only(right: 4.w),
+        child: CircularProgressIndicator(
+          strokeWidth: 2,
+          valueColor: AlwaysStoppedAnimation<Color>(
+            isSentByMe ? Colors.white70 : Colors.grey,
+          ),
+        ),
+      );
+    } else {
+      // 发送成功，不显示任何状态
+      return SizedBox(width: 4.w);
+    }
+  }
 }