Commit 283bdd5b authored by yuzheng.tz's avatar yuzheng.tz

发布1.8.6版本 更新bundle获取路径,解决偶发的图片/本地化语言获取失败的问题

parent bffb534b
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = "TZImagePickerController" s.name = "TZImagePickerController"
s.version = "1.8.5" s.version = "1.8.6"
s.summary = "A clone of UIImagePickerController, support picking multiple photos、original photo and video" s.summary = "A clone of UIImagePickerController, support picking multiple photos、original photo and video"
s.homepage = "https://github.com/banchichen/TZImagePickerController" s.homepage = "https://github.com/banchichen/TZImagePickerController"
s.license = "MIT" s.license = "MIT"
s.author = { "banchichen" => "tanzhenios@foxmail.com" } s.author = { "banchichen" => "tanzhenios@foxmail.com" }
s.platform = :ios s.platform = :ios
s.ios.deployment_target = "6.0" s.ios.deployment_target = "6.0"
s.source = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "1.8.5" } s.source = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "1.8.6" }
s.requires_arc = true s.requires_arc = true
s.resources = "TZImagePickerController/TZImagePickerController/*.{png,xib,nib,bundle}" s.resources = "TZImagePickerController/TZImagePickerController/*.{png,xib,nib,bundle}"
s.source_files = "TZImagePickerController/TZImagePickerController/*.{h,m}" s.source_files = "TZImagePickerController/TZImagePickerController/*.{h,m}"
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.8.5</string> <string>1.8.6</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<string>armv7</string> <string>armv7</string>
</array> </array>
<key>UIStatusBarHidden</key> <key>UIStatusBarHidden</key>
<true/> <false/>
<key>UISupportedInterfaceOrientations</key> <key>UISupportedInterfaceOrientations</key>
<array> <array>
<string>UIInterfaceOrientationPortrait</string> <string>UIInterfaceOrientationPortrait</string>
......
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
@interface NSBundle (TZImagePicker) @interface NSBundle (TZImagePicker)
+ (NSBundle *)tz_imagePickerBundle;
+ (NSString *)tz_localizedStringForKey:(NSString *)key value:(NSString *)value; + (NSString *)tz_localizedStringForKey:(NSString *)key value:(NSString *)value;
+ (NSString *)tz_localizedStringForKey:(NSString *)key; + (NSString *)tz_localizedStringForKey:(NSString *)key;
......
...@@ -11,16 +11,11 @@ ...@@ -11,16 +11,11 @@
@implementation NSBundle (TZImagePicker) @implementation NSBundle (TZImagePicker)
+ (instancetype)tz_imagePickerBundle { + (NSBundle *)tz_imagePickerBundle {
static NSBundle *tzBundle = nil; NSBundle *bundle = [NSBundle bundleForClass:[TZImagePickerController class]];
if (tzBundle == nil) { NSURL *url = [bundle URLForResource:@"TZImagePickerController" withExtension:@"bundle"];
NSString *path = [[NSBundle mainBundle] pathForResource:@"TZImagePickerController" ofType:@"bundle"]; bundle = [NSBundle bundleWithURL:url];
if (!path) { return bundle;
path = [[NSBundle mainBundle] pathForResource:@"TZImagePickerController" ofType:@"bundle" inDirectory:@"Frameworks/TZImagePickerController.framework/"];
}
tzBundle = [NSBundle bundleWithPath:path];
}
return tzBundle;
} }
+ (NSString *)tz_localizedStringForKey:(NSString *)key { + (NSString *)tz_localizedStringForKey:(NSString *)key {
......
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
- (UIImageView *)videoImgView { - (UIImageView *)videoImgView {
if (_videoImgView == nil) { if (_videoImgView == nil) {
UIImageView *videoImgView = [[UIImageView alloc] init]; UIImageView *videoImgView = [[UIImageView alloc] init];
[videoImgView setImage:[UIImage imageNamedFromMyBundle:@"VideoSendIcon.png"]]; [videoImgView setImage:[UIImage imageNamedFromMyBundle:@"VideoSendIcon"]];
[self.bottomView addSubview:videoImgView]; [self.bottomView addSubview:videoImgView];
_videoImgView = videoImgView; _videoImgView = videoImgView;
} }
...@@ -316,7 +316,7 @@ ...@@ -316,7 +316,7 @@
UIImageView *arrowImageView = [[UIImageView alloc] init]; UIImageView *arrowImageView = [[UIImageView alloc] init];
CGFloat arrowWH = 15; CGFloat arrowWH = 15;
arrowImageView.frame = CGRectMake(self.tz_width - arrowWH - 12, 28, arrowWH, arrowWH); arrowImageView.frame = CGRectMake(self.tz_width - arrowWH - 12, 28, arrowWH, arrowWH);
[arrowImageView setImage:[UIImage imageNamedFromMyBundle:@"TableViewArrow.png"]]; [arrowImageView setImage:[UIImage imageNamedFromMyBundle:@"TableViewArrow"]];
[self.contentView addSubview:arrowImageView]; [self.contentView addSubview:arrowImageView];
_arrowImageView = arrowImageView; _arrowImageView = arrowImageView;
} }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// //
// Created by 谭真 on 15/12/24. // Created by 谭真 on 15/12/24.
// Copyright © 2015年 谭真. All rights reserved. // Copyright © 2015年 谭真. All rights reserved.
// version 1.8.5 - 2017.07.25 // version 1.8.6 - 2017.07.28
// 更多信息,请前往项目的github地址:https://github.com/banchichen/TZImagePickerController // 更多信息,请前往项目的github地址:https://github.com/banchichen/TZImagePickerController
/* /*
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// //
// Created by 谭真 on 15/12/24. // Created by 谭真 on 15/12/24.
// Copyright © 2015年 谭真. All rights reserved. // Copyright © 2015年 谭真. All rights reserved.
// version 1.8.5 - 2017.07.25 // version 1.8.6 - 2017.07.28
// 更多信息,请前往项目的github地址:https://github.com/banchichen/TZImagePickerController // 更多信息,请前往项目的github地址:https://github.com/banchichen/TZImagePickerController
#import "TZImagePickerController.h" #import "TZImagePickerController.h"
...@@ -243,13 +243,13 @@ ...@@ -243,13 +243,13 @@
} }
- (void)configDefaultImageName { - (void)configDefaultImageName {
self.takePictureImageName = @"takePicture.png"; self.takePictureImageName = @"takePicture";
self.photoSelImageName = @"photo_sel_photoPickerVc.png"; self.photoSelImageName = @"photo_sel_photoPickerVc";
self.photoDefImageName = @"photo_def_photoPickerVc.png"; self.photoDefImageName = @"photo_def_photoPickerVc";
self.photoNumberIconImageName = @"photo_number_icon.png"; self.photoNumberIconImageName = @"photo_number_icon";
self.photoPreviewOriginDefImageName = @"preview_original_def.png"; self.photoPreviewOriginDefImageName = @"preview_original_def";
self.photoOriginDefImageName = @"photo_original_def.png"; self.photoOriginDefImageName = @"photo_original_def";
self.photoOriginSelImageName = @"photo_original_sel.png"; self.photoOriginSelImageName = @"photo_original_sel";
} }
- (void)configDefaultBtnTitle { - (void)configDefaultBtnTitle {
...@@ -682,16 +682,11 @@ ...@@ -682,16 +682,11 @@
@implementation UIImage (MyBundle) @implementation UIImage (MyBundle)
+ (UIImage *)imageNamedFromMyBundle:(NSString *)name { + (UIImage *)imageNamedFromMyBundle:(NSString *)name {
UIImage *image = [UIImage imageNamed:[@"TZImagePickerController.bundle" stringByAppendingPathComponent:name]]; NSBundle *imageBundle = [NSBundle tz_imagePickerBundle];
if (image) { name = [name stringByAppendingString:@"@2x"];
return image; NSString *imagePath = [imageBundle pathForResource:name ofType:@"png"];
} else { UIImage *image = [UIImage imageWithContentsOfFile:imagePath];
image = [UIImage imageNamed:[@"Frameworks/TZImagePickerController.framework/TZImagePickerController.bundle" stringByAppendingPathComponent:name]]; return image;
if (!image) {
image = [UIImage imageNamed:name];
}
return image;
}
} }
@end @end
...@@ -333,8 +333,8 @@ ...@@ -333,8 +333,8 @@
[_playButton removeFromSuperview]; [_playButton removeFromSuperview];
} }
_playButton = [UIButton buttonWithType:UIButtonTypeCustom]; _playButton = [UIButton buttonWithType:UIButtonTypeCustom];
[_playButton setImage:[UIImage imageNamedFromMyBundle:@"MMVideoPreviewPlay.png"] forState:UIControlStateNormal]; [_playButton setImage:[UIImage imageNamedFromMyBundle:@"MMVideoPreviewPlay"] forState:UIControlStateNormal];
[_playButton setImage:[UIImage imageNamedFromMyBundle:@"MMVideoPreviewPlayHL.png"] forState:UIControlStateHighlighted]; [_playButton setImage:[UIImage imageNamedFromMyBundle:@"MMVideoPreviewPlayHL"] forState:UIControlStateHighlighted];
[_playButton addTarget:self action:@selector(playButtonClick) forControlEvents:UIControlEventTouchUpInside]; [_playButton addTarget:self action:@selector(playButtonClick) forControlEvents:UIControlEventTouchUpInside];
[self addSubview:_playButton]; [self addSubview:_playButton];
} }
...@@ -401,7 +401,7 @@ ...@@ -401,7 +401,7 @@
- (void)pausePlayerAndShowNaviBar { - (void)pausePlayerAndShowNaviBar {
if (_player.rate != 0.0) { if (_player.rate != 0.0) {
[_player pause]; [_player pause];
[_playButton setImage:[UIImage imageNamedFromMyBundle:@"MMVideoPreviewPlay.png"] forState:UIControlStateNormal]; [_playButton setImage:[UIImage imageNamedFromMyBundle:@"MMVideoPreviewPlay"] forState:UIControlStateNormal];
if (self.singleTapGestureBlock) { if (self.singleTapGestureBlock) {
self.singleTapGestureBlock(); self.singleTapGestureBlock();
} }
......
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
_naviBar.backgroundColor = [UIColor colorWithRed:(34/255.0) green:(34/255.0) blue:(34/255.0) alpha:0.7]; _naviBar.backgroundColor = [UIColor colorWithRed:(34/255.0) green:(34/255.0) blue:(34/255.0) alpha:0.7];
_backButton = [[UIButton alloc] initWithFrame:CGRectZero]; _backButton = [[UIButton alloc] initWithFrame:CGRectZero];
[_backButton setImage:[UIImage imageNamedFromMyBundle:@"navi_back.png"] forState:UIControlStateNormal]; [_backButton setImage:[UIImage imageNamedFromMyBundle:@"navi_back"] forState:UIControlStateNormal];
[_backButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; [_backButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[_backButton addTarget:self action:@selector(backButtonClick) forControlEvents:UIControlEventTouchUpInside]; [_backButton addTarget:self action:@selector(backButtonClick) forControlEvents:UIControlEventTouchUpInside];
......
...@@ -88,8 +88,8 @@ ...@@ -88,8 +88,8 @@
- (void)configPlayButton { - (void)configPlayButton {
_playButton = [UIButton buttonWithType:UIButtonTypeCustom]; _playButton = [UIButton buttonWithType:UIButtonTypeCustom];
[_playButton setImage:[UIImage imageNamedFromMyBundle:@"MMVideoPreviewPlay.png"] forState:UIControlStateNormal]; [_playButton setImage:[UIImage imageNamedFromMyBundle:@"MMVideoPreviewPlay"] forState:UIControlStateNormal];
[_playButton setImage:[UIImage imageNamedFromMyBundle:@"MMVideoPreviewPlayHL.png"] forState:UIControlStateHighlighted]; [_playButton setImage:[UIImage imageNamedFromMyBundle:@"MMVideoPreviewPlayHL"] forState:UIControlStateHighlighted];
[_playButton addTarget:self action:@selector(playButtonClick) forControlEvents:UIControlEventTouchUpInside]; [_playButton addTarget:self action:@selector(playButtonClick) forControlEvents:UIControlEventTouchUpInside];
[self.view addSubview:_playButton]; [self.view addSubview:_playButton];
} }
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
[_player pause]; [_player pause];
_toolBar.hidden = NO; _toolBar.hidden = NO;
[self.navigationController setNavigationBarHidden:NO]; [self.navigationController setNavigationBarHidden:NO];
[_playButton setImage:[UIImage imageNamedFromMyBundle:@"MMVideoPreviewPlay.png"] forState:UIControlStateNormal]; [_playButton setImage:[UIImage imageNamedFromMyBundle:@"MMVideoPreviewPlay"] forState:UIControlStateNormal];
if (!TZ_isGlobalHideStatusBar) { if (!TZ_isGlobalHideStatusBar) {
if (iOS7Later) [UIApplication sharedApplication].statusBarHidden = NO; if (iOS7Later) [UIApplication sharedApplication].statusBarHidden = NO;
......
...@@ -79,8 +79,6 @@ ...@@ -79,8 +79,6 @@
_selectedPhotos = [NSMutableArray array]; _selectedPhotos = [NSMutableArray array];
_selectedAssets = [NSMutableArray array]; _selectedAssets = [NSMutableArray array];
[self configCollectionView]; [self configCollectionView];
[UIApplication sharedApplication].statusBarHidden = NO;
} }
- (BOOL)prefersStatusBarHidden { - (BOOL)prefersStatusBarHidden {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment