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

1，修改登录后初始化极光推送

Browse Source 
2，修改废弃的打开URL的方法
3，修复同意隐私协议前调用了设备信息的上架问题
This commit is contained in:
Daisy 2024-03-20 10:57:20 +08:00
parent e5af81daa0
commit dd1deb6ce1
4 changed files with 78 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
star_lock/lib/app.dart
View File

@ -9,6 +9,7 @@ import 'package:permission_handler/permission_handler.dart';
import 'package:star_lock/flavors.dart'; import 'package:star_lock/flavors.dart';
import 'package:star_lock/tools/app_manager.dart'; import 'package:star_lock/tools/app_manager.dart';
import 'package:star_lock/tools/bindings/app_binding.dart'; import 'package:star_lock/tools/bindings/app_binding.dart';
import 'package:star_lock/tools/storage.dart';
// import 'package:star_lock/tools/storage.dart'; // import 'package:star_lock/tools/storage.dart';
// import 'package:star_lock/tools/xs_aliyunPush.dart'; // import 'package:star_lock/tools/xs_aliyunPush.dart';
@ -104,6 +105,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver, BaseWidget {
void initState() { void initState() {
super.initState(); super.initState();
WidgetsBinding.instance.addObserver(this); WidgetsBinding.instance.addObserver(this);
initJPushService(); initJPushService();
} }
@ -114,21 +116,24 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver, BaseWidget {
} }
Future<void> initJPushService() async { Future<void> initJPushService() async {
jpush.setup( final data = await Storage.getString(saveUserLoginData);
appKey: "7ff37d174c1a568a89e98dad", if (data != null && data.isNotEmpty) {
channel: "flutter_channel", jpush.setup(
production: false, appKey: "7ff37d174c1a568a89e98dad",
debug: true, channel: "flutter_channel",
); production: false,
jpush.applyPushAuthority( debug: true,
const NotificationSettingsIOS(sound: true, alert: true, badge: true)); );
// jpush.setChannelAndSound( jpush.applyPushAuthority(
// channel: "flutter_channel", channelID: "115700", sound: "default"); const NotificationSettingsIOS(sound: true, alert: true, badge: true));
// jpush.setChannelAndSound(
// channel: "flutter_channel", channelID: "115700", sound: "default");
// Platform messages may fail, so we use a try/catch PlatformException. // Platform messages may fail, so we use a try/catch PlatformException.
jpush.getRegistrationID().then((rid) { jpush.getRegistrationID().then((rid) {
print("flutter get registration id : $rid"); print("flutter get registration id : $rid");
}); });
}
} }
} }

13
star_lock/lib/starLockApplication/starLockApplication.dart
View File

@ -3,7 +3,6 @@ import 'package:star_lock/login/login/starLock_login_page.dart';
import 'package:star_lock/tools/appFirstEnterHandle.dart'; import 'package:star_lock/tools/appFirstEnterHandle.dart';
import 'package:star_lock/tools/storage.dart'; import 'package:star_lock/tools/storage.dart';
import '../blue/blue_manage.dart';
import '../main/lockMian/lockMain/lockMain_page.dart'; import '../main/lockMian/lockMain/lockMain_page.dart';
class StarLockApplication extends StatefulWidget { class StarLockApplication extends StatefulWidget {
@ -14,8 +13,6 @@ class StarLockApplication extends StatefulWidget {
} }
class _StarLockApplicationState extends State<StarLockApplication> { class _StarLockApplicationState extends State<StarLockApplication> {
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
@ -27,7 +24,8 @@ class _StarLockApplicationState extends State<StarLockApplication> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
print("StarLockApplication build"); print("StarLockApplication build");
AppFirstEnterHandle().getAppFirstEnter(context, isAgreePrivacy); AppFirstEnterHandle().getAppFirstEnter(context, isAgreePrivacy);
AppFirstEnterHandle().getAppFirstEnter(context, isShowUpdateVersion); getAgreePrivacyShowUpdate();
return FutureBuilder<bool>( return FutureBuilder<bool>(
future: getLoginStatus(), future: getLoginStatus(),
builder: (context, snapshot) { builder: (context, snapshot) {
@ -57,4 +55,11 @@ class _StarLockApplicationState extends State<StarLockApplication> {
} }
return false; return false;
} }
Future<void> getAgreePrivacyShowUpdate() async {
final data = await Storage.getString(isAgreePrivacy);
if (data == isAgreePrivacy) {
AppFirstEnterHandle().getAppFirstEnter(context, isShowUpdateVersion);
}
}
} }

7
star_lock/lib/tools/appFirstEnterHandle.dart
View File

@ -1,20 +1,14 @@
import 'dart:io'; import 'dart:io';
import 'package:device_info_plus/device_info_plus.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/gestures.dart'; import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:package_info_plus/package_info_plus.dart';
import 'package:star_lock/appRouters.dart'; import 'package:star_lock/appRouters.dart';
import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart'; import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart';
import 'package:star_lock/tools/storage.dart'; import 'package:star_lock/tools/storage.dart';
import '../network/api_repository.dart';
import '../translations/trans_lib.dart';
import '../versionUndate/versionUndateTool.dart'; import '../versionUndate/versionUndateTool.dart';
import '../versionUndate/versionUndate_entity.dart';
class AppFirstEnterHandle { class AppFirstEnterHandle {
Future getAppFirstEnter(BuildContext widgetContext, String flagStr) async { Future getAppFirstEnter(BuildContext widgetContext, String flagStr) async {
@ -116,6 +110,7 @@ class AppFirstEnterHandle {
onPressed: () { onPressed: () {
Storage.setString(isAgreePrivacy, isAgreePrivacy); Storage.setString(isAgreePrivacy, isAgreePrivacy);
Navigator.of(context).pop(); Navigator.of(context).pop();
getAppFirstEnter(context, isShowUpdateVersion);
}, },
), ),
], ],

90
star_lock/lib/versionUndate/versionUndateTool.dart
View File

@ -1,4 +1,3 @@
import 'dart:io'; import 'dart:io';
import 'package:device_info_plus/device_info_plus.dart'; import 'package:device_info_plus/device_info_plus.dart';
@ -17,7 +16,7 @@ import 'versionUndate_entity.dart';
class VersionUndateTool { class VersionUndateTool {
static VersionUndateTool? _manager; static VersionUndateTool? _manager;
VersionUndateTool._init(){ VersionUndateTool._init() {
// _initLoadUpdateVersionData(); // _initLoadUpdateVersionData();
} }
@ -32,7 +31,6 @@ class VersionUndateTool {
VersionUndateTool? get manager => shareManager(); VersionUndateTool? get manager => shareManager();
void _initLoadUpdateVersionData() { void _initLoadUpdateVersionData() {
getVersionData(); getVersionData();
} }
@ -68,7 +66,7 @@ class VersionUndateTool {
currentVersion: version, currentVersion: version,
); );
if (entity.errorCode! == 0) { if (entity.errorCode! == 0) {
if(entity.data!.isUpdate! == 1){ if (entity.data!.isUpdate! == 1) {
showUpdateAlertDialog(entity); showUpdateAlertDialog(entity);
} }
} }
@ -82,50 +80,58 @@ class VersionUndateTool {
content: Column( content: Column(
children: [ children: [
Container( Container(
// color: AppColors.mainColor, // color: AppColors.mainColor,
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
height: 50.h, height: 50.h,
child: Text('版本更新', style: TextStyle(fontSize: 28.sp, color: Colors.blue),) child: Text(
), '版本更新',
style: TextStyle(fontSize: 28.sp, color: Colors.blue),
)),
Container( Container(
padding: EdgeInsets.only(left:20.w, right: 20.w, top: 10.h), padding: EdgeInsets.only(left: 20.w, right: 20.w, top: 10.h),
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: Text(versionUndateEntity.data!.description!, textAlign:TextAlign.start, style: TextStyle(fontSize: 20.sp)) child: Text(versionUndateEntity.data!.description!,
), textAlign: TextAlign.start,
style: TextStyle(fontSize: 20.sp))),
], ],
), ),
actions: versionUndateEntity.data!.isForceUpdate == 0 ? actions: versionUndateEntity.data!.isForceUpdate == 0
[ ? [
CupertinoDialogAction( CupertinoDialogAction(
child: Text("下次再说"), child: Text("下次再说"),
onPressed: () { onPressed: () {
Navigator.pop(context); Navigator.pop(context);
Storage.setString(isShowUpdateVersion, isShowUpdateVersion); Storage.setString(
}, isShowUpdateVersion, isShowUpdateVersion);
), },
CupertinoDialogAction( ),
child: Text(TranslationLoader.lanKeys!.sure!.tr), CupertinoDialogAction(
onPressed: () async { child: Text(TranslationLoader.lanKeys!.sure!.tr),
if (await canLaunch(versionUndateEntity.data!.appDownloadUrl!)) { onPressed: () async {
await launch(versionUndateEntity.data!.appDownloadUrl!); if (await canLaunchUrl(Uri.parse(
} else { versionUndateEntity.data!.appDownloadUrl!))) {
throw 'Could not launch ${versionUndateEntity.data!.appDownloadUrl}'; await launchUrl(Uri.parse(
} versionUndateEntity.data!.appDownloadUrl!));
}, } else {
), throw 'Could not launch ${versionUndateEntity.data!.appDownloadUrl}';
]: }
[ },
CupertinoDialogAction( ),
child: Text(TranslationLoader.lanKeys!.sure!.tr), ]
onPressed: () async { : [
if (await canLaunch(versionUndateEntity.data!.appDownloadUrl!)) { CupertinoDialogAction(
await launch(versionUndateEntity.data!.appDownloadUrl!); child: Text(TranslationLoader.lanKeys!.sure!.tr),
} else { onPressed: () async {
throw 'Could not launch ${versionUndateEntity.data!.appDownloadUrl}'; if (await canLaunchUrl(Uri.parse(
} versionUndateEntity.data!.appDownloadUrl!))) {
}, await launchUrl(Uri.parse(
), versionUndateEntity.data!.appDownloadUrl!));
], } else {
throw 'Could not launch ${versionUndateEntity.data!.appDownloadUrl}';
}
},
),
],
); );
}, },
); );