Commit 622f638bfece163cf149101193efc7c3dae64eb7

Authored by “张旭”
1 parent 76bb03fc

提前获取礼物详情静态数据

metaCode/Classes/Common/Base/CNLiveBaseTabBarViewController.swift
@@ -34,6 +34,12 @@ class CNLiveBaseTabBarViewController: UITabBarController @@ -34,6 +34,12 @@ class CNLiveBaseTabBarViewController: UITabBarController
34 34
35 self.setUpTabBar() 35 self.setUpTabBar()
36 self.setupBackgroup() 36 self.setupBackgroup()
  37 +
  38 + CNLiveHomePageViewModel.requestGetHomePageTopBannerGift{[weak self] result, status in
  39 + guard let self = self else { return }
  40 + let giftModel = result as? CNLiveHomePageHuBiLieGiftModel
  41 + metaAppDelegate.giftModel = giftModel
  42 + }
37 } 43 }
38 44
39 override func viewDidAppear(_ animated: Bool) { 45 override func viewDidAppear(_ animated: Bool) {
@@ -41,18 +47,13 @@ class CNLiveBaseTabBarViewController: UITabBarController @@ -41,18 +47,13 @@ class CNLiveBaseTabBarViewController: UITabBarController
41 print("获取用户用户数据=====>\(UserInfoManager.shared.userInfo.uid)") 47 print("获取用户用户数据=====>\(UserInfoManager.shared.userInfo.uid)")
42 48
43 //已经弹出过就不用再弹框了 49 //已经弹出过就不用再弹框了
44 - if ConfigManager.shared.show_update {  
45 - CNLiveMineViewModel.requestSystemNews { result, respStatue in  
46 - if respStatue == .success {  
47 - UpdataAlertView.showUpdataView(updataModel: result as! UpdateInfoModel)  
48 - } 50 +// if ConfigManager.shared.show_update {
  51 + CNLiveMineViewModel.requestSystemNews { result, respStatue in
  52 + if respStatue == .success {
  53 + UpdataAlertView.showUpdataView(updataModel: result as! UpdateInfoModel)
49 } 54 }
50 } 55 }
51 - CNLiveHomePageViewModel.requestGetHomePageTopBannerGift{[weak self] result, status in  
52 - guard let self = self else { return }  
53 - let giftModel = result as? CNLiveHomePageHuBiLieGiftModel  
54 - metaAppDelegate.giftModel = giftModel  
55 - } 56 +// }
56 } 57 }
57 // MARK: - 控制器的信息 58 // MARK: - 控制器的信息
58 func setUpTabBar() { 59 func setUpTabBar() {
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveTVHomeViewController.swift
@@ -677,8 +677,8 @@ class CNLiveTVHomeViewController:CNLiveBaseViewController, UITableViewDataSource @@ -677,8 +677,8 @@ class CNLiveTVHomeViewController:CNLiveBaseViewController, UITableViewDataSource
677 677
678 if status == .success{ 678 if status == .success{
679 self.shareGiftBtn.isHidden = !metaAppDelegate.isGift 679 self.shareGiftBtn.isHidden = !metaAppDelegate.isGift
680 - self.shareGiftBtn.setTitle(metaAppDelegate.giftModel?.data?.share_app_banner?.home_top_button_name, for: .normal)  
681 - self.shareGiftBtn.setTitle(metaAppDelegate.giftModel?.data?.share_app_banner?.home_top_button_name, for: .selected) 680 + self.shareGiftBtn.setTitle(metaAppDelegate.giftModel?.data?.share_app_banner?.home_top_button_name ?? "好看送好礼", for: .normal)
  681 + self.shareGiftBtn.setTitle(metaAppDelegate.giftModel?.data?.share_app_banner?.home_top_button_name ?? "好看送好礼", for: .selected)
682 682
683 self.dataArray.removeAllObjects() 683 self.dataArray.removeAllObjects()
684 let array = result as! [Any] 684 let array = result as! [Any]
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveTVPlayerViewController.swift
@@ -244,7 +244,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa @@ -244,7 +244,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
244 make.height.equalToSuperview().offset(-self.containerView.bottom) 244 make.height.equalToSuperview().offset(-self.containerView.bottom)
245 } 245 }
246 bottomCommentShowContainView.isHidden = true 246 bottomCommentShowContainView.isHidden = true
247 -// self.addRefreshView() 247 +// self.addRefreshView()//测试使用 ,正式别打开!!!
248 self.isAblumVideo = false 248 self.isAblumVideo = false
249 self.isPlayAblumOrKandian = false 249 self.isPlayAblumOrKandian = false
250 250