Skip to content

pidan / FuSiLive

Go to a project
Commit e34a78f9 by suolong
Options

Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive… 

Merge branch 'feature/v57版本pk迁移' of http://git.yabolive.net:88/pidan/FuSiLive into feature/v57版本pk迁移
parents 4cfd9c4f 209ac1af
Inline Side-by-side
Showing with 584 additions and 88 deletions
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_board_rank_no1.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_board_rank_no1@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_board_rank_no1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_board_rank_no2.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_board_rank_no2@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_board_rank_no2@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_board_rank_no3.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_board_rank_no3@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_board_rank_no3@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_list_room_popular_img.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_list_room_popular_img@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_list_room_popular_img@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_control_contribution_winStreak_bg.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_pk_control_contribution_winStreak_bg@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_pk_control_contribution_winStreak_bg@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_control_matching_img.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_pk_control_matching_img@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_pk_control_matching_img@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_control_pkGamePlay_game_tag.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_pk_control_pkGamePlay_game_tag@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_pk_control_pkGamePlay_game_tag@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_control_pkGamePlay_gift_tag.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_pk_control_pkGamePlay_gift_tag@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_pk_control_pkGamePlay_gift_tag.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_control_pkGamePlay_welcomeNew_tag.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_pk_control_pkGamePlay_welcomeNew_tag@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_pk_control_pkGamePlay_welcomeNew_tag@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_control_pkMode_game_bigIcon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_pk_control_pkMode_game_bigIcon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_pk_control_pkMode_game_bigIcon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_control_pkMode_gift_bigIcon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_pk_control_pkMode_gift_bigIcon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_pk_control_pkMode_gift_bigIcon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_control_pkMode_pop_bigIcon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_pk_control_pkMode_pop_bigIcon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_pk_control_pkMode_pop_bigIcon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_control_pkMode_welcomeNew_bigIcon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_pk_control_pkMode_welcomeNew_bigIcon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_pk_control_pkMode_welcomeNew_bigIcon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_control_question_btn.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_pk_control_question_btn@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_pk_control_question_btn@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_control_record_btn.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_pk_control_record_btn@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_pk_control_record_btn@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_control_search_icon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_pk_control_search_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_pk_control_search_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_control_search_randomMatch.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_pk_control_search_randomMatch@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_pk_control_search_randomMatch@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_control_search_refresh_icon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_pk_control_search_refresh_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_pk_control_search_refresh_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_control_setting_btn.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_pk_control_setting_btn@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_pk_control_setting_btn@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/PKNEW/live_pk_control_title_image.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_pk_control_title_image@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_pk_control_title_image@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/View/Main/View/Other/FUSCommonPullMenuView.swift
......@@ -44,7 +44,7 @@ import UIKit
}).disposed(by: disposeBag)
menuBgView.layer.masksToBounds = true
menuBgView.backgroundColor = .white
menuBgView.backgroundColor = .init(hex: "#E7E8EC")
menuBgView.layer.cornerRadius = 12
menuBgView.showsVerticalScrollIndicator = false
bgBtn.addSubview(menuBgView)
......@@ -68,7 +68,7 @@ import UIKit
let btn = UIButton(type: .custom)
btn.setTitle(titleName, for: .normal)
btn.titleLabel?.font = .fus_themeFont(13)
btn.setTitleColor(.white, for: .normal)
btn.setTitleColor(.fus_textColorRich(), for: .normal)
btn.setTitleColor(.fus_theme(), for: .selected)
// btn.setTitleColor(.black.withAlphaComponent(0.2), for: .highlighted)
btn.setBackgroundImage(UIImage.init(color: .black.withAlphaComponent(0.2)), for: .highlighted)
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBottomToolView.m
......@@ -145,6 +145,7 @@
@(FUSLiveBottomToolTypeTool2),
@(FUSLiveBottomToolTypeBeautySticker),
@(FUSLiveBottomToolTypeRoomScope),
@(FUSLiveBottomToolTypePK),
@(FUSLiveBottomToolTypeGift)]];
}
}
......@@ -984,6 +985,7 @@
@(FUSLiveBottomToolTypeTool2),
@(FUSLiveBottomToolTypeBeautySticker),
@(FUSLiveBottomToolTypeRoomScope),
@(FUSLiveBottomToolTypePK),
@(FUSLiveBottomToolTypeGift)]];
}
} else {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/Cell/FFPKControlContributionUserBlankCell.swift
......@@ -26,11 +26,12 @@ class FFPKControlContributionUserBlankCell: UITableViewCell{
fatalError("init(coder:) has not been implemented")
}
let bgImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_contribution_blank_all"))
// let bgImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_contribution_blank_all"))
let bgImageView = UIImageView()
let faceView = UIImageView(frame: CGRectMake(0, 0, 40, 40))
// let richImageView = UIImageView(frame: .init(x: 0, y: 0, width: 37, height: 14))
let nicknameLabel = UILabel()
let winSteakBgImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_contribution_winStreak_bg"))
let winSteakBgImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_pk_control_contribution_winStreak_bg"))
let winStreakLabel = UILabel()
let pkCountLabel = UILabel()
......@@ -40,6 +41,9 @@ class FFPKControlContributionUserBlankCell: UITableViewCell{
func makeUI() {
bgImageView.layer.cornerRadius = 8
bgImageView.layer.masksToBounds = true
bgImageView.backgroundColor = .init(hex: "#F0F0F0")
self.contentView.addSubview(bgImageView)
bgImageView.snp.makeConstraints { make in
make.top.bottom.equalToSuperview()
......@@ -62,7 +66,7 @@ class FFPKControlContributionUserBlankCell: UITableViewCell{
make.size.equalTo(CGSizeMake(40, 40))
}
nicknameLabel.textColor = .white
nicknameLabel.textColor = .fus_textColorRich()
nicknameLabel.font = .fus_themeMediumFont(15)
infoBgView.addSubview(nicknameLabel)
nicknameLabel.snp.makeConstraints { make in
......@@ -79,7 +83,7 @@ class FFPKControlContributionUserBlankCell: UITableViewCell{
let winStreakTitleLabel = UILabel()
winStreakTitleLabel.font = .fus_themeMediumFont(12)
winStreakTitleLabel.textColor = .fus_diamondBlue()
winStreakTitleLabel.textColor = .fus_textColorRich()
winStreakTitleLabel.text = .fus_versionLocalString("连胜")
winSteakBgImageView.addSubview(winStreakTitleLabel)
winStreakTitleLabel.snp.makeConstraints { make in
......@@ -88,7 +92,7 @@ class FFPKControlContributionUserBlankCell: UITableViewCell{
}
winStreakLabel.font = .fus_custom1ItalicFont(17)
winStreakLabel.textColor = .fus_diamondBlue()
winStreakLabel.textColor = .fus_textColorRich()
winStreakLabel.text = "0"
winSteakBgImageView.addSubview(winStreakLabel)
winStreakLabel.snp.makeConstraints { make in
......@@ -109,7 +113,7 @@ class FFPKControlContributionUserBlankCell: UITableViewCell{
let todayDetailTitleLabel = UILabel()
todayDetailTitleLabel.font = .fus_themeMediumFont(15)
todayDetailTitleLabel.textColor = .white
todayDetailTitleLabel.textColor = .fus_textColorRich()
todayDetailTitleLabel.text = .fus_versionLocalString("今日战绩")
bgImageView.addSubview(todayDetailTitleLabel)
todayDetailTitleLabel.snp.makeConstraints { make in
......@@ -208,24 +212,24 @@ class FFPKControlContributionUserBlankCell: UITableViewCell{
// 下半部分
self.pkCountLabel.font = .fus_custom1ItalicFont(20)
self.pkCountLabel.textColor = .white
self.pkCountLabel.textColor = .fus_textColorRich()
self.pkCountLabel.text = "\(model.showTotal)"
self.winCountLabel.font = .fus_custom1ItalicFont(20)
self.winCountLabel.textColor = .white
self.winCountLabel.textColor = .fus_textColorRich()
self.winCountLabel.text = "\(model.winsTotal)"
self.winRateLabel.font = .fus_custom1ItalicFont(20)
self.winRateLabel.textColor = .white
self.winRateLabel.textColor = .fus_textColorRich()
self.winRateLabel.text = "\(model.winsRate)%"
self.hotNumLabel.attributedText = .sj.makeText({ make in
make.append { make in
make.image = FUSShowRoomCenterBunble.versionImageNamed("live_list_room_popular_img")
make.image = FUSShowRoomCenterBunble.imageNamed("live_list_room_popular_img")
make.bounds = CGRectMake(0, 0, 18, 17)
make.alignment = .bottom
}.baseLineOffset(-2)
make.append("\(model.popularTotal)").textColor(.white)
make.append("\(model.popularTotal)").textColor(.fus_textColorRich())
make.font(.fus_custom1ItalicFont(20))
})
}
......@@ -247,7 +251,7 @@ class FFPKControlContributionHotDataListHeader: FUSBaseView {
self.backgroundColor = .clear
titleLabel.font = .fus_themeMediumFont(15)
titleLabel.textColor = .white
titleLabel.textColor = .fus_textColorRich()
titleLabel.text = .fus_versionLocalString("PKの贡献")
self.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
......@@ -256,7 +260,7 @@ class FFPKControlContributionHotDataListHeader: FUSBaseView {
}
menuBtn.layer.cornerRadius = 20 / 2.0
menuBtn.backgroundColor = .white.withAlphaComponent(0.1)
menuBtn.backgroundColor = .init(hex: "#E7E8EC")
self.addSubview(menuBtn)
menuBtn.snp.makeConstraints { make in
make.right.equalTo(-18)
......@@ -269,7 +273,7 @@ class FFPKControlContributionHotDataListHeader: FUSBaseView {
public func ff_setMenuBtn(title: String) {
menuBtn.setAttributedTitle(.sj.makeText({ make in
make.append(" ")
make.append(title + " ").textColor(.white)
make.append(title + " ").textColor(.fus_textColorRich())
make.append { make in
make.image = FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_menu_down_arrow")
make.alignment = .center
......@@ -279,7 +283,7 @@ class FFPKControlContributionHotDataListHeader: FUSBaseView {
}), for: .normal)
menuBtn.setAttributedTitle(.sj.makeText({ make in
make.append(" ")
make.append(title + " ").textColor(.white)
make.append(title + " ").textColor(.fus_textColorRich())
make.append { make in
make.image = FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_menu_down_arrow")?.byRotate180()
make.alignment = .center
......@@ -324,14 +328,14 @@ class FFPKControlContributionHotDataCell: UITableViewCell {
let richImageView = UIImageView(frame: .init(x: 0, y: 0, width: 37, height: 14))
let nicknameLabel = UILabel()
let hotNumLabel = UILabel()
let hotImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_list_room_popular_img"))
let hotImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_list_room_popular_img"))
let firstBloodImageView = UIImageView()
func makeUI(){
rankBtn.titleLabel?.font = .fus_themeMediumFont(17)
rankBtn.setTitleColor(.white, for: .normal)
rankBtn.setImage(FUSShowRoomCenterBunble.versionImageNamed("live_board_rank_no1"), for: .normal)
rankBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_board_rank_no1"), for: .normal)
self.contentView.addSubview(rankBtn)
rankBtn.snp.makeConstraints { make in
make.centerX.equalTo(self.contentView.snp.left).offset(30)
......@@ -401,7 +405,7 @@ class FFPKControlContributionHotDataCell: UITableViewCell {
func ff_setup(model: FUSVSIndexDevoteUserModel, icon: UIImage?, indexPath: IndexPath) {
if indexPath.row <= 2 {
rankBtn.setImage(FUSShowRoomCenterBunble.versionImageNamed("live_board_rank_no" + "\(indexPath.row + 1)"), for: .normal)
rankBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_board_rank_no" + "\(indexPath.row + 1)"), for: .normal)
rankBtn.setTitle("", for: .normal)
}else {
rankBtn.setTitle("\(indexPath.row + 1)", for: .normal)
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/Cell/FFPKControlPKModeCell.swift
......@@ -25,33 +25,44 @@ class FFPKControlPKModeCell: UICollectionViewCell {
/// 垃圾袋
public let disposeBag = DisposeBag()
let selectImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_pkMode_cell_unselect"))
let selectImageView = UIImageView()
let iconImageView = UIImageView()
let selectBgImage = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_pkGamePlay_light_bg"))
let sortImageIcon = UIImageView()
let nameLabel = UILabel()
func makeUI() {
selectImageView.backgroundColor = .init(hex: "#EBEBEB")
selectImageView.layer.cornerRadius = 9
selectImageView.layer.masksToBounds = true
selectImageView.layer.borderColor = UIColor.fus_theme().cgColor
selectImageView.layer.borderWidth = 2
self.addSubview(selectImageView)
selectImageView.snp.makeConstraints { make in
make.edges.equalToSuperview()
make.edges.equalToSuperview().inset(2)
}
selectBgImage.isHidden = true
self.addSubview(selectBgImage)
selectBgImage.snp.makeConstraints { make in
make.centerX.equalToSuperview()
make.centerY.equalToSuperview().offset(-6)
let centerBgView = UIView()
self.addSubview(centerBgView)
centerBgView.snp.makeConstraints { make in
make.center.equalToSuperview()
make.height.equalToSuperview().multipliedBy(0.8)
make.width.equalToSuperview().multipliedBy(0.8)
}
iconImageView.isUserInteractionEnabled = true
iconImageView.contentMode = .scaleAspectFit
self.addSubview(iconImageView)
centerBgView.addSubview(iconImageView)
iconImageView.snp.makeConstraints { make in
// make.centerX.equalToSuperview()
// make.centerY.equalToSuperview().offset(-6)
// make.size.equalTo(CGSizeMake(115, 115))
make.top.equalToSuperview()
make.centerX.equalToSuperview()
make.centerY.equalToSuperview().offset(-6)
make.size.equalTo(CGSizeMake(115, 115))
make.left.greaterThanOrEqualTo(centerBgView.snp.left)
make.right.lessThanOrEqualTo(centerBgView.snp.right)
make.bottom.lessThanOrEqualTo(centerBgView.snp.bottom)
// make.width.equalTo(iconImageView.snp.height)
}
self.addSubview(sortImageIcon)
......@@ -60,12 +71,15 @@ class FFPKControlPKModeCell: UICollectionViewCell {
}
nameLabel.font = .fus_themeMediumFont(17)
nameLabel.textColor = .white
nameLabel.textColor = .fus_textColorRich()
nameLabel.textAlignment = .center
self.addSubview(nameLabel)
centerBgView.addSubview(nameLabel)
nameLabel.snp.makeConstraints { make in
make.top.equalTo(iconImageView.snp.bottom).offset(6)
// make.top.equalTo(iconImageView.snp.bottom).offset(6)
make.left.right.equalToSuperview().inset(12)
// make.top.equalTo(iconImageView.snp.bottom)
make.bottom.equalToSuperview()
make.height.equalTo(24)
}
}
......@@ -78,20 +92,24 @@ class FFPKControlPKModeCell: UICollectionViewCell {
var sortImage: UIImage?
var iconImage: UIImage? = .fus_emptyImg()
if model.sort == 1 {
sortImage = FUSShowRoomCenterBunble.versionImageNamed("live_list_room_popular_img")
iconImage = FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_pkMode_pop_bigIcon")
sortImage = FUSShowRoomCenterBunble.imageNamed("live_list_room_popular_img")
iconImage = FUSShowRoomCenterBunble.imageNamed("live_pk_control_pkMode_pop_bigIcon")
}
else if model.sort == 2{
sortImage = .fus_fireIcon()
iconImage = .fus_emptyImg()
}
else if model.sort == 3{
sortImage = FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_pkGamePlay_game_tag")
iconImage = FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_pkMode_game_bigIcon")
sortImage = FUSShowRoomCenterBunble.imageNamed("live_pk_control_pkGamePlay_game_tag")
iconImage = FUSShowRoomCenterBunble.imageNamed("live_pk_control_pkMode_game_bigIcon")
}
else if model.sort == 4 {
sortImage = FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_pkGamePlay_welcomeNew_tag")
iconImage = FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_pkMode_welcomeNew_bigIcon")
sortImage = FUSShowRoomCenterBunble.imageNamed("live_pk_control_pkGamePlay_welcomeNew_tag")
iconImage = FUSShowRoomCenterBunble.imageNamed("live_pk_control_pkMode_welcomeNew_bigIcon")
}
else if model.sort == 5 {
sortImage = FUSShowRoomCenterBunble.imageNamed("live_pk_control_pkGamePlay_gift_tag")
iconImage = FUSShowRoomCenterBunble.imageNamed("live_pk_control_pkMode_gift_bigIcon")
}
if let sortImage = sortImage {
......@@ -110,7 +128,13 @@ class FFPKControlPKModeCell: UICollectionViewCell {
self.nameLabel.text = model.name
self.selectImageView.image = FUSShowRoomCenterBunble.versionImageNamed(isSelect ? "live_pk_control_pkMode_cell_select" : "live_pk_control_pkMode_cell_unselect")
self.selectBgImage.isHidden = !isSelect
// 最后确定选择诓
self.selectImageView.layer.borderWidth = isSelect ? 2 : 0
if viewType == .pkGamePlay {
nameLabel.font = .fus_themeMediumFont(15)
}
else {
nameLabel.font = .fus_themeMediumFont(17)
}
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/Cell/FFPKControlSearchPlayerRandomCell.swift
......@@ -25,14 +25,17 @@ class FFPKControlSearchPlayerRandomCell: UITableViewCell {
fatalError("init(coder:) has not been implemented")
}
let bgImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_search_random_bg"))
let randomImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_search_randomMatch"))
let bgImageView = UIImageView()
let randomImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_pk_control_search_randomMatch"))
let randomTitleLabel = UILabel()
let descLabel = UILabel()
let rightArrow = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_search_rightArrow"))
let rightArrow = UIImageView(image: .fus_rightArrowIcon())
func makeUI(){
bgImageView.layer.cornerRadius = 8
bgImageView.layer.masksToBounds = true
bgImageView.backgroundColor = .init(hex: "#F0F0F0")
bgImageView.isUserInteractionEnabled = true
self.addSubview(bgImageView)
bgImageView.snp.makeConstraints { make in
......@@ -57,7 +60,7 @@ class FFPKControlSearchPlayerRandomCell: UITableViewCell {
}
randomTitleLabel.font = .fus_themeMediumFont(17)
randomTitleLabel.textColor = .white
randomTitleLabel.textColor = .fus_textColorRich()
randomTitleLabel.text = .fus_versionLocalString("随机匹配")
contentCenterView.addSubview(randomTitleLabel)
randomTitleLabel.snp.makeConstraints { make in
......@@ -96,7 +99,7 @@ class FFPKControlSearchPlayerPlayerListHeader: FUSBaseView {
/// 点击搜索
public var searchBtnDidClick: ((String?) -> Void)?
let bgImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_search_player_top_bg"))
let bgImageView = UIImageView()
let titleLabel = UILabel()
let refreshBtn = UIButton(type: .custom)
let searchTF = FUSTextView()
......@@ -105,6 +108,18 @@ class FFPKControlSearchPlayerPlayerListHeader: FUSBaseView {
override func makeUI() {
super.makeUI()
let bottomBgColorView = UIView()
bottomBgColorView.backgroundColor = .init(hex: "#F0F0F0")
self.addSubview(bottomBgColorView)
bottomBgColorView.snp.makeConstraints { make in
make.left.right.equalToSuperview().inset(16)
make.bottom.equalToSuperview()
make.height.equalTo(10)
}
bgImageView.backgroundColor = .init(hex: "#F0F0F0")
bgImageView.layer.cornerRadius = 8
bgImageView.layer.masksToBounds = true
bgImageView.isUserInteractionEnabled = true
self.addSubview(bgImageView)
bgImageView.snp.makeConstraints { make in
......@@ -114,7 +129,7 @@ class FFPKControlSearchPlayerPlayerListHeader: FUSBaseView {
}
titleLabel.font = .fus_themeMediumFont(17)
titleLabel.textColor = .white
titleLabel.textColor = .fus_textColorRich()
titleLabel.text = .fus_versionLocalString("主播列表")
bgImageView.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
......@@ -122,7 +137,7 @@ class FFPKControlSearchPlayerPlayerListHeader: FUSBaseView {
make.top.equalToSuperview()
}
refreshBtn.setImage(FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_search_refresh_icon"), for: .normal)
refreshBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_pk_control_search_refresh_icon"), for: .normal)
bgImageView.addSubview(refreshBtn)
refreshBtn.snp.makeConstraints { make in
make.right.equalTo(-6)
......@@ -131,7 +146,7 @@ class FFPKControlSearchPlayerPlayerListHeader: FUSBaseView {
}
let searchBgView = UIView()
searchBgView.backgroundColor = .white.withAlphaComponent(0.1)
searchBgView.backgroundColor = .white
searchBgView.layer.cornerRadius = 34/2.0
searchBgView.layer.masksToBounds = true
bgImageView.addSubview(searchBgView)
......@@ -143,7 +158,7 @@ class FFPKControlSearchPlayerPlayerListHeader: FUSBaseView {
make.top.equalTo(titleLabel.snp.bottom)
}
let searchIcon = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_search_icon"))
let searchIcon = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_pk_control_search_icon"))
searchBgView.addSubview(searchIcon)
searchIcon.snp.makeConstraints { make in
make.left.equalTo(10)
......@@ -152,10 +167,10 @@ class FFPKControlSearchPlayerPlayerListHeader: FUSBaseView {
}
searchTF.attributedPlaceholder = .sj.makeText({ make in
make.append(.fus_versionLocalString("通过ID/暱称搜寻主播")).textColor(.init(hex: "#717172")).font(.fus_themeFont(12))
make.append(.fus_versionLocalString("通过ID/暱称搜寻主播")).textColor(.init(hex: "#808080")).font(.fus_themeFont(12))
})
searchTF.font = .fus_themeFont(12)
searchTF.textColor = .white
searchTF.textColor = .fus_textColorRich()
searchTF.shouldTakeLineBreakAsConfirm = true
searchTF.backgroundColor = .clear
searchBgView.addSubview(searchTF)
......@@ -166,7 +181,7 @@ class FFPKControlSearchPlayerPlayerListHeader: FUSBaseView {
}
searchBtn.titleLabel?.font = .fus_themeFont(12)
searchBtn.setTitleColor(.fus_theme(), for: .normal)
searchBtn.setTitleColor(.fus_textColorRich(), for: .normal)
searchBtn.setTitle(.fus_versionLocalString("搜寻"), for: .normal)
bgImageView.addSubview(searchBtn)
searchBtn.snp.makeConstraints { make in
......@@ -346,17 +361,17 @@ class FFPKControlSearchPlayerPlayerListCell: UITableViewCell {
if model.status == -1 {
self.inviteBtn.isEnabled = false
self.inviteBtn.backgroundColor = .white.withAlphaComponent(0.1)
self.inviteBtn.backgroundColor = .init(hex: "#E5E5E5")
}else {
self.inviteBtn.isEnabled = true
self.inviteBtn.isSelected = inviteState
self.inviteBtn.backgroundColor = inviteState ? .white.withAlphaComponent(0.1) : .fus_theme()
self.inviteBtn.backgroundColor = inviteState ? .init(hex: "#E5E5E5") : .fus_theme()
}
self.inviteState = inviteState
let isVip = model.vip
var level = model.level
self.nicknameLabel.textColor = .white
self.nicknameLabel.textColor = .fus_textColorRich()
if isVip, let levelModel = FUSSwiftCacheDataShare.share.fus_levelModel(level: level) {
self.nicknameLabel.textColor = .init(hex: levelModel.color)
......@@ -401,11 +416,23 @@ class FFPKControlSearchPlayerNoDataCell: UITableViewCell {
fatalError("init(coder:) has not been implemented")
}
let bgImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_search_player_bottom_bg"))
let bgImageView = UIImageView()
let emptyView = FUSEmptyView(frame: CGRectMake(0, 0, UIView.fus_screenW() - 16*2, FFPKControlSearchPlayerNoDataCell.cellHeight))
func makeUI(){
let topColorView = UIView()
topColorView.backgroundColor = .init(hex: "#F0F0F0")
self.contentView.addSubview(topColorView)
topColorView.snp.makeConstraints { make in
make.left.right.equalToSuperview().inset(16)
make.top.equalToSuperview()
make.height.equalTo(10)
}
bgImageView.layer.cornerRadius = 8
bgImageView.layer.masksToBounds = true
bgImageView.backgroundColor = .init(hex: "#F0F0F0")
self.contentView.addSubview(bgImageView)
bgImageView.snp.makeConstraints { make in
make.top.bottom.equalToSuperview()
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/Cell/FFPKUserContributionLogCell.swift
......@@ -36,7 +36,6 @@ class FFPKUserContributionLogCell: UITableViewCell {
let nicknameLabel = UILabel()
let noRichNickNameLabel = UILabel()
let hotNumLabel = UILabel()
// let hotImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_list_room_popular_img"))
let hotImageView = UIImageView()
let plusLabel = UILabel()
let firstBloodImageView = UIImageView()
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FFPKControlContributionView.swift
......@@ -19,7 +19,7 @@ public class FFPKControlContributionView: FFPKControlSubBaseView {
case hotData
}
let titleImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_title_image"))
let titleImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_pk_control_title_image"))
let recordBtn = UIButton(type: .custom)
let questionBtn = UIButton(type: .custom)
let settingBtn = UIButton(type: .custom)
......@@ -44,7 +44,7 @@ public class FFPKControlContributionView: FFPKControlSubBaseView {
public override func makeUI() {
super.makeUI()
recordBtn.setImage(FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_record_btn"), for: .normal)
recordBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_pk_control_record_btn"), for: .normal)
naviView.addSubview(recordBtn)
recordBtn.snp.makeConstraints { make in
make.left.equalTo(18)
......@@ -57,7 +57,7 @@ public class FFPKControlContributionView: FFPKControlSubBaseView {
make.center.equalToSuperview()
}
settingBtn.setImage(FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_setting_btn"), for: .normal)
settingBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_pk_control_setting_btn"), for: .normal)
naviView.addSubview(settingBtn)
settingBtn.snp.makeConstraints { make in
make.right.equalTo(-18)
......@@ -65,7 +65,7 @@ public class FFPKControlContributionView: FFPKControlSubBaseView {
make.size.equalTo(CGSizeMake(32, 32))
}
questionBtn.setImage(FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_question_btn"), for: .normal)
questionBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_pk_control_question_btn"), for: .normal)
naviView.addSubview(questionBtn)
questionBtn.snp.makeConstraints { make in
make.right.equalTo(settingBtn.snp.left).offset(-4)
......@@ -124,7 +124,7 @@ public class FFPKControlContributionView: FFPKControlSubBaseView {
make.top.equalTo(bottomStatusBgView.snp.bottom)
}
goPkBtn.style = .gradientLeftToRight
goPkBtn.style = .blue
goPkBtn.titleLabel?.font = .fus_themeMediumFont(17)
goPkBtn.setTitle(.fus_versionLocalString("开启PK"), for: .normal)
bottomStatusBgView.addSubview(goPkBtn)
......@@ -394,7 +394,7 @@ extension FFPKControlContributionView: UITableViewDelegate, UITableViewDataSourc
if let cell = tableView.dequeueReusableCell(withIdentifier: FFPKControlContributionHotDataCell.cellID, for: indexPath) as? FFPKControlContributionHotDataCell{
if let model = self.devoteDataList?[indexPath.row] {
cell.ff_setup(model: model, icon: FUSShowRoomCenterBunble.versionImageNamed("live_list_room_popular_img"), indexPath: indexPath)
cell.ff_setup(model: model, icon: FUSShowRoomCenterBunble.imageNamed("live_list_room_popular_img"), indexPath: indexPath)
cell.avatarDidClick = {[weak self] in
let userModel = FUSRoomUserInfoModel()
userModel.fus_setValue(with: model)
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FFPKControlMatchingView.swift
......@@ -11,9 +11,9 @@ import RxCocoa
class FFPKControlMatchingView: FFPKControlSubBaseView {
let titleImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_title_image"))
let titleImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_pk_control_title_image"))
let backBtn = UIButton(type: .custom)
let matchingImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_matching_img"))
let matchingImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_pk_control_matching_img"))
let matchingNameLabel = UILabel()
let matchingStateLabel = UILabel()
let cancelBtn = FUSStyleButton(type: .custom)
......@@ -57,7 +57,7 @@ class FFPKControlMatchingView: FFPKControlSubBaseView {
}
matchingNameLabel.font = .fus_themeMediumFont(19)
matchingNameLabel.textColor = .white
matchingNameLabel.textColor = .fus_textColorRich()
contentView.addSubview(matchingNameLabel)
matchingNameLabel.snp.makeConstraints { make in
make.centerX.equalToSuperview()
......@@ -72,7 +72,7 @@ class FFPKControlMatchingView: FFPKControlSubBaseView {
make.top.equalTo(matchingNameLabel.snp.bottom).offset(8)
}
cancelBtn.style = .gradientLeftToRight
cancelBtn.style = .blue
cancelBtn.titleLabel?.font = .fus_themeMediumFont(17)
cancelBtn.setTitle(.fus_versionLocalString("取消匹配"), for: .normal)
contentView.addSubview(cancelBtn)
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FFPKControlOpponentView.swift
......@@ -9,7 +9,7 @@ import UIKit
class FFPKControlOpponentView: FFPKControlSubBaseView {
let titleImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_title_image"))
let titleImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_pk_control_title_image"))
let backBtn = UIButton(type: .custom)
let pkNameLabel = UILabel()
let opponentInfoView = FFPKControlOpponentInfoView()
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FFPKControlPKModeView.swift
......@@ -9,7 +9,7 @@ import UIKit
class FFPKControlPKModeView: FFPKControlSubBaseView {
let titleImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_title_image"))
let titleImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_pk_control_title_image"))
let backBtn = UIButton(type: .custom)
let modeTitleLabel = UILabel()
let modeDescLabel = UILabel()
......@@ -45,7 +45,7 @@ class FFPKControlPKModeView: FFPKControlSubBaseView {
}
modeTitleLabel.font = .fus_themeMediumFont(19)
modeTitleLabel.textColor = .white
modeTitleLabel.textColor = .init(hex: "#222222")
contentView.addSubview(modeTitleLabel)
modeTitleLabel.snp.makeConstraints { make in
make.centerX.equalToSuperview()
......@@ -89,7 +89,7 @@ class FFPKControlPKModeView: FFPKControlSubBaseView {
// make.height.equalTo(210)
}
self.nextBtn.style = .gradientLeftToRight
self.nextBtn.style = .blue
self.nextBtn.titleLabel?.font = .fus_themeMediumFont(17)
self.nextBtn.setTitle(.fus_versionLocalString("下一步"), for: .normal)
contentView.addSubview(self.nextBtn)
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FFPKControlSearchPlayerView.swift
......@@ -9,7 +9,7 @@ import UIKit
class FFPKControlSearchPlayerView: FFPKControlSubBaseView {
let titleImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_title_image"))
let titleImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_pk_control_title_image"))
let backBtn = UIButton(type: .custom)
let tableView = UITableView(frame: .zero, style: .grouped)
let resetKeyBoardBtn = UIButton(type: .custom)
......@@ -362,7 +362,7 @@ extension FFPKControlSearchPlayerView: UITableViewDelegate, UITableViewDataSourc
if section == 0 {
let titleLabel = UILabel(frame: CGRectMake(0, 0, UIView.fus_screenW(), 50))
titleLabel.font = .fus_themeMediumFont(19)
titleLabel.textColor = .white
titleLabel.textColor = .fus_textColorRich()
titleLabel.text = .fus_versionLocalString("PK对手")
titleLabel.textAlignment = .center
return titleLabel
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FFPKControlSettingView.swift
......@@ -35,7 +35,7 @@ class FFPKControlSettingView: FFPKControlSubBaseView {
}
titleLabel.font = .fus_themeMediumFont(18)
titleLabel.textColor = .white
titleLabel.textColor = .fus_textColorRich()
titleLabel.text = .fus_versionLocalString("PK设置")
naviView.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
......@@ -211,16 +211,16 @@ class FFPKControlSettingSwitchView: FUSBaseView {
override func makeUI() {
super.makeUI()
// bgView.backgroundColor = .white.withAlphaComponent(0.05)
// bgView.layer.cornerRadius = 8
// bgView.layer.masksToBounds = true
bgView.backgroundColor = .init(hex: "#F0F0F0")
bgView.layer.cornerRadius = 8
bgView.layer.masksToBounds = true
self.addSubview(bgView)
bgView.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
titleLabel.font = .fus_themeMediumFont(15)
titleLabel.textColor = .white
titleLabel.textColor = .fus_textColorRich()
self.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
make.left.equalTo(14)
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FFPKMessageAlertView.swift
......@@ -186,7 +186,7 @@ extension FFPKMessageAlertView{
else if type == 2 {
self.titleLabel.attributedText = .sj.makeText({ make in
make.append { make in
make.image = FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_title_image")
make.image = FUSShowRoomCenterBunble.imageNamed("live_pk_control_title_image")
make.alignment = .center
}
make.font(.fus_themeBoldFont(20)).alignment(.center)
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FFPKPunishActivatedAlertView.swift
......@@ -46,7 +46,7 @@ class FFPKPunishActivatedAlertView: FFPKControlSubBaseView {
make.center.equalToSuperview()
}
questionBtn.setImage(FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_question_btn"), for: .normal)
questionBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_pk_control_question_btn"), for: .normal)
naviView.addSubview(questionBtn)
questionBtn.snp.makeConstraints { make in
make.right.equalTo(-18)
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FFPKPunishDetailAlertView.swift
......@@ -40,7 +40,7 @@ class FFPKPunishDetailAlertView: FFPKControlSubBaseView {
make.center.equalToSuperview()
}
questionBtn.setImage(FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_question_btn"), for: .normal)
questionBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_pk_control_question_btn"), for: .normal)
naviView.addSubview(questionBtn)
questionBtn.snp.makeConstraints { make in
make.right.equalTo(-18)
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FFPKPunishSelectAlertView.swift
......@@ -46,7 +46,7 @@ class FFPKPunishSelectAlertView: FFPKControlSubBaseView {
make.center.equalToSuperview()
}
questionBtn.setImage(FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_question_btn"), for: .normal)
questionBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_pk_control_question_btn"), for: .normal)
naviView.addSubview(questionBtn)
questionBtn.snp.makeConstraints { make in
make.right.equalTo(-18)
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FFPKResaultRewardAlertView.swift
......@@ -37,7 +37,7 @@ class FFPKResaultRewardAlertView: FUSBaseView {
let iconImageView = UIImageView()
let titleLabel = UILabel()
let contentLabel = UILabel()
let winSteakBgImageView = UIImageView(image: FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_contribution_winStreak_bg"))
let winSteakBgImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_pk_control_contribution_winStreak_bg"))
let winStreakLabel = UILabel()
let collectionView = UICollectionView(frame: .zero, collectionViewLayout: JJCollectionViewRoundFlowLayout_Swift())
let drawBtn = FUSStyleButton(type: .custom)
......@@ -77,7 +77,7 @@ class FFPKResaultRewardAlertView: FUSBaseView {
make.centerY.equalTo(contentView.snp.top).offset(10)
}
winSteakBgImageView.image = FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_contribution_winStreak_bg")
winSteakBgImageView.image = FUSShowRoomCenterBunble.imageNamed("live_pk_control_contribution_winStreak_bg")
contentView.addSubview(winSteakBgImageView)
winSteakBgImageView.snp.makeConstraints { make in
make.right.equalTo(-14)
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FFPKUserContributionInLiveAlertView.swift
......@@ -70,7 +70,7 @@ class FFPKUserContributionInLiveAlertView: FFPKControlSubBaseView {
make.left.equalTo(titleImageView.snp.right).offset(3)
}
questionBtn.setImage(FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_question_btn"), for: .normal)
questionBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_pk_control_question_btn"), for: .normal)
naviView.addSubview(questionBtn)
questionBtn.snp.makeConstraints { make in
make.right.equalTo(-18)
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FFPKUserContributionLogInLiveAlertView.swift
......@@ -43,7 +43,7 @@ class FFPKUserContributionLogInLiveAlertView: FFPKControlSubBaseView {
make.center.equalToSuperview()
}
questionBtn.setImage(FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_question_btn"), for: .normal)
questionBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_pk_control_question_btn"), for: .normal)
naviView.addSubview(questionBtn)
questionBtn.snp.makeConstraints { make in
make.right.equalTo(-18)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment