Commit 76bb03fcde1078c4750cc0f638f6b427ae8f5e09

Authored by “张旭”
1 parent e3a94be8

首页送礼标题 , 新增 分享icon ,分享标题 ,分享desc

metaCode/Classes/Main/HomePages/Model/CNLiveHomePageModel.swift
@@ -51,9 +51,13 @@ class CNLiveHomePageHuBiLieGiftBannerDataModel:BaseModel{ @@ -51,9 +51,13 @@ class CNLiveHomePageHuBiLieGiftBannerDataModel:BaseModel{
51 var share_app_banner :CNLiveHomePageHuBiLieGiftDataModel? 51 var share_app_banner :CNLiveHomePageHuBiLieGiftDataModel?
52 } 52 }
53 class CNLiveHomePageHuBiLieGiftDataModel:BaseModel{ 53 class CNLiveHomePageHuBiLieGiftDataModel:BaseModel{
54 - var home_image = ""  
55 - var jumpUrl = ""  
56 - var mine_image = "" 54 + var home_image = "https://wjj.ys1.cnliveimg.com/download/mc/extInfoData/ver-001/home_banner_bg.jpg"
  55 + var jumpUrl = "http://wjjh5.cnlive.com/cnYmHbl.html?channelName=ymhbl"
  56 + var mine_image = "https://wjj.ys1.cnliveimg.com/download/mc/extInfoData/ver-001/mine_banner_bg.jpg"
  57 + var home_top_button_name = "好看送好礼"
  58 + var share_title = "忽必烈电视剧"
  59 + var share_content = "邀您共赴大元史诗!点击加入追剧联盟"
  60 + var share_icon = "https://wjj.ys1.cnliveimg.com/download/mc/extInfoData/ver-001/share_h5_icon.jpg"
57 } 61 }
58 62
59 63
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveTVHomeViewController.swift
@@ -274,7 +274,12 @@ class CNLiveTVHomeViewController:CNLiveBaseViewController, UITableViewDataSource @@ -274,7 +274,12 @@ class CNLiveTVHomeViewController:CNLiveBaseViewController, UITableViewDataSource
274 } 274 }
275 275
276 @objc func shareGiftBtnAction(){ 276 @objc func shareGiftBtnAction(){
277 - CNLiveShareManager.showShareViewWithParam(forShareTitle: "忽必烈电视剧", shareUrl: "http://wjjh5.cnlive.com/cnYmHbl.html?channelName=ymhbl", shareDesc: "邀你共赴大元史诗!点击加入追剧联盟", shareImage: UIImage(named: "shareAppIcon"), screenFull: false, hiddenWjj: true, hiddenQQ: true, hiddenWB: true, hiddenLifeCircle: true, hiddenWechatCircle: false, hiddenWechat: false, hiddenSafari: true, formVC: currentViewController(), topImage: [], topTitles: [], platformType: .all) { title in 277 + let shareTitle = metaAppDelegate.giftModel?.data?.share_app_banner?.share_title
  278 + let shareDesc = metaAppDelegate.giftModel?.data?.share_app_banner?.share_content
  279 + let shareImage = metaAppDelegate.giftModel?.data?.share_app_banner?.share_icon
  280 + let shareUrl = metaAppDelegate.giftModel?.data?.share_app_banner?.jumpUrl
  281 +
  282 + CNLiveShareManager.showShareViewWithParam(forShareTitle: shareTitle, shareUrl: shareUrl, shareDesc: shareDesc, shareImage: shareImage, screenFull: false, hiddenWjj: true, hiddenQQ: true, hiddenWB: true, hiddenLifeCircle: true, hiddenWechatCircle: false, hiddenWechat: false, hiddenSafari: true, formVC: currentViewController(), topImage: [], topTitles: [], platformType: .all) { title in
278 283
279 } completerBlock: { resultType, platformType, typeString in 284 } completerBlock: { resultType, platformType, typeString in
280 if resultType == .succ{ 285 if resultType == .succ{
@@ -672,6 +677,8 @@ class CNLiveTVHomeViewController:CNLiveBaseViewController, UITableViewDataSource @@ -672,6 +677,8 @@ class CNLiveTVHomeViewController:CNLiveBaseViewController, UITableViewDataSource
672 677
673 if status == .success{ 678 if status == .success{
674 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)
675 682
676 self.dataArray.removeAllObjects() 683 self.dataArray.removeAllObjects()
677 let array = result as! [Any] 684 let array = result as! [Any]
metaCode/Classes/Main/HuBiLieHomePage/View/Home/Home/CNLiveHomeYingshiBannerCell.swift
@@ -110,7 +110,13 @@ class CNLiveHomeYingshiBannerCell: UITableViewCell ,FSPagerViewDataSource,FSPage @@ -110,7 +110,13 @@ class CNLiveHomeYingshiBannerCell: UITableViewCell ,FSPagerViewDataSource,FSPage
110 } 110 }
111 if let bannerMdl = self.slideModel?.contents[index]{ 111 if let bannerMdl = self.slideModel?.contents[index]{
112 if bannerMdl.model == SlideModelTypeApp_ext_info{ 112 if bannerMdl.model == SlideModelTypeApp_ext_info{
113 - CNLiveShareManager.showShareViewWithParam(forShareTitle: "忽必烈电视剧", shareUrl: bannerMdl.shareUrl.count > 0 ? bannerMdl.shareUrl : "http://wjjh5.cnlive.com/cnYmHbl.html?channelName=ymhbl", shareDesc: "邀你共赴大元史诗!点击加入追剧联盟", shareImage: UIImage(named: "shareAppIcon"), screenFull: false, hiddenWjj: true, hiddenQQ: true, hiddenWB: true, hiddenLifeCircle: true, hiddenWechatCircle: false, hiddenWechat: false, hiddenSafari: true, formVC: currentViewController(), topImage: [], topTitles: [], platformType: .all) { title in 113 +
  114 + let shareTitle = metaAppDelegate.giftModel?.data?.share_app_banner?.share_title
  115 + let shareDesc = metaAppDelegate.giftModel?.data?.share_app_banner?.share_content
  116 + let shareImage = metaAppDelegate.giftModel?.data?.share_app_banner?.share_icon
  117 + let shareUrl = metaAppDelegate.giftModel?.data?.share_app_banner?.jumpUrl
  118 +
  119 + CNLiveShareManager.showShareViewWithParam(forShareTitle: shareTitle, shareUrl: shareUrl, shareDesc: shareDesc, shareImage: shareImage, screenFull: false, hiddenWjj: true, hiddenQQ: true, hiddenWB: true, hiddenLifeCircle: true, hiddenWechatCircle: false, hiddenWechat: false, hiddenSafari: true, formVC: currentViewController(), topImage: [], topTitles: [], platformType: .all) { title in
114 120
115 } completerBlock: { resultType, platformType, typeString in 121 } completerBlock: { resultType, platformType, typeString in
116 if resultType == .succ{ 122 if resultType == .succ{
metaCode/Classes/Main/HuBiLieHomePage/View/VodDetail/CNLiveVodIntroductionCell.swift
@@ -223,7 +223,12 @@ class CNLiveVodIntroductionCell:UITableViewCell{ @@ -223,7 +223,12 @@ class CNLiveVodIntroductionCell:UITableViewCell{
223 } 223 }
224 224
225 @objc func shareGiftBtnAction(){ 225 @objc func shareGiftBtnAction(){
226 - CNLiveShareManager.showShareViewWithParam(forShareTitle: "忽必烈电视剧", shareUrl: "http://wjjh5.cnlive.com/cnYmHbl.html?channelName=ymhbl", shareDesc: "邀你共赴大元史诗!点击加入追剧联盟", shareImage: UIImage(named: "shareAppIcon"), screenFull: false, hiddenWjj: true, hiddenQQ: true, hiddenWB: true, hiddenLifeCircle: true, hiddenWechatCircle: false, hiddenWechat: false, hiddenSafari: true, formVC: currentViewController(), topImage: [], topTitles: [], platformType: .all) { title in 226 + let shareTitle = metaAppDelegate.giftModel?.data?.share_app_banner?.share_title
  227 + let shareDesc = metaAppDelegate.giftModel?.data?.share_app_banner?.share_content
  228 + let shareImage = metaAppDelegate.giftModel?.data?.share_app_banner?.share_icon
  229 + let shareUrl = metaAppDelegate.giftModel?.data?.share_app_banner?.jumpUrl
  230 +
  231 + CNLiveShareManager.showShareViewWithParam(forShareTitle: shareTitle, shareUrl: shareUrl, shareDesc: shareDesc, shareImage: shareImage, screenFull: false, hiddenWjj: true, hiddenQQ: true, hiddenWB: true, hiddenLifeCircle: true, hiddenWechatCircle: false, hiddenWechat: false, hiddenSafari: true, formVC: currentViewController(), topImage: [], topTitles: [], platformType: .all) { title in
227 232
228 } completerBlock: { resultType, platformType, typeString in 233 } completerBlock: { resultType, platformType, typeString in
229 if resultType == .succ{ 234 if resultType == .succ{
metaCode/Classes/Main/MinePage/View/CNLiveMineGiftCell.swift
@@ -75,9 +75,14 @@ class CNLiveMineGiftCell:UITableViewCell{ @@ -75,9 +75,14 @@ class CNLiveMineGiftCell:UITableViewCell{
75 } 75 }
76 76
77 @objc func imgTapAction(ges: UITapGestureRecognizer){ 77 @objc func imgTapAction(ges: UITapGestureRecognizer){
78 - let jumpUrl = self.giftModel?.data?.share_app_banner?.jumpUrl 78 +// let jumpUrl = self.giftModel?.data?.share_app_banner?.jumpUrl
79 79
80 - CNLiveShareManager.showShareViewWithParam(forShareTitle: "忽必烈电视剧", shareUrl: jumpUrl?.count ?? 0 > 0 ? jumpUrl : "http://wjjh5.cnlive.com/cnYmHbl.html?channelName=ymhbl", shareDesc: "邀你共赴大元史诗!点击加入追剧联盟", shareImage: UIImage(named: "shareAppIcon"), screenFull: false, hiddenWjj: true, hiddenQQ: true, hiddenWB: true, hiddenLifeCircle: true, hiddenWechatCircle: false, hiddenWechat: false, hiddenSafari: true, formVC: currentViewController(), topImage: [], topTitles: [], platformType: .all) { title in 80 + let shareTitle = metaAppDelegate.giftModel?.data?.share_app_banner?.share_title
  81 + let shareDesc = metaAppDelegate.giftModel?.data?.share_app_banner?.share_content
  82 + let shareImage = metaAppDelegate.giftModel?.data?.share_app_banner?.share_icon
  83 + let shareUrl = metaAppDelegate.giftModel?.data?.share_app_banner?.jumpUrl
  84 +
  85 + CNLiveShareManager.showShareViewWithParam(forShareTitle: shareTitle, shareUrl: shareUrl, shareDesc: shareDesc, shareImage: shareImage, screenFull: false, hiddenWjj: true, hiddenQQ: true, hiddenWB: true, hiddenLifeCircle: true, hiddenWechatCircle: false, hiddenWechat: false, hiddenSafari: true, formVC: currentViewController(), topImage: [], topTitles: [], platformType: .all) { title in
81 86
82 } completerBlock: { resultType, platformType, typeString in 87 } completerBlock: { resultType, platformType, typeString in
83 if resultType == .succ{ 88 if resultType == .succ{