Skip to content

Commit a98bbcb

Browse files
committed
发布2.1.0.1版本,优化视频拍摄相关属性的设置
1 parent 6835fa7 commit a98bbcb

File tree

8 files changed

+22
-11
lines changed

8 files changed

+22
-11
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ A:1.8.4版本已支持
9393
A:考虑下,优先级低
9494

9595
最近更新
96-
2.1.0 新增拍摄视频功能,优化一些细节
96+
2.1.0.1 新增拍摄视频功能,优化一些细节
9797
2.0.1 修复一些bug
9898
2.0.0.6 优化自定义languageBundle的支持,加入使用示例
9999
2.0.0.5 优化性能,提高选择器打开速度,新增越南语支持

TZImagePickerController.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Pod::Spec.new do |s|
22
s.name = "TZImagePickerController"
3-
s.version = "2.1.0"
3+
s.version = "2.1.0.1"
44
s.summary = "A clone of UIImagePickerController, support picking multiple photos、original photo and video"
55
s.homepage = "https://github.com/banchichen/TZImagePickerController"
66
s.license = "MIT"
77
s.author = { "banchichen" => "tanzhenios@foxmail.com" }
88
s.platform = :ios
99
s.ios.deployment_target = "6.0"
10-
s.source = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "2.1.0" }
10+
s.source = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "2.1.0.1" }
1111
s.requires_arc = true
1212
s.resources = "TZImagePickerController/TZImagePickerController/*.{png,bundle}"
1313
s.source_files = "TZImagePickerController/TZImagePickerController/*.{h,m}"

TZImagePickerController.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
9F763A761FA0741D00D9E526 /* TZImageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 90CE84AC1C3A89EF003D0779 /* TZImageManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
6666
9F763A771FA0741D00D9E526 /* TZImageCropManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DC84D081DF5358500A107A9 /* TZImageCropManager.h */; };
6767
9F763A781FA0741D00D9E526 /* TZLocationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 902938D61EE2D02C000F2F8F /* TZLocationManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
68-
9F763A791FA0741D00D9E526 /* UIView+Layout.h in Headers */ = {isa = PBXBuildFile; fileRef = 90EBF5D41C2E298000CB9BCC /* UIView+Layout.h */; settings = {ATTRIBUTES = (Public, ); }; };
68+
9F763A791FA0741D00D9E526 /* UIView+Layout.h in Headers */ = {isa = PBXBuildFile; fileRef = 90EBF5D41C2E298000CB9BCC /* UIView+Layout.h */; };
6969
/* End PBXBuildFile section */
7070

7171
/* Begin PBXContainerItemProxy section */
@@ -353,9 +353,9 @@
353353
9F763A731FA0741D00D9E526 /* TZVideoPlayerController.h in Headers */,
354354
9F763A741FA0741D00D9E526 /* TZGifPhotoPreviewController.h in Headers */,
355355
9F763A761FA0741D00D9E526 /* TZImageManager.h in Headers */,
356-
9F763A791FA0741D00D9E526 /* UIView+Layout.h in Headers */,
357356
9F763A781FA0741D00D9E526 /* TZLocationManager.h in Headers */,
358357
9F763A711FA0741D00D9E526 /* TZPhotoPreviewController.h in Headers */,
358+
9F763A791FA0741D00D9E526 /* UIView+Layout.h in Headers */,
359359
9F763A6F1FA0741D00D9E526 /* TZPhotoPickerController.h in Headers */,
360360
9F763A701FA0741D00D9E526 /* TZAssetCell.h in Headers */,
361361
9F763A721FA0741D00D9E526 /* TZPhotoPreviewCell.h in Headers */,

TZImagePickerController/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.1.0</string>
18+
<string>2.1.0.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

TZImagePickerController/TZImagePickerController/TZImagePickerController.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// Created by 谭真 on 15/12/24.
66
// Copyright © 2015年 谭真. All rights reserved.
7-
// version 2.1.0 - 2018.04.19
7+
// version 2.1.0.1 - 2018.04.20
88
// 更多信息,请前往项目的github地址:https://github.com/banchichen/TZImagePickerController
99

1010
/*
@@ -19,6 +19,11 @@
1919
#import <UIKit/UIKit.h>
2020
#import "TZAssetModel.h"
2121
#import "NSBundle+TZImagePicker.h"
22+
#import "TZImageManager.h"
23+
#import "TZVideoPlayerController.h"
24+
#import "TZGifPhotoPreviewController.h"
25+
#import "TZLocationManager.h"
26+
#import "TZPhotoPreviewController.h"
2227

2328
#define iOS7Later ([UIDevice currentDevice].systemVersion.floatValue >= 7.0f)
2429
#define iOS8Later ([UIDevice currentDevice].systemVersion.floatValue >= 8.0f)

TZImagePickerController/TZImagePickerController/TZImagePickerController.m

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//
55
// Created by 谭真 on 15/12/24.
66
// Copyright © 2015年 谭真. All rights reserved.
7-
// version 2.1.0 - 2018.04.19
7+
// version 2.1.0.1 - 2018.04.20
88
// 更多信息,请前往项目的github地址:https://github.com/banchichen/TZImagePickerController
99

1010
#import "TZImagePickerController.h"
@@ -510,11 +510,17 @@ - (void)setSelectedAssets:(NSMutableArray *)selectedAssets {
510510
- (void)setAllowPickingImage:(BOOL)allowPickingImage {
511511
_allowPickingImage = allowPickingImage;
512512
[TZImagePickerConfig sharedInstance].allowPickingImage = allowPickingImage;
513+
if (!allowPickingImage) {
514+
_allowTakePicture = NO;
515+
}
513516
}
514517

515518
- (void)setAllowPickingVideo:(BOOL)allowPickingVideo {
516519
_allowPickingVideo = allowPickingVideo;
517520
[TZImagePickerConfig sharedInstance].allowPickingVideo = allowPickingVideo;
521+
if (!allowPickingVideo) {
522+
_allowTakeVideo = NO;
523+
}
518524
}
519525

520526
- (void)setPreferredLanguage:(NSString *)preferredLanguage {

TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ - (void)viewDidLoad {
8888
tzImagePickerVc.navLeftBarButtonSettingBlock(leftButton);
8989
self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:leftButton];
9090
}
91-
_showTakePhotoBtn = _model.isCameraRoll && (tzImagePickerVc.allowTakePicture || tzImagePickerVc.allowTakeVideo);
91+
_showTakePhotoBtn = _model.isCameraRoll && ((tzImagePickerVc.allowTakePicture && tzImagePickerVc.allowPickingImage) || (tzImagePickerVc.allowTakeVideo && tzImagePickerVc.allowPickingVideo));
9292
// [self resetCachedAssets];
9393
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didChangeStatusBarOrientationNotification:) name:UIApplicationDidChangeStatusBarOrientationNotification object:nil];
9494
}
@@ -144,8 +144,6 @@ - (BOOL)prefersStatusBarHidden {
144144
}
145145

146146
- (void)configCollectionView {
147-
TZImagePickerController *tzImagePickerVc = (TZImagePickerController *)self.navigationController;
148-
149147
_layout = [[UICollectionViewFlowLayout alloc] init];
150148
_collectionView = [[TZCollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:_layout];
151149
_collectionView.backgroundColor = [UIColor whiteColor];

TZImagePickerController/ViewController.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,12 +608,14 @@ - (void)deleteBtnClik:(UIButton *)sender {
608608
- (IBAction)showTakePhotoBtnSwitchClick:(UISwitch *)sender {
609609
if (sender.isOn) {
610610
[_showSheetSwitch setOn:NO animated:YES];
611+
[_allowPickingImageSwitch setOn:YES animated:YES];
611612
}
612613
}
613614

614615
- (IBAction)showTakeVideoBtnSwitchClick:(UISwitch *)sender {
615616
if (sender.isOn) {
616617
[_showSheetSwitch setOn:NO animated:YES];
618+
[_allowPickingVideoSwitch setOn:YES animated:YES];
617619
}
618620
}
619621

0 commit comments

Comments
 (0)