1.update upload

BFFramework/Classes/SelectImage/PQUploadController.swift

@@ -18,6 +18,7 @@ open class PQUploadController: BFBaseViewController {
     public var maxWidth: CGFloat = cScreenWidth
     // 最大的高度
     public var maxHeight: CGFloat = adapterWidth(width: 300)
+    public var jumptoPublicHandle:((_ selectData:PQUploadModel?) -> Void)?
     // 画面比例
     public var aspectRatio: aspectRatio?
     public var preViewSize: CGSize {
@@ -483,8 +484,7 @@ open class PQUploadController: BFBaseViewController {
         }
         if !isAssetImage {
             // 视频上传相关上报
-            // MARK: SanW--待修改-2021.11.08
-//            PQEventTrackViewModel.baseReportUpload(businessType: .bt_pageView, objectType: .ot_pageView, pageSource: .sp_upload_videoSelect, extParams: ["source": getSourceType().rawValue, "projectId": getMakeVideoProjectId() ?? "", "draftboxId": getMakeVideoDraftboxId() ?? ""], remindmsg: "上传相关")
+            PQEventTrackViewModel.baseReportUpload(businessType: .bt_pageView, objectType: .ot_pageView, pageSource: .sp_upload_videoSelect, extParams: ["source": videoUploadSourceType.videoUpload.rawValue, "projectId": "", "draftboxId": ""], remindmsg: "上传相关")
         }
     }
 
@@ -514,7 +514,7 @@ open class PQUploadController: BFBaseViewController {
             if !isAssetImage {
                 // 视频上传相关上报
                 // MARK: SanW--待修改-2021.11.08
-//                PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_up_backBtn, pageSource: .sp_upload_videoSelect, extParams: ["source": getSourceType().rawValue, "projectId": getMakeVideoProjectId() ?? "", "draftboxId": getMakeVideoDraftboxId() ?? ""], remindmsg: "上传相关")
+                PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_up_backBtn, pageSource: .sp_upload_videoSelect, extParams: ["source": videoUploadSourceType.videoUpload.rawValue, "projectId": "", "draftboxId":""], remindmsg: "上传相关")
             }
         case 2: // 筛选
             showCollects()
@@ -526,18 +526,12 @@ open class PQUploadController: BFBaseViewController {
             if !isAssetImage {
                 avPlayer.pause()
                 playBtn.isHidden = false
-                // MARK: SanW--待修改-2021.11.08
-//                let publicVc = PQPublicVideoController()
-//                uploadData?.videoFromScene = .UploadNormal
-//                publicVc.uploadData = selectedData
-//                navigationController?.pushViewController(publicVc, animated: true)
-//                return
-//                let coverVc = PQUploadHandingController()
-//                selectedData?.videoFromScene = .UploadNormal
-//                coverVc.uploadData = selectedData
-//                navigationController?.pushViewController(coverVc, animated: true)
+                if jumptoPublicHandle != nil {
+                    uploadData?.videoFromScene = .UploadNormal
+                    jumptoPublicHandle!(selectedData)
+                }
                 // 视频上传相关上报
-//                PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_up_nextBtn, pageSource: .sp_upload_videoSelect, extParams: ["source": getSourceType().rawValue, "projectId": getMakeVideoProjectId() ?? "", "draftboxId": getMakeVideoDraftboxId() ?? ""], remindmsg: "上传相关")
+                PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_up_nextBtn, pageSource: .sp_upload_videoSelect, extParams: ["source": videoUploadSourceType.videoUpload.rawValue, "projectId": "", "draftboxId": ""], remindmsg: "上传相关")
                 return
             }
             imageManager.requestImage(for: (selectedData?.asset)!, targetSize: itemSize, contentMode: .aspectFill, options: nil) { [weak self] image, _ in