avoid selectedAssets index change, release 3.8.7

Author: dino.tan

README.md

@@ -8,7 +8,7 @@
 
 ## 重要提示1：提issue前，请先对照Demo、常见问题自查！Demo正常说明你可以升级下新版试试。          
 
-## 重要提示2：3.8.6版本修复了iOS18下无照片的问题       
+## 重要提示2：3.8.7版本修复了iOS18下无照片的问题       
      关于iOS14模拟器的问题
  PHAuthorizationStatusLimited授权模式下，iOS14模拟器有bug，未授权照片无法显示，真机正常，暂可忽略：https://github.com/banchichen/TZImagePickerController/issues/1347 
 
@@ -123,7 +123,7 @@ A：不要去拿PHImageFileURLKey，没用的，只有通过Photos框架才能
 
 ## 六. Release Notes 最近更新     
 
-**3.8.6 支持iOS18** [#1686](https://github.com/banchichen/TZImagePickerController/issues/1686)               
+**3.8.7 支持iOS18** [#1686](https://github.com/banchichen/TZImagePickerController/issues/1686)               
 **3.8.5 新增隐私清单文件** [#1675](https://github.com/banchichen/TZImagePickerController/pull/1675)               
 **3.8.4 支持使用不带定位代码的版本** [#1606](https://github.com/banchichen/TZImagePickerController/pull/1606)               
 3.8.1 iOS14下可添加访问更多照片，详见PR内的评论 [#1526](https://github.com/banchichen/TZImagePickerController/pull/1526)               

TZImagePickerController.podspec

@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
   s.name         = "TZImagePickerController"
-  s.version      = "3.8.6"
+  s.version      = "3.8.7"
   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" => "tanzhenios@foxmail.com" }
   s.platform     = :ios
   s.ios.deployment_target = "10.0"
-  s.source       = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "3.8.6" }
+  s.source       = { :git => "https://github.com/banchichen/TZImagePickerController.git", :tag => "3.8.7" }
   s.requires_arc = true
 
   s.subspec 'Basic' do |b|

TZImagePickerController.xcodeproj/project.pbxproj

@@ -862,8 +862,8 @@
 				INFOPLIST_FILE = TZImagePickerController/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 3.8.6;
-				PRODUCT_BUNDLE_IDENTIFIER = tanzhenios2024.TZImagePickerController.www;
+				MARKETING_VERSION = 3.8.7;
+				PRODUCT_BUNDLE_IDENTIFIER = tanzhenios2025.TZImagePickerController.www;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -887,7 +887,7 @@
 				INFOPLIST_FILE = TZImagePickerController/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 3.8.6;
+				MARKETING_VERSION = 3.8.7;
 				PRODUCT_BUNDLE_IDENTIFIER = tanzhenios2022.TZImagePickerController.www;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";

TZImagePickerController/TZImagePickerController/TZImagePickerController.h

@@ -4,7 +4,7 @@
 //
 //  Created by 谭真 on 15/12/24.
 //  Copyright © 2015年 谭真. All rights reserved.
-//  version 3.8.6 - 2024.06.27
+//  version 3.8.7 - 2024.08.14
 //  更多信息，请前往项目的github地址：https://github.com/banchichen/TZImagePickerController
 
 /*

TZImagePickerController/TZImagePickerController/TZImagePickerController.m

@@ -4,7 +4,7 @@
 //
 //  Created by 谭真 on 15/12/24.
 //  Copyright © 2015年 谭真. All rights reserved.
-//  version 3.8.6 - 2024.06.27
+//  version 3.8.7 - 2024.08.14
 //  更多信息，请前往项目的github地址：https://github.com/banchichen/TZImagePickerController
 
 #import "TZImagePickerController.h"
@@ -680,15 +680,6 @@ - (void)removeSelectedModel:(TZAssetModel *)model {
     [_selectedAssetIds removeObject:model.asset.localIdentifier];
 }
 
-- (void)setSelectedModels:(NSMutableArray<TZAssetModel *> *)selectedModels {
-    _selectedModels = selectedModels;
-    NSMutableArray *selectedAssetIds = [NSMutableArray array];
-    for (TZAssetModel *model in selectedModels) {
-        [selectedAssetIds addObject:model.asset.localIdentifier];
-    }
-    _selectedAssetIds = selectedAssetIds;
-}
-
 - (UIImage *)createImageWithColor:(UIColor *)color size:(CGSize)size radius:(CGFloat)radius {
     if (!color) {
         color = self.iconThemeColor;

TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m

@@ -151,7 +151,6 @@ - (void)initSubviews {
         [self configCollectionView];
         self->_collectionView.hidden = YES;
         [self configBottomToolBar];
-        [self refreshBottomToolBarStatus];
         [self prepareScrollCollectionViewToBottom];
     });
 }
@@ -966,16 +965,12 @@ - (void)checkSelectedModels {
         [selectedAssets addObject:model.asset];
     }
     // 拿到了最新的models，在此刷新照片选中状态
-    // 由于可能有照片权限变化，也需要刷新selectedModels https://github.com/banchichen/TZImagePickerController/pull/1658
-    NSMutableArray *newSelectedModels = [NSMutableArray array];
     for (TZAssetModel *model in _models) {
         model.isSelected = NO;
         if ([selectedAssets containsObject:model.asset]) {
             model.isSelected = YES;
-            [newSelectedModels addObject:model];
         }
     }
-    tzImagePickerVc.selectedModels = newSelectedModels;
 }
 
 /// 选中/取消选中某张照片
@@ -1115,10 +1110,14 @@ - (void)photoLibraryDidChange:(PHChange *)changeInstance {
         PHFetchResultChangeDetails *changeDetail = [changeInstance changeDetailsForFetchResult:self.model.result];
         if (changeDetail == nil) return;
         if ([[TZImageManager manager] isPHAuthorizationStatusLimited]) {
-            self.model.result = changeDetail.fetchResultAfterChanges;
-            self.model.count = changeDetail.fetchResultAfterChanges.count;
-            [self fetchAssetModels];
-        } else if (changeDetail.hasIncrementalChanges == NO) {
+            NSArray *changedObjects = [changeDetail changedObjects];
+            changeDetail = [PHFetchResultChangeDetails changeDetailsFromFetchResult:self.model.result toFetchResult:changeDetail.fetchResultAfterChanges changedObjects:changedObjects];
+            if (changeDetail && changeDetail.removedObjects.count) {
+                [self handleRemovedAssets:changeDetail.removedObjects];
+            }
+        }
+
+        if (changeDetail.hasIncrementalChanges == NO) {
             [self.model refreshFetchResult];
             [self fetchAssetModels];
         } else {
@@ -1134,6 +1133,21 @@ - (void)photoLibraryDidChange:(PHChange *)changeInstance {
     });
 }
 
+- (void)handleRemovedAssets:(NSArray<PHAsset *> *)removedObjects {
+    TZImagePickerController *tzImagePickerVc = (TZImagePickerController *)self.navigationController;
+    for (PHAsset *asset in removedObjects) {
+        Boolean isSelected = [tzImagePickerVc.selectedAssetIds containsObject:asset.localIdentifier];
+        if (!isSelected) continue;
+        NSArray *selectedModels = [NSArray arrayWithArray:tzImagePickerVc.selectedModels];
+        for (TZAssetModel *model_item in selectedModels) {
+            if ([asset.localIdentifier isEqualToString:model_item.asset.localIdentifier]) {
+                [tzImagePickerVc removeSelectedModel:model_item];
+            }
+        }
+        [self refreshBottomToolBarStatus];
+    }
+}
+
 #pragma mark - Asset Caching
 
 - (void)resetCachedAssets {