Commit 7ba717750eaece1e6ea7af281c0070d811123432
1 parent
2bf60226
1.1.7.25.04.25.20 ,提审
Showing
2 changed files
with
42 additions
and
2 deletions
metaCode.xcodeproj/project.pbxproj
| @@ -2960,7 +2960,7 @@ | @@ -2960,7 +2960,7 @@ | ||
| 2960 | CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements; | 2960 | CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements; |
| 2961 | CODE_SIGN_IDENTITY = "Apple Development"; | 2961 | CODE_SIGN_IDENTITY = "Apple Development"; |
| 2962 | CODE_SIGN_STYLE = Automatic; | 2962 | CODE_SIGN_STYLE = Automatic; |
| 2963 | - CURRENT_PROJECT_VERSION = 1.1.7.25.04.25.19; | 2963 | + CURRENT_PROJECT_VERSION = 1.1.7.25.04.25.20; |
| 2964 | DEBUG_INFORMATION_FORMAT = dwarf; | 2964 | DEBUG_INFORMATION_FORMAT = dwarf; |
| 2965 | DEVELOPMENT_TEAM = 94X49GG3ZW; | 2965 | DEVELOPMENT_TEAM = 94X49GG3ZW; |
| 2966 | ENABLE_BITCODE = NO; | 2966 | ENABLE_BITCODE = NO; |
| @@ -3216,7 +3216,7 @@ | @@ -3216,7 +3216,7 @@ | ||
| 3216 | CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements; | 3216 | CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements; |
| 3217 | CODE_SIGN_IDENTITY = "Apple Development"; | 3217 | CODE_SIGN_IDENTITY = "Apple Development"; |
| 3218 | CODE_SIGN_STYLE = Automatic; | 3218 | CODE_SIGN_STYLE = Automatic; |
| 3219 | - CURRENT_PROJECT_VERSION = 1.1.7.25.04.25.19; | 3219 | + CURRENT_PROJECT_VERSION = 1.1.7.25.04.25.20; |
| 3220 | DEVELOPMENT_TEAM = 94X49GG3ZW; | 3220 | DEVELOPMENT_TEAM = 94X49GG3ZW; |
| 3221 | ENABLE_BITCODE = NO; | 3221 | ENABLE_BITCODE = NO; |
| 3222 | ENABLE_MODULE_VERIFIER = NO; | 3222 | ENABLE_MODULE_VERIFIER = NO; |
metaCode/Classes/Main/HuBiLieHomePage/View/VodDetail/CNLiveVodIntroductionCell.swift
| @@ -6,6 +6,7 @@ | @@ -6,6 +6,7 @@ | ||
| 6 | // 简介,点赞等 | 6 | // 简介,点赞等 |
| 7 | 7 | ||
| 8 | import Foundation | 8 | import Foundation |
| 9 | +import CNLiveShareToolKit | ||
| 9 | 10 | ||
| 10 | // type 1详情按钮 2点赞按钮 3收藏按钮 4分享按钮 | 11 | // type 1详情按钮 2点赞按钮 3收藏按钮 4分享按钮 |
| 11 | typealias CNLiveVodIntroductionCellUpdateBlock = (_ isExpandDetail:Bool,_ isFavorite:Bool ,_ favoriteNum:Int,_ isCollection:Bool,_ type:String,_ model:CNLiveVodPlayBlockListListModel)->Void | 12 | typealias CNLiveVodIntroductionCellUpdateBlock = (_ isExpandDetail:Bool,_ isFavorite:Bool ,_ favoriteNum:Int,_ isCollection:Bool,_ type:String,_ model:CNLiveVodPlayBlockListListModel)->Void |
| @@ -103,6 +104,25 @@ class CNLiveVodIntroductionCell:UITableViewCell{ | @@ -103,6 +104,25 @@ class CNLiveVodIntroductionCell:UITableViewCell{ | ||
| 103 | expandBtn.addTarget(self, action: #selector(shareBtnAction), for: .touchUpInside) | 104 | expandBtn.addTarget(self, action: #selector(shareBtnAction), for: .touchUpInside) |
| 104 | return expandBtn | 105 | return expandBtn |
| 105 | }() | 106 | }() |
| 107 | + //share gift | ||
| 108 | + lazy var shareGiftBtn: UIButton = { | ||
| 109 | + let expandBtn = UIButton.init(type: .custom) | ||
| 110 | + expandBtn.backgroundColor = .clear | ||
| 111 | + expandBtn.frame = CGRect(x: 0, y: 0, width: 64, height: 21) | ||
| 112 | + expandBtn.setTitle("送礼", for: .normal) | ||
| 113 | + expandBtn.setTitle("送礼", for: .selected) | ||
| 114 | + expandBtn.setTitleColor(HexColor("#000102"), for: .normal) | ||
| 115 | + expandBtn.setImage(UIImage(named: "home_shareGift"), for: .normal) | ||
| 116 | + expandBtn.setImage(UIImage(named: "home_shareGift"), for: .selected) | ||
| 117 | + expandBtn.titleLabel?.font = Font_12 | ||
| 118 | + expandBtn.setupButtonImageAndTitlePossitionWith(padding: 6, style: .left) | ||
| 119 | + expandBtn.addTarget(self, action: #selector(shareGiftBtnAction), for: .touchUpInside) | ||
| 120 | + expandBtn.backgroundColor = HexColor("#FFEFE9") | ||
| 121 | + expandBtn.clipsToBounds = true | ||
| 122 | + expandBtn.layer.cornerRadius = 10 | ||
| 123 | + return expandBtn | ||
| 124 | + }() | ||
| 125 | + | ||
| 106 | 126 | ||
| 107 | override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { | 127 | override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { |
| 108 | super.init(style: style, reuseIdentifier: reuseIdentifier) | 128 | super.init(style: style, reuseIdentifier: reuseIdentifier) |
| @@ -138,6 +158,15 @@ class CNLiveVodIntroductionCell:UITableViewCell{ | @@ -138,6 +158,15 @@ class CNLiveVodIntroductionCell:UITableViewCell{ | ||
| 138 | make.height.equalTo(40) | 158 | make.height.equalTo(40) |
| 139 | } | 159 | } |
| 140 | 160 | ||
| 161 | + self.contentView.addSubview(shareGiftBtn) | ||
| 162 | + shareGiftBtn.snp.makeConstraints { make in | ||
| 163 | + make.right.equalToSuperview().offset(-10) | ||
| 164 | + make.width.equalTo(64) | ||
| 165 | + make.height.equalTo(21) | ||
| 166 | + make.centerY.equalTo(self.titleLabel.snp.centerY) | ||
| 167 | + } | ||
| 168 | + | ||
| 169 | + | ||
| 141 | self.contentView.addSubview(self.collectionBtn) | 170 | self.contentView.addSubview(self.collectionBtn) |
| 142 | collectionBtn.snp.makeConstraints { make in | 171 | collectionBtn.snp.makeConstraints { make in |
| 143 | make.left.equalTo(self.likeBtn.snp.right).offset(10) | 172 | make.left.equalTo(self.likeBtn.snp.right).offset(10) |
| @@ -191,6 +220,17 @@ class CNLiveVodIntroductionCell:UITableViewCell{ | @@ -191,6 +220,17 @@ class CNLiveVodIntroductionCell:UITableViewCell{ | ||
| 191 | @objc func shareBtnAction(){ | 220 | @objc func shareBtnAction(){ |
| 192 | self.updateCellBlock?(false, false,0, false, "4",self.vodPlayBlockListModel!.list.first!) | 221 | self.updateCellBlock?(false, false,0, false, "4",self.vodPlayBlockListModel!.list.first!) |
| 193 | } | 222 | } |
| 223 | + | ||
| 224 | + @objc func shareGiftBtnAction(){ | ||
| 225 | + 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 | + | ||
| 227 | + } completerBlock: { resultType, platformType, typeString in | ||
| 228 | + if resultType == .succ{ | ||
| 229 | + print("succ") | ||
| 230 | + } | ||
| 231 | + } | ||
| 232 | + | ||
| 233 | + } | ||
| 194 | 234 | ||
| 195 | 235 | ||
| 196 | } | 236 | } |