From 8327000a0cce5e47226372e0e25c1e6faec497e7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 一月 2022 16:56:43 +0800
Subject: [PATCH] 推送功能完善

---
 lib/utils/push_util.dart |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/lib/utils/push_util.dart b/lib/utils/push_util.dart
index d111392..ca14e1d 100644
--- a/lib/utils/push_util.dart
+++ b/lib/utils/push_util.dart
@@ -5,14 +5,13 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
 import 'package:fluwx_no_pay/fluwx_no_pay.dart';
-import 'package:flutter_baidu_mapapi_base/src/map/bmf_map_sdk.dart';
-import 'package:flutter_baidu_mapapi_base/src/map/bmf_types.dart';
 import 'package:flutter/services.dart';
 import 'package:jpush_flutter/jpush_flutter.dart';
 import 'package:locations/api/http.dart';
 import 'package:locations/model/user/user_info.dart';
 import 'package:locations/ui/main/location.dart';
 import 'package:locations/ui/sos/sos.dart';
+import 'package:locations/utils/event_bus_util.dart';
 import 'package:locations/utils/pageutils.dart';
 import 'package:locations/utils/user_util.dart';
 
@@ -35,12 +34,20 @@
         if (type == "sos") {
           //SOS
           NavigatorUtil.navigateToNextPagePush(SOSPage(title: ""));
-        } else if (type == "requestLocation") {
+        } else if (type == "locationInvite") {
           //璇锋眰瀹氫綅
-          LocationPage.getLocationInvite(navigatorKey.currentState!.context);
+          eventBus.fire(LocationInviteEventBus());
         }
       }, onReceiveMessage: (Map<String, dynamic> message) async {
-        print("flutter onReceiveMessage: ${message["message"]}");
+        var data = jsonDecode(message["message"]);
+        print("flutter onReceiveMessage: $data");
+        var type = data["type"];
+        if (type == "sos") {
+          //SOS
+          NavigatorUtil.navigateToNextPagePush(SOSPage(title: ""));
+        } else if (type == "locationInvite") {
+            eventBus.fire(LocationInviteEventBus());
+        }
       }, onReceiveNotificationAuthorization:
               (Map<String, dynamic> message) async {
         print("flutter onReceiveNotificationAuthorization: $message");
@@ -66,13 +73,15 @@
     bool isLogin = await UserUtil.isLogin();
     if (isLogin) {
       UserInfo? user = await UserUtil.getUserInfo();
-      await setAlias(user!.id!.toString());
+      setAlias(user!.id!.toString());
     }
   }
 
   ///娣诲姞alias
   static Future setAlias(String alias) async {
-    await _jpush.setAlias(alias);
+    try {
+      await _jpush.setAlias(alias);
+    } catch (e) {}
   }
 
   //鍒犻櫎alias

--
Gitblit v1.8.0