Merge branch 'master' into module

BFFramework/Classes/Base/ViewModel/PQUploadViewModel.swift

@@ -21,7 +21,7 @@ public class PQUploadViewModel: NSObject {
     ///   - descr: 描述
     ///   - videoFromScene 视频来源场景 1：普通上传 2：创作工具，3：普通上传转创作工具，4：后台转换加工，5：卡点视频制作
     /// - Returns: <#description#>
-    public class func publishVideo(projectId: String?, fileExtensions: String?, title: String, videoPath: String, coverImgPath: String?, descr: String, videoFromScene: videoFromScene, reCreateData: PQReCreateModel?, eventTrackData: PQVideoMakeEventTrackModel?, topicId: String? = nil, completeHander: @escaping (_ videoData: PQVideoListModel?, _ jsonDict: [String: Any]?, _ msg: String?) -> Void) {
+    public class func publishVideo(projectId: String?, fileExtensions: String?, title: String, videoPath: String, coverImgPath: String?, descr: String, videoFromScene: videoFromScene, reCreateData: PQReCreateModel?, eventTrackData: PQVideoMakeEventTrackModel?, topicId: String? = nil,extParams:String? = nil, completeHander: @escaping (_ videoData: PQVideoListModel?, _ jsonDict: [String: Any]?, _ msg: String?) -> Void) {
         BFLog(message: "AKAKAAKprojectId is\(String(describing: projectId)) videoFromScene is \(videoFromScene)")
         var params: [String: Any] = ["title": title, "fileExtensions": fileExtensions ?? "application/octet-stream", "videoPath": videoPath, "descr": descr, "viewStatus": 1, "produceProjectId": (projectId ?? "") as String, "videoFromScene": videoFromScene.rawValue]
         if coverImgPath != nil, (coverImgPath?.count ?? 0) > 0 {
@@ -30,6 +30,10 @@ public class PQUploadViewModel: NSObject {
         if topicId != nil, (topicId?.count ?? 0) > 0 {
             params["topicId"] = topicId
         }
+        if extParams != nil && (extParams?.count ?? 0) > 0 {
+            params["reserve"] = extParams!
+        }
+        
         BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + videoSendUrl, parames: params, commonParams: commonParams()) { response, _, error, _ in
             if error != nil {
                 completeHander(nil, nil, error?.msg)

BFFramework/Classes/PModels/PQVideoListModel.swift

@@ -114,6 +114,8 @@ public protocol BFVideoItemProtocol {
     var autoType: autoType? { get set } // autoType 自动动作的类型
     // 发布视频来源类型
     var videoFromScene: videoFromScene { get set }
+    // extParams: 额外参数-传入发布页 - 主要中秋红包塞活动使用
+    var extParams:String { get set }
 }
 
 open class PQVideoListModel: PQBaseModel, BFVideoItemProtocol {
@@ -235,7 +237,8 @@ open class PQVideoListModel: PQBaseModel, BFVideoItemProtocol {
     public var autoType: autoType? // autoType 自动动作的类型
     // add by ak 发布视频来源类型
     public var videoFromScene: videoFromScene = .UploadNormal
-
+    // extParams: 额外参数-传入发布页 - 主要中秋红包塞活动使用
+    public var extParams:String = ""
     // 视频分类
     public var categoryName: String = ""
     // 视频分类图

BFFramework/Classes/Stuckpoint/ViewModel/PQGPUImagePlayerView.swift

@@ -455,7 +455,10 @@ public class PQGPUImagePlayerView: UIView {
                 strongSelf.status = .stop
                 strongSelf.finishedClosure?()
                 strongSelf.showPlayBtn(isHidden: false)
-                strongSelf.progress!(0,0,1)
+                if(strongSelf.progress != nil){
+                    strongSelf.progress!(0,0,1)
+                }
+                
             }
         }
         speaker = SpeakerOutput()

BFFramework/Classes/Utils/PQRequestURLUtil.swift

@@ -18,6 +18,8 @@ public let onlineClipapiApi = "https://clipapi.piaoquantv.com/longvideoapi/"
 public let onlineMaterialSearchApi = "https://search-material.piaoquantv.com/"
 // 消息相关域名-线上环境
 public let onlineMessageApi = "https://messageapi.piaoquantv.com/"
+// 票圈Api-线上环境
+let onlinePQTvApi = "https://api.piaoquantv.com/"
 
 // 票圈视频主域名-预发布环境
 public let preLongvideoapi = "https://prespeed.piaoquantv.com/longvideoapi/"
@@ -27,6 +29,8 @@ public let preCommonapi = "https://precommon.piaoquantv.com/commonapi/"
 public let preMaterialSearchApi = "https://search-material-pre.piaoquantv.com/"
 // 消息相关域名-预发布环境
 public let preMessageApi = "https://messageapipre.piaoquantv.com/"
+// 票圈Api-预发布环境
+let prePQTvApi = "https://preapi.piaoquantv.com/"
 
 // 票圈视频主域名-测试环境
 public let testLongvideoapi = "https://videotest.yishihui.com/longvideoapi/"
@@ -36,6 +40,8 @@ public let testCommonapi = "https://videotest.yishihui.com/commonapi/"
 public let testMaterialSearchApi = "https://search-material.yishihui.com/"
 // 消息相关域名-测试环境
 public let testMessageApi = "https://messageapitest.yishihui.com/"
+// 票圈Api-测试环境
+let testPQTvApi = "https://testapi.piaoquantv.com/"
 
 // 票圈视频主域名-北京预发布环境
 public let preBJLongvideoapi = "https://videoprebeijing.piaoquantv.com/longvideoapi/"
@@ -394,6 +400,12 @@ public let feedbackUrl = "https://support.qq.com/product/\(feedbackAppId)"
 // 意见反馈主页
 public let feedbackPageUrl = "https://support.qq.com/embed/phone/\(feedbackAppId)"
 
+
+// ***************** 激励相关地址 **********************//
+
+public let applyCheckUrl = "incentive/creator/applyCheck"
+public let applyStatusUrl = "incentive/creator/applyStatus"
+
 // ***************** 评论相关地址 **********************//
 
 // 评论列表

BFFramework/Classes/Utils/PQSingletonEnvUtil.swift

@@ -101,4 +101,15 @@ public class PQENVUtil {
             return onlineMessageApi
         }
     }
+    // 票圈Api域名
+    public var pqTvApi: String {
+        switch envMode {
+        case .ENVModeTest:
+            return testPQTvApi
+        case .ENVModePre, .ENVModeBJPre:
+            return prePQTvApi
+        default:
+            return onlinePQTvApi
+        }
+    }
 }