fix #103

longitachi · Sep 30, 2017 · 1037e1f · 1037e1f
1 parent e50781c
commit 1037e1f
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 29 deletions.
diff --git a/PhotoBrowser/ZLCollectionCell.m b/PhotoBrowser/ZLCollectionCell.m
@@ -241,11 +241,16 @@ - (void)restartCapture
 
 - (void)startCapture
 {
+    AVAuthorizationStatus status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
+
     if (![UIImagePickerController isSourceTypeAvailable:
-         UIImagePickerControllerSourceTypeCamera]) {
+         UIImagePickerControllerSourceTypeCamera] ||
+        status == AVAuthorizationStatusRestricted ||
+        status == AVAuthorizationStatusDenied) {
         return;
     }
 
+
     if (self.session && [self.session isRunning]) {
         return;
     }
@@ -277,9 +282,7 @@ - (void)startCapture
     [self.previewLayer setVideoGravity:AVLayerVideoGravityResizeAspectFill];
     [self.contentView.layer insertSublayer:self.previewLayer atIndex:0];
 
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        [self.session startRunning];
-    });
+    [self.session startRunning];
 }
 
 - (AVCaptureDevice *)backCamera {

diff --git a/PhotoBrowser/ZLPhotoActionSheet.h b/PhotoBrowser/ZLPhotoActionSheet.h
@@ -5,7 +5,7 @@
 //  Created by long on 15/11/25.
 //  Copyright © 2015年 long. All rights reserved.
 //
-//pods version 2.4.3 - 2017.9.22 update
+//pods version 2.4.5 - 2017.9.28 update
 
 #import <UIKit/UIKit.h>
 #import "ZLDefine.h"

diff --git a/PhotoBrowser/ZLShowBigImgViewController.m b/PhotoBrowser/ZLShowBigImgViewController.m
@@ -500,15 +500,8 @@ - (void)handlerSingleTap
 {
     _hideNavBar = !_hideNavBar;
 
-    UIEdgeInsets inset = UIEdgeInsetsZero;
-    if (@available(iOS 11, *)) {
-        inset = self.view.safeAreaInsets;
-    }
-    CGFloat navHeight = inset.top+44;
-    CGRect navFrame = _hideNavBar?CGRectMake(0, -navHeight, kViewWidth, navHeight):CGRectMake(0, 0, kViewWidth, navHeight);
-    CGRect frame = _hideNavBar?CGRectMake(0, kViewHeight, kViewWidth, 44+inset.bottom):CGRectMake(0, kViewHeight-44-inset.bottom, kViewWidth, 44+inset.bottom);
-    _navView.frame = navFrame;
-    _bottomView.frame = frame;
+    _navView.hidden = _hideNavBar;
+    _bottomView.hidden = _hideNavBar;
 }
 
 #pragma mark - UICollectionDataSource

diff --git a/PhotoBrowser/ZLThumbnailViewController.m b/PhotoBrowser/ZLThumbnailViewController.m
@@ -29,7 +29,6 @@ typedef NS_ENUM(NSUInteger, SlideSelectType) {
 @interface ZLThumbnailViewController () <UICollectionViewDataSource, UICollectionViewDelegate, UINavigationControllerDelegate, UIImagePickerControllerDelegate, UIViewControllerPreviewingDelegate>
 {
     BOOL _isLayoutOK;
-    BOOL _haveTakePic;
 
     //设备旋转前的第一个可视indexPath
     NSIndexPath *_visibleIndexPath;
@@ -92,7 +91,7 @@ - (void)dealloc
                 }];
             });
         } else {
-            if (nav.allowTakePhotoInLibrary && nav.allowSelectImage) {
+            if (nav.allowTakePhotoInLibrary && nav.allowSelectImage && self.albumListModel.isCameraRoll) {
                 self.allowTakePhoto = YES;
             }
             [ZLPhotoManager markSelcectModelInArr:self.albumListModel.models selArr:nav.arrSelectedModels];
@@ -621,11 +620,7 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cell
         cell.layer.masksToBounds = YES;
         cell.layer.cornerRadius = nav.cellCornerRadio;
         if (nav.showCaptureImageOnTakePhotoBtn) {
-            if (!_isLayoutOK || _haveTakePic) {
-                [cell restartCapture];
-            } else {
-                [cell startCapture];
-            }
+            [cell startCapture];
         }
         return cell;
     }

diff --git a/ZLPhotoBrowser.xcodeproj/project.pbxproj b/ZLPhotoBrowser.xcodeproj/project.pbxproj
@@ -548,7 +548,7 @@
 				INFOPLIST_FILE = ZLPhotoBrowser/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = ZL.Bluetooth;
+				PRODUCT_BUNDLE_IDENTIFIER = ZL.ABC;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;
 			};
@@ -563,7 +563,7 @@
 				INFOPLIST_FILE = ZLPhotoBrowser/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = ZL.Bluetooth;
+				PRODUCT_BUNDLE_IDENTIFIER = ZL.ABC;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;
 			};

diff --git a/ZLPhotoBrowser/Info.plist b/ZLPhotoBrowser/Info.plist
@@ -19,13 +19,18 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.1</string>
+	<string>2.4.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>NSCameraUsageDescription</key>
 	<string>是否允许访问你的相机？</string>
 	<key>NSPhotoLibraryUsageDescription</key>
@@ -44,11 +49,6 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
 </dict>