Update

2022-04-17 23:56:10 +08:00
parent f0d85d914c
commit fc8f56e491
8 changed files with 40 additions and 20 deletions
@@ -54,7 +54,7 @@ post_install do |installer|
        'PERMISSION_CONTACTS=0',

        ## dart: PermissionGroup.camera
-        'PERMISSION_CAMERA=0',
+        # 'PERMISSION_CAMERA=0',

        ## dart: PermissionGroup.microphone
        'PERMISSION_MICROPHONE=0',
@@ -63,7 +63,7 @@ post_install do |installer|
        'PERMISSION_SPEECH_RECOGNIZER=0',

        ## dart: PermissionGroup.photos
-        'PERMISSION_PHOTOS=0',
+        # 'PERMISSION_PHOTOS=0',

        ## dart: [PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse]
        'PERMISSION_LOCATION=0',
@@ -187,6 +187,6 @@ SPEC CHECKSUMS:
  url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
  webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96

-PODFILE CHECKSUM: 7aa39c7b6cdbcee37d1fd9a834a0ffb3482eb5ae
+PODFILE CHECKSUM: 472b36355d7f1afce121640438e776da12affe90

 COCOAPODS: 1.11.2
@@ -49,6 +49,8 @@
 		A9E5C779455BA6DB4938099D /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		B472C24F89C59DC84E9553C1 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		F71731B5280B2314003F97C3 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
+		F71731B6280C5F53003F97C3 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Main.strings"; sourceTree = "<group>"; };
+		F71731B7280C5F53003F97C3 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/LaunchScreen.strings"; sourceTree = "<group>"; };
 		F7CA8BAC2802882F00457217 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
 /* End PBXFileReference section */

@@ -173,11 +175,12 @@
 			};
 			buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
 			compatibilityVersion = "Xcode 9.3";
-			developmentRegion = en;
+			developmentRegion = "zh-Hans";
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				Base,
+				"zh-Hans",
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
@@ -307,6 +310,7 @@
 			isa = PBXVariantGroup;
 			children = (
 				97C146FB1CF9000F007C117D /* Base */,
+				F71731B6280C5F53003F97C3 /* zh-Hans */,
 			);
 			name = Main.storyboard;
 			sourceTree = "<group>";
@@ -315,6 +319,7 @@
 			isa = PBXVariantGroup;
 			children = (
 				97C147001CF9000F007C117D /* Base */,
+				F71731B7280C5F53003F97C3 /* zh-Hans */,
 			);
 			name = LaunchScreen.storyboard;
 			sourceTree = "<group>";
@@ -326,6 +331,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -363,7 +369,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -411,6 +417,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -454,7 +461,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -466,6 +473,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -503,7 +511,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<string>zh-Hans</string>
 	<key>CFBundleDisplayName</key>
 	<string>黑烟车抓拍系统</string>
 	<key>CFBundleExecutable</key>
@@ -20,14 +20,18 @@
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSCameraUsageDescription</key>
+	<string>使用相机进行人脸登录</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>获取相册照片进行人脸注册</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
-	<key>NSCameraUsageDescription</key>
-	<string>使用相机进行人脸登录</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
@@ -0,0 +1 @@
+
@@ -0,0 +1 @@
+
@@ -8,6 +8,7 @@ import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hyzp_ybqx/components/customDialogFaceReg.dart';
 import 'package:hyzp_ybqx/components/dioFun.dart';
 import 'package:image_picker/image_picker.dart';
+import 'package:permission_handler/permission_handler.dart';

 import '../../components/commonFun.dart';
 import '../../services/EventBus.dart';
@@ -300,6 +301,11 @@ class _LoginPageState extends State<FaceReg> {

  //从相册选取图片
  Future _getImageGallery() async {
+    if (Platform.isIOS && !await Permission.camera.isGranted) {
+      Fluttertoast.showToast(msg: '请允许访问相册');
+      return;
+    }
+
    final imagePicker = ImagePicker();
    _username = _controller.text;
    //final pickedFile = await imagePicker.getImage(source: ImageSource.gallery, maxWidth: 400);
@@ -202,11 +202,6 @@ class _Page4_MyMsicsNewState extends State<Page4_MyMsicsNew>
          leadColor: _deepBlueColor,
          onTapFun: OnTap_user_manager),
      //bNewVer：是否发现新版本
-      _getListTile('版本更新',
-          leadPath: 'assets/images/版本更新.png',
-          leadColor: _greenColor,
-          onTapFun: OnTap_MyUpdate,
-          bBadge: bNewVer),
      _getListTile('待审提醒',
          leadPath: 'assets/images/语音提醒.png',
          leadColor: _deepGreyColor,
@@ -226,12 +221,17 @@ class _Page4_MyMsicsNewState extends State<Page4_MyMsicsNew>
      //     onTapFun: OnTap_UserAuthority),
    ];
    if (Platform.isAndroid) {
-      _listViewUser.insert(
-          3,
+      _listViewUser.insertAll(
+          2,
+          [_getListTile('版本更新',
+            leadPath: 'assets/images/版本更新.png',
+            leadColor: _greenColor,
+            onTapFun: OnTap_MyUpdate,
+            bBadge: bNewVer),
          _getListTile('软件下载',
-              leadPath: 'assets/images/download.png',
-              leadColor: _deepBlueColor,
-              onTapFun: OnTap_download));
+            leadPath: 'assets/images/download.png',
+            leadColor: _deepBlueColor,
+            onTapFun: OnTap_download)]);
    }
  }