更新消息控制逻辑

lib/clx_flutter_message.dart

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'clx_flutter_message_platform_interface.dart';
 import 'core/model/message_config.dart';
 import 'core/model/message_data.dart';
+import 'core/notification/notification_manager.dart';
 import 'core/socket/socket_io.dart';
 
 class ClxFlutterMessage {
@@ -15,7 +16,7 @@ class ClxFlutterMessage {
 
 MessageConfig messageConfig = MessageConfig();
 
-abstract class BaseMessageConfig {
+abstract class BaseMessageConfig with NotificationManager {
   //处理消息页面跳转
   void onJumpToMessagePage(String page, dynamic arguments);
 

lib/core/notice/notice_dialog_widget.dart

 import 'package:flutter/material.dart';
+import 'package:get/get.dart';
 
+import '../../clx_flutter_message.dart';
 import '../../util/string_util.dart';
+import '../model/message_data.dart';
 import '../model/message_node.dart';
 import '../widget/button_public/button_public_rect.dart';
 import '../widget/button_public/button_public_type.dart';
 
-class NoticeDialogWidget extends StatefulWidget {
+class NoticeDialogWidget extends GetView<NoticeDialogWidgetController> {
   const NoticeDialogWidget({
     super.key,
-    required this.showDialog,
     this.decoration,
     this.cancelText,
     this.confirmText,
@@ -16,8 +18,6 @@ class NoticeDialogWidget extends StatefulWidget {
     this.confirmType,
   });
 
-  //是否显示
-  final bool showDialog;
   // 对话框背景 decoration
   final Decoration? decoration;
 
@@ -31,23 +31,11 @@ class NoticeDialogWidget extends StatefulWidget {
   // 确认按钮类型
   final ButtonPublicType? confirmType;
 
-  @override
-  State<NoticeDialogWidget> createState() => _NoticeDialogWidgetState();
-}
-
-class _NoticeDialogWidgetState extends State<NoticeDialogWidget> {
-  MessageNode? headNode;
-
-  @override
-  Widget build(BuildContext context) {
-    return _buildView();
-  }
-
-  // 构建view
+  // 主视图
   Widget _buildView() {
-    var message = headNode?.data;
+    var message = controller.headNode?.data;
     var extraShowInfoList = message?.textVo?.extraShowInfoList;
-    return !widget.showDialog
+    return !controller.showDialog
         ? const SizedBox()
         : Container(
             height: double.infinity,
@@ -58,7 +46,7 @@ class _NoticeDialogWidgetState extends State<NoticeDialogWidget> {
               child: Stack(
                 children: [
                   Container(
-                    decoration: widget.decoration,
+                    decoration: decoration,
                     padding: const EdgeInsets.symmetric(horizontal: 24),
                     child: SingleChildScrollView(
                       child: Column(
@@ -84,22 +72,20 @@ class _NoticeDialogWidgetState extends State<NoticeDialogWidget> {
                             children: [
                               Expanded(
                                 child: ButtonPublicRect(
-                                  type: widget.cancelType ??
-                                      ButtonPublicType.outline,
-                                  text: widget.cancelText ?? '忽略',
-                                  onPressed: ignore,
+                                  type: cancelType ?? ButtonPublicType.outline,
+                                  text: cancelText ?? '忽略',
+                                  onPressed: controller.ignore,
                                   borderRadius: 8,
                                 ),
                               ),
                               const SizedBox(width: 10),
                               Expanded(
                                 child: ButtonPublicRect(
-                                  type: widget.confirmType ??
-                                      ButtonPublicType.solid,
-                                  text: widget.confirmText ?? '去处理',
+                                  type: confirmType ?? ButtonPublicType.solid,
+                                  text: confirmText ?? '去处理',
                                   onPressed: () {
-                                    MessageDeal.gotoDealMessage(message);
-                                    ignore();
+                                    controller.gotoDealMessage(message);
+                                    controller.ignore();
                                   },
                                   borderRadius: 8,
                                 ),
@@ -115,7 +101,7 @@ class _NoticeDialogWidgetState extends State<NoticeDialogWidget> {
                     top: 0,
                     right: 0,
                     child: IconButton(
-                      onPressed: dismiss,
+                      onPressed: controller.dismiss,
                       icon: const Icon(
                         Icons.close,
                         size: 16,
@@ -187,9 +173,50 @@ class _NoticeDialogWidgetState extends State<NoticeDialogWidget> {
     );
   }
 
-  void dismiss() {
-    MessageDeal.setMessageShowed(headNode?.data);
-    next();
+  @override
+  Widget build(BuildContext context) {
+    return GetBuilder<NoticeDialogWidgetController>(
+      init: NoticeDialogWidgetController(),
+      id: "NoticeDialogWidget",
+      builder: (_) {
+        return _buildView();
+      },
+    );
+  }
+}
+
+class NoticeDialogWidgetController extends GetxController {
+  NoticeDialogWidgetController();
+  BaseMessageConfig? messageDeal = messageConfig.baseMessageConfig;
+  _initData() {
+    update(["NoticeDialogWidget"]);
+  }
+
+  /// 所属页面Context
+  BuildContext? context;
+
+  MessageNode? headNode;
+
+  bool showDialog = false;
+
+  /// 插入公告
+  void insertNotice(MessageData data) {
+    _insertNode(data);
+    update();
+  }
+
+  /// 处理公告
+  gotoDealMessage(MessageData? data) {
+    messageDeal?.gotoDealMessage(data);
+  }
+
+  void _insertNode(MessageData data) {
+    if (headNode == null) {
+      headNode = MessageNode(data);
+      showDialog = true;
+    } else {
+      headNode?.insertData(data);
+    }
   }
 
   void next() {
@@ -208,10 +235,45 @@ class _NoticeDialogWidgetState extends State<NoticeDialogWidget> {
     }
   }
 
+  void setNotice(List<dynamic> data) {
+    for (var element in data) {
+      _insertNode(MessageData.fromJson(element));
+    }
+
+    update();
+  }
+
+  void clear() {
+    headNode = null;
+    showDialog = false;
+    update();
+  }
+
   void ignore() {
     /// 标记已展示
-    MessageDeal.setMessageShowed(headNode?.data);
-    MessageDeal.markReadAction(headNode?.data);
+    messageDeal?.setMessageShowed(headNode?.data);
+    messageDeal?.markReadAction(headNode?.data);
+    next();
+  }
+
+  void dismiss() {
+    messageDeal?.setMessageShowed(headNode?.data);
     next();
   }
+
+  // @override
+  // void onInit() {
+  //   super.onInit();
+  // }
+
+  @override
+  void onReady() {
+    super.onReady();
+    _initData();
+  }
+
+  // @override
+  // void onClose() {
+  //   super.onClose();
+  // }
 }

lib/core/notification/notification_layout/notification_layout_logic.dart

-import 'package:clx_flutter_message/clx_flutter_message.dart';
-
-import '../../model/message_data.dart';
-import '../../model/message_node.dart';
-
-mixin NotificationLayoutLogic {
-  MessageNode? headNode;
-
-  BaseMessageConfig? messageDeal;
-
-  void setCashMessage(List<MessageData> messages) {
-    headNode = null;
-
-    /// 上一个节点
-    MessageNode? preNode;
-    for (var data in messages) {
-      var theNode = MessageNode(data);
-      if (preNode == null) {
-        preNode = theNode;
-        headNode = preNode;
-      } else {
-        preNode.next = theNode;
-        theNode.prev = preNode;
-        preNode = theNode;
-      }
-    }
-  }
-
-  void next() {
-    messageConfig.baseMessageConfig?.setMessageShowed(headNode?.data);
-    if (headNode?.next == null) {
-      headNode = null;
-      NotificationManager.instance.hideNotification();
-      return;
-    }
-    headNode = headNode?.next;
-    headNode?.prev?.next = null;
-    headNode?.prev = null;
-    update();
-  }
-
-  void ignore() {
-    MessageDeal.markReadAction(headNode?.data);
-    MessageDeal.setMessageShowed(headNode?.data);
-    next();
-  }
-
-  void dismiss() {
-    MessageDeal.setMessageShowed(headNode?.data);
-    next();
-  }
-
-  void confirm(MessageData data) {
-    messageDeal?.gotoDealMessage(data);
-    messageDeal?.markReadAction(headNode?.data);
-    messageDeal?.setMessageShowed(headNode?.data);
-    next();
-  }
-
-  /// 插入消息
-  void insertNotification(MessageData data) {
-    if (headNode == null) {
-      headNode = MessageNode(data);
-    } else {
-      headNode?.insertData(data);
-    }
-  }
-
-  void clear() {
-    headNode = null;
-    NotificationManager.instance.hideNotification();
-    update();
-  }
-}

lib/core/notification/notification_layout/notification_layout_widget.dart

@@ -3,34 +3,28 @@ import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
+import '../../../clx_flutter_message.dart';
 import '../../model/message_data.dart';
 import '../../model/message_node.dart';
-import 'notification_layout_logic.dart';
 import 'widget/list_item.dart';
 
-class NotificationLayoutWidget extends StatefulWidget {
+class NotificationLayoutWidget extends GetView<NotificationLayoutController> {
   const NotificationLayoutWidget({super.key});
 
-  @override
-  State<NotificationLayoutWidget> createState() =>
-      _NotificationLayoutWidgetState();
-}
-
-class _NotificationLayoutWidgetState extends State<NotificationLayoutWidget> {
-  MessageNode? headNode;
   @override
   Widget build(BuildContext context) {
-    return _buildView();
-  }
-
-  // 构建View
-  Widget _buildView() {
-    if (headNode == null) {
-      return const SizedBox();
-    }
-    return Container(
-      margin: const EdgeInsets.only(top: 35),
-      child: buildStackedList(context),
+    return GetBuilder<NotificationLayoutController>(
+      init: NotificationLayoutController(),
+      id: "NotificationLayoutWidget",
+      builder: (_) {
+        if (controller.headNode == null) {
+          return const SizedBox();
+        }
+        return Container(
+          margin: const EdgeInsets.only(top: 35),
+          child: buildStackedList(context),
+        );
+      },
     );
   }
 
@@ -40,37 +34,24 @@ class _NotificationLayoutWidgetState extends State<NotificationLayoutWidget> {
       child: Stack(
         fit: StackFit.expand,
         children: [
-          if (headNode?.next != null)
+          if (controller.headNode?.next != null)
             Positioned(
               bottom: 15,
               left: 25,
               right: 25,
-              child: _message(headNode?.next?.data),
+              child: _message(controller.headNode?.next?.data),
             ),
           Positioned(
             bottom: 0,
             left: 10,
             right: 10,
-            child: _buildNotification(headNode?.data),
+            child: _buildNotification(controller.headNode?.data),
           )
         ],
       ),
     );
   }
 
-  MessageWidget _message(data) {
-    return MessageWidget(
-      data: data,
-      width: double.infinity,
-      onCancel: () {
-        ignore();
-      },
-      onHand: () {
-        confirm(data);
-      },
-    );
-  }
-
   Widget _buildNotification(data) {
     if (data == null) {
       return const SizedBox();
@@ -79,7 +60,7 @@ class _NotificationLayoutWidgetState extends State<NotificationLayoutWidget> {
       key: Key(data.messageNo?.toString() ?? ''),
       direction: DismissDirection.endToStart,
       onDismissed: (direction) {
-        dismiss();
+        controller.dismiss();
       },
       child: Stack(
         children: [
@@ -104,34 +85,29 @@ class _NotificationLayoutWidgetState extends State<NotificationLayoutWidget> {
     );
   }
 
-  void ignore() {
-    MessageDeal.markReadAction(headNode?.data);
-    MessageDeal.setMessageShowed(headNode?.data);
-    next();
+  MessageWidget _message(data) {
+    return MessageWidget(
+      data: data,
+      width: double.infinity,
+      onCancel: () {
+        controller.ignore();
+      },
+      onHand: () {
+        controller.confirm(data);
+      },
+    );
   }
+}
 
-  void next() {
-    MessageDeal.setMessageShowed(headNode?.data);
-    if (headNode?.next == null) {
-      headNode = null;
-      hideNotification();
-      return;
-    }
-    headNode = headNode?.next;
-    headNode?.prev?.next = null;
-    headNode?.prev = null;
-    setState(() {});
-  }
+class NotificationLayoutController extends GetxController {
+  NotificationLayoutController();
 
-  void clear() {
-    headNode = null;
-    hideNotification();
-    setState(() {});
-  }
+  MessageNode? headNode;
 
-  void dismiss() {
-    MessageDeal.setMessageShowed(headNode?.data);
-    next();
+  BaseMessageConfig? messageDeal=messageConfig.baseMessageConfig;
+
+  _initData() {
+    update(["NotificationLayoutWidget"]);
   }
 
   void setCashMessage(List<MessageData> messages) {
@@ -152,57 +128,65 @@ class _NotificationLayoutWidgetState extends State<NotificationLayoutWidget> {
     }
   }
 
-  /// 插入消息
-  void insertNotification(MessageData data) {
-    if (headNode == null) {
-      headNode = MessageNode(data);
-    } else {
-      headNode?.insertData(data);
+  void next() {
+    messageDeal?.setMessageShowed(headNode?.data);
+    if (headNode?.next == null) {
+      headNode = null;
+      messageDeal?.hideNotification();
+      return;
     }
+    headNode = headNode?.next;
+    headNode?.prev?.next = null;
+    headNode?.prev = null;
+    _initData();
   }
 
+  void ignore() {
+    messageDeal?.markReadAction(headNode?.data);
+    messageDeal?.setMessageShowed(headNode?.data);
+    next();
+  }
 
+  void dismiss() {
+    messageDeal?.setMessageShowed(headNode?.data);
+    next();
+  }
 
   void confirm(MessageData data) {
-    MessageDeal.gotoDealMessage(data);
-    MessageDeal.markReadAction(headNode?.data);
-    MessageDeal.setMessageShowed(headNode?.data);
+    messageDeal?.gotoDealMessage(data);
+    messageDeal?.markReadAction(headNode?.data);
+    messageDeal?.setMessageShowed(headNode?.data);
     next();
   }
 
-    void setNotification(List<dynamic> data) {
-    setCashMessage(
-      data.map<MessageData>((e) => MessageData.fromJson(e)).toList(),
-    );
+  /// 插入消息
+  void insertNotification(MessageData data) {
+    if (headNode == null) {
+      headNode = MessageNode(data);
+    } else {
+      headNode?.insertData(data);
+    }
   }
 
-}
-
-
-
-class NotePage extends GetView<NotificationLayoutLogic> {
-  const NotePage({super.key});
-
-  // 主视图
-  Widget _buildView() {
-    return const Center(
-      child: Text("NotePage"),
-    );
+  void clear() {
+    headNode = null;
+    messageDeal?.hideNotification();
+    update();
   }
 
+  // @override
+  // void onInit() {
+  //   super.onInit();
+  // }
+
   @override
-  Widget build(BuildContext context) {
-    return GetBuilder<NoteController>(
-      init: NoteController(),
-      id: "note",
-      builder: (_) {
-        return Scaffold(
-          appBar: AppBar(title: const Text("note")),
-          body: SafeArea(
-            child: _buildView(),
-          ),
-        );
-      },
-    );
+  void onReady() {
+    super.onReady();
+    _initData();
   }
+
+  // @override
+  // void onClose() {
+  //   super.onClose();
+  // }
 }

lib/core/notification/notification_manager.dart

 import 'package:flutter/cupertino.dart';
 
 import '../model/message_data.dart';
+import 'notification_layout/notification_layout_widget.dart';
 
 /// 全局消息展示管理
-class NotificationManager {
-  static NotificationManager? _instance;
-
-  static NotificationManager get instance {
-    _instance ??= NotificationManager._internal();
-    return _instance!;
-  }
-
- 
-
+mixin NotificationManager {
   OverlayEntry? _overlayEntry;
 
-  
+  final NotificationLayoutWidget _notificationLayoutWidget =
+      const NotificationLayoutWidget();
 
   /// 显示悬浮布局
   void showNotification(BuildContext? context) {
     if (context == null) return;
     if (_overlayEntry != null) return; // 防止重复显示
-    if (_notificationLayoutLogic.headNode == null) return; // 防止没有消息时显示
+    if (_notificationLayoutWidget.controller.headNode == null) {
+      return; // 防止没有消息时显示
+    }
     _overlayEntry = OverlayEntry(
       builder: (context) => Positioned(
         top: 0,
         left: 0,
         right: 0,
-        child: NotificationLayoutPage(
-          logic: _notificationLayoutLogic,
-        ),
+        child: _notificationLayoutWidget,
       ),
     );
 
@@ -44,16 +37,16 @@ class NotificationManager {
 
   /// 缓存之前的消息列表
   void setNotification(List<dynamic> data) {
-    _notificationLayoutLogic.setCashMessage(
+    _notificationLayoutWidget.controller.setCashMessage(
       data.map<MessageData>((e) => MessageData.fromJson(e)).toList(),
     );
   }
 
   void insertNotification(MessageData data) {
-    _notificationLayoutLogic.insertNotification(data);
+    _notificationLayoutWidget.controller.insertNotification(data);
   }
 
   void clear() {
-    _notificationLayoutLogic.clear();
+    _notificationLayoutWidget.controller.clear();
   }
 }