0.0.27 版本修改取消按钮不显示

完成按钮错位

0.0.27 版本修改取消按钮不显示
完成按钮错位
niudaojian
1 parent b6b50741
Showing 5 changed files with 55 additions and 23 deletions
CNLiveImagePickerController.podspec
CNLiveImagePickerController/Classes/CNImagePickerController.m
CNLiveImagePickerController/Classes/CNTZImagePickerController.m
Example/CNLiveImagePickerController.xcodeproj/project.pbxproj
Example/CNLiveImagePickerController/CNLiveViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveImagePickerController'
-  s.version          = '0.0.26'
+  s.version          = '0.0.27'
   s.summary          = '相册'
 # This description is used to generate tags and improve search results.
@@ -254,34 +254,38 @@
     [self setPhotoPickerPageDidLayoutSubviewsBlock:^(UICollectionView *collectionView, UIView *bottomToolBar, UIButton *previewButton, UIButton *originalPhotoButton, UILabel *originalPhotoLabel, UIButton *doneButton, UIImageView *numberImageView, UILabel *numberLabel, UIView *divideLine) {
         CGRect frame = bottomToolBar.frame;
-        doneButton.frame = CGRectMake(frame.size.width - 60 - 13, frame.size.height /2 - 15 - (kVerticalBottomSafeHeight /2), 60, 30);
+//        doneButton.frame = CGRectMake(frame.size.width - 60 - 13, frame.size.height /2 - 15 - (kVerticalBottomSafeHeight /2), 60, 30);
+        doneButton.frame = CGRectMake(frame.size.width - 60 - 13, 12, 60, 30);
         CGRect originalPhotoLabelFrame = originalPhotoLabel.frame;
         CGFloat originalX = (bottomToolBar.frame.size.width - originalPhotoLabelFrame.size.width) /2;
         CGFloat originalY = originalPhotoLabelFrame.origin.y;
         originalPhotoButton.frame = CGRectMake(originalX, originalY, originalPhotoLabelFrame.size.width, originalPhotoLabelFrame.size.height);
-
     }];
     //图片预览
     [self setPhotoPreviewPageDidLayoutSubviewsBlock:^(UICollectionView *collectionView, UIView *naviBar, UIButton *backButton, UIButton *selectButton, UILabel *indexLabel, UIView *toolBar, UIButton *originalPhotoButton, UILabel *originalPhotoLabel, UIButton *doneButton, UIImageView *numberImageView, UILabel *numberLabel) {
         [backButton setImage:[UIImage imageNamedFromMyBundle:@"navi_back"] forState:UIControlStateNormal];
         CGRect frame = toolBar.frame;
-        doneButton.frame = CGRectMake(frame.size.width - 60 - 13, frame.size.height /2 - 15 - (kVerticalBottomSafeHeight /2), 60, 30);
+//        doneButton.frame = CGRectMake(frame.size.width - 60 - 13, frame.size.height /2 - 15 - (kVerticalBottomSafeHeight /2), 60, 30);
+        doneButton.frame = CGRectMake(frame.size.width - 60 - 13, 15, 60, 30);
+
     }];
     //视频预览
     [self setVideoPreviewPageDidLayoutSubviewsBlock:^(UIButton *playButton, UIView *toolBar, UIButton *doneButton) {
         CGRect frame = toolBar.frame;
-        doneButton.frame = CGRectMake(frame.size.width - 60 - 13, frame.size.height /2 - 15 - (kVerticalBottomSafeHeight /2), 60, 30);
+//        doneButton.frame = CGRectMake(frame.size.width - 60 - 13, frame.size.height /2 - 15 - (kVerticalBottomSafeHeight /2), 60, 30);
+        doneButton.frame = CGRectMake(frame.size.width - 60 - 13, 12, 60, 30);
     }];
     //gif预览
     [self setGifPreviewPageDidLayoutSubviewsBlock:^(UIView *toolBar, UIButton *doneButton) {
         CGRect frame = toolBar.frame;
-        doneButton.frame = CGRectMake(frame.size.width - 60 - 13, frame.size.height /2 - 15 - (kVerticalBottomSafeHeight /2), 60, 30);
+//        doneButton.frame = CGRectMake(frame.size.width - 60 - 13, frame.size.height /2 - 15 - (kVerticalBottomSafeHeight /2), 60, 30);
+        doneButton.frame = CGRectMake(frame.size.width - 60 - 13, 12, 60, 30);
     }];
     //相册cell
@@ -744,7 +744,7 @@
     self.view.backgroundColor = [UIColor whiteColor];
     CNTZImagePickerController *imagePickerVc = (CNTZImagePickerController *)self.navigationController;
