From 3465ac6e980f1473e4f42ba3eaafc7815423efec Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 27 十一月 2021 17:10:45 +0800
Subject: [PATCH] 功能完善
---
lib/main.dart | 61 ++++++++++++------------------
1 files changed, 25 insertions(+), 36 deletions(-)
diff --git a/lib/main.dart b/lib/main.dart
index 15178cd..c55b603 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -7,6 +7,7 @@
import 'package:flutter/services.dart';
import 'package:locations/utils/app_util.dart';
import 'package:locations/utils/pageutils.dart';
+import 'package:locations/utils/ui_utils.dart';
import 'package:locations/utils/user_util.dart';
import 'package:permission_handler/permission_handler.dart';
@@ -113,9 +114,6 @@
});
}
-
-
-
Future requestPermission() async {
await Permission.phone.request();
await Permission.storage.request();
@@ -130,39 +128,30 @@
//寮瑰嚭鐢ㄦ埛鍗忚妗�
String content =
"娆㈣繋鎮ㄤ娇鐢ㄧ櫨搴﹀湴鍥炬湇鍔★紒<a href='${Constant.PROTOCOL_URL}'> 鐢ㄦ埛鍗忚 </a>鍜�<a href='${Constant.PRIVACY_URL}'>闅愮鏀跨瓥</a> 鎴戜滑闈炲父閲嶈鎮ㄧ殑闅愮淇濇姢鍜屼釜浜轰俊鎭繚鎶ゃ�傛湰闅愮鏀跨瓥閫傜敤浜庢偍閫氳繃浠讳綍鏂瑰紡瀵圭櫨搴﹀湴鍥惧悇椤规湇鍔＄殑璁块棶鍜屼娇鐢ㄣ�傛偍鍙互鍒╃敤鐧惧害鍦板浘鎼滅储璺喌淇℃伅銆佸晢瀹朵俊鎭�佸畾浣嶆偍鎵�鍦ㄧ殑浣嶇疆锛岃繘琛岃矾寰勮鍒掋�佸鑸偍鎯冲幓鐨勫湴鍧�锛屾悳绱㈠懆杈圭殑鏈嶅姟绛夛紙浠ヤ笅缁熺О鈥滅櫨搴﹀湴鍥句骇鍝佹垨鏈嶅姟鈥濓級銆傛偍鍏蜂綋鑾峰緱鐨勭櫨搴﹀湴鍥炬湇鍔″唴瀹瑰彲鑳藉洜涓烘偍浣跨敤鐨勭櫨搴﹀湴鍥剧殑鐗堟湰鍙婃惌杞借澶囦笉鍚岃�屾湁鎵�宸紓锛屽鏋滃湪閮ㄥ垎鐗堟湰鎴栨惌杞借澶囦腑涓嶆兜鐩栨煇浜涙湇鍔″唴瀹规垨鏈彁渚涚壒瀹氬姛鑳斤紙渚嬪锛氶儴鍒嗙増鏈笉鏀寔鐧诲綍锛屾垜浠彲鑳芥棤娉曚负鎮ㄦ彁渚涚涓夋柟鏈嶅姟浠ュ強鍏朵粬鐧诲綍鍚庢墠鑳戒娇鐢ㄧ殑鍔熻兘锛涙墜琛ㄧ瓑绌挎埓璁惧鏆傛椂鍙敮鎸佹楠戣鐨勮矾绾胯鍒掑強瀵艰埅锛屾墍浠ユ垜浠湪绌挎埓璁惧涓婃惌杞界殑鍦板浘鏃犳硶涓烘偍鎻愪緵濡傞┚杞﹁矾绾胯鍒掑強瀵艰埅绛夊叾浠栧姛鑳斤級锛屾湰闅愮鏀跨瓥涓秹鍙婂埌涓婅堪鏈嶅姟/鍔熻兘鍙婄浉鍏充釜浜轰俊鎭殑鍐呭灏嗕笉閫傜敤銆傛偍鍙互閫氳繃澶氱涓嶅悓鐨勬柟寮忔潵浣跨敤鎴戜滑鐨勪骇鍝佸拰鏈嶅姟锛屽寘鎷櫨搴﹀湴鍥剧殑缃戠珯銆佽蒋浠躲�佷緵绗笁鏂圭綉绔欏拰搴旂敤绋嬪簭浣跨敤鐨勭櫨搴﹀湴鍥捐蒋浠跺紑鍙戝伐鍏峰寘锛圫DK锛夊拰搴旂敤绋嬪簭缂栫▼鎺ュ彛锛圓PI锛夈�佽溅杞藉鑸华銆佹櫤鑳藉悗瑙嗛暅绛夋櫤鑳界‖浠惰澶囥��";
- showGeneralDialog(
- context: context,
- pageBuilder: (BuildContext buildContext,
- Animation<double> animation,
- Animation<double> secondaryAnimation) =>
- NotifyDialog(
- "鐢ㄦ埛鍗忚&闅愮鏀跨瓥",
- content,
- () {
- Navigator.of(context).pop();
- },
- () {
- UserUtil.setAgreeProtocol().then((value) {
- if (value) {
- //寮瑰嚭鏉冮檺妗�
- showGeneralDialog(
- context: context,
- pageBuilder: (BuildContext buildContext,
- Animation<double> animation,
- Animation<double> secondaryAnimation) {
- return PermissionNotifyDialog(() {
- Navigator.of(context).pop();
- requestPermission().then((value) {
- init();
- });
- });
- });
- } else {}
- });
- },
- richText: true,
- height: 400,
- ));
+ DialogUtil.showDialog(
+ context,
+ NotifyDialog(
+ "鐢ㄦ埛鍗忚&闅愮鏀跨瓥",
+ content,
+ () {
+ Navigator.of(context).pop();
+ },
+ () {
+ UserUtil.setAgreeProtocol().then((value) {
+ if (value) {
+ //寮瑰嚭鏉冮檺妗�
+ DialogUtil.showDialog(context, PermissionNotifyDialog(() {
+ Navigator.of(context).pop();
+ requestPermission().then((value) {
+ init();
+ });
+ }));
+ } else {}
+ });
+ },
+ richText: true,
+ height: 400,
+ ));
} else {
//宸茬粡鍚屾剰浜�
init();
--
Gitblit v1.8.0