修改视频相关上报

BFAnalyzeKit/Classes/BFBaseEventTrack.swift

@@ -123,29 +123,41 @@ public class BFBaseEventTrack: NSObject {
     ///   - businessType: 操作类型
     ///   - targetUid: 视频用户ID
     /// - Returns: <#description#>
-    public class func bf_videoReportUpload(url: String, videoId: String?, headVideoId: String?, playId: String?, recommendId: String?, recommendLogVO: String?, flowPool: String?, abInfoData: String?, measureType: Int?, measureId: Int?, targetUid: Int = 0, businessType: String?, objectType: String?, pageSource: String?, eventData: [String: Any]? = nil, extParams: [String: Any]? = nil, commonParams: [String: Any]? = nil) {
+    public class func bf_videoReportUpload(url: String, videoId: String?, headVideoId: String?, playId: String?, recommendId: String?, recommendLogVO: String?, flowPool: String?, abInfoData: String?, measureType: Int?, measureId: Int?, targetUid: Int = 0, businessType: String?, objectType: String?, pageSource: String?, params: [String: Any]? = nil, eventData: [String: Any]? = nil, extParams: [String: Any]? = nil, commonParams: [String: Any]? = nil) {
         DispatchQueue.global().async {
-            var params: [String: Any] = ["videoId": Int64(videoId ?? "") ?? 0, "pageSource": pageSource ?? "", "playId": playId ?? "", "targetUid": targetUid]
+            var tempParams: [String: Any] = params ?? [:]
+            if !tempParams.keys.contains("videoId") {
+                tempParams["videoId"] = Int64(videoId ?? "") ?? 0
+            }
+            if !tempParams.keys.contains("pageSource") {
+                tempParams["pageSource"] = pageSource ?? ""
+            }
+            if !tempParams.keys.contains("playId") {
+                tempParams["playId"] = playId ?? ""
+            }
+            if !tempParams.keys.contains("targetUid") {
+                tempParams["targetUid"] = targetUid
+            }
             if measureType != nil {
-                params["measureType"] = measureType
+                tempParams["measureType"] = measureType
             }
             if measureId != nil {
-                params["measureId"] = measureId
+                tempParams["measureId"] = measureId
             }
             if recommendId != nil, !(recommendId?.isEmpty ?? true) {
-                params["recommendId"] = recommendId
+                tempParams["recommendId"] = recommendId
             }
             if recommendLogVO != nil, !(recommendLogVO?.isEmpty ?? true) {
-                params["recommendLogVO"] = recommendLogVO
+                tempParams["recommendLogVO"] = recommendLogVO
             }
             if flowPool != nil, (flowPool?.count ?? 0) > 0 {
-                params["flowPool"] = flowPool
+                tempParams["flowPool"] = flowPool
             }
             if abInfoData != nil, !(abInfoData?.isEmpty ?? true) {
-                params["abInfoData"] = abInfoData
+                tempParams["abInfoData"] = abInfoData
             }
             if pageSource?.contains("speedApp-category") ?? false {
-                params["pageCategoryId"] = 55
+                tempParams["pageCategoryId"] = 55
             }
             // eventData
             var tempEventData: [String: Any] = eventData ?? [:]
@@ -154,6 +166,7 @@ public class BFBaseEventTrack: NSObject {
             }
             if businessType != nil {
                 tempEventData["businessType"] = businessType ?? ""
+                tempParams["businessType"] = businessType ?? ""
             }
             tempEventData["pageSource"] = pageSource ?? ""
             // extParams
@@ -165,12 +178,12 @@ public class BFBaseEventTrack: NSObject {
                 tempExtParams["videoId"] = Int64(videoId ?? "") ?? 0
             }
             if tempEventData.keys.count > 0 {
-                params["eventData"] = bf_dictionaryToJsonString(tempEventData)
+                tempParams["eventData"] = bf_dictionaryToJsonString(tempEventData)
             }
             if tempExtParams.keys.count > 0 {
-                params["extParams"] = bf_dictionaryToJsonString(tempExtParams)
+                tempParams["extParams"] = bf_dictionaryToJsonString(tempExtParams)
             }
-            BFNetRequestAdaptor.postRequestData(url: url, parames: params, commonParams: commonParams) { _, _, _, _ in
+            BFNetRequestAdaptor.postRequestData(url: url, parames: tempParams, commonParams: commonParams) { _, _, _, _ in
             }
         }
     }
@@ -189,13 +202,13 @@ public class BFBaseEventTrack: NSObject {
     //   - businessType: <#businessType description#>
     //   - targetUid: <#targetUid description#>
     //   - shareId: <#shareId description#>
-    public class func bf_shareReportUpload(url: String, isShareVideo: Bool = true, screenType _: Int = 1, videoId: String?, recommendId: String?, recommendLogVO: String?, flowPool: String?, abInfoData: String?, measureType: Int?, measureId: Int?, targetUid: Int?, shareId: String = "", playId: String?, wxOpenId: String?,rootPageTimestamp:Int64, businessType: String?, pageSource: String?, extParams: [String: Any]? = nil, commonParams: [String: Any]? = nil) {
+    public class func bf_shareReportUpload(url: String, isShareVideo: Bool = true, screenType _: Int = 1, videoId: String?, recommendId: String?, recommendLogVO: String?, flowPool: String?, abInfoData: String?, measureType: Int?, measureId: Int?, targetUid: Int?, shareId: String = "", playId: String?, wxOpenId: String?, rootPageTimestamp: Int64, businessType: String?, pageSource: String?, extParams: [String: Any]? = nil, commonParams: [String: Any]? = nil) {
         DispatchQueue.global().async {
-            var params: [String: Any] = ["type": isShareVideo ? "1" : "2", "videoId": videoId ?? "", "pageSource": pageSource ?? "", "playId": playId ?? "", "targetUid": targetUid ?? 0, "shareDepth": "0","rootPageTimestamp":rootPageTimestamp]
+            var params: [String: Any] = ["type": isShareVideo ? "1" : "2", "videoId": videoId ?? "", "pageSource": pageSource ?? "", "playId": playId ?? "", "targetUid": targetUid ?? 0, "shareDepth": "0", "rootPageTimestamp": rootPageTimestamp]
             if extParams != nil {
                 params["extParams"] = bf_dictionaryToJsonString(extParams!)
             }
-            params["eventData"] = bf_dictionaryToJsonString(["rootPageTimestamp":rootPageTimestamp])
+            params["eventData"] = bf_dictionaryToJsonString(["rootPageTimestamp": rootPageTimestamp])
             if measureType != nil {
                 params["measureType"] = measureType
             }

BFAnalyzeKit/Classes/BFEventTrackAdaptor.swift

@@ -106,7 +106,7 @@ public class BFEventTrackAdaptor: NSObject {
                     params["eventData"] = bf_dictionaryToJsonString(["businessType": businessType?.rawValue ?? ""])
                 }
                 DispatchQueue.main.async {
-                    BFBaseEventTrack.bf_videoReportUpload(url: url, videoId: "\(videoData?.id ?? 0)", headVideoId: headVideoId ?? videoData?.headVideoId, playId: playId ?? "", recommendId: videoData?.recommendId, recommendLogVO: videoData?.recommendLogVO, flowPool: videoData?.flowPool, abInfoData: videoData?.abInfoData, measureType: videoData?.measureType, measureId: videoData?.measureId, businessType: businessType?.rawValue, objectType: objectType?.rawValue, pageSource: (videoData?.pageSource ?? .sp_category).rawValue, extParams: tempExtParams, commonParams: commonParams)
+                    BFBaseEventTrack.bf_videoReportUpload(url: url, videoId: "\(videoData?.id ?? 0)", headVideoId: headVideoId ?? videoData?.headVideoId, playId: playId ?? "", recommendId: videoData?.recommendId, recommendLogVO: videoData?.recommendLogVO, flowPool: videoData?.flowPool, abInfoData: videoData?.abInfoData, measureType: videoData?.measureType, measureId: videoData?.measureId, businessType: businessType?.rawValue, objectType: objectType?.rawValue, pageSource: (videoData?.pageSource ?? .sp_category).rawValue,params:params, extParams: tempExtParams, commonParams: commonParams)
                 }
             }
         }