Merge branch 'master' of https://git.oa00.com/austin_dai/project_telephony

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

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);
 

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';

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',
     ],
   );
 }

tool/_project_manage.dart

@@ -1,4 +1,4 @@
-part of './grind.dart';
+part of 'grind.dart';
 
 @Task('import 排序')
 void sort() {

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';