feat:更新消息通知功能

2026-06-20 16:11:57 +08:00
parent 5d12377606
commit 5e0864d3ac
16 changed files with 332 additions and 24 deletions
--- a/lib/pages/chat_page.dart
+++ b/lib/pages/chat_page.dart
@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:liquid_glass_widgets/liquid_glass_widgets.dart';
 import 'package:sweet_chat_app/apis/message_api.dart';
+import 'package:sweet_chat_app/config/AppConfig.dart';
 import 'package:sweet_chat_app/models/chat_message.dart';
 import 'package:sweet_chat_app/models/contact_info.dart';
 import 'package:sweet_chat_app/models/im_message.dart';
@@ -27,8 +28,10 @@ class _ChatPageState extends State<ChatPage> {
  late StreamSubscription<String> _msgSub;
  final TextEditingController _textController = TextEditingController();
  final ScrollController _scrollController = ScrollController();
-
+  final FocusNode _focusNode = FocusNode();
+  
  late int userId;
+  late String nickname;
  late String avatarUrl;
  late List<ChatMessage> _messages;

@@ -37,16 +40,23 @@ class _ChatPageState extends State<ChatPage> {
    super.initState();

    userId = SpUtil.getInt('userId') ?? 0;
+    nickname = SpUtil.getString('nickname') ?? '';
    avatarUrl = SpUtil.getString('avatarUrl') ?? '';
    
    _messages = [];
    _loadChatMessage();

-    _msgSub = WebSocketService().messages.listen((websocketMessage) {
-      _handleMessage(websocketMessage);
-      _textController.clear();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
      scrollToBottom();
    });
+
+    listenMessage();
+
+    _focusNode.addListener(() {
+      if (_focusNode.hasFocus) {
+        Future.delayed(const Duration(milliseconds: 350), scrollToBottom);
+      }
+    });
  }

  Future<void> _loadChatMessage() async {
@@ -58,10 +68,19 @@ class _ChatPageState extends State<ChatPage> {
      _messages = list;
    });
  }
