From fd45bfda92842b118516e2687178e7aed6f61c70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=90=8C?= <494089941@qq.com> Date: Thu, 2 Jun 2022 15:15:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=E9=9B=86=E6=88=90=E5=9C=A8=E5=A2=9E=E5=8A=A0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E8=84=9A=E6=9C=AC=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/splash/splash_page.dart | 3 ++- pubspec.lock | 9 ++++++++- pubspec.yaml | 11 +++++++---- tool/grind.dart | 24 ++++++++++++++++++------ 4 files changed, 35 insertions(+), 12 deletions(-) diff --git a/lib/pages/splash/splash_page.dart b/lib/pages/splash/splash_page.dart index 28a7dbe8..c0b0afa6 100644 --- a/lib/pages/splash/splash_page.dart +++ b/lib/pages/splash/splash_page.dart @@ -1,4 +1,4 @@ - +import 'package:aku_app_upgrade/aku_app_upgrade.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -111,6 +111,7 @@ class _SplashPageState extends State { // await Permission.locationWhenInUse.request(); // } //第三方加载 + await AppUpgrade().checkUpgrade(context); MainInitialize.initJPush(); EquatableConfig.stringify = true; AMapFlutterLocation.updatePrivacyShow(true, true); diff --git a/pubspec.lock b/pubspec.lock index 7e04eb83..7e416385 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -15,6 +15,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.1" + aku_app_upgrade: + dependency: "direct main" + description: + path: "../aku_app_upgrade" + relative: true + source: path + version: "0.0.1" amap_flutter_base: dependency: "direct main" description: @@ -1391,7 +1398,7 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.0.20" + version: "6.1.2" url_launcher_android: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 50eca530..5e0c15e1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -86,7 +86,7 @@ dependencies: amap_flutter_map: ^3.0.0 amap_flutter_location: ^3.0.0 amap_flutter_base: ^3.0.0 -# amap_search_fluttify: 0.17.0-dev.0 + # amap_search_fluttify: 0.17.0-dev.0 #动态文字 animated_text_kit: ^4.2.1 #分享功能 @@ -117,8 +117,8 @@ dependencies: scroll_to_index: ^2.1.1 #验证码自动填充 sms_autofill: ^2.2.0 -# #提取图片主色 -# palette_generator: ^0.3.2 + # #提取图片主色 + # palette_generator: ^0.3.2 #音频播放 just_audio: ^0.9.20 #录音 @@ -131,6 +131,9 @@ dependencies: sp_util: ^2.0.0 #系统通知栏消息 flutter_local_notifications: ^9.5.3+1 + #app更新 + aku_app_upgrade: + path: ../aku_app_upgrade dev_dependencies: flutter_test: @@ -140,7 +143,7 @@ dev_dependencies: hive_generator: ^1.1.0 #脚本工具 grinder: ^0.9.0 -# flutter_native_splash: ^1.1.8+4 + # flutter_native_splash: ^1.1.8+4 #model自动生成 json_serializable: ^6.1.3 build_runner: ^2.0.2 diff --git a/tool/grind.dart b/tool/grind.dart index bc6ae14a..044031e7 100644 --- a/tool/grind.dart +++ b/tool/grind.dart @@ -17,6 +17,8 @@ main(args) => grind(args); @Task('add minor version number') void addVersion() async { + TaskArgs args = context.invocation.arguments; + bool force = args.getFlag('f'); String projectPath = Directory('.').absolute.path; String yamlPath = join(projectPath, 'pubspec.yaml'); String yamlContent = await File(yamlPath).readAsString(); @@ -28,10 +30,14 @@ void addVersion() async { String result = yamlContent.replaceFirst(version, resultVersion.toString()); await File(yamlPath).writeAsString(result); + stdout.write('version has been add 👍\n'); + await uploadVersion(force); } @Task('add path version number') void addVersionPatch() async { + TaskArgs args = context.invocation.arguments; + bool force = args.getFlag('f'); String projectPath = Directory('.').absolute.path; String yamlPath = join(projectPath, 'pubspec.yaml'); String yamlContent = await File(yamlPath).readAsString(); @@ -43,10 +49,14 @@ void addVersionPatch() async { String result = yamlContent.replaceFirst(version, resultVersion.toString()); await File(yamlPath).writeAsString(result); + stdout.write('version has been add 👍'); + await uploadVersion(force); } @Task('add major version number') void addVersionMajor() async { + TaskArgs args = context.invocation.arguments; + bool force = args.getFlag('f'); String projectPath = Directory('.').absolute.path; String yamlPath = join(projectPath, 'pubspec.yaml'); String yamlContent = await File(yamlPath).readAsString(); @@ -58,10 +68,14 @@ void addVersionMajor() async { String result = yamlContent.replaceFirst(version, resultVersion.toString()); await File(yamlPath).writeAsString(result); + stdout.write('version has been add 👍'); + await uploadVersion(force); } @Task() Future getVersion() async { + TaskArgs args = context.invocation.arguments; + bool force = args.getFlag('f'); String projectPath = Directory('.').absolute.path; String yamlPath = join(projectPath, 'pubspec.yaml'); String yamlContent = await File(yamlPath).readAsString(); @@ -71,14 +85,12 @@ Future getVersion() async { } @Task() -Future uploadVersion() async { - TaskArgs args = context.invocation.arguments; - bool force = args.getFlag('f'); +Future uploadVersion(bool force) async { var version = await getVersion(); List spVersion = version.split('+'); - stdout.write('版本号：' + spVersion[0]+'\n'); - stdout.write('构建号：' + spVersion[1]+'\n'); - stdout.write('强制更新：' + force.toString()+'\n'); + stdout.write('版本号：' + spVersion[0] + '\n'); + stdout.write('构建号：' + spVersion[1] + '\n'); + stdout.write('强制更新：' + force.toString() + '\n'); var response = await Dio().post('http://121.41.26.225:8006/app/version/insert', data: { 'versionNumber': spVersion[0],