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/AI/AI-Dialogue(AI对话)/C/YHAIMainChatViewController.swift

@@ -370,10 +370,19 @@ extension YHAIMainChatViewController: UITableViewDelegate, UITableViewDataSource
         if 0 <= indexPath.row, indexPath.row < messages.count {
             let message = messages[indexPath.row]
             let msgType = message.getType()
+            
+            if msgType == .productList {
+                var height = 16+70.0
+                if let listModel = message.body.cardsInfo {
+                    height += height + (120.0 * Double(listModel.list.count)) + 40.0
+                }
+                return height
+            }
+            
             if msgType != .text  {
                 return UITableView.automaticDimension
             }
-            
+        
             let text = message.body.contentText // 要显示的文本内容
             let font = UIFont.PFSC_R(ofSize: 14) // 字体大小
             let maxWidth = KScreenWidth-20*2-16*2 // 最大宽度限制

galaxy/galaxy/Classes/Modules/AI/AI-Dialogue(AI对话)/C/YHAIRequestManager.swift

@@ -254,7 +254,7 @@ class YHAIRequestManager: NSObject {
 //                }
                 
                 if receiveMessage.isUserfulMessage() {
-                    if receiveMessage.body.isDone() {
+                    if receiveMessage.body.isDone() || receiveMessage.isMessageCompleted() {
                         completion?(nil, sessionDone)
                         return
                     }

galaxy/galaxy/Classes/Modules/AI/AI-Dialogue(AI对话)/C/YHAIRobotChatViewController.swift

@@ -183,8 +183,6 @@ class YHAIRobotChatViewController: YHBaseViewController {
         
         self.tableView.reloadData()
         
-       
-        
         DispatchQueue.main.async {
             [weak self] in
             guard let self = self else { return }
@@ -407,13 +405,6 @@ extension YHAIRobotChatViewController: UITableViewDelegate, UITableViewDataSourc
                     [weak self] text in
                     guard let self = self else { return }
                     
-                    if self.isNeedStopResonse() {
-                        self.stopAutoResponse { success in
-                            self.sendMessage(text, true)
-                        }
-                    } else {
-                        self.sendMessage(text, true)
-                    }
                 }
                 return cell
                 
@@ -510,10 +501,19 @@ extension YHAIRobotChatViewController: UITableViewDelegate, UITableViewDataSourc
         if 0 <= indexPath.row, indexPath.row < messages.count {
             let message = messages[indexPath.row]
             let msgType = message.getType()
+            
+            if msgType == .productList {
+                var height = 16+70.0
+                if let listModel = message.body.cardsInfo {
+                    height += height + (120.0 * Double(listModel.list.count)) + 40.0
+                }
+                return height
+            }
+            
             if msgType != .text  {
                 return UITableView.automaticDimension
             }
-            
+        
             let text = message.body.contentText // 要显示的文本内容
             let font = UIFont.PFSC_R(ofSize: 14) // 字体大小
             let maxWidth = KScreenWidth-20*2-16*2 // 最大宽度限制

galaxy/galaxy/Classes/Modules/AI/AI-Dialogue(AI对话)/V/YHAIChatBannerView.swift

@@ -97,6 +97,7 @@ class YHAIChatBannerView: UIView {
         let view = YHHomeBannerIndicatorView()
         view.normalColor = .init(hex: 0xD5DAE1)
         view.selectedColor = .brandMainColor
+        view.layer.cornerRadius = 1.0
         return view
     }()
     

galaxy/galaxy/Classes/Modules/AI/AI-Dialogue(AI对话)/V/YHAITextMessageCell.swift

@@ -66,15 +66,8 @@ class YHAITextMessageCell: UITableViewCell {
                     make.width.height.equalTo(15)
                 }
                 
-                if message.getType() == .recommendText {
-                    isNeedShowCopyView = false
-                    isNeedShowLoadingView = false
-                    
-                } else {
-                    isNeedShowCopyView = message.isDone
-                    let complete = message.isDone
-                    isNeedShowLoadingView = !complete
-                }
+                isNeedShowCopyView = message.isDone
+                isNeedShowLoadingView = !message.isDone
             }
             
             self.setNeedsLayout()

galaxy/galaxy/Classes/Modules/AI/AI-Dialogue(AI对话)/V/YHProductListMessageCell.swift

@@ -23,7 +23,7 @@ class YHProductListMessageCell: UITableViewCell {
                 let productView = YHProductItemView()
                 productView.productModel = item
                 listView.addSubview(productView)
-                productView.snp.makeConstraints { make in
+                productView.snp.remakeConstraints { make in
                     make.left.right.equalToSuperview()
                     if let lastItemView = lastItemView {
                         make.top.equalTo(lastItemView.snp.bottom)
@@ -156,7 +156,7 @@ class YHProductListMessageCell: UITableViewCell {
         }
         
         titleLabel.snp.makeConstraints { make in
-            make.top.equalTo(iconImgView)
+            make.top.equalTo(iconImgView).offset(-4)
             make.left.equalTo(iconImgView.snp.right).offset(8)
             make.height.equalTo(24)
             make.right.equalTo(-16)

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(首页)/InvitationWithGifts(邀请有礼)/C/YHInvatationShareViewController.swift

@@ -268,7 +268,7 @@ class YHShareOneCollectionViewCell: UICollectionViewCell {
         }()
         centerImageView.addSubview(imageView)
         imageView.snp.makeConstraints { make in
-            make.bottom.equalTo(-57)
+            make.bottom.equalTo(-64)
             make.right.equalTo(-27)
             make.width.height.equalTo(56)
         }

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

@@ -110,6 +110,7 @@ class YHVODPlayerViewController: YHBasePlayerViewController {
         }
         containerView.addSubview(progressControl)
         containerView.addSubview(centerPlayIcon)
+        containerView.bringSubviewToFront(centerPlayIcon)
         progressControl.snp.makeConstraints { make in
             make.left.right.bottom.equalToSuperview()
             make.top.equalTo(view.safeAreaLayoutGuide.snp.bottom).offset(-102)
@@ -124,10 +125,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 +235,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 +257,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"]
 }