From 3cfe50277ee5746dd3e07f6717517b1609d5b4de Mon Sep 17 00:00:00 2001 From: Liuyf Date: Thu, 20 Feb 2025 17:01:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20fcm=E9=9B=86=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/build.gradle | 5 +++++ android/app/src/main/AndroidManifest.xml | 2 ++ 2 files changed, 7 insertions(+) diff --git a/android/app/build.gradle b/android/app/build.gradle index 41903854..0386ff73 100755 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -357,4 +357,9 @@ dependencies { implementation 'com.umeng.umsdk:common:9.7.9' implementation 'com.umeng.umsdk:asms:1.8.5' // + // + implementation 'cn.jiguang.sdk.plugin:fcm:5.2.3' + implementation 'com.google.firebase:firebase-messaging:23.0.5' + // + } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index db2e332c..236a8fbe 100755 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -78,6 +78,8 @@ + From 63ce6b10709436a06c1865a971847cb327f921f5 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Fri, 21 Feb 2025 14:15:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=20=20feat=EF=BC=9Ajpush=E4=B8=AD=E5=90=84?= =?UTF-8?q?=E4=B8=AA=E5=8E=82=E5=95=86token=E6=88=AA=E5=8F=96=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E4=BB=A5=E5=8F=8A=E5=8E=9F=E7=94=9Fnative=E5=B1=82?= =?UTF-8?q?=E8=8E=B7=E5=8F=96token=E6=8E=A5=E5=8F=A3=E6=A1=A5=E6=8E=A5?= =?UTF-8?q?=E5=88=B0flutter=E5=B1=82=E4=BE=9B=E4=B8=9A=E5=8A=A1=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main.dart | 2 +- lib/tools/push/xs_jPhush.dart | 12 ++++++++++++ pubspec.lock | 9 +++++---- pubspec.yaml | 5 ++++- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index acdb013d..6671c0fb 100755 --- a/lib/main.dart +++ b/lib/main.dart @@ -61,7 +61,7 @@ FutureOr main() async { ], child: MyApp(isLogin: isLogin))); // runApp(MyApp(isLogin: isLogin)); }, onException: (FlutterErrorDetails details) async { - debugPrint("FlutterErrorDetails $details"); + debugPrint('FlutterErrorDetails ${details.exceptionAsString()}'); }); if (AppPlatform.isAndroid) { diff --git a/lib/tools/push/xs_jPhush.dart b/lib/tools/push/xs_jPhush.dart index bbeaa07a..3ce9adf3 100755 --- a/lib/tools/push/xs_jPhush.dart +++ b/lib/tools/push/xs_jPhush.dart @@ -1,5 +1,6 @@ import 'dart:io'; +import 'package:flutter/foundation.dart'; import 'package:jpush_flutter/jpush_flutter.dart'; import 'package:star_lock/flavors.dart'; import 'package:star_lock/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccount/mineUnbindPhoneOrEmail_entity.dart'; @@ -49,28 +50,39 @@ class XSJPushProvider { //极光推送事件处理方法 void addJPushEventHandler() { jpush.addEventHandler( + onCommandResult: (Map message) async { + AppLog.log('onCommandResult: $message'); + debugPrint("addJPushEventHandler onCommandResult:$message"); + }, onReceiveNotification: (Map message) async { AppLog.log('onReceiveNotification: $message'); + debugPrint("addJPushEventHandler onReceiveNotification:$message"); // showCustomNotification(message); }, onOpenNotification: (Map message) async { AppLog.log('onOpenNotification: $message'); + debugPrint("addJPushEventHandler onOpenNotification:$message"); }, onReceiveMessage: (Map message) async { AppLog.log('onReceiveMessage: $message'); + debugPrint("addJPushEventHandler onReceiveMessage:$message"); //这里接收自定义消息 MessageManagement.shunting(message); }, onReceiveNotificationAuthorization: (Map message) async { AppLog.log('onReceiveNotificationAuthorization: $message'); + debugPrint( + "addJPushEventHandler onReceiveNotificationAuthorization:$message"); }, onInAppMessageShow: (Map message) async { AppLog.log('onInAppMessageShow: $message'); + debugPrint("addJPushEventHandler onInAppMessageShow:$message"); }, onConnected: (Map message) async { //绑定设备id final String rid = await jpush.getRegistrationID(); AppLog.log('onConnected registration id : $rid'); + debugPrint("addJPushEventHandler onConnected:$message"); await Storage.setString(pushDeviceID, rid); await pushBindDeviceID(rid); diff --git a/pubspec.lock b/pubspec.lock index 1f831260..f09c8feb 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -991,10 +991,11 @@ packages: jpush_flutter: dependency: "direct main" description: - name: jpush_flutter - sha256: bb29ce650c6765a54ecbdd8f448840ecea83b4e24564e554d11eba20ed3b37d9 - url: "https://pub.dev" - source: hosted + path: "." + ref: main + resolved-ref: aa93729f48762421658675800be68aee27b6d8fb + url: "git@code-internal.star-lock.cn:StarlockTeam/jpush_flutter.git" + source: git version: "2.5.8" js: dependency: transitive diff --git a/pubspec.yaml b/pubspec.yaml index 5473124e..9109e0a9 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -211,7 +211,10 @@ dependencies: cached_network_image: ^3.2.0 webview_flutter: ^4.5.0 - jpush_flutter: ^2.5.1 + jpush_flutter: + git: + url: git@code-internal.star-lock.cn:StarlockTeam/jpush_flutter.git + ref: main #视频播放器 video_player: ^2.9.2