xt / Flutter-ReserveApp · Commits

Go to a project

Commit 4553bfc9f6f74654ecec17d81cf44819b6c0cad2

Authored by wdn127929
1 parent 43da1025
build: skipped

权限目的消失弹框

Inline Side-by-side
Showing 7 changed files with 31 additions and 10 deletions
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 archiveVersion = 1; 3 archiveVersion = 1;
4 classes = { 4 classes = {
5 }; 5 };
6 - objectVersion = 50; 6 + objectVersion = 46;
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
@@ -548,7 +548,7 @@ @@ -548,7 +548,7 @@
548 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; 548 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
549 CODE_SIGN_IDENTITY = "Apple Development"; 549 CODE_SIGN_IDENTITY = "Apple Development";
550 CODE_SIGN_STYLE = Automatic; 550 CODE_SIGN_STYLE = Automatic;
551 - CURRENT_PROJECT_VERSION = 5280; 551 + CURRENT_PROJECT_VERSION = 529;
552 DEVELOPMENT_TEAM = 8J59HM8B82; 552 DEVELOPMENT_TEAM = 8J59HM8B82;
553 ENABLE_BITCODE = NO; 553 ENABLE_BITCODE = NO;
554 FLUTTER_BUILD_MODE = release; 554 FLUTTER_BUILD_MODE = release;
@@ -563,7 +563,7 @@ @@ -563,7 +563,7 @@
563 "$(inherited)", 563 "$(inherited)",
564 "$(PROJECT_DIR)/Flutter", 564 "$(PROJECT_DIR)/Flutter",
565 ); 565 );
566 - MARKETING_VERSION = 5.2.8; 566 + MARKETING_VERSION = 5.2.9;
567 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 567 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
568 PRODUCT_NAME = Runner; 568 PRODUCT_NAME = Runner;
569 PROVISIONING_PROFILE_SPECIFIER = ""; 569 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -696,10 +696,10 @@ @@ -696,10 +696,10 @@
696 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 696 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
697 CODE_SIGN_IDENTITY = "Apple Development"; 697 CODE_SIGN_IDENTITY = "Apple Development";
698 CODE_SIGN_STYLE = Automatic; 698 CODE_SIGN_STYLE = Automatic;
699 - CURRENT_PROJECT_VERSION = 5280; 699 + CURRENT_PROJECT_VERSION = 529;
700 DEVELOPMENT_TEAM = 8J59HM8B82; 700 DEVELOPMENT_TEAM = 8J59HM8B82;
701 ENABLE_BITCODE = NO; 701 ENABLE_BITCODE = NO;
702 - FLUTTER_BUILD_MODE = debug; 702 + FLUTTER_BUILD_MODE = release;
703 FRAMEWORK_SEARCH_PATHS = ( 703 FRAMEWORK_SEARCH_PATHS = (
704 "$(inherited)", 704 "$(inherited)",
705 "$(PROJECT_DIR)/Flutter", 705 "$(PROJECT_DIR)/Flutter",
@@ -711,7 +711,7 @@ @@ -711,7 +711,7 @@
711 "$(inherited)", 711 "$(inherited)",
712 "$(PROJECT_DIR)/Flutter", 712 "$(PROJECT_DIR)/Flutter",
713 ); 713 );
714 - MARKETING_VERSION = 5.2.8; 714 + MARKETING_VERSION = 5.2.9;
715 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 715 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
716 PRODUCT_NAME = Runner; 716 PRODUCT_NAME = Runner;
717 PROVISIONING_PROFILE_SPECIFIER = ""; 717 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -732,7 +732,7 @@ @@ -732,7 +732,7 @@
732 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 732 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
733 CODE_SIGN_IDENTITY = "Apple Development"; 733 CODE_SIGN_IDENTITY = "Apple Development";
734 CODE_SIGN_STYLE = Automatic; 734 CODE_SIGN_STYLE = Automatic;
735 - CURRENT_PROJECT_VERSION = 5280; 735 + CURRENT_PROJECT_VERSION = 529;
736 DEVELOPMENT_TEAM = 8J59HM8B82; 736 DEVELOPMENT_TEAM = 8J59HM8B82;
737 ENABLE_BITCODE = NO; 737 ENABLE_BITCODE = NO;
738 FLUTTER_BUILD_MODE = release; 738 FLUTTER_BUILD_MODE = release;
@@ -747,7 +747,7 @@ @@ -747,7 +747,7 @@
747 "$(inherited)", 747 "$(inherited)",
748 "$(PROJECT_DIR)/Flutter", 748 "$(PROJECT_DIR)/Flutter",
749 ); 749 );
750 - MARKETING_VERSION = 5.2.8; 750 + MARKETING_VERSION = 5.2.9;
751 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 751 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
752 PRODUCT_NAME = Runner; 752 PRODUCT_NAME = Runner;
753 PROVISIONING_PROFILE_SPECIFIER = ""; 753 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -19,6 +19,8 @@ class App { @@ -19,6 +19,8 @@ class App {
19 static final GlobalKey<NavigatorState> navigatorKey = 19 static final GlobalKey<NavigatorState> navigatorKey =
20 new GlobalKey<NavigatorState>(); 20 new GlobalKey<NavigatorState>();
21 21
  22 + static bool isShowDes = false; //权限使用目的
  23 +
22 static initSp() async { 24 static initSp() async {
23 sp = await SharedPreferences.getInstance(); 25 sp = await SharedPreferences.getInstance();
24 } 26 }
@@ -150,6 +150,9 @@ class _CouponPageState extends State<CouponPage> with TickerProviderStateMixin { @@ -150,6 +150,9 @@ class _CouponPageState extends State<CouponPage> with TickerProviderStateMixin {
150 aspectTolerance: 0.5, useAutoFocus: true), //(默认已配)添加Android自动对焦 150 aspectTolerance: 0.5, useAutoFocus: true), //(默认已配)添加Android自动对焦
151 ), 151 ),
152 ); 152 );
  153 + if(App.isShowDes){
  154 + Navigator.pop(context);
  155 + }
153 // result.rawContent 156 // result.rawContent
154 setState(() => scanResult = result); 157 setState(() => scanResult = result);
155 print(result); 158 print(result);
@@ -127,6 +127,9 @@ class _ExportBookDataPageState extends State<ExportBookDataPage> { @@ -127,6 +127,9 @@ class _ExportBookDataPageState extends State<ExportBookDataPage> {
127 } 127 }
128 128
129 final result = await Permission.photos.request(); 129 final result = await Permission.photos.request();
  130 + if(App.isShowDes){
  131 + Navigator.pop(context);
  132 + }
130 return result == PermissionStatus.granted; 133 return result == PermissionStatus.granted;
131 } else { 134 } else {
132 final status = await Permission.storage.status; 135 final status = await Permission.storage.status;
@@ -142,6 +145,9 @@ class _ExportBookDataPageState extends State<ExportBookDataPage> { @@ -142,6 +145,9 @@ class _ExportBookDataPageState extends State<ExportBookDataPage> {
142 } 145 }
143 146
144 final result = await Permission.storage.request(); 147 final result = await Permission.storage.request();
  148 + if(App.isShowDes){
  149 + Navigator.pop(context);
  150 + }
145 return result == PermissionStatus.granted; 151 return result == PermissionStatus.granted;
146 } 152 }
147 } 153 }
@@ -38,6 +38,9 @@ class CallLogUtils { @@ -38,6 +38,9 @@ class CallLogUtils {
38 } 38 }
39 39
40 Iterable<CallLogEntry> result = await CallLog.query(); 40 Iterable<CallLogEntry> result = await CallLog.query();
  41 + if(App.isShowDes){
  42 + Navigator.pop(context);
  43 + }
41 return result; 44 return result;
42 } catch (e) { 45 } catch (e) {
43 print(e); 46 print(e);
@@ -38,6 +38,7 @@ import 'package:table_calendar/table_calendar.dart'; @@ -38,6 +38,7 @@ import 'package:table_calendar/table_calendar.dart';
38 import 'package:one_key/models/table.dart' as t; 38 import 'package:one_key/models/table.dart' as t;
39 import 'package:url_launcher/url_launcher.dart'; 39 import 'package:url_launcher/url_launcher.dart';
40 40
  41 +import '../app.dart';
41 import '../models/cookbook_model.dart'; 42 import '../models/cookbook_model.dart';
42 import '../models/customer_label_model.dart'; 43 import '../models/customer_label_model.dart';
43 import '../models/get_reserve_type_field_model.dart'; 44 import '../models/get_reserve_type_field_model.dart';
@@ -732,6 +733,7 @@ class DialogUtil { @@ -732,6 +733,7 @@ class DialogUtil {
732 // Navigator.of(context).pop(true); 733 // Navigator.of(context).pop(true);
733 // // } 734 // // }
734 // }); 735 // });
  736 + App.isShowDes = true;
735 final action = await showDialog( 737 final action = await showDialog(
736 context: context, 738 context: context,
737 barrierDismissible: true, 739 barrierDismissible: true,
@@ -785,7 +787,7 @@ class DialogUtil { @@ -785,7 +787,7 @@ class DialogUtil {
785 ]))); 787 ])));
786 }); 788 });
787 }); 789 });
788 - 790 + App.isShowDes = false;
789 print(action); 791 print(action);
790 // _timer.cancel(); 792 // _timer.cancel();
791 793
@@ -38,7 +38,7 @@ Future<bool> checkPermission(Permission permissionGroup) async { @@ -38,7 +38,7 @@ Future<bool> checkPermission(Permission permissionGroup) async {
38 } 38 }
39 } 39 }
40 40
41 -Future<bool> requestPermission(Permission permissionGroup) async { 41 +Future<bool> requestPermission( Permission permissionGroup) async {
42 //全局提示权限使用目的 42 //全局提示权限使用目的
43 if (Platform.isAndroid) { 43 if (Platform.isAndroid) {
44 //全局提示权限使用目的 44 //全局提示权限使用目的
@@ -66,6 +66,11 @@ Future<bool> requestPermission(Permission permissionGroup) async { @@ -66,6 +66,11 @@ Future<bool> requestPermission(Permission permissionGroup) async {
66 } 66 }
67 67
68 final permissions = await [permissionGroup].request(); 68 final permissions = await [permissionGroup].request();
  69 + if(App.isShowDes){
  70 + //全局提示权限使用目的
  71 + BuildContext context = App.navigatorKey.currentState.overlay.context;
  72 + Navigator.pop(context);
  73 + }
69 if (await permissionGroup.request().isGranted) { 74 if (await permissionGroup.request().isGranted) {
70 print(true); 75 print(true);
71 // Either the permission was already granted before or the user just granted it. 76 // Either the permission was already granted before or the user just granted it.