Procházet zdrojové kódy

相册完成/开始滑动手势

南鑫林 před 5 roky
rodič
revize
d335870e1e

+ 41 - 35
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMediaPicker/Controller/KSMediaPickerController.swift

@@ -467,46 +467,52 @@ open class KSMediaPickerController: UIViewController, UICollectionViewDelegate,
             cell.isMultipleSelected = maxItemCount > 1
         }
         
-        // 3.0s以下视频不可选择
-        if mediaType == .video {
-            let duration = Double(itemModel?.asset.duration ?? 0)
-            if duration < 3.0 {
-                itemModel?.isLoseFocus = true
-            }
-        }
-        
         if _currentSingleType != nil {
-            if _currentSingleType == .video {
-                if itemModel?.asset.mediaType == .video {
-                    itemModel?.isLoseFocus = false
-                }else {
-                    itemModel?.isLoseFocus = true
-                }
-            }else if _currentSingleType == .picture {
-                if itemModel?.asset.mediaType == .video {
-                    itemModel?.isLoseFocus = true
-                }else {
-                    itemModel?.isLoseFocus = false
-                }
-            }
-        }
-        
-        if _selectedAssetArray.count > 0 {
-            for itemModel1 in _selectedAssetArray {
-                if itemModel?.asset.localIdentifier == (itemModel1 as! KSMediaPickerItemModel).asset.localIdentifier {
-                    itemModel = itemModel1 as? KSMediaPickerItemModel
-                }else {
-                    if _currentSingleType == .video {
-                        if _selectedAssetArray.count == 1 {
-                            itemModel?.isLoseFocus = true
-                        }
-                    }else if _currentSingleType == .picture {
-                        if _selectedAssetArray.count == 9 {
+            if _selectedAssetArray.count > 0 {
+                if _currentSingleType == .video {
+                    for itemModel1 in _selectedAssetArray {
+                        if itemModel?.asset.localIdentifier == (itemModel1 as! KSMediaPickerItemModel).asset.localIdentifier {
+                            itemModel = itemModel1 as? KSMediaPickerItemModel
+                            itemModel?.isLoseFocus = false
+                        }else {
                             itemModel?.isLoseFocus = true
                         }
                     }
-                    
+                }else if _currentSingleType == .picture {
+
+                    if mediaType == .video {
+                        itemModel?.isLoseFocus = true
+                    }else {
+//                        if _selectedAssetArray.count == maxPictureItemCount {
+//                            for itemModel1 in _selectedAssetArray {
+//                                if itemModel?.asset.localIdentifier == (itemModel1 as! KSMediaPickerItemModel).asset.localIdentifier {
+//                                    itemModel = itemModel1 as? KSMediaPickerItemModel
+//                                    itemModel?.isLoseFocus = false
+//                                }else {
+//                                    itemModel?.isLoseFocus = true
+//                                }
+//                            }
+//                        }else {
+//                            for itemModel1 in _selectedAssetArray {
+//                                if itemModel?.asset.localIdentifier == (itemModel1 as! KSMediaPickerItemModel).asset.localIdentifier {
+//                                    itemModel = itemModel1 as? KSMediaPickerItemModel
+//                                }
+//                            }
+//                        }
+                    }
                 }
+            }else {
+                itemModel?.isLoseFocus = false
+            }
+        }else {
+            itemModel?.isLoseFocus = false
+        }
+        
+        // 3.0s以下视频不可选择
+        if mediaType == .video {
+            let duration = Double(itemModel?.asset.duration ?? 0)
+            if duration < 3.0 {
+                itemModel?.isLoseFocus = true
             }
         }