Merge branch 'yinhe-live-1212' of...

Merge branch 'yinhe-live-1212' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into yinhe-live-1212

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift

@@ -422,6 +422,7 @@ extension YHHomePageViewController {
         guard let userId = YHLoginManager.shared.userModel?.id, userId.count > 0 else {
             return
         }
+        YHAnalytics.track("APP_HomeTab_IntelligentAssistant")
         YHButlerServiceManager.shared.gotoButlerServiceSessionVC(navigationController: navigationController, completion: { success in
             completion(success)
         })

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHOtherServiceViewController.swift

@@ -86,7 +86,7 @@ class YHOtherServiceViewController: YHBaseViewController {
         } else if classID == 4 {
             gk_navTitle = "办理攻略"
         } else if classID == 5 {
-            gk_navTitle = "客户心声"
+            gk_navTitle = "客户成功"
         }
         gk_navBackgroundColor = .white
         gk_navBarAlpha = 1.0

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift

@@ -151,6 +151,7 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
         if model.isLocalItemFlag {
             return
         }
+        YHAnalytics.track("APP_Home_Banners")
         switch model.skip_type {
         case 1: //跳转H5
             if model.skip_url.isEmpty == false {

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHLivePlayerViewController.swift

@@ -183,6 +183,7 @@ class YHLivePlayerViewController: YHBasePlayerViewController {
         }
 
         topBarView.zoomButtonClickEvent = { [weak self] in
+            YHAnalytics.track("APP_LivePage_ClickWindowPlay")
             if let playbackInfo = self?.playbackInfo, playbackInfo.isFromSaleDetail {
                 self?.clearInfo()
                 if let nav = self?.navigationController, nav.viewControllers.count > 1 {
@@ -200,11 +201,13 @@ class YHLivePlayerViewController: YHBasePlayerViewController {
         }
 
         topBarView.shareButtonClickEvent = { [weak self] in
+            YHAnalytics.track("APP_LivePage_ClickShare")
             self?.shareLive()
         }
 
         bottomInputBar.giftButtonClickEvent = { [weak self] in
             self?.showGoods()
+            YHAnalytics.track("APP_LivePage_ClickProductWindow")
         }
 #if DEBUG || TESTENV
         playerView.addSubview(videoStatsLabel)
@@ -424,6 +427,7 @@ class YHLivePlayerViewController: YHBasePlayerViewController {
             let model = list[index]
             self?.gotoH5GoodsDetail(id: model.id)
         }
+        view.fromPage = .live
         view.dataSource = list
         view.closeEvent = { [weak self] in
             self?.goodsListView = nil

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHPlayerManager.swift

@@ -702,6 +702,9 @@ extension YHPlayerManager: YHFloatingWindowDelegate {
     func floatingWindowDidTap(_ window: YHFloatingWindow) {
         guard let playbackInfo = window.playbackInfo else { return }
         guard checkLogin() else { return }
+        if window.source == .configured {
+            YHAnalytics.track("APP_Home_LiveWindow")
+        }
         if playbackInfo.isLive {
             enterLive(from: window.contentView, playbackInfo: playbackInfo)
         } else {

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHVODPlayerViewController.swift

@@ -124,10 +124,12 @@ class YHVODPlayerViewController: YHBasePlayerViewController {
         }
 
         topBarView.zoomButtonClickEvent = { [weak self] in
+            YHAnalytics.track("APP_RecordedPage_ClickWindowPlay")
             self?.enterFloating()
         }
 
         topBarView.shareButtonClickEvent = { [weak self] in
+            YHAnalytics.track("APP_RecordedPage_ClickShare")
             self?.shareLive()
         }
         // 现在改为全部
@@ -232,6 +234,7 @@ class YHVODPlayerViewController: YHBasePlayerViewController {
 
         progressControl.updateGiftCount(detail.goods.count)
         progressControl.giftButtonClickEvent = { [weak self] in
+            YHAnalytics.track("APP_RecordedPage_ClickProductWindow")
             self?.showGoods()
         }
         if let player = player {
@@ -253,6 +256,7 @@ class YHVODPlayerViewController: YHBasePlayerViewController {
             let model = list[index]
             self?.gotoH5GoodsDetail(id: model.id)
         }
+        view.fromPage = .vod
         view.dataSource = list
         view.closeEvent = { [weak self] in
             self?.goodsListView = nil

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/V/YHLiveShopView.swift

@@ -10,6 +10,12 @@ import UIKit
 import AttributedString
 
 class YHLiveShopView: UIView {
+    enum FromPage {
+        case live
+        case vod
+    }
+    
+    var fromPage: FromPage = .live
     var closeEvent: (() -> Void)?
     var backData: ((Int) -> Void)?
     var buyData: ((Int) -> Void)?
@@ -212,6 +218,13 @@ extension YHLiveShopView: UITableViewDelegate, UITableViewDataSource {
         guard dataSource.count > indexPath.row else {
             return
         }
+        switch fromPage {
+        case .live:
+            YHAnalytics.track("APP_LivePage_ProductWindowPopup_ClickProduct")
+        case .vod:
+            YHAnalytics.track("APP_RecordedPage_ProductWindowPopup_ClickProduct")
+        }
+        
         backData?(indexPath.row)
     }
 }

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageListVC.swift

@@ -368,6 +368,7 @@ extension YHMessageListVC {
             completion(false)
             return
         }
+        YHAnalytics.track("APP_FriendsTab_Conversation_GalaxyButler")
         YHButlerServiceManager.shared.gotoButlerServiceSessionVC(navigationController: navigationController, completion: { success in
             completion(success)
         })

galaxy/galaxy/Classes/Tools/Analytics/YHAnalyticsUnit.swift

@@ -52,5 +52,7 @@ class YHAnalyticsUnit: NSObject {
                                         "YHResignUploadTravelCardListViewController": "APP_Elite_Renewal_Service_UploadTravelDocuments",
                                         "YHSelectViewController": "APP_HomeTab_GalaxySelection",
                                         "YHLifeViewController": "APP_LiveList",
-                                        "YHServiceCenterViewController": "APP_ServiceTab_ApplicationStage"]
+                                        "YHServiceCenterViewController": "APP_ServiceTab_ApplicationStage",
+                                        "YHVODPlayerViewController": "APP_RecordedPage",
+                                        "YHLivePlayerViewController": "APP_LivePage"]
 }