商品轮播删除图片/视频的bug

张旭
1 parent 2b6a5abd
Showing 2 changed files with 62 additions and 2 deletions
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveAddGoodsSelectUploadImageView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveSelUplSingleImageView.swift
@@ -669,6 +669,66 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
         let subviews = self.subviews
         for i in 0..<subviews.count {
             let singleImageView = self.viewWithTag(i+1+DS_SUIV_ADD_TAG_COUNT) as! CNLiveSelUplSingleImageView
+            
+            
+            
+            if (model.imageUrl?.count ?? 0 > 0) && (singleImageView.model?.imageUrl?.count ?? 0 > 0){
+                if model.imageUrl == singleImageView.model?.imageUrl{
+                    if singleImageView.model?.isVideo == true{
+                        //subview是视频
+                        if singleImageView.model?.isUploading == true{
+                            //subview正在上传中
+                            UploadManager.shared.cancelUploadKey(key: singleImageView.model!.uploadKey!)
+                        }else{
+                            //subview上传完成
+                            //标记当前有视频,并替换model
+                            self.replaceVideoUrls.append(singleImageView.model!)
+                            let videoModel = CNLiveSelectUploadImageModel()
+                            videoModel.isVideo = true
+                            self.uploadVideoModel = videoModel
+                        }
+                    }else{
+                        //subview是纯图片
+                        if singleImageView.model?.isUploading == true{
+                            //上传中
+                            UploadManager.shared.cancelUploadKey(key: singleImageView.model!.uploadKey!)
+                        }else{
+                            //上传完成
+                            if let index = self.uploadImageUrls.firstIndex(of: singleImageView.model!){
+                                //移除上传完成的model
+                                self.uploadImageUrls.remove(at: index)
+                                self.replaceImageUrls.append(singleImageView.model!)
+                            }
+                        }
+                    }
+                    break
+                }
+            }else{
+                //imageUrl有空值
+                if model.videoUrl?.count ?? 0 > 0 && self.uploadVideoModel?.videoUrl?.count ?? 0 > 0 && model.videoUrl == self.uploadVideoModel?.videoUrl{
+                    //当前要删除的是视频
+                    if self.uploadVideoModel?.isVideo == true{
+                        //subview是视频
+                        if self.uploadVideoModel?.isUploading == true{
+                            //subview正在上传中
+                            UploadManager.shared.cancelUploadKey(key: self.uploadVideoModel!.uploadKey!)
+                        }else{
+                            //subview上传完成
+                            //标记当前有视频,并替换model
+                            self.replaceVideoUrls.append(self.uploadVideoModel!)
+                            let videoModel = CNLiveSelectUploadImageModel()
+                            videoModel.isVideo = true
+                            self.uploadVideoModel = videoModel
+                        }
+                    }
+                    break
+                }
+                
+            }
+            
+            
+            
+            /*
             //TODO 目前imageUrl为nil
             if model.imageUrl == singleImageView.model?.imageUrl{
                 //要删除model的imageUrl和subview的imageUrl相等
@@ -700,7 +760,7 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
                     }
                 }
                 break
-            }
+            }*/
         }
         self.resetUI()
         self.autoAdjustHeight()
@@ -132,7 +132,7 @@ class CNLiveSelUplSingleImageView: UIView {
                 }else{
                     self.deleteBtn?.isHidden = false
                 }
-            }else if self.model?.isUploading! == true{
+            }else if self.model?.isUploading == true{
                 self.progressLab?.text = String(format: "%.0f%%", self.model?.uploadingPercent ?? 0 * 100)
                 self.progressLab?.isHidden = false
                 self.deleteBtn?.isHidden = false