diff --git a/lib/login/login/starLock_login_logic.dart b/lib/login/login/starLock_login_logic.dart index c943d7e8..c0edc5bd 100755 --- a/lib/login/login/starLock_login_logic.dart +++ b/lib/login/login/starLock_login_logic.dart @@ -53,11 +53,13 @@ class StarLockLoginLogic extends BaseGetXController { Storage.saveLoginData(entity.data); Storage.setBool(saveIsVip, entity.data!.isVip == 1); eventBus.fire(MineInfoChangeRefreshUI()); - await XSJPushProvider().initJPushService(); - await XSJPushProvider().bindDeviceID(); - XSJPushProvider().initLocalNotification(isCancelLocalPush: false); Get.offNamedUntil(Routers.starLockMain, (Route route) => false); BlueManage().scanDevices.clear(); //清除设备缓存 + // 初始化JPush服务并绑定设备ID + final XSJPushProvider jpushProvider = XSJPushProvider(); + await jpushProvider.initJPushService(); + await jpushProvider.bindDeviceID(); + await jpushProvider.initLocalNotification(isCancelLocalPush: false); } } diff --git a/lib/main.dart b/lib/main.dart index d68c857f..d2a361ff 100755 --- a/lib/main.dart +++ b/lib/main.dart @@ -33,7 +33,7 @@ FutureOr main() async { final bool isLogin = await getLoginStatus(); if (isLogin) { await privacySDKInitialization(); - Future.delayed(const Duration(milliseconds: 500), () async{ + Future.delayed(const Duration(milliseconds: 500), () async { final GetAppInfo entity = await ApiRepository.to.getAppInfo(); CustomerTool.init(entity.data?.wechatServiceUrl ?? ''); WxPayTool.setAssociationUrl(entity.data!.appSiteUrl!); @@ -80,5 +80,7 @@ Future _setCommonServices() async { Future privacySDKInitialization() async { await Get.putAsync(() => PlatformInfoService().init()); await BuglyTool.init(); - await XSJPushProvider().initJPushService(); + // 初始化JPush服务 + final XSJPushProvider jpushProvider = XSJPushProvider(); + await jpushProvider.initJPushService(); } diff --git a/lib/main/lockDetail/doorLockLog/exportSuccess/exportSuccess_page.dart b/lib/main/lockDetail/doorLockLog/exportSuccess/exportSuccess_page.dart index f66c2238..9a249136 100644 --- a/lib/main/lockDetail/doorLockLog/exportSuccess/exportSuccess_page.dart +++ b/lib/main/lockDetail/doorLockLog/exportSuccess/exportSuccess_page.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:open_file/open_file.dart'; +import 'package:open_filex/open_filex.dart'; import 'package:star_lock/app_settings/app_colors.dart'; import 'package:star_lock/main/lockDetail/doorLockLog/exportSuccess/exportSuccess_logic.dart'; import 'package:star_lock/main/lockDetail/doorLockLog/exportSuccess/exportSuccess_state.dart'; @@ -73,10 +73,11 @@ class _ExportSuccessPageState extends State with RouteAware { height: 60.h, ), SubmitBtn( - btnName: '立即查看'.tr, - onClick: () { - OpenFile.open(state.getFilePath.value); - }), + btnName: '立即查看'.tr, + onClick: () { + OpenFilex.open(state.getFilePath.value); + }, + ), SizedBox( height: 20.h, ), diff --git a/lib/tools/push/xs_jPhush.dart b/lib/tools/push/xs_jPhush.dart index d71827d5..2993aaee 100755 --- a/lib/tools/push/xs_jPhush.dart +++ b/lib/tools/push/xs_jPhush.dart @@ -43,6 +43,7 @@ class XSJPushProvider { ); addJPushEventHandler(); + AppLog.log('JPush initialized.'); } //极光推送事件处理方法 diff --git a/pubspec.yaml b/pubspec.yaml index 84c22c7e..fd1117fd 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -217,7 +217,8 @@ dependencies: file_picker: ^5.3.1 # 错误日志监控 flutter_bugly_plugin: ^0.0.9 - open_file: ^3.3.2 + open_filex: ^4.4.0 + dependency_overrides: #强制设置google_maps_flutter_ios 为 2.5.2