修改资源查找路径

TZImagePickerController.podspec

 Pod::Spec.new do |s|
   s.name         = "TZImagePickerController"
-  s.version      = "1.2.0"
+  s.version      = "1.2.3"
   s.summary      = "A clone of UIImagePickerController, support picking multiple photos、original photo and video"
   s.homepage     = "https://github.com/banchichen/TZImagePickerController"
   s.license      = "MIT"
   s.author       = { "banchichen" => "736420282@qq.com" }
   s.platform     = :ios
   s.ios.deployment_target = "6.0"
-  s.source       = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "1.2.0" }
+  s.source       = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "1.2.3" }
   s.requires_arc = true
-  s.resources    = "TZImagePickerController/TZImagePickerController/Resource/*.{png,xib,nib}"
+  s.resources    = "TZImagePickerController/TZImagePickerController/*.{png,xib,nib,bundle}"
   s.source_files = "TZImagePickerController/TZImagePickerController/*.{h,m}"
 end
\ No newline at end of file

TZImagePickerController/TZImagePickerController/TZAssetCell.m

@@ -39,7 +39,7 @@
         self.imageView.image = photo;
     }];
     self.selectPhotoButton.selected = model.isSelected;
-    self.selectImageView.image = self.selectPhotoButton.isSelected ? [UIImage imageNamed:TZImagePickerSrcName(@"photo_sel_photoPickerVc.png")] : [UIImage imageNamed:TZImagePickerSrcName(@"photo_def_photoPickerVc.png")];
+    self.selectImageView.image = self.selectPhotoButton.isSelected ? [UIImage imageNamedFromMyBundle:@"photo_sel_photoPickerVc.png"] : [UIImage imageNamedFromMyBundle:@"photo_def_photoPickerVc.png"];
     self.type = TZAssetCellTypePhoto;
     if (model.type == TZAssetModelMediaTypeLivePhoto)      self.type = TZAssetCellTypeLivePhoto;
     else if (model.type == TZAssetModelMediaTypeAudio)     self.type = TZAssetCellTypeAudio;
@@ -66,7 +66,7 @@
     if (self.didSelectPhotoBlock) {
         self.didSelectPhotoBlock(sender.isSelected);
     }
-    self.selectImageView.image = sender.isSelected ? [UIImage imageNamed:TZImagePickerSrcName(@"photo_sel_photoPickerVc.png")] : [UIImage imageNamed:TZImagePickerSrcName(@"photo_def_photoPickerVc.png")];
+    self.selectImageView.image = sender.isSelected ? [UIImage imageNamedFromMyBundle:@"photo_sel_photoPickerVc.png"] : [UIImage imageNamedFromMyBundle:@"photo_def_photoPickerVc.png"];
     if (sender.isSelected) {
         [UIView showOscillatoryAnimationWithLayer:_selectImageView.layer type:TZOscillatoryAnimationToBigger];
     }
@@ -123,7 +123,7 @@
     if (_viewImgView == nil) {
         UIImageView *viewImgView = [[UIImageView alloc] init];
         viewImgView.frame = CGRectMake(8, 0, 17, 17);
-        [viewImgView setImage:[UIImage imageNamed:TZImagePickerSrcName(@"VideoSendIcon.png")]];
+        [viewImgView setImage:[UIImage imageNamedFromMyBundle:@"VideoSendIcon.png"]];
         [self.bottomView addSubview:viewImgView];
         _viewImgView = viewImgView;
     }
@@ -212,7 +212,7 @@
         UIImageView *arrowImageView = [[UIImageView alloc] init];
         CGFloat arrowWH = 15;
         arrowImageView.frame = CGRectMake(self.tz_width - arrowWH - 12, 28, arrowWH, arrowWH);
-        [arrowImageView setImage:[UIImage imageNamed:TZImagePickerSrcName(@"TableViewArrow.png")]];
+        [arrowImageView setImage:[UIImage imageNamedFromMyBundle:@"TableViewArrow.png"]];
         [self.contentView addSubview:arrowImageView];
         _arrowImageView = arrowImageView;
     }

TZImagePickerController/TZImagePickerController/TZImagePickerController.h

@@ -21,8 +21,6 @@
 #define iOS8Later ([UIDevice currentDevice].systemVersion.floatValue >= 8.0f)
 #define iOS9Later ([UIDevice currentDevice].systemVersion.floatValue >= 9.0f)
 #define iOS9_1Later ([UIDevice currentDevice].systemVersion.floatValue >= 9.1f)
-// 图片路径
-#define TZImagePickerSrcName(file) [@"TZImagePickerController.bundle" stringByAppendingPathComponent:file]
 
 @protocol TZImagePickerControllerDelegate;
 @interface TZImagePickerController : UINavigationController
@@ -99,3 +97,10 @@
 
 @end
 
+
+@interface UIImage (MyBundle)
+
++ (UIImage *)imageNamedFromMyBundle:(NSString *)name;
+
+@end
+

TZImagePickerController/TZImagePickerController/TZImagePickerController.m

@@ -194,7 +194,7 @@
     
     if (self.childViewControllers.count > 0) {
         UIButton *backButton = [[UIButton alloc] initWithFrame:CGRectMake(3, 0, 50, 44)];
-        [backButton setImage:[UIImage imageNamed:TZImagePickerSrcName(@"navi_back.png")] forState:UIControlStateNormal];
+        [backButton setImage:[UIImage imageNamedFromMyBundle:@"navi_back.png"] forState:UIControlStateNormal];
         backButton.imageEdgeInsets = UIEdgeInsetsMake(0, -5, 0, 0);
         [backButton setTitle:@"返回" forState:UIControlStateNormal];
         backButton.titleLabel.font = [UIFont systemFontOfSize:15];
@@ -282,3 +282,18 @@
 }
 
 @end
+
+
+@implementation UIImage (MyBundle)
+
++ (UIImage *)imageNamedFromMyBundle:(NSString *)name {
+    UIImage *image = [UIImage imageNamed:[@"TZImagePickerController.bundle" stringByAppendingPathComponent:name]];
+    if (image) {
+        return image;
+    } else {
+        image = [UIImage imageNamed:[@"Frameworks/TZImagePickerController.framework/TZImagePickerController.bundle" stringByAppendingPathComponent:name]];
+        return image;
+    }
+}
+
+@end

TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m

@@ -124,8 +124,8 @@ static CGSize AssetGridThumbnailSize;
         [_originalPhotoButton setTitle:@"原图" forState:UIControlStateSelected];
         [_originalPhotoButton setTitleColor:[UIColor lightGrayColor] forState:UIControlStateNormal];
         [_originalPhotoButton setTitleColor:[UIColor blackColor] forState:UIControlStateSelected];
-        [_originalPhotoButton setImage:[UIImage imageNamed:TZImagePickerSrcName(@"photo_original_def.png")] forState:UIControlStateNormal];
-        [_originalPhotoButton setImage:[UIImage imageNamed:TZImagePickerSrcName(@"photo_original_sel.png")] forState:UIControlStateSelected];
+        [_originalPhotoButton setImage:[UIImage imageNamedFromMyBundle:@"photo_original_def.png"] forState:UIControlStateNormal];
+        [_originalPhotoButton setImage:[UIImage imageNamedFromMyBundle:@"photo_original_sel.png"] forState:UIControlStateSelected];
         _originalPhotoButton.enabled = _selectedPhotoArr.count > 0;
         
         _originalPhotoLable = [[UILabel alloc] init];
@@ -146,7 +146,7 @@ static CGSize AssetGridThumbnailSize;
     [_okButton setTitleColor:imagePickerVc.oKButtonTitleColorDisabled forState:UIControlStateDisabled];
     _okButton.enabled = NO;
     
-    _numberImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:TZImagePickerSrcName(@"photo_number_icon.png")]];
+    _numberImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamedFromMyBundle:@"photo_number_icon.png"]];
     _numberImageView.frame = CGRectMake(self.view.tz_width - 56 - 24, 12, 26, 26);
     _numberImageView.hidden = _selectedPhotoArr.count <= 0;
     _numberImageView.backgroundColor = [UIColor clearColor];

TZImagePickerController/TZImagePickerController/TZPhotoPreviewController.m

@@ -65,13 +65,13 @@
     _naviBar.alpha = 0.7;
     
     _backButton = [[UIButton alloc] initWithFrame:CGRectMake(10, 10, 44, 44)];
-    [_backButton setImage:[UIImage imageNamed:TZImagePickerSrcName(@"navi_back.png")] forState:UIControlStateNormal];
+    [_backButton setImage:[UIImage imageNamedFromMyBundle:@"navi_back.png"] forState:UIControlStateNormal];
     [_backButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
     [_backButton addTarget:self action:@selector(back) forControlEvents:UIControlEventTouchUpInside];
     
     _selectButton = [[UIButton alloc] initWithFrame:CGRectMake(self.view.tz_width - 54, 10, 42, 42)];
-    [_selectButton setImage:[UIImage imageNamed:TZImagePickerSrcName(@"photo_def_photoPickerVc.png")] forState:UIControlStateNormal];
-    [_selectButton setImage:[UIImage imageNamed:TZImagePickerSrcName(@"photo_sel_photoPickerVc.png")] forState:UIControlStateSelected];
+    [_selectButton setImage:[UIImage imageNamedFromMyBundle:@"photo_def_photoPickerVc.png"] forState:UIControlStateNormal];
+    [_selectButton setImage:[UIImage imageNamedFromMyBundle:@"photo_sel_photoPickerVc.png"] forState:UIControlStateSelected];
     [_selectButton addTarget:self action:@selector(select:) forControlEvents:UIControlEventTouchUpInside];
     
     [_naviBar addSubview:_selectButton];
@@ -98,8 +98,8 @@
         [_originalPhotoButton setTitle:@"原图" forState:UIControlStateSelected];
         [_originalPhotoButton setTitleColor:[UIColor lightGrayColor] forState:UIControlStateNormal];
         [_originalPhotoButton setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected];
-        [_originalPhotoButton setImage:[UIImage imageNamed:TZImagePickerSrcName(@"preview_original_def.png")] forState:UIControlStateNormal];
-        [_originalPhotoButton setImage:[UIImage imageNamed:TZImagePickerSrcName(@"photo_original_sel.png")] forState:UIControlStateSelected];
+        [_originalPhotoButton setImage:[UIImage imageNamedFromMyBundle:@"preview_original_def.png"] forState:UIControlStateNormal];
+        [_originalPhotoButton setImage:[UIImage imageNamedFromMyBundle:@"photo_original_sel.png"] forState:UIControlStateSelected];
         
         _originalPhotoLable = [[UILabel alloc] init];
         _originalPhotoLable.frame = CGRectMake(60, 0, 70, 44);
@@ -117,7 +117,7 @@
     [_okButton setTitle:@"确定" forState:UIControlStateNormal];
     [_okButton setTitleColor:imagePickerVc.oKButtonTitleColorNormal forState:UIControlStateNormal];
     
-    _numberImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:TZImagePickerSrcName(@"photo_number_icon.png")]];
+    _numberImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamedFromMyBundle:@"photo_number_icon.png"]];
     _numberImageView.backgroundColor = [UIColor clearColor];
     _numberImageView.frame = CGRectMake(self.view.tz_width - 56 - 24, 9, 26, 26);
     _numberImageView.hidden = _selectedPhotoArr.count <= 0;

TZImagePickerController/TZImagePickerController/TZVideoPlayerController.m

@@ -68,8 +68,8 @@
 - (void)configPlayButton {
     _playButton = [UIButton buttonWithType:UIButtonTypeCustom];
     _playButton.frame = CGRectMake(0, 64, self.view.tz_width, self.view.tz_height - 64 - 44);
-    [_playButton setImage:[UIImage imageNamed:TZImagePickerSrcName(@"MMVideoPreviewPlay.png")] forState:UIControlStateNormal];
-    [_playButton setImage:[UIImage imageNamed:TZImagePickerSrcName(@"MMVideoPreviewPlayHL.png")] forState:UIControlStateHighlighted];
+    [_playButton setImage:[UIImage imageNamedFromMyBundle:@"MMVideoPreviewPlay.png"] forState:UIControlStateNormal];
+    [_playButton setImage:[UIImage imageNamedFromMyBundle:@"MMVideoPreviewPlayHL.png"] forState:UIControlStateHighlighted];
     [_playButton addTarget:self action:@selector(playButtonClick) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:_playButton];
 }
@@ -126,7 +126,7 @@
     [_player pause];
     _toolBar.hidden = NO;
     [self.navigationController setNavigationBarHidden:NO];
-    [_playButton setImage:[UIImage imageNamed:TZImagePickerSrcName(@"MMVideoPreviewPlay.png")] forState:UIControlStateNormal];
+    [_playButton setImage:[UIImage imageNamedFromMyBundle:@"MMVideoPreviewPlay.png"] forState:UIControlStateNormal];
     if (iOS7Later) [UIApplication sharedApplication].statusBarHidden = NO;
 }