-    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:imagePickerVc.cancelBtnTitleStr style:UIBarButtonItemStylePlain target:imagePickerVc action:@selector(cancelButtonClick)];
+    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"取消" style:UIBarButtonItemStylePlain target:imagePickerVc action:@selector(cancelButtonClick)];
     [self.navigationItem.rightBarButtonItem setTintColor:[UIColor blackColor]];
 }
@@ -554,7 +554,7 @@
 				GCC_PREFIX_HEADER = "CNLiveImagePickerController/CNLiveImagePickerController-Prefix.pch";
 				INFOPLIST_FILE = "CNLiveImagePickerController/CNLiveImagePickerController-Info.plist";
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAdd.debug;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAdd.debug1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 4.0;
 				WRAPPER_EXTENSION = app;
@@ -571,7 +571,7 @@
 				GCC_PREFIX_HEADER = "CNLiveImagePickerController/CNLiveImagePickerController-Prefix.pch";
 				INFOPLIST_FILE = "CNLiveImagePickerController/CNLiveImagePickerController-Info.plist";
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAdd.debug;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAdd.debug1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 4.0;
 				WRAPPER_EXTENSION = app;
@@ -157,26 +157,54 @@
 //
 //        [self presentViewController:imagePickerVc animated:YES completion:nil];
-    
-    
-    CNImagePickerController *imagePickerVc = [[CNImagePickerController alloc] initWithMaxImagesCount:9 delegate:self];
+    CNImagePickerController *imagePickerVc = [[CNImagePickerController alloc] initWithMaxImagesCount:9 columnNumber:4 delegate:nil pushPhotoPickerVc:YES];
     imagePickerVc.modalPresentationStyle = UIModalPresentationFullScreen;
-    imagePickerVc.allowTakePicture = NO; // 在内部显示拍照按钮
-    imagePickerVc.allowPreview = NO;
-    imagePickerVc.allowPickingOriginalPhoto = NO;
-    imagePickerVc.allowPickingVideo = YES;
+    [imagePickerVc configCNTZImagePicker];//配置
+#pragma mark - 五类个性化设置，这些参数都可以不传，此时会走默认设置
+    imagePickerVc.isSelectOriginalPhoto = NO;//是否选择原图
+    // 1.设置目前已经选中的图片数组
+//    imagePickerVc.selectedAssets = CNLiveLifeCirCleViewModelManager.selectedAssets; // 目前已经选中的图片数组
+//    imagePickerVc.maxEditVideoTime = kFriendsCircle_limit_video_maxEdit;//编辑长度
+//    imagePickerVc.maxVideoDuration = kFriendsCircle_limit_video_max;//编辑视频最大长度
+    // 3. Set allow picking video & photo & originalPhoto or not
+    // 3. 设置是否可以选择视频/图片/原图
+    imagePickerVc.allowPickingMultipleVideo = NO;
+    /// 5. Single selection mode, valid when maxImagesCount = 1
+    /// 5. 单选模式,maxImagesCount为1时才生效
+    // 设置竖屏下的裁剪尺寸
+    NSInteger left = 30;
+    NSInteger widthHeight = KScreenWidth - 2 * left;
+    NSInteger top = (KScreenHeight - widthHeight) / 2;
+    imagePickerVc.cropRect = CGRectMake(left, top, widthHeight, widthHeight);
+#pragma mark - 到这里为止
+    // You can get the photos by block, the same as by delegate.
+    // 你可以通过block或者代理，来得到用户选择的照片.
     [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
-        UIImage *image = photos.firstObject;
-        if (image) {
-            
-            NSLog(@"发送的图过大 = %@",image);
-        }
-        
-        
     }];
+    
     [self presentViewController:imagePickerVc animated:YES completion:nil];
+
+    
+//    CNImagePickerController *imagePickerVc = [[CNImagePickerController alloc] initWithMaxImagesCount:9 delegate:self];
+//    imagePickerVc.modalPresentationStyle = UIModalPresentationFullScreen;
+//    imagePickerVc.allowTakePicture = NO; // 在内部显示拍照按钮
+//    imagePickerVc.allowPreview = NO;
+//    imagePickerVc.allowPickingOriginalPhoto = NO;
+//    imagePickerVc.allowPickingVideo = YES;
+//
+//    [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
+//        UIImage *image = photos.firstObject;
+//        if (image) {
+//
+//            NSLog(@"发送的图过大 = %@",image);
+//        }
+//
+//
+//
+//    }];
+//    [self presentViewController:imagePickerVc animated:YES completion:nil];