sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'canary_release' into develop_liyi

Browse Source
This commit is contained in:
Liuyf 2025-02-21 14:16:32 +08:00
commit 8e3791636f
6 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
android/app/build.gradle
View File

@ -357,4 +357,9 @@ dependencies {
implementation 'com.umeng.umsdk:common:9.7.9' implementation 'com.umeng.umsdk:common:9.7.9'
implementation 'com.umeng.umsdk:asms:1.8.5' implementation 'com.umeng.umsdk:asms:1.8.5'
//</cn> //</cn>
//<com>
implementation 'cn.jiguang.sdk.plugin:fcm:5.2.3'
implementation 'com.google.firebase:firebase-messaging:23.0.5'
//</com>
} }

2
android/app/src/main/AndroidManifest.xml
View File

@ -78,6 +78,8 @@
<meta-data <meta-data
android:name="flutterEmbedding" android:name="flutterEmbedding"
android:value="2" /> android:value="2" />
<meta-data android:name="com.google.firebase.messaging.default_notification_icon"
android:resource="@mipmap/ic_launcher" />
<meta-data <meta-data
android:name="com.google.firebase.messaging.default_notification_channel_id" android:name="com.google.firebase.messaging.default_notification_channel_id"
android:value="1" /> <!-- 将您的通知渠道ID替换为您的实际ID --> android:value="1" /> <!-- 将您的通知渠道ID替换为您的实际ID -->

2
lib/main.dart
View File

@ -61,7 +61,7 @@ FutureOr<void> main() async {
// ], child: MyApp(isLogin: isLogin))); // ], child: MyApp(isLogin: isLogin)));
runApp(MyApp(isLogin: isLogin)); runApp(MyApp(isLogin: isLogin));
}, onException: (FlutterErrorDetails details) async { }, onException: (FlutterErrorDetails details) async {
debugPrint("FlutterErrorDetails $details"); debugPrint('FlutterErrorDetails ${details.exceptionAsString()}');
}); });
if (AppPlatform.isAndroid) { if (AppPlatform.isAndroid) {

12
lib/tools/push/xs_jPhush.dart
View File

@ -1,5 +1,6 @@
import 'dart:io'; import 'dart:io';
import 'package:flutter/foundation.dart';
import 'package:jpush_flutter/jpush_flutter.dart'; import 'package:jpush_flutter/jpush_flutter.dart';
import 'package:star_lock/flavors.dart'; import 'package:star_lock/flavors.dart';
import 'package:star_lock/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccount/mineUnbindPhoneOrEmail_entity.dart'; import 'package:star_lock/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccount/mineUnbindPhoneOrEmail_entity.dart';
@ -49,28 +50,39 @@ class XSJPushProvider {
//极光推送事件处理方法 //极光推送事件处理方法
void addJPushEventHandler() { void addJPushEventHandler() {
jpush.addEventHandler( jpush.addEventHandler(
onCommandResult: (Map<String, dynamic> message) async {
AppLog.log('onCommandResult: $message');
debugPrint("addJPushEventHandler onCommandResult:$message");
},
onReceiveNotification: (Map<String, dynamic> message) async { onReceiveNotification: (Map<String, dynamic> message) async {
AppLog.log('onReceiveNotification: $message'); AppLog.log('onReceiveNotification: $message');
debugPrint("addJPushEventHandler onReceiveNotification:$message");
// showCustomNotification(message); // showCustomNotification(message);
}, },
onOpenNotification: (Map<String, dynamic> message) async { onOpenNotification: (Map<String, dynamic> message) async {
AppLog.log('onOpenNotification: $message'); AppLog.log('onOpenNotification: $message');
debugPrint("addJPushEventHandler onOpenNotification:$message");
}, },
onReceiveMessage: (Map<String, dynamic> message) async { onReceiveMessage: (Map<String, dynamic> message) async {
AppLog.log('onReceiveMessage: $message'); AppLog.log('onReceiveMessage: $message');
debugPrint("addJPushEventHandler onReceiveMessage:$message");
//这里接收自定义消息 //这里接收自定义消息
MessageManagement.shunting(message); MessageManagement.shunting(message);
}, },
onReceiveNotificationAuthorization: (Map<String, dynamic> message) async { onReceiveNotificationAuthorization: (Map<String, dynamic> message) async {
AppLog.log('onReceiveNotificationAuthorization: $message'); AppLog.log('onReceiveNotificationAuthorization: $message');
debugPrint(
"addJPushEventHandler onReceiveNotificationAuthorization:$message");
}, },
onInAppMessageShow: (Map<String, dynamic> message) async { onInAppMessageShow: (Map<String, dynamic> message) async {
AppLog.log('onInAppMessageShow: $message'); AppLog.log('onInAppMessageShow: $message');
debugPrint("addJPushEventHandler onInAppMessageShow:$message");
}, },
onConnected: (Map<String, dynamic> message) async { onConnected: (Map<String, dynamic> message) async {
//绑定设备id //绑定设备id
final String rid = await jpush.getRegistrationID(); final String rid = await jpush.getRegistrationID();
AppLog.log('onConnected registration id : $rid'); AppLog.log('onConnected registration id : $rid');
debugPrint("addJPushEventHandler onConnected:$message");
await Storage.setString(pushDeviceID, rid); await Storage.setString(pushDeviceID, rid);
await pushBindDeviceID(rid); await pushBindDeviceID(rid);

9
pubspec.lock
View File

@ -991,10 +991,11 @@ packages:
jpush_flutter: jpush_flutter:
dependency: "direct main" dependency: "direct main"
description: description:
name: jpush_flutter path: "."
sha256: bb29ce650c6765a54ecbdd8f448840ecea83b4e24564e554d11eba20ed3b37d9 ref: main
url: "https://pub.dev" resolved-ref: aa93729f48762421658675800be68aee27b6d8fb
source: hosted url: "git@code-internal.star-lock.cn:StarlockTeam/jpush_flutter.git"
source: git
version: "2.5.8" version: "2.5.8"
js: js:
dependency: transitive dependency: transitive

5
pubspec.yaml
View File

@ -211,7 +211,10 @@ dependencies:
cached_network_image: ^3.2.0 cached_network_image: ^3.2.0
webview_flutter: ^4.5.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 video_player: ^2.9.2