+  
+  void listenMessage() {
+    WebSocketService().connect('${AppConfig.wsUrl}?userId=$userId');
+    _msgSub = WebSocketService().messages.listen((websocketMessage) {
+      _handleMessage(websocketMessage);
+      scrollToBottom();
+    });
+  }

  @override
  void dispose() {
    _msgSub.cancel();
+    _focusNode.dispose();
    _textController.dispose();
    _scrollController.dispose();
    super.dispose();
@@ -73,11 +92,13 @@ class _ChatPageState extends State<ChatPage> {

    final chat = ImMessage(
      type: ImMessageType.chatPrivate,
+      title: nickname,
      from: userId.toString(),
      to: widget.contactInfo.id.toString(),
      content: text,
    );
    WebSocketService().send(chat.toJsonString());
+    _textController.clear();
  }

  bool checkIsMe(ChatMessage message) {
@@ -94,7 +115,7 @@ class _ChatPageState extends State<ChatPage> {
        _messages.add(
          ChatMessage(
            msgId: DateTime.now().millisecondsSinceEpoch,
-            senderId: userId,
+            senderId: int.parse(imMsg.from),
            content: imMsg.content,
            msgType: 1,
            createTime: DateTime.now(),
@@ -204,6 +225,7 @@ class _ChatPageState extends State<ChatPage> {
            Expanded(
              child: TextField(
                controller: _textController,
+                focusNode: _focusNode,
                onSubmitted: (_) => _sendMessage(),
                style: const TextStyle(color: Colors.white),
                cursorColor: Colors.white,
@@ -212,6 +234,9 @@ class _ChatPageState extends State<ChatPage> {
                  hintStyle: TextStyle(color: Colors.white),
                  border: InputBorder.none,
                ),
+                onTap: () {
+                  Future.delayed(const Duration(milliseconds: 350), scrollToBottom);
+                },
              ),
            ),
            IconButton(
--- a/lib/pages/home_page.dart
+++ b/lib/pages/home_page.dart
@@ -1,12 +1,17 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:liquid_glass_widgets/widgets/shared/glass_page.dart';
 import 'package:liquid_glass_widgets/widgets/surfaces/glass_bottom_bar.dart';
 import 'package:liquid_glass_widgets/widgets/surfaces/glass_scaffold.dart';
+import 'package:provider/provider.dart';
 import 'package:sweet_chat_app/config/AppConfig.dart';
 import 'package:sweet_chat_app/models/im_message.dart';
 import 'package:sweet_chat_app/pages/contact_page.dart';
 import 'package:sweet_chat_app/pages/explore_page.dart';
 import 'package:sweet_chat_app/pages/message_page.dart';
+import 'package:sweet_chat_app/providers/app_provider.dart';
+import 'package:sweet_chat_app/services/notify_service.dart';
 import 'package:sweet_chat_app/services/webSocket_service.dart';
 import 'package:sweet_chat_app/utils/sp_utils.dart';

@@ -19,8 +24,11 @@ class HomePage extends StatefulWidget {
 }

 class _HomePageState extends State<HomePage> {
+  late StreamSubscription<String> _msgSub;
+  final NotifyService notifyService = NotifyService();
  int _index = 0;
-
+  late int userId;
+  
  final _pages = [
    const MessagePage(),
    const ContactsPage(),
@@ -36,13 +44,35 @@ class _HomePageState extends State<HomePage> {
  
  @override
  void dispose() {
+    _msgSub.cancel();
    super.dispose();
  }

  void initWebsocket() {
-    final userId = SpUtil.getInt('userId') ?? 0;
+    userId = SpUtil.getInt('userId') ?? 0;
    WebSocketService().connect('${AppConfig.wsUrl}?userId=$userId');
    WebSocketService().send(ImMessage.online(userId).toJsonString());
+
+    _msgSub = WebSocketService().messages.listen((websocketMessage) {
+      _handleMessage(websocketMessage);
+    });
+  }
+
+  void _handleMessage(String wsMsg) {
+    if (!mounted) return;
+
+    final ImMessage imMsg = ImMessage.fromJsonString(wsMsg);
+
+    // 非自己的消息
+    if (imMsg.from != userId.toString()) {
+      final appProvider = Provider.of<AppProvider>(context, listen: false);
+      // 如果已经在聊天中 则不用提醒
+      if (appProvider.routerName == 'chat') {
+        return;
+      }
+
+      notifyService.showInstantNotification(title: imMsg.title, body: imMsg.content);
+    }
  }
  
  @override
--- a/lib/pages/login.dart
+++ b/lib/pages/login.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:liquid_glass_widgets/liquid_glass_widgets.dart';
 import 'package:sweet_chat_app/apis/auth_api.dart';
+import 'package:sweet_chat_app/services/notify_service.dart';
 import 'package:sweet_chat_app/utils/sp_utils.dart';
 import 'package:sweet_chat_app/utils/toast_utils.dart';
 import 'home_page.dart';
@@ -15,14 +16,18 @@ class LoginPage extends StatefulWidget {
 class _LoginPageState extends State<LoginPage> {
  final _usernameController = TextEditingController();
  final _passwordController = TextEditingController();
-
+  // final NotifyService notifyService = NotifyService();
+  
  void _login() async {
    try {
+      // notifyService.showInstantNotification(title: '你好', body: '测试消息');
+      
      final auth = await loginApi(
        _usernameController.text,
        _passwordController.text,
      );
      await SpUtil.setInt('userId', auth.user.id);
+      await SpUtil.setString('nickname', auth.user.nickname);
      await SpUtil.setString('avatarUrl', auth.user.avatarUrl);
      
      Navigator.of(
--- a/lib/pages/message_page.dart
+++ b/lib/pages/message_page.dart
@@ -2,10 +2,13 @@ import 'dart:async';

 import 'package:flutter/material.dart';
 import 'package:liquid_glass_widgets/liquid_glass_widgets.dart';
+import 'package:provider/provider.dart';
 import 'package:sweet_chat_app/apis/message_api.dart';
 import 'package:sweet_chat_app/models/chat_session.dart';
 import 'package:sweet_chat_app/models/contact_info.dart';
 import 'package:sweet_chat_app/pages/chat_page.dart';
+import 'package:sweet_chat_app/providers/app_provider.dart';
+import 'package:sweet_chat_app/services/notify_service.dart';
 import 'package:sweet_chat_app/services/webSocket_service.dart';
 import 'package:sweet_chat_app/utils/date_utils.dart';
 import 'package:sweet_chat_app/utils/sp_utils.dart';
@@ -20,13 +23,19 @@ class MessagePage extends StatefulWidget {
 class _MessagePageState extends State<MessagePage> {
  late StreamSubscription<String> _msgSub;
  late List<ChatSession> _chatSessionList;
+  final NotifyService notifyService = NotifyService();

+  late int userId;
+  
  @override
  void initState() {
    super.initState();
+    userId = SpUtil.getInt('userId') ?? 0;
    _chatSessionList = [];
    _loadChatSession();
-    _msgSub = WebSocketService().messages.listen((websocketMessage) {});
+    _msgSub = WebSocketService().messages.listen((websocketMessage) {
+      _loadChatSession();
+    });
  }

  @override
@@ -58,11 +67,14 @@ class _MessagePageState extends State<MessagePage> {
      conversationId: chatSession.conversationId,
    );

+    final appProvider = Provider.of<AppProvider>(context, listen: false);
    Navigator.push(context, MaterialPageRoute(builder: (_) => chatPage)).then((
      _,
    ) {
+      appProvider.routerName = '';
      _loadChatSession();
    });
+    appProvider.routerName = 'chat';
  }

  @override