上传视频和图片部分代码

张旭
1 parent a990a2f1
Showing 10 changed files with 148 additions and 116 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Util/CNLiveCommonQiniuTool.swift
metaCode/Classes/Extensions/Array+CNLiveExtensions.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveCreateShopClassifyViewController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveGoodsCategoryController.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveAddGoodsSelectUploadImageView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveSelUplSingleImageView.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineInputViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineShopViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineHeaderView.swift
@@ -28,6 +28,7 @@
 		191733002B0B58E5007BCC04 /* CNLiveSelectUploadImageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191732FF2B0B58E5007BCC04 /* CNLiveSelectUploadImageModel.swift */; };
 		191733022B0C4EAB007BCC04 /* CNLiveSelUplSingleImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733012B0C4EAB007BCC04 /* CNLiveSelUplSingleImageView.swift */; };
 		191733042B0F216E007BCC04 /* NSDictionary+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733032B0F216E007BCC04 /* NSDictionary+CNLiveExtensions.swift */; };
+		1917330A2B10864F007BCC04 /* Array+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191733092B10864F007BCC04 /* Array+CNLiveExtensions.swift */; };
 		192336EB2AD9224300D47CD4 /* CNUpSlideViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192336EA2AD9224300D47CD4 /* CNUpSlideViewController.swift */; };
 		1926C28F2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1926C28E2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift */; };
 		1926C2912AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1926C2902AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift */; };
@@ -219,6 +220,7 @@
 		191732FF2B0B58E5007BCC04 /* CNLiveSelectUploadImageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSelectUploadImageModel.swift; sourceTree = "<group>"; };
 		191733012B0C4EAB007BCC04 /* CNLiveSelUplSingleImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSelUplSingleImageView.swift; sourceTree = "<group>"; };
 		191733032B0F216E007BCC04 /* NSDictionary+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSDictionary+CNLiveExtensions.swift"; sourceTree = "<group>"; };
+		191733092B10864F007BCC04 /* Array+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Array+CNLiveExtensions.swift"; sourceTree = "<group>"; };
 		192336EA2AD9224300D47CD4 /* CNUpSlideViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNUpSlideViewController.swift; sourceTree = "<group>"; };
 		1926C28E2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideViewModel.swift; sourceTree = "<group>"; };
 		1926C2902AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideModel.swift; sourceTree = "<group>"; };
@@ -540,6 +542,7 @@
 				19CC4D552ADD19C200308E2A /* String+Extension.swift */,
 				191732E62B0615C1007BCC04 /* UIScrollView+CNLiveExtensions.swift */,
 				191733032B0F216E007BCC04 /* NSDictionary+CNLiveExtensions.swift */,
+				191733092B10864F007BCC04 /* Array+CNLiveExtensions.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -1365,6 +1368,7 @@
 				19CC4D562ADD19C200308E2A /* String+Extension.swift in Sources */,
 				7905BB492AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift in Sources */,
 				19565EC22AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift in Sources */,
+				1917330A2B10864F007BCC04 /* Array+CNLiveExtensions.swift in Sources */,
 				191732FB2B0AF34A007BCC04 /* CNLiveShopGoodsDetailsModel.swift in Sources */,
 				794FF1052B01FC8800385E85 /* CNLiveShopOrderSearchViewController.swift in Sources */,
 				798A44EC2A302DBE00815935 /* CNLiveMineAddInfoViewController.swift in Sources */,
@@ -11,6 +11,7 @@ import CNLiveRequestBastKit
 typealias ProgressBlcok = (_ key: String,_ percent: CGFloat) -> Void
 typealias SuccessBlock = (_ key: String,_ url: String) -> Void
+
 class UploadManager: NSObject {
     var uploadModels = NSMutableArray()
@@ -34,7 +35,7 @@ class UploadManager: NSObject {
     ///   - imageData: 图片数据
     ///   - progressBlock: 进度回调
     ///   - successBlock: 成功回调
-    static func uploadImage(imageData: NSData, progressBlock:@escaping ProgressBlcok, successBlock: @escaping SuccessBlock) {
+    static func uploadImage(imageData: NSData, progressBlock:@escaping ProgressBlcok, successBlock: @escaping SuccessBlock) -> String {
         let key = UploadManager.createImageFileName()
         UploadManager.uploadData(madiaData: imageData, key: key, progress: progressBlock, success: successBlock)
     }
@@ -44,12 +45,40 @@ class UploadManager: NSObject {
     ///   - imageData: 视频数据
     ///   - progressBlock: 进度回调
     ///   - successBlock: 成功回调
-    static func uploadVideo(videoData: NSData, progressBlock:@escaping ProgressBlcok, successBlock: @escaping SuccessBlock) {
+    static func uploadVideo(videoData: NSData, progressBlock:@escaping ProgressBlcok, successBlock: @escaping SuccessBlock) -> String {
         let key = UploadManager.createVideoFileName()
         UploadManager.uploadData(madiaData: videoData, key: key, progress: progressBlock, success: successBlock)
     }
-    
+    // MARK: - 取消上传
+    func cancelUploadKey(key:String){
+        for (_,obj) in self.uploadModels.enumerated() {
+            let model = obj as! QiNiuUploadModel
+            if model.key == key{
+                model.isCancel = true
+                break
+            }
+        }
+    }
+    // MARK: - 删除云中图片
+    func requestQiNiuDeleteImageUrl(imageUrl:String,resultBlock:downSlideResultBlock){
+        
+        let param = NSMutableDictionary()
+        param.setValue(imageUrl, forKey: "img")
+        showLoading(message: "处理中...")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/Api/v1/delQiniuImg", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                resultBlock(result as Any,.success)
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+        
+    }
     /// 上传到七牛
     /// - Parameters:
+//
+//  Array+CNLiveExtensions.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/24.
+//
+
+import Foundation
+
+extension Array where Element: Equatable {
+    
+    // Remove first collection element that is equal to the given `object`:
+    mutating func remove(_ object: Element) {
+        if let index = firstIndex(of: object) {
+            remove(at: index)
+        }
+    }
+}
@@ -76,10 +76,6 @@ class CNLiveCreateShopClassifyViewController:CNLiveBaseViewController, UITableVi
         self.isEdite = isEdite
     }
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
     // MARK: - 初始化UI
     func initUI(){
         self.view.addSubview(self.tableView)
@@ -470,7 +470,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
     ///创建店铺分类
     @objc func createBtnClick(){
-        let vc = CNLiveCreateShopClassifyViewController()
+        let vc = CNLiveCreateShopClassifyViewController()  
         vc.classifyType = .oneLevelClassify
         vc.successCompleteBlock = {
             self.postShopClassify()
@@ -174,9 +174,11 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
                     i -= 1
                     let model = self.uploadImageUrls[i]
                     if model.isUploading == true{
-                        [[DSQiNiuUploadManager sharedManager] cancelUploadKey:model.uploadKey];
+                        UploadManager.shared.cancelUploadKey(key: model.uploadKey!)
                     }else{
-                        [[DSQiNiuUploadManager sharedManager] requestQiNiuDeleteImageUrl:model.imageUrl complete:nil];
+                        UploadManager.shared.requestQiNiuDeleteImageUrl(imageUrl: model.imageUrl!) { result, status in
+                            
+                        }
                         self.uploadImageUrls.remove(model)
                     }
                 }
@@ -300,8 +302,8 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
      @return 网络视频Url
      */
-    func getCurrentSelectLocalVideoUrl()->NSURL{
-        return self.uploadVideoModel?.localVideoUrl ?? NSURL()
+    func getCurrentSelectLocalVideoUrl()->URL{
+        return (self.uploadVideoModel?.localVideoUrl)!
     }
     /**
      获取当前选取的本地视频Url第一帧图片
@@ -316,11 +318,15 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
      */
     func deleteReplaceImageUrlAfterSuccessUploadThings(){
         for replaceImageModel in self.replaceImageUrls {
-            [[DSQiNiuUploadManager sharedManager] requestQiNiuDeleteImageUrl:replaceImageModel.imageUrl complete:nil];
+            UploadManager.shared.requestQiNiuDeleteImageUrl(imageUrl: replaceImageModel.imageUrl!) { result, status in
+                
+            }
         }
         self.networkImageArr = self.getCurrentSelectImageUrls()
         for replaceVideoModel in self.replaceVideoUrls {
-            [[DSQiNiuUploadManager sharedManager] requestQiNiuDeleteImageUrl:replaceVideoModel.videoUrl complete:nil];
+            UploadManager.shared.requestQiNiuDeleteImageUrl(imageUrl: replaceVideoModel.videoUrl!) { result, status in
+                
+            }
         }
         self.networkVideoUrl = self.getCurrentSelectVideoUrl()
     }
@@ -336,15 +342,19 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
      */
     func deleteUploadImageUrl(){
         for uploadImageModel in self.uploadImageUrls {
-            if ((self.networkImageArr?.contains(uploadImageModel.imageUrl ?? "")) != nil){
-                [[DSQiNiuUploadManager sharedManager] requestQiNiuDeleteImageUrl:uploadImageModel.imageUrl complete:nil];
+            if !self.networkImageArr.contains(uploadImageModel.imageUrl!){
+                UploadManager.shared.requestQiNiuDeleteImageUrl(imageUrl: uploadImageModel.imageUrl!) { result, status in
+                    
+                }
             }else if uploadImageModel.isUploading == true{
-                [[DSQiNiuUploadManager sharedManager] cancelUploadKey:uploadImageModel.uploadKey];
+                UploadManager.shared.cancelUploadKey(key: uploadImageModel.uploadKey!)
             }
         }
         for replaceImageModel in self.replaceImageUrls{
-            if ((self.networkImageArr.contains(replaceImageModel.imageUrl ?? "")) != nil){
-                [[DSQiNiuUploadManager sharedManager] requestQiNiuDeleteImageUrl:replaceImageModel.imageUrl complete:nil];
+            if !self.networkImageArr.contains(replaceImageModel.imageUrl!){
+                UploadManager.shared.requestQiNiuDeleteImageUrl(imageUrl: replaceImageModel.imageUrl!) { result, status in
+                    
+                }
             }
         }
     }
@@ -353,13 +363,17 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
      */
     func deleteUploadVideoUrl(){
         if self.networkVideoUrl != self.uploadVideoModel?.videoUrl{
-            [[DSQiNiuUploadManager sharedManager] requestQiNiuDeleteImageUrl:self.uploadVideoModel.videoUrl complete:nil];
+            UploadManager.shared.requestQiNiuDeleteImageUrl(imageUrl: (self.uploadVideoModel?.videoUrl)!) { result, status in
+                
+            }
         }else if self.uploadVideoModel?.isUploading == true{
-            [[DSQiNiuUploadManager sharedManager] cancelUploadKey:self.uploadVideoModel.uploadKey];
+            UploadManager.shared.cancelUploadKey(key: self.uploadVideoModel!.uploadKey!)
         }
         for replaceVideoModel in self.replaceVideoUrls {
             if self.networkVideoUrl != replaceVideoModel.videoUrl{
-                [[DSQiNiuUploadManager sharedManager] requestQiNiuDeleteImageUrl:replaceVideoModel.videoUrl complete:nil];
+                UploadManager.shared.requestQiNiuDeleteImageUrl(imageUrl: replaceVideoModel .videoUrl!) { result, status in
+                    
+                }
             }
         }
     }
@@ -513,7 +527,7 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
             }
             for i in 0..<self.networkImageArr.count {
                 var model = CNLiveSelectUploadImageModel()
-                model.imageUrl = self.networkImageArr![i]
+                model.imageUrl = self.networkImageArr[i]
                 var singleImageView = self.createSingleImageView()
                 if self.networkVideoUrl!.count > 0{
@@ -642,7 +656,7 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
             if model.imageUrl == singleImageView.model?.imageUrl{
                 if singleImageView.model?.isVideo == true{
                     if singleImageView.model?.isUploading == true{
-                        [[DSQiNiuUploadManager sharedManager] cancelUploadKey:singleImageView.model.uploadKey];
+                        UploadManager.shared.cancelUploadKey(key: singleImageView.model!.uploadKey!)
                     }else{
                         self.replaceVideoUrls.append(singleImageView.model!)
                         var videoModel = CNLiveSelectUploadImageModel()
@@ -651,7 +665,7 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
                     }
                 }else{
                     if singleImageView.model?.isUploading == true{
-                        [[DSQiNiuUploadManager sharedManager] cancelUploadKey:singleImageView.model.uploadKey];
+                        UploadManager.shared.cancelUploadKey(key: singleImageView.model!.uploadKey!)
                     }else{
                         let index = self.uploadImageUrls.firstIndex(of: singleImageView.model!)!
                         self.uploadImageUrls.remove(at: index)
@@ -668,6 +682,8 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
     // MARK: - PickerControllerDelegate
     func pickerController(_ pickerController: HXPHPicker.PhotoPickerController, didFinishSelection result: HXPHPicker.PickerResult) {
+ 
+        
         let photoAssets = result.photoAssets
         for asset in photoAssets{
             if asset.mediaType == .video
@@ -675,102 +691,71 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
                 let videoFileName = "\(asset.phAsset?.localIdentifier ?? "").mp4".replacingOccurrences(of: "-", with: "").replacingOccurrences(of: "/", with: "")
                 let videoURL = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent(videoFileName)
-                let videoData = NSData(contentsOf: videoURL)
+                let videoData = NSData(contentsOf: videoURL) ?? NSData()
                 self.splitVideoFileUrlFps(splitFileUrl: videoURL, fps: 1) { isSucc,firstImage in
                     if isSucc{
                         self.uploadVideoModel?.videoUrl = nil
                         self.uploadVideoModel?.image = firstImage.first
                         self.uploadVideoModel?.localVideoUrl = videoURL
-                        self.uploadVideoModel.isUploading = true
+                        self.uploadVideoModel?.isUploading = true
-                        self.uploadVideoModel?.uploadKey = [[DSQiNiuUploadManager sharedManager] uploadVideoData:videoData uploadProgress:^(NSString * _Nonnull key, CGFloat percent) {
-                            weakSelf.uploadVideoModel.uploadingPercent = percent;
-                            [weakSelf replaceVideoModelInSubviews:self.uploadVideoModel target:firstImage];
-                        } complete:^(NSString * _Nonnull key, DSQiNiuUploadResult result, NSString * _Nonnull videoUrl, NSString * _Nonnull errorMessage) {
-                            if (errorMessage) {
-                                DS_showMessage(errorMessage);
-                                DSSelectUploadImageModel * videoModel = [[DSSelectUploadImageModel alloc] init];
-                                videoModel.isVideo = YES;
-                                weakSelf.uploadVideoModel = videoModel;
-                            }else {
-                                self.uploadVideoModel.videoUrl = videoUrl;
-                                self.uploadVideoModel.isUploading = NO;
-                                self.uploadVideoModel.uploadKey = nil;
-                                [weakSelf replaceVideoModelInSubviews:self.uploadVideoModel target:firstImage];
-                            }
-
-                            weakSelf.uploadingCount = weakSelf.uploadingCount - 1;
-                            if (weakSelf.uploadingCount == 0) {
-                                if (weakSelf.endUploadImageCallBack) {
-                                    weakSelf.endUploadImageCallBack();
-                                }
-                            }
-                            if (weakSelf.changeUploadDataCallBack) {
-                                weakSelf.changeUploadDataCallBack([weakSelf getCurrentSelectImageUrls], [weakSelf getCurrentSelectVideoUrl]);
-                            }
-                        }];
-                        [self resetUI];
-                        [self autoAdjustHeight];
-
-                        self.uploadingCount = self.uploadingCount + 1;
-                        if (self.uploadingCount == 1) {
-                            if (self.beginUploadImageCallBack) {
-                                self.beginUploadImageCallBack();
+                        self.uploadVideoModel?.uploadKey = UploadManager.uploadVideo(videoData: videoData, progressBlock: { [weak self] key, progress in
+                            self!.uploadVideoModel?.uploadingPercent = progress
+                            self?.replaceVideoModelInSubviews(model: (self?.uploadVideoModel)!, target: firstImage.first!)
+                        }, successBlock: { [weak self] key,url in
+                            self?.uploadVideoModel?.videoUrl = url
+                            self?.uploadVideoModel?.isUploading = false
+                            self?.uploadVideoModel?.uploadKey = nil
+                            self?.replaceVideoModelInSubviews(model: (self?.uploadVideoModel)!, target: firstImage.first!)
+                            self?.uploadingCount = self!.uploadingCount - 1
+                            if self?.uploadingCount == 0{
+                                self?.endUploadImageCallBack!()
                             }
+                            self?.changeUploadDataCallBack!((self?.getCurrentSelectImageUrls())!,(self?.getCurrentSelectVideoUrl())!)
+                        })
+                        self.resetUI()
+                        self.autoAdjustHeight()
+                        self.uploadingCount = self.uploadingCount + 1
+                        if self.uploadingCount == 1{
+                            self.beginUploadImageCallBack!()
                         }
                     }
                 }
-            }
-        }
-        pickerController.dismiss(animated: true)
-    }
-    
-    // MARK: - TZImagePickerControllerDelegate
-    - (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray<UIImage *> *)photos sourceAssets:(NSArray *)assets isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto
-    {
-        [photos enumerateObjectsUsingBlock:^(UIImage * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-            UIImage * image = obj;
-
-            DSSelectUploadImageModel * model = [[DSSelectUploadImageModel alloc] init];
-            model.image = image;
-            model.isUploading = YES;
-            DS_WEAK_SELF(self);
-            model.uploadKey = [[DSQiNiuUploadManager sharedManager] uploadImageData:UIImageJPEGRepresentation(image, 0.5) uploadProgress:^(NSString * _Nonnull key, CGFloat percent) {
-                model.uploadingPercent = percent;
-                [weakSelf replaceImageModelInDataArr:model target:image];
-            } complete:^(NSString * _Nonnull key, DSQiNiuUploadResult result, NSString * _Nonnull imageUrl, NSString * _Nonnull errorMessage) {
-                if (errorMessage) {
-                    DS_showMessage(errorMessage);
-                    [weakSelf.uploadImageUrls removeObject:model];
-                }else {
-                    model.imageUrl = imageUrl;
-                    model.isUploading = NO;
-                    model.uploadKey = nil;
-                    [weakSelf replaceImageModelInDataArr:model target:image];
-                }
-
-                weakSelf.uploadingCount = weakSelf.uploadingCount - 1;
-                if (weakSelf.uploadingCount == 0) {
-                    if (weakSelf.endUploadImageCallBack) {
-                        weakSelf.endUploadImageCallBack();
+            }else if asset.mediaType == .photo{
+                let image = asset.localImageAsset?.image
+                let imageData = asset.localImageAsset?.imageData
+                var model = CNLiveSelectUploadImageModel()
+                model.image = image
+                model.isUploading = true
+                
+                self.uploadVideoModel?.uploadKey = UploadManager.uploadImage(imageData: imageData! as NSData) { [weak self] key, percent in
+                    model.uploadingPercent = percent
+                    self?.replaceImageModelInDataArr(model: model, target: image!)
+                } successBlock: { key, url in
+                    model.imageUrl = url
+                    model.isUploading = false
+                    model.uploadKey = nil
+                    self.replaceImageModelInDataArr(model: model, target: image!)
+                    
+                    self.uploadingCount = self.uploadingCount - 1
+                    
+                    if self.uploadingCount == 0{
+                        self.endUploadImageCallBack!()
                     }
+                    self.changeUploadDataCallBack!(self.getCurrentSelectImageUrls(),self.getCurrentSelectVideoUrl())
                 }
-                if (weakSelf.changeUploadDataCallBack) {
-                    weakSelf.changeUploadDataCallBack([weakSelf getCurrentSelectImageUrls], [weakSelf getCurrentSelectVideoUrl]);
-                }
-            }];
-            [self.uploadImageUrls addObject:model];
-            [self resetUI];
-            [self autoAdjustHeight];
-
-            self.uploadingCount = self.uploadingCount + 1;
-            if (self.uploadingCount == 1) {
-                if (self.beginUploadImageCallBack) {
-                    self.beginUploadImageCallBack();
+                self.uploadImageUrls.append(model)
+                self.resetUI()
+                self.autoAdjustHeight()
+                self.uploadingCount = self.uploadingCount + 1
+                if self.uploadingCount == 1{
+                    self.beginUploadImageCallBack!()
                 }
             }
-        }];
+        }
+        pickerController.dismiss(animated: true)
     }
+    
     // MARK: - 获取视频的第一帧
     func splitVideoFileUrlFps(splitFileUrl: URL, fps: Float, splitCompleteClosure: @escaping (Bool, [UIImage]) -> Void) {
@@ -232,7 +232,7 @@ class CNLiveSelUplSingleImageView: UIView {
     // MARK: - 触发事件
     @objc func selfTap(){
-        self.clickCallBack!(self.model)
+        self.clickCallBack!(self.model!)
     }
     @objc func deleteBtnClick(){
         self.clickDeleteCallBack!(self.model!)
@@ -149,7 +149,7 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
     private func setupWithContentUploadImage(resultUploadImageBlock: @escaping resultUploadImageBlock) {
         if select_image != nil {
-            UploadManager.uploadImage(imageData: select_image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
+            let uploadKey = UploadManager.uploadImage(imageData: select_image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
                 print("获取进度==>\(progress)")
             }, successBlock: { key,url in
                 resultUploadImageBlock(url)
@@ -258,7 +258,7 @@ class CNLiveMineShopViewController : CNLiveBaseViewController, UITextViewDelegat
                 self.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .two, listModel: _listModel, tempArray: temp_array), animated: true)
                 return
             }
-            UploadManager.uploadImage(imageData: image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
+            let uploadKey = UploadManager.uploadImage(imageData: image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
                 print("获取进度==>\(progress)")
             }, successBlock: { [self] key,url in
                 hiddenLoading()
@@ -309,10 +309,10 @@ class CNLiveMineShopViewController : CNLiveBaseViewController, UITextViewDelegat
                 self.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .three, listModel: _listModel, tempArray: temp_array), animated: true)
                 return
             }
-            UploadManager.uploadImage(imageData: image_one.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
+            let uploadKey = UploadManager.uploadImage(imageData: image_one.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
                 temp_dict_one.removeObject(forKey: "content")
                 temp_dict_one.setObject(url, forKey: "content" as NSCopying)
-                UploadManager.uploadImage(imageData: image_two.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
+                let uploadKey = UploadManager.uploadImage(imageData: image_two.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
                     hiddenLoading()
                     temp_dict_two.removeObject(forKey: "content")
                     temp_dict_two.setObject(url, forKey: "content" as NSCopying)
@@ -364,7 +364,7 @@ class CNLiveMineShopViewController : CNLiveBaseViewController, UITextViewDelegat
                 uploadWithMessage()
                 return
             }
-            UploadManager.uploadImage(imageData: image_one.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
+            let uploadKey = UploadManager.uploadImage(imageData: image_one.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
                 temp_dict_one.removeObject(forKey: "content")
                 temp_dict_one.setObject(url, forKey: "content" as NSCopying)
                 if image_two == nil {
@@ -372,7 +372,7 @@ class CNLiveMineShopViewController : CNLiveBaseViewController, UITextViewDelegat
                     temp_array.addObjects(from: threeArray as! [Any])
                     uploadWithMessage()
                 }else{
-                    UploadManager.uploadImage(imageData: image_two.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
+                    let uploadKey = UploadManager.uploadImage(imageData: image_two.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
                         hiddenLoading()
                         temp_dict_two.removeObject(forKey: "content")
                         temp_dict_two.setObject(url, forKey: "content" as NSCopying)
@@ -256,7 +256,7 @@ extension MinePhotoUploadView {
             if let image = image {
                 self!.temp_imageView.image = image
                 if self!.temp_imageView == self!.imageView01 {
-                    UploadManager.uploadImage(imageData: image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
+                    let uploadKey = UploadManager.uploadImage(imageData: image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
                         print("获取进度==>\(progress)")
                     }, successBlock: { [weak self] key,url in
                         self!.imageView02.isHidden = false
@@ -265,7 +265,7 @@ extension MinePhotoUploadView {
                     })
                 }
                 if self!.temp_imageView == self!.imageView02 {
-                    UploadManager.uploadImage(imageData: image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
+                    let uploadKey = UploadManager.uploadImage(imageData: image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
                         print("获取进度==>\(progress)")
                     }, successBlock: { [weak self] key,url in
                         self!.imageView03.isHidden = false
@@ -274,7 +274,7 @@ extension MinePhotoUploadView {
                     })
                 }
                 if self!.temp_imageView == self!.imageView03 {
-                    UploadManager.uploadImage(imageData: image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
+                    let uploadKey = UploadManager.uploadImage(imageData: image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
                         print("获取进度==>\(progress)")
                     }, successBlock: { [weak self] key,url in
                         self!.selectedImages.replaceObject(at: 2, with: image)