diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 44ca36a..6b1b4b0 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jul 28 13:53:35 CST 2022 +#Mon Aug 29 15:08:28 CST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/lib/ui/home/home_page.dart b/lib/ui/home/home_page.dart index 287da14..9202824 100644 --- a/lib/ui/home/home_page.dart +++ b/lib/ui/home/home_page.dart @@ -1,13 +1,16 @@ import 'dart:async'; - import 'package:flutter/material.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:project_telephony/ui/home/content_connect_page.dart'; import 'package:project_telephony/ui/home/content_refuse_page.dart'; import 'package:project_telephony/ui/user/privacy_rights_page.dart'; +import 'package:project_telephony/ui/user/privacy_rights_page.dart'; + import 'package:project_telephony/utils/headers.dart'; +import '../user/privacy_rights_page.dart'; + class HomePage extends StatefulWidget { const HomePage({Key? key}) : super(key: key); diff --git a/lib/ui/user/privacy_rights_page.dart b/lib/ui/user/privacy_rights_page.dart index 511b154..5579b0f 100644 --- a/lib/ui/user/privacy_rights_page.dart +++ b/lib/ui/user/privacy_rights_page.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:project_telephony/base/base_style.dart'; +import 'package:project_telephony/ui/user/privacy_rights_page.dart'; import 'package:project_telephony/ui/widget/plone_back_button.dart'; import 'package:project_telephony/utils/headers.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/tool/_build.dart b/tool/_build.dart index 249976d..60a902c 100644 --- a/tool/_build.dart +++ b/tool/_build.dart @@ -10,7 +10,7 @@ buildApk() async { 'apk', '--target-platform=android-arm64', '--dart-define', - 'BUILD_TYPE=PRODUCT', + 'ENV=release', ], ); @@ -34,7 +34,7 @@ buildApkDev() async { 'apk', '--target-platform=android-arm64', '--dart-define', - 'BUILD_TYPE=Dev', + 'ENV=dev', ], ); String date = DateUtil.formatDate(DateTime.now(), format: 'yy_MM_dd_HH_mm'); @@ -56,7 +56,21 @@ buildIos() async { 'build', 'ios', '--dart-define', - 'BUILD_TYPE=PRODUCT', + 'ENV=release', + ], + ); +} + +@Task('打包iOS项目') +buildIosDev() async { + await runAsync( + 'fvm', + arguments: [ + 'flutter', + 'build', + 'ios', + '--dart-define', + 'ENV=dev', ], ); } diff --git a/tool/_project_manage.dart b/tool/_project_manage.dart index 5f58c3a..26c077d 100644 --- a/tool/_project_manage.dart +++ b/tool/_project_manage.dart @@ -1,4 +1,4 @@ -part of './grind.dart'; +part of 'grind.dart'; @Task('import 排序') void sort() { diff --git a/tool/grind.dart b/tool/grind.dart index 112ee83..4a42c3f 100644 --- a/tool/grind.dart +++ b/tool/grind.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:flustars/flustars.dart'; +import 'package:common_utils/common_utils.dart'; import 'package:grinder/grinder.dart'; import 'package:path/path.dart'; import 'package:pub_semver/pub_semver.dart';