Adaptation iPad and fixed #56 display of view on iPad

ko1o · Feb 14, 2017 · eea3ce2 · eea3ce2
1 parent f94dbda
commit eea3ce2
Show file tree

Hide file tree

Showing 5 changed files with 145 additions and 120 deletions.
diff --git a/PYPhotoBrowser/Controller/PYPhotosReaderController.m b/PYPhotoBrowser/Controller/PYPhotosReaderController.m
@@ -296,6 +296,20 @@ - (void)hiddenPhoto
     }];
 }
 
+/** 该控制器不受项目的Device Orientation配置影响 */
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+-(BOOL)shouldAutorotate
+{
+    return NO;
+}
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations
+{
+    return UIInterfaceOrientationMaskPortrait;
+}
+
 // 监听屏幕旋转
 - (void)deviceOrientationDidChange
 {
@@ -336,8 +350,8 @@ - (void)deviceOrientationDidChange
     }
 
     // 判断即将显示哪一张
-    // 执行旋转动画
-    __block UIWindow *tempWindow = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+    // 执行旋转动画（保证黑色背景足够大）
+    __block UIWindow *tempWindow = [[UIWindow alloc] initWithFrame:CGRectMake(-6000, -6000, 12000, 12000)];
     tempWindow.windowLevel = UIWindowLevelStatusBar;
     // 自动调节宽高
     self.collectionView.autoresizingMask = UIViewAutoresizingFlexibleHeight;
@@ -388,8 +402,6 @@ - (void)deviceOrientationDidChange
     }];
 }
 
-
-
 #pragma mark - UICollectionViewDataSource
 - (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView {
     return 1;

diff --git a/PYPhotoBrowser/View/PYPhotoView.m b/PYPhotoBrowser/View/PYPhotoView.m
@@ -421,11 +421,30 @@ - (void)imageDidLongPress:(UITapGestureRecognizer *)longPress
             // 如果实现了代理方法，直接返回，不使用默认的操作
             if([browseView.delegate respondsToSelector:@selector(photoBrowseView:didLongPressImage:index:)]) return;
         }
+        UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+        UIAlertAction *savePhotoAction = [UIAlertAction actionWithTitle:@"保存到相册" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+            // 保存到相册
+            UIImageWriteToSavedPhotosAlbum(self.image, self, @selector(image: didFinishSavingWithError: contextInfo:), nil);
+        }];
+        UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleDefault handler:nil];
+        [alertController addAction:savePhotoAction];
+        [alertController addAction:cancelAction];
 
-        // 跳出提示
-        UIActionSheet *sheet = [[UIActionSheet alloc] initWithTitle:nil delegate:self cancelButtonTitle:@"取消" destructiveButtonTitle:nil otherButtonTitles:@"保存到相册", nil];
-        sheet.delegate = self;
-        [sheet showInView:self.window];
+        if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad)
+        { // iPad
+            UIPopoverPresentationController *popover = alertController.popoverPresentationController;
+            if (popover){
+                popover.sourceView = self.window;
+                popover.sourceRect = CGRectMake((PYRealyScreenW - 100) * 0.5, PYRealyScreenH, 100, 100);
+                popover.permittedArrowDirections = UIPopoverArrowDirectionDown;
+            }
+            // 跳出提示
+            [self.window.rootViewController presentViewController:alertController animated:YES completion:nil];
+        } else { // iPhone
+
+            // 跳出提示
+            [self.window.rootViewController presentViewController:alertController animated:YES completion:nil];
+        }
     }
 }
 
@@ -674,15 +693,6 @@ - (CGPoint)setAnchorPointBaseOnGestureRecognizer:(UIGestureRecognizer *)gr
 
 
 #pragma mark - PYAcitonSheetDeleagate
-- (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex
-{
-    if (buttonIndex == 0) {
-        NSLog(@"保存到相册");
-        UIImageWriteToSavedPhotosAlbum(self.image, self, @selector(image: didFinishSavingWithError: contextInfo:), nil);
-    } else if (buttonIndex == 2) {
-        NSLog(@"取消");
-    }
-}
 
 - (void)image:(UIImage *)image didFinishSavingWithError:(NSError *)error contextInfo:(void *)contextInfo
 {