diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index 95322b6..67c27a5 100644 Binary files a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate and b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index ad1a584..2e10492 100644 --- a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -14,8 +14,8 @@ filePath = "SwiftProject/Project/Controller/CCHomeController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "547" - endingLineNumber = "547" + startingLineNumber = "550" + endingLineNumber = "550" landmarkName = "imagePickerController(_:didFinishPickingMediaWithInfo:)" landmarkType = "7"> @@ -30,8 +30,8 @@ filePath = "SwiftProject/Project/Controller/CCHomeController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "539" - endingLineNumber = "539" + startingLineNumber = "542" + endingLineNumber = "542" landmarkName = "CCHomeController" landmarkType = "21"> @@ -94,8 +94,8 @@ filePath = "SwiftProject/Project/Controller/CCHomeController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "503" - endingLineNumber = "503" + startingLineNumber = "506" + endingLineNumber = "506" landmarkName = "gotoVideoTransformVC(url:asset:)" landmarkType = "7"> @@ -387,8 +387,8 @@ filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialShootController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1173" - endingLineNumber = "1173" + startingLineNumber = "1176" + endingLineNumber = "1176" landmarkName = "compositeSpatialPhoto()" landmarkType = "7"> @@ -659,8 +659,8 @@ filePath = "SwiftProject/CCKit/SKUPay/SKUPay.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "185" - endingLineNumber = "185" + startingLineNumber = "187" + endingLineNumber = "187" landmarkName = "paymentQueueRestoreCompletedTransactionsFinished(_:)" landmarkType = "7"> @@ -675,8 +675,8 @@ filePath = "SwiftProject/CCKit/SKUPay/SKUPay.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "152" - endingLineNumber = "152" + startingLineNumber = "153" + endingLineNumber = "153" landmarkName = "paymentQueue(_:updatedTransactions:)" landmarkType = "7"> diff --git a/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/Contents.json b/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/Contents.json index fa08b22..b2941fb 100644 --- a/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/Contents.json +++ b/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "start3.png", + "filename" : "launch.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "start3 1.png", + "filename" : "launch 1.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "start3 2.png", + "filename" : "launch 2.png", "idiom" : "universal", "scale" : "3x" } diff --git a/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/launch 1.png b/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/launch 1.png new file mode 100644 index 0000000..9910cf0 Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/launch 1.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/launch 2.png b/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/launch 2.png new file mode 100644 index 0000000..9910cf0 Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/launch 2.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/launch.png b/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/launch.png new file mode 100644 index 0000000..9910cf0 Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/launch.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/start3 1.png b/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/start3 1.png deleted file mode 100644 index 79ff79e..0000000 Binary files a/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/start3 1.png and /dev/null differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/start3 2.png b/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/start3 2.png deleted file mode 100644 index 79ff79e..0000000 Binary files a/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/start3 2.png and /dev/null differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/start3.png b/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/start3.png deleted file mode 100644 index 79ff79e..0000000 Binary files a/SwiftProject/SwiftProject/Assets.xcassets/loading.imageset/start3.png and /dev/null differ diff --git a/SwiftProject/SwiftProject/CCKit/SKUPay/SKUPay.swift b/SwiftProject/SwiftProject/CCKit/SKUPay/SKUPay.swift index 3e91f14..9ea475c 100644 --- a/SwiftProject/SwiftProject/CCKit/SKUPay/SKUPay.swift +++ b/SwiftProject/SwiftProject/CCKit/SKUPay/SKUPay.swift @@ -8,6 +8,7 @@ import Foundation import StoreKit import SVProgressHUD +import Firebase //MARK: - 将货币信息格式化为本地信息 extension SKProduct { var regularPrice: String? { @@ -175,6 +176,7 @@ class SKUPay:NSObject, SKRequestDelegate,SKProductsRequestDelegate,SKPaymentTran func paymentQueue(_ queue: SKPaymentQueue, restoreCompletedTransactionsFailedWithError error: Error){ print("restoreCompletedTransactionsFailedWithError...") showToast(value: false) + Analytics.logEvent("Payment_fail", parameters: nil) } @@ -183,6 +185,7 @@ class SKUPay:NSObject, SKRequestDelegate,SKProductsRequestDelegate,SKPaymentTran // queue.transactions print("paymentQueueRestoreCompletedTransactionsFinished...") showToast(value: false) + Analytics.logEvent("Payment_success", parameters: nil) } // Sent when a user initiates an IAP buy from the App Store diff --git a/SwiftProject/SwiftProject/Project/Controller/CCHomeController.swift b/SwiftProject/SwiftProject/Project/Controller/CCHomeController.swift index 91e6cb7..19ae715 100644 --- a/SwiftProject/SwiftProject/Project/Controller/CCHomeController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/CCHomeController.swift @@ -297,12 +297,15 @@ class CCHomeController: BaseController, LLCycleScrollViewDelegate,MFMailComposeV addMenu() } - if(sender.tag == 10) { + if(sender.tag == 10) {//右上角会员入口 let vc:MembershipVC = MembershipVC() let nav = UINavigationController(rootViewController: vc) nav.modalTransitionStyle = UIModalTransitionStyle.coverVertical nav.modalPresentationStyle = .fullScreen self.present(nav, animated: true) + if !UserInfo.sharedInstance.isMemberShip {//统计 + Analytics.logEvent("home_unvip_click", parameters: nil) + } } if sender.tag == 20 { diff --git a/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVC.swift b/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVC.swift index 9dd6792..8369c47 100644 --- a/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVC.swift +++ b/SwiftProject/SwiftProject/Project/Controller/MembershipVC/MembershipVC.swift @@ -7,6 +7,8 @@ import Foundation import UIKit +import Firebase + class MembershipVC: BaseController { var pvView:MembershipProductView? var pcenterView:UIView? @@ -24,6 +26,18 @@ class MembershipVC: BaseController { super.viewDidLoad() self.configureUI() self.configureData() + + } + + override func viewWillDisappear(_ animated: Bool) { + super.viewWillDisappear(animated) + if UserInfo.sharedInstance.isMemberShip {//统计 + + Analytics.logEvent("iap_isvip_pv", parameters: nil) + } + else { + Analytics.logEvent("iap_unvip_pv", parameters: nil) + } } //用户vip身份改变 diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialShootController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialShootController.swift index 094b2c3..68d69e6 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialShootController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialShootController.swift @@ -620,6 +620,9 @@ class CCSpatialShootController: BaseController { nav.modalTransitionStyle = UIModalTransitionStyle.coverVertical nav.modalPresentationStyle = .fullScreen self.present(nav, animated: true) + //统计 + Analytics.logEvent("capture_unvip_pv", parameters: nil) + } }else if sender.tag == 1002 { diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRVideoTransformController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRVideoTransformController.swift index 7e6c34d..5815013 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRVideoTransformController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRVideoTransformController.swift @@ -576,6 +576,10 @@ class VRVideoTransformController: BaseController { //显示分辨率选项 func showResolutionAlert() { + if !UserInfo.sharedInstance.isMemberShip {//统计 + Analytics.logEvent("transcode_video_resolution_unvip_click", parameters: nil) + } + let alertVC = CustomSheetController() let dataSource = [ ["imgName":"vip_Diamond","text":NSLocalizedString("原始", comment: "")], @@ -632,6 +636,9 @@ class VRVideoTransformController: BaseController { //显示比特率 func showBitRateAlert() { + if !UserInfo.sharedInstance.isMemberShip {//统计 + Analytics.logEvent("transcode_video_bite_unvip_click", parameters: nil) + } let alertVC = CustomSheetController() let dataSource = [ ["imgName":"vip_Diamond","text":NSLocalizedString("最佳", comment: "")],