diff --git a/Documentation/README_EN.md b/Documentation/README_EN.md index 43f35ae9..c920d60d 100644 --- a/Documentation/README_EN.md +++ b/Documentation/README_EN.md @@ -85,7 +85,7 @@ ```swift dependencies: [ - .package(url: "https://github.com/SilenceLove/HXPhotoPicker.git", .upToNextMajor(from: "4.2.0")) + .package(url: "https://github.com/SilenceLove/HXPhotoPicker.git", .upToNextMajor(from: "4.2.1")) ] ``` @@ -279,7 +279,7 @@ photoAsset.getURL(compression: compression) { result in ```swift /// Get thumbnail -let thumImage = try await photoAsset.requesthumbnailImage() +let thumImage = try await photoAsset.requesThumbnailImage() /// Get preview let previewImage = try await photoAsset.requestPreviewImage() @@ -301,7 +301,7 @@ let livePhoto = try await photoAsset.requestLivePhoto() | Version | Release Date | Xcode | Swift | iOS | | ---- | ---- | ---- | ---- | ---- | -| [v4.2.0](https://github.com/SilenceLove/HXPhotoPicker/blob/master/Documentation/RELEASE_NOTE.md#420) | 2024-04-23 | 15.0.0 | 5.9.0 | 12.0+ | +| [v4.2.1](https://github.com/SilenceLove/HXPhotoPicker/blob/master/Documentation/RELEASE_NOTE.md#421) | 2024-05-18 | 15.0.0 | 5.9.0 | 12.0+ | @@ -310,6 +310,7 @@ let livePhoto = try await photoAsset.requestLivePhoto() | Version | Release Date | Xcode | Swift | iOS | | ---- | ---- | ---- | ---- | ---- | +| [v4.2.0](https://github.com/SilenceLove/HXPhotoPicker/blob/master/Documentation/RELEASE_NOTE.md#420) | 2024-04-23 | 15.0.0 | 5.9.0 | 12.0+ | | [v4.1.9](https://github.com/SilenceLove/HXPhotoPicker/blob/master/Documentation/RELEASE_NOTE.md#419) | 2024-04-09 | 15.0.0 | 5.9.0 | 12.0+ | | [v4.1.8](https://github.com/SilenceLove/HXPhotoPicker/blob/master/Documentation/RELEASE_NOTE.md#418) | 2024-03-24 | 15.0.0 | 5.9.0 | 12.0+ | | [v4.1.7](https://github.com/SilenceLove/HXPhotoPicker/blob/master/Documentation/RELEASE_NOTE.md#417) | 2024-03-09 | 15.0.0 | 5.9.0 | 12.0+ | diff --git a/Documentation/RELEASE_NOTE.md b/Documentation/RELEASE_NOTE.md index 456d9f2e..6adaef41 100644 --- a/Documentation/RELEASE_NOTE.md +++ b/Documentation/RELEASE_NOTE.md @@ -1,5 +1,14 @@ # Release Notes +## 4.2.1 + +### Resolved + +- [[691]](https://github.com/SilenceLove/HXPhotoPicker/issues/691) +- [[690]](https://github.com/SilenceLove/HXPhotoPicker/issues/690) +- [[686]](https://github.com/SilenceLove/HXPhotoPicker/issues/686) +- [[681]](https://github.com/SilenceLove/HXPhotoPicker/issues/681) + ## 4.2.0 ### Add @@ -61,7 +70,7 @@ ``` - `PhotoAsset`Added content for display ``` - let thumImage = try await photoAsset.requesthumbnailImage() + let thumImage = try await photoAsset.requesThumbnailImage() let previewImage = try await photoAsset.requestPreviewImage() let avAsset = try await photoAsset.requestAVAsset() let playerItem = try await photoAsset.requestPlayerItem() diff --git a/Documentation/RELEASE_NOTE_CN.md b/Documentation/RELEASE_NOTE_CN.md index 04480c24..ad4682b7 100644 --- a/Documentation/RELEASE_NOTE_CN.md +++ b/Documentation/RELEASE_NOTE_CN.md @@ -1,5 +1,14 @@ # 更新日志 +## 4.2.1 + +### 修复 + +- [[691]](https://github.com/SilenceLove/HXPhotoPicker/issues/691) +- [[690]](https://github.com/SilenceLove/HXPhotoPicker/issues/690) +- [[686]](https://github.com/SilenceLove/HXPhotoPicker/issues/686) +- [[681]](https://github.com/SilenceLove/HXPhotoPicker/issues/681) + ## 4.2.0 ### 新增 @@ -59,7 +68,7 @@ - `PhotoAsset`新增获取用于展示的内容 ``` /// 获取缩略图 - let thumImage = try await photoAsset.requesthumbnailImage() + let thumImage = try await photoAsset.requesThumbnailImage() /// 获取预览图 let previewImage = try await photoAsset.requestPreviewImage() diff --git a/HXPhotoPicker-Lite.podspec b/HXPhotoPicker-Lite.podspec index 649997ab..5c8d47d7 100644 --- a/HXPhotoPicker-Lite.podspec +++ b/HXPhotoPicker-Lite.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = "HXPhotoPicker-Lite" - spec.version = "4.2.0.3" + spec.version = "4.2.1" spec.summary = "Photo selector - Support LivePhoto, GIF selection" spec.homepage = "https://github.com/SilenceLove/HXPhotoPicker" spec.license = { :type => "MIT", :file => "LICENSE" } diff --git a/HXPhotoPicker.podspec b/HXPhotoPicker.podspec index bc033e64..7a86ecd3 100644 --- a/HXPhotoPicker.podspec +++ b/HXPhotoPicker.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = "HXPhotoPicker" - spec.version = "4.2.0.3" + spec.version = "4.2.1" spec.summary = "照片/视频选择器 - 支持LivePhoto、GIF图片选择、自定义编辑照片/视频、3DTouch预览、浏览网络图片/网络视频 功能 - Imitation weibo photo/image picker - support for LivePhoto, GIF image selection, 3DTouch preview, browse the web image function" spec.homepage = "https://github.com/SilenceLove/HXPhotoPicker" spec.license = { :type => "MIT", :file => "LICENSE" } diff --git a/HXPhotoPickerExample.xcodeproj/project.pbxproj b/HXPhotoPickerExample.xcodeproj/project.pbxproj index cbe24b2c..b9df35ab 100644 --- a/HXPhotoPickerExample.xcodeproj/project.pbxproj +++ b/HXPhotoPickerExample.xcodeproj/project.pbxproj @@ -3070,7 +3070,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 4.2.0; + MARKETING_VERSION = 4.2.1; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -3134,7 +3134,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 4.2.0; + MARKETING_VERSION = 4.2.1; OTHER_LDFLAGS = ( "$(inherited)", "-framework", diff --git a/Podfile.lock b/Podfile.lock index d1c779d1..bbb7afcb 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,42 +1,42 @@ PODS: - - HXPhotoPicker (4.2.0.2): - - HXPhotoPicker/Full (= 4.2.0.2) - - HXPhotoPicker/Camera (4.2.0.2): - - HXPhotoPicker/Camera/Lite (= 4.2.0.2) - - HXPhotoPicker/Camera/Location (= 4.2.0.2) - - HXPhotoPicker/Camera/Lite (4.2.0.2): + - HXPhotoPicker (4.2.1): + - HXPhotoPicker/Full (= 4.2.1) + - HXPhotoPicker/Camera (4.2.1): + - HXPhotoPicker/Camera/Lite (= 4.2.1) + - HXPhotoPicker/Camera/Location (= 4.2.1) + - HXPhotoPicker/Camera/Lite (4.2.1): - HXPhotoPicker/Core - - HXPhotoPicker/Camera/Location (4.2.0.2): + - HXPhotoPicker/Camera/Location (4.2.1): - HXPhotoPicker/Camera/Lite - - HXPhotoPicker/Core (4.2.0.2): + - HXPhotoPicker/Core (4.2.1): - HXPhotoPicker/Resources - - HXPhotoPicker/Editor (4.2.0.2): - - HXPhotoPicker/Editor/KF (= 4.2.0.2) - - HXPhotoPicker/Editor/Lite (= 4.2.0.2) - - HXPhotoPicker/Editor/KF (4.2.0.2): + - HXPhotoPicker/Editor (4.2.1): + - HXPhotoPicker/Editor/KF (= 4.2.1) + - HXPhotoPicker/Editor/Lite (= 4.2.1) + - HXPhotoPicker/Editor/KF (4.2.1): - HXPhotoPicker/Editor/Lite - HXPhotoPicker/EditorView/KF - Kingfisher (~> 7.0) - - HXPhotoPicker/Editor/Lite (4.2.0.2): + - HXPhotoPicker/Editor/Lite (4.2.1): - HXPhotoPicker/EditorView/Lite - - HXPhotoPicker/EditorView/KF (4.2.0.2): + - HXPhotoPicker/EditorView/KF (4.2.1): - HXPhotoPicker/EditorView/Lite - Kingfisher (~> 7.0) - - HXPhotoPicker/EditorView/Lite (4.2.0.2): + - HXPhotoPicker/EditorView/Lite (4.2.1): - HXPhotoPicker/Core - - HXPhotoPicker/Full (4.2.0.2): + - HXPhotoPicker/Full (4.2.1): - HXPhotoPicker/Camera - HXPhotoPicker/Editor - HXPhotoPicker/Picker - - HXPhotoPicker/Picker (4.2.0.2): - - HXPhotoPicker/Picker/KF (= 4.2.0.2) - - HXPhotoPicker/Picker/Lite (= 4.2.0.2) - - HXPhotoPicker/Picker/KF (4.2.0.2): + - HXPhotoPicker/Picker (4.2.1): + - HXPhotoPicker/Picker/KF (= 4.2.1) + - HXPhotoPicker/Picker/Lite (= 4.2.1) + - HXPhotoPicker/Picker/KF (4.2.1): - HXPhotoPicker/Picker/Lite - Kingfisher (~> 7.0) - - HXPhotoPicker/Picker/Lite (4.2.0.2): + - HXPhotoPicker/Picker/Lite (4.2.1): - HXPhotoPicker/Core - - HXPhotoPicker/Resources (4.2.0.2) + - HXPhotoPicker/Resources (4.2.1) - Kingfisher (7.11.0) DEPENDENCIES: @@ -51,7 +51,7 @@ EXTERNAL SOURCES: :path: "./" SPEC CHECKSUMS: - HXPhotoPicker: 0e09d16981c5a4909cc97832a58f956aed98cc83 + HXPhotoPicker: e1835b71c58b48058955ea15eb557f1e26e8b784 Kingfisher: b9c985d864d43515f404f1ef4a8ce7d802ace3ac PODFILE CHECKSUM: 21b9e041ba4e451b12f1e956e5cd813bc50684be diff --git a/Pods/Local Podspecs/HXPhotoPicker.podspec.json b/Pods/Local Podspecs/HXPhotoPicker.podspec.json index 485900da..06b7de4d 100644 --- a/Pods/Local Podspecs/HXPhotoPicker.podspec.json +++ b/Pods/Local Podspecs/HXPhotoPicker.podspec.json @@ -1,6 +1,6 @@ { "name": "HXPhotoPicker", - "version": "4.2.0.2", + "version": "4.2.1", "summary": "照片/视频选择器 - 支持LivePhoto、GIF图片选择、自定义编辑照片/视频、3DTouch预览、浏览网络图片/网络视频 功能 - Imitation weibo photo/image picker - support for LivePhoto, GIF image selection, 3DTouch preview, browse the web image function", "homepage": "https://github.com/SilenceLove/HXPhotoPicker", "license": { @@ -18,7 +18,7 @@ }, "source": { "git": "https://github.com/SilenceLove/HXPhotoPicker.git", - "tag": "4.2.0.2" + "tag": "4.2.1" }, "frameworks": [ "UIKit", diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index d1c779d1..bbb7afcb 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -1,42 +1,42 @@ PODS: - - HXPhotoPicker (4.2.0.2): - - HXPhotoPicker/Full (= 4.2.0.2) - - HXPhotoPicker/Camera (4.2.0.2): - - HXPhotoPicker/Camera/Lite (= 4.2.0.2) - - HXPhotoPicker/Camera/Location (= 4.2.0.2) - - HXPhotoPicker/Camera/Lite (4.2.0.2): + - HXPhotoPicker (4.2.1): + - HXPhotoPicker/Full (= 4.2.1) + - HXPhotoPicker/Camera (4.2.1): + - HXPhotoPicker/Camera/Lite (= 4.2.1) + - HXPhotoPicker/Camera/Location (= 4.2.1) + - HXPhotoPicker/Camera/Lite (4.2.1): - HXPhotoPicker/Core - - HXPhotoPicker/Camera/Location (4.2.0.2): + - HXPhotoPicker/Camera/Location (4.2.1): - HXPhotoPicker/Camera/Lite - - HXPhotoPicker/Core (4.2.0.2): + - HXPhotoPicker/Core (4.2.1): - HXPhotoPicker/Resources - - HXPhotoPicker/Editor (4.2.0.2): - - HXPhotoPicker/Editor/KF (= 4.2.0.2) - - HXPhotoPicker/Editor/Lite (= 4.2.0.2) - - HXPhotoPicker/Editor/KF (4.2.0.2): + - HXPhotoPicker/Editor (4.2.1): + - HXPhotoPicker/Editor/KF (= 4.2.1) + - HXPhotoPicker/Editor/Lite (= 4.2.1) + - HXPhotoPicker/Editor/KF (4.2.1): - HXPhotoPicker/Editor/Lite - HXPhotoPicker/EditorView/KF - Kingfisher (~> 7.0) - - HXPhotoPicker/Editor/Lite (4.2.0.2): + - HXPhotoPicker/Editor/Lite (4.2.1): - HXPhotoPicker/EditorView/Lite - - HXPhotoPicker/EditorView/KF (4.2.0.2): + - HXPhotoPicker/EditorView/KF (4.2.1): - HXPhotoPicker/EditorView/Lite - Kingfisher (~> 7.0) - - HXPhotoPicker/EditorView/Lite (4.2.0.2): + - HXPhotoPicker/EditorView/Lite (4.2.1): - HXPhotoPicker/Core - - HXPhotoPicker/Full (4.2.0.2): + - HXPhotoPicker/Full (4.2.1): - HXPhotoPicker/Camera - HXPhotoPicker/Editor - HXPhotoPicker/Picker - - HXPhotoPicker/Picker (4.2.0.2): - - HXPhotoPicker/Picker/KF (= 4.2.0.2) - - HXPhotoPicker/Picker/Lite (= 4.2.0.2) - - HXPhotoPicker/Picker/KF (4.2.0.2): + - HXPhotoPicker/Picker (4.2.1): + - HXPhotoPicker/Picker/KF (= 4.2.1) + - HXPhotoPicker/Picker/Lite (= 4.2.1) + - HXPhotoPicker/Picker/KF (4.2.1): - HXPhotoPicker/Picker/Lite - Kingfisher (~> 7.0) - - HXPhotoPicker/Picker/Lite (4.2.0.2): + - HXPhotoPicker/Picker/Lite (4.2.1): - HXPhotoPicker/Core - - HXPhotoPicker/Resources (4.2.0.2) + - HXPhotoPicker/Resources (4.2.1) - Kingfisher (7.11.0) DEPENDENCIES: @@ -51,7 +51,7 @@ EXTERNAL SOURCES: :path: "./" SPEC CHECKSUMS: - HXPhotoPicker: 0e09d16981c5a4909cc97832a58f956aed98cc83 + HXPhotoPicker: e1835b71c58b48058955ea15eb557f1e26e8b784 Kingfisher: b9c985d864d43515f404f1ef4a8ce7d802ace3ac PODFILE CHECKSUM: 21b9e041ba4e451b12f1e956e5cd813bc50684be diff --git a/Pods/Target Support Files/HXPhotoPicker/HXPhotoPicker-Info.plist b/Pods/Target Support Files/HXPhotoPicker/HXPhotoPicker-Info.plist index 0ea62814..03d8a177 100644 --- a/Pods/Target Support Files/HXPhotoPicker/HXPhotoPicker-Info.plist +++ b/Pods/Target Support Files/HXPhotoPicker/HXPhotoPicker-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 4.2.0 + 4.2.1 CFBundleSignature ???? CFBundleVersion diff --git a/Pods/Target Support Files/HXPhotoPicker/ResourceBundle-HXPhotoPicker_Privacy-HXPhotoPicker-Info.plist b/Pods/Target Support Files/HXPhotoPicker/ResourceBundle-HXPhotoPicker_Privacy-HXPhotoPicker-Info.plist index e1b40f67..af5b7f9a 100644 --- a/Pods/Target Support Files/HXPhotoPicker/ResourceBundle-HXPhotoPicker_Privacy-HXPhotoPicker-Info.plist +++ b/Pods/Target Support Files/HXPhotoPicker/ResourceBundle-HXPhotoPicker_Privacy-HXPhotoPicker-Info.plist @@ -13,7 +13,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 4.2.0 + 4.2.1 CFBundleSignature ???? CFBundleVersion diff --git a/README.md b/README.md index d16d53f9..a7ba9a15 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ ```swift dependencies: [ - .package(url: "https://github.com/SilenceLove/HXPhotoPicker.git", .upToNextMajor(from: "4.2.0")) + .package(url: "https://github.com/SilenceLove/HXPhotoPicker.git", .upToNextMajor(from: "4.2.1")) ] ``` @@ -311,7 +311,7 @@ photoAsset.getURL(compression: compression) { result in ```swift /// 获取缩略图 -let thumImage = try await photoAsset.requesthumbnailImage() +let thumImage = try await photoAsset.requesThumbnailImage() /// 获取预览图 let previewImage = try await photoAsset.requestPreviewImage() @@ -333,7 +333,7 @@ let livePhoto = try await photoAsset.requestLivePhoto() | 版本 | 发布时间 | Xcode | Swift | iOS | | ---- | ---- | ---- | ---- | ---- | -| [v4.2.0](https://github.com/SilenceLove/HXPhotoPicker/blob/master/Documentation/RELEASE_NOTE_CN.md#420) | 2024-04-23 | 15.0.0 | 5.9.0 | 12.0+ | +| [v4.2.1](https://github.com/SilenceLove/HXPhotoPicker/blob/master/Documentation/RELEASE_NOTE_CN.md#421) | 2024-05-18 | 15.0.0 | 5.9.0 | 12.0+ | @@ -342,6 +342,7 @@ let livePhoto = try await photoAsset.requestLivePhoto() | 版本 | 发布时间 | Xcode | Swift | iOS | | ---- | ---- | ---- | ---- | ---- | +| [v4.2.0](https://github.com/SilenceLove/HXPhotoPicker/blob/master/Documentation/RELEASE_NOTE_CN.md#420) | 2024-04-23 | 15.0.0 | 5.9.0 | 12.0+ | | [v4.1.9](https://github.com/SilenceLove/HXPhotoPicker/blob/master/Documentation/RELEASE_NOTE_CN.md#419) | 2024-04-09 | 15.0.0 | 5.9.0 | 12.0+ | | [v4.1.8](https://github.com/SilenceLove/HXPhotoPicker/blob/master/Documentation/RELEASE_NOTE_CN.md#418) | 2024-03-24 | 15.0.0 | 5.9.0 | 12.0+ | | [v4.1.7](https://github.com/SilenceLove/HXPhotoPicker/blob/master/Documentation/RELEASE_NOTE_CN.md#417) | 2024-03-09 | 15.0.0 | 5.9.0 | 12.0+ | diff --git a/Sources/HXPhotoPicker/Picker/Model/PhotoAsset/PhotoAsset+Request.swift b/Sources/HXPhotoPicker/Picker/Model/PhotoAsset/PhotoAsset+Request.swift index cf074ae0..840a58df 100644 --- a/Sources/HXPhotoPicker/Picker/Model/PhotoAsset/PhotoAsset+Request.swift +++ b/Sources/HXPhotoPicker/Picker/Model/PhotoAsset/PhotoAsset+Request.swift @@ -1140,7 +1140,7 @@ public extension PhotoAsset { @available(iOS 13.0, *) public extension PhotoAsset { - func requesthumbnailImage( + func requesThumbnailImage( targetWidth: CGFloat = 180, didRequestHandler: ((PhotoAsset, PHImageRequestID) -> Void)? = nil ) async throws -> UIImage {