修复photoWidth属性失效的问题；发布3.1.8版本

banchichen · Jan 14, 2019 · 0737c61 · 0737c61
1 parent 2f3bb53
commit 0737c61
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -124,7 +124,7 @@ A：不要去拿PHImageFileURLKey，没用的，只有通过Photos框架才能
 
 ## 六. Release Notes 最近更新     
 
-3.1.7 批量获取图片时加入队列控制，尝试优化大批量选择图片时CPU和内存占用过高的问题（仍然危险，maxImagesCount谨慎设置过大...）             
+3.1.8 批量获取图片时加入队列控制，尝试优化大批量选择图片时CPU和内存占用过高的问题（仍然危险，maxImagesCount谨慎设置过大...）             
 3.1.5 相册内无照片时给出提示，修复快速滑动时内存一直增加的问题           
 3.1.3 适配阿拉伯等语言下从右往左布局的特性         
 3.0.8 新增gifImagePlayBlock允许使用FLAnimatedImage等替换内部的GIF播放方案         

diff --git a/TZImagePickerController.podspec b/TZImagePickerController.podspec
@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
   s.name         = "TZImagePickerController"
-  s.version      = "3.1.7"
+  s.version      = "3.1.8"
   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" => "[email protected]" }
   s.platform     = :ios
   s.ios.deployment_target = "8.0"
-  s.source       = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "3.1.7" }
+  s.source       = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "3.1.8" }
   s.requires_arc = true
   s.resources    = "TZImagePickerController/TZImagePickerController/*.{png,bundle}"
   s.source_files = "TZImagePickerController/TZImagePickerController/*.{h,m}"

diff --git a/TZImagePickerController/Info.plist b/TZImagePickerController/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.7</string>
+	<string>3.1.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/TZImagePickerController/TZImagePickerController/TZImageManager.m b/TZImagePickerController/TZImagePickerController/TZImageManager.m
@@ -347,7 +347,7 @@ - (PHImageRequestID)getPhotoWithAsset:(PHAsset *)asset photoWidth:(CGFloat)photo
     } else {
         PHAsset *phAsset = (PHAsset *)asset;
         CGFloat aspectRatio = phAsset.pixelWidth / (CGFloat)phAsset.pixelHeight;
-        CGFloat pixelWidth = photoWidth * TZScreenScale * 1.5;
+        CGFloat pixelWidth = photoWidth * TZScreenScale;
         // 超宽图片
         if (aspectRatio > 1.8) {
             pixelWidth = pixelWidth * aspectRatio;

diff --git a/TZImagePickerController/TZImagePickerController/TZImagePickerController.h b/TZImagePickerController/TZImagePickerController/TZImagePickerController.h
@@ -4,7 +4,7 @@
 //
 //  Created by 谭真 on 15/12/24.
 //  Copyright © 2015年 谭真. All rights reserved.
-//  version 3.1.7 - 2019.01.04
+//  version 3.1.8 - 2019.01.14
 //  更多信息，请前往项目的github地址：https://github.com/banchichen/TZImagePickerController
 
 /*

diff --git a/TZImagePickerController/TZImagePickerController/TZImagePickerController.m b/TZImagePickerController/TZImagePickerController/TZImagePickerController.m
@@ -4,7 +4,7 @@
 //
 //  Created by 谭真 on 15/12/24.
 //  Copyright © 2015年 谭真. All rights reserved.
-//  version 3.1.7 - 2019.01.04
+//  version 3.1.8 - 2019.01.14
 //  更多信息，请前往项目的github地址：https://github.com/banchichen/TZImagePickerController
 
 #import "TZImagePickerController.h"

diff --git a/TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m b/TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m
@@ -345,6 +345,7 @@ - (void)viewDidLayoutSubviews {
     _divideLine.frame = CGRectMake(0, 0, self.view.tz_width, 1);
 
     [TZImageManager manager].columnNumber = [TZImageManager manager].columnNumber;
+    [TZImageManager manager].photoWidth = tzImagePickerVc.photoWidth;
     [self.collectionView reloadData];
 
     if (tzImagePickerVc.photoPickerPageDidLayoutSubviewsBlock) {

diff --git a/TZImagePickerController/ViewController.m b/TZImagePickerController/ViewController.m
@@ -270,7 +270,7 @@ - (void)pushTZImagePickerController {
         imagePickerController.videoQuality = UIImagePickerControllerQualityTypeHigh;
     }];
 
-    // imagePickerVc.photoWidth = 1000;
+    // imagePickerVc.photoWidth = 800;
 
     // 2. Set the appearance
     // 2. 在这里设置imagePickerVc的外观

diff --git a/TZImagePickerControllerFramework/Info.plist b/TZImagePickerControllerFramework/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.7</string>
+	<string>3.1.8</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>