Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
pidan
/
FuSiLive
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
c0758565
authored
Mar 06, 2026
by
ludi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
补充一些洗代码
parent
424e9bed
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
30 additions
and
71 deletions
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/project.pbxproj
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBottomToolView.m
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSModel/FUSPKContributeUserModel.swift
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSModel/FUSPKViewModel.swift
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSModel/FUSPKViewModelOCBridge.h
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSModel/FUSPKViewModelOCBridge.m
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKContentView/SubViews/FUSPKPunishTypesView.swift
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKContentView/SubViews/FUSPKScoreProgressView.swift
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKContentView/SubViews/FUSPKTopStateCountdownView.swift
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKContentView/SubViews/UserContributeView/FUSPKUserContributeCell.swift
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKContentView/SubViews/UserContributeView/FUSPKUserContributeListView.swift
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FUSPKControlContributionView.swift
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FUSPKControlMatchingView.swift
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/View/FUSPKScoreProgressLargeSmallView.swift
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/ViewModel/FUSPKControlViewModel.swift
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FFUserGuideTipsView/FUSUserGuideCloseInfoAlertView.swift → Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/UserGuideTipsView/FUSUserGuideCloseInfoAlertView.swift
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FFUserGuideTipsView/FUSUserGuideTipsHelper.swift → Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/UserGuideTipsView/FUSUserGuideTipsHelper.swift
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FFUserGuideTipsView/FUSUserGuideTipsView.swift → Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/UserGuideTipsView/FUSUserGuideTipsView.swift
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FFUserGuideTipsView/RectRadarAnimationView.swift → Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/UserGuideTipsView/RectRadarAnimationView.swift
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/project.pbxproj
View file @
c0758565
...
@@ -6030,7 +6030,7 @@
...
@@ -6030,7 +6030,7 @@
path
=
PKReasultAnimate
;
path
=
PKReasultAnimate
;
sourceTree
=
"<group>"
;
sourceTree
=
"<group>"
;
};
};
00E2A8182F21C44C003B779E
/*
FF
UserGuideTipsView */
=
{
00E2A8182F21C44C003B779E
/* UserGuideTipsView */
=
{
isa
=
PBXGroup
;
isa
=
PBXGroup
;
children
=
(
children
=
(
00E2A8142F21C44C003B779E
/* FUSUserGuideCloseInfoAlertView.swift */
,
00E2A8142F21C44C003B779E
/* FUSUserGuideCloseInfoAlertView.swift */
,
...
@@ -6038,7 +6038,7 @@
...
@@ -6038,7 +6038,7 @@
00E2A8162F21C44C003B779E
/* FUSUserGuideTipsView.swift */
,
00E2A8162F21C44C003B779E
/* FUSUserGuideTipsView.swift */
,
00E2A8172F21C44C003B779E
/* RectRadarAnimationView.swift */
,
00E2A8172F21C44C003B779E
/* RectRadarAnimationView.swift */
,
);
);
path
=
FF
UserGuideTipsView
;
path
=
UserGuideTipsView
;
sourceTree
=
"<group>"
;
sourceTree
=
"<group>"
;
};
};
00E6CB202F4E9AB800B63797
/* FUSPunishment */
=
{
00E6CB202F4E9AB800B63797
/* FUSPunishment */
=
{
...
@@ -7196,7 +7196,7 @@
...
@@ -7196,7 +7196,7 @@
BED657A62C5B745D00668116
/* FunctionView */
=
{
BED657A62C5B745D00668116
/* FunctionView */
=
{
isa
=
PBXGroup
;
isa
=
PBXGroup
;
children
=
(
children
=
(
00E2A8182F21C44C003B779E
/*
FF
UserGuideTipsView */
,
00E2A8182F21C44C003B779E
/* UserGuideTipsView */
,
BEEAB2712D34F8DF008CD059
/* PopularListView */
,
BEEAB2712D34F8DF008CD059
/* PopularListView */
,
BEEAB2502D337F87008CD059
/* AnchorReward */
,
BEEAB2502D337F87008CD059
/* AnchorReward */
,
BEB504712D2E8FD100EA6E6F
/* LiveThemeView */
,
BEB504712D2E8FD100EA6E6F
/* LiveThemeView */
,
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBottomToolView.m
View file @
c0758565
...
@@ -60,7 +60,7 @@
...
@@ -60,7 +60,7 @@
@property
(
nonatomic
,
strong
)
UIButton
*
inputChatBtn
;
@property
(
nonatomic
,
strong
)
UIButton
*
inputChatBtn
;
/// 引导波纹的view
/// 引导波纹的view
@property
(
nonatomic
,
strong
)
F
F
UserGuideRippleView
*
inputChatGuideRippleView
;
@property
(
nonatomic
,
strong
)
F
US
UserGuideRippleView
*
inputChatGuideRippleView
;
@property
(
nonatomic
,
strong
)
FUSLiveBottomToolWebpButton
*
linkMicroBtn
;
@property
(
nonatomic
,
strong
)
FUSLiveBottomToolWebpButton
*
linkMicroBtn
;
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSModel/FUSPKContributeUserModel.swift
View file @
c0758565
import
SwiftyJSON
import
SwiftyJSON
// MARK: - F
FPKVsPoint
Model
// MARK: - F
USPKContributeUser
Model
class
FUSPKContributeUserModel
:
FUSSwiftBaseModel
{
class
FUSPKContributeUserModel
:
FUSSwiftBaseModel
{
/// 用户ID
/// 用户ID
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSModel/FUSPKViewModel.swift
View file @
c0758565
...
@@ -10,7 +10,7 @@ import RxSwift
...
@@ -10,7 +10,7 @@ import RxSwift
import
RxRelay
import
RxRelay
import
SwiftyJSON
import
SwiftyJSON
/// 当前 PK 到了哪个流程,关联了F
FOCPKState这个oc映射,如果添加减少这里的类型,那么记得在FF
OCPKState里也进行添加减少
/// 当前 PK 到了哪个流程,关联了F
USOCPKState这个oc映射,如果添加减少这里的类型,那么记得在FUS
OCPKState里也进行添加减少
@objc
public
enum
FUSPKState
:
Int
,
Codable
{
@objc
public
enum
FUSPKState
:
Int
,
Codable
{
/// 没有在 PK 中(空闲状态)
/// 没有在 PK 中(空闲状态)
case
none
=
0
case
none
=
0
...
@@ -559,9 +559,6 @@ import SwiftyJSON
...
@@ -559,9 +559,6 @@ import SwiftyJSON
private
var
isPrepareReloadGiftBombData
:
Bool
=
false
private
var
isPrepareReloadGiftBombData
:
Bool
=
false
/// 重新请求礼物暴击信息
/// 重新请求礼物暴击信息
@objc
public
func
fus_reloadGiftBombDataHandle
()
{
@objc
public
func
fus_reloadGiftBombDataHandle
()
{
// if FFConfig.develop.environment != .release {
// FFToastIndicator.showToastMessage("----- 重新请求礼物暴击信息!")
// }
FUSSwiftLiveHelper
.
shared
.
pkHelper
.
fus_reloadPKGiftbombInfo
()
FUSSwiftLiveHelper
.
shared
.
pkHelper
.
fus_reloadPKGiftbombInfo
()
}
}
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSModel/FUSPKViewModelOCBridge.h
View file @
c0758565
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN
NS_ASSUME_NONNULL_BEGIN
/// 桥接给oc的F
F
PKViewModel相关信息
/// 桥接给oc的F
US
PKViewModel相关信息
@interface
FUSPKViewModelOCBridge
:
NSObject
@interface
FUSPKViewModelOCBridge
:
NSObject
/// 激活的惩罚改变的时候
/// 激活的惩罚改变的时候
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSModel/FUSPKViewModelOCBridge.m
View file @
c0758565
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
+
(
void
)
fus_activatedPunishInPKModelDidChange
{
+
(
void
)
fus_activatedPunishInPKModelDidChange
{
// 处理F
F
LivePunishmentManager
// 处理F
US
LivePunishmentManager
FUSPKState
pkState
=
[
FUSSwiftLiveHelper
shared
].
pkHelper
.
ocViewModel
.
currentPKState
;
FUSPKState
pkState
=
[
FUSSwiftLiveHelper
shared
].
pkHelper
.
ocViewModel
.
currentPKState
;
FUSVSPunishSelectActivatedModel
*
model
=
[
FUSSwiftLiveHelper
shared
].
pkHelper
.
ocViewModel
.
oc_activatedPunishInPKModel
;
FUSVSPunishSelectActivatedModel
*
model
=
[
FUSSwiftLiveHelper
shared
].
pkHelper
.
ocViewModel
.
oc_activatedPunishInPKModel
;
FUSPKAnchorModel
*
localAnchor
=
[
FUSSwiftLiveHelper
shared
].
pkHelper
.
ocViewModel
.
oc_localAnchorModel
;
FUSPKAnchorModel
*
localAnchor
=
[
FUSSwiftLiveHelper
shared
].
pkHelper
.
ocViewModel
.
oc_localAnchorModel
;
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKContentView/SubViews/FUSPKPunishTypesView.swift
View file @
c0758565
...
@@ -13,20 +13,20 @@ import SJAttributesStringMaker
...
@@ -13,20 +13,20 @@ import SJAttributesStringMaker
// 注意。有内在的宽高,不需要设定宽高
// 注意。有内在的宽高,不需要设定宽高
class
FUSPKPunishTypesView
:
FUSBaseView
{
class
FUSPKPunishTypesView
:
FUSBaseView
{
enum
F
F
PKPunishTypesViewState
{
enum
F
US
PKPunishTypesViewState
{
case
selectButton
case
selectButton
case
waiting
case
waiting
case
typesIcon
case
typesIcon
}
}
enum
F
F
PKPunishTypesViewPosition
{
enum
F
US
PKPunishTypesViewPosition
{
case
left
case
left
case
right
case
right
}
}
// public var clickHandler: ((F
F
PKPunishTypesViewState, FUSVSPunishGetListDataModel) -> Void)?
// public var clickHandler: ((F
US
PKPunishTypesViewState, FUSVSPunishGetListDataModel) -> Void)?
public
var
position
:
F
F
PKPunishTypesViewPosition
=
.
left
{
public
var
position
:
F
US
PKPunishTypesViewPosition
=
.
left
{
didSet
{
didSet
{
selectBtn
.
snp
.
remakeConstraints
{
make
in
selectBtn
.
snp
.
remakeConstraints
{
make
in
make
.
centerY
.
equalToSuperview
()
make
.
centerY
.
equalToSuperview
()
...
@@ -62,7 +62,7 @@ class FUSPKPunishTypesView: FUSBaseView {
...
@@ -62,7 +62,7 @@ class FUSPKPunishTypesView: FUSBaseView {
}
}
}
}
public
var
state
:
F
F
PKPunishTypesViewState
=
.
typesIcon
{
public
var
state
:
F
US
PKPunishTypesViewState
=
.
typesIcon
{
didSet
{
didSet
{
self
.
selectBtn
.
isHidden
=
state
!=
.
selectButton
self
.
selectBtn
.
isHidden
=
state
!=
.
selectButton
self
.
waitingView
.
isHidden
=
state
!=
.
waiting
self
.
waitingView
.
isHidden
=
state
!=
.
waiting
...
@@ -109,17 +109,6 @@ class FUSPKPunishTypesView: FUSBaseView {
...
@@ -109,17 +109,6 @@ class FUSPKPunishTypesView: FUSBaseView {
make
.
width
.
greaterThanOrEqualTo
(
24*
3
)
make
.
width
.
greaterThanOrEqualTo
(
24*
3
)
}
}
// 测试代码
// if FFConfig.develop.environment == .developing {
// reamingTimeLabel.font = .fus_themeFont(14)
// reamingTimeLabel.textColor = .red
// self.addSubview(reamingTimeLabel)
// reamingTimeLabel.snp.makeConstraints { make in
// make.centerX.equalToSuperview()
// make.top.equalTo(self.snp.top).offset(-10)
// }
// }
selectBtn
.
backgroundColor
=
.
init
(
hex
:
"#000000"
,
alpha
:
0.4
)
selectBtn
.
backgroundColor
=
.
init
(
hex
:
"#000000"
,
alpha
:
0.4
)
selectBtn
.
layer
.
cornerRadius
=
20
/
2.0
selectBtn
.
layer
.
cornerRadius
=
20
/
2.0
selectBtn
.
layer
.
masksToBounds
=
true
selectBtn
.
layer
.
masksToBounds
=
true
...
@@ -193,38 +182,11 @@ class FUSPKPunishTypesView: FUSBaseView {
...
@@ -193,38 +182,11 @@ class FUSPKPunishTypesView: FUSBaseView {
super
.
bindViewModel
()
super
.
bindViewModel
()
selectBtn
.
rx
.
tap
.
subscribe
(
onNext
:
{[
weak
self
]
in
selectBtn
.
rx
.
tap
.
subscribe
(
onNext
:
{[
weak
self
]
in
// self?.clickHandler?(F
F
PKPunishTypesViewState.selectButton, .init())
// self?.clickHandler?(F
US
PKPunishTypesViewState.selectButton, .init())
self
?
.
fus_showPunishSelectAlertView
()
self
?
.
fus_showPunishSelectAlertView
()
})
})
.
disposed
(
by
:
disposeBag
)
.
disposed
(
by
:
disposeBag
)
// 测试代码
// if FFConfig.develop.environment == .developing {
// FUSSwiftLiveHelper.shared.pkHelper.viewModel.flatMap({ $0.activatedPunishInPKModel })
// .subscribe(onNext: {[weak self] activatedPunishInPKModel in
// guard let self = self else { return }
// self.activatedPunishInPKModelDisposeBag = .init()
//
// if let activatedPunishInPKModel = activatedPunishInPKModel {
// activatedPunishInPKModel.currentRemaintime
// .subscribe(onNext: {[weak self] currentRemaintime in
//
// if self?.punishList.first(where: { $0.pid == activatedPunishInPKModel.punishModel.pid }) != nil {
// self?.reamingTimeLabel.text = "\(currentRemaintime)"
// }
// else {
// self?.reamingTimeLabel.text = "0"
// }
// })
// .disposed(by: activatedPunishInPKModelDisposeBag)
// }
// else {
// self.reamingTimeLabel.text = "0"
// }
// })
// .disposed(by: activatedPunishInPKModelDisposeBag)
// }
}
}
var
positionDisposeBag
=
DisposeBag
()
var
positionDisposeBag
=
DisposeBag
()
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKContentView/SubViews/FUSPKScoreProgressView.swift
View file @
c0758565
...
@@ -580,7 +580,7 @@ class FUSPKScoreProgressView: FUSBaseView {
...
@@ -580,7 +580,7 @@ class FUSPKScoreProgressView: FUSBaseView {
func
fus_addPointImagePopAnim
(
_
left
:
Bool
)
{
func
fus_addPointImagePopAnim
(
_
left
:
Bool
)
{
let
animKey
=
"F
F
ScoreViePopAnim"
let
animKey
=
"F
US
ScoreViePopAnim"
let
anima
=
CAKeyframeAnimation
(
keyPath
:
"transform.scale"
)
let
anima
=
CAKeyframeAnimation
(
keyPath
:
"transform.scale"
)
// 字体变化大小
// 字体变化大小
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKContentView/SubViews/FUSPKTopStateCountdownView.swift
View file @
c0758565
//
//
// F
F
PKTopStateCountdownModel.swift
// F
US
PKTopStateCountdownModel.swift
// LiveRoom
// LiveRoom
//
//
// Created by pppidan on 2025/8/4.
// Created by pppidan on 2025/8/4.
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKContentView/SubViews/UserContributeView/FUSPKUserContributeCell.swift
View file @
c0758565
...
@@ -144,7 +144,7 @@ class FUSPKUserContributeCell: FUSSwiftCollectionViewCell {
...
@@ -144,7 +144,7 @@ class FUSPKUserContributeCell: FUSSwiftCollectionViewCell {
class
FUSPKUserCountCell
:
FUSSwiftCollectionViewCell
{
class
FUSPKUserCountCell
:
FUSSwiftCollectionViewCell
{
let
countLabel
=
UILabel
()
let
countLabel
=
UILabel
()
static
let
FFPKUserCountCellIdentifier
=
"FFPKUserCountCellIdentifier
"
static
let
cellIdentifier
=
"FUSPKUserCountCell
"
override
func
makeUI
()
{
override
func
makeUI
()
{
super
.
makeUI
()
super
.
makeUI
()
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKContentView/SubViews/UserContributeView/FUSPKUserContributeListView.swift
View file @
c0758565
...
@@ -89,7 +89,7 @@ class FUSPKUserContributeListView: FUSBaseView {
...
@@ -89,7 +89,7 @@ class FUSPKUserContributeListView: FUSBaseView {
collectionView
.
backgroundColor
=
.
clear
collectionView
.
backgroundColor
=
.
clear
collectionView
.
register
(
FUSPKUserCountCell
.
self
,
collectionView
.
register
(
FUSPKUserCountCell
.
self
,
forCellWithReuseIdentifier
:
FUSPKUserCountCell
.
FFPKUserCountC
ellIdentifier
)
forCellWithReuseIdentifier
:
FUSPKUserCountCell
.
c
ellIdentifier
)
collectionView
.
register
(
FUSPKUserContributeCell
.
self
,
collectionView
.
register
(
FUSPKUserContributeCell
.
self
,
forCellWithReuseIdentifier
:
FUSPKUserContributeCell
.
pkUserContributeCellCollectionViewCellId
)
forCellWithReuseIdentifier
:
FUSPKUserContributeCell
.
pkUserContributeCellCollectionViewCellId
)
collectionView
.
dataSource
=
self
collectionView
.
dataSource
=
self
...
@@ -535,7 +535,7 @@ extension FUSPKUserContributeListView: UICollectionViewDataSource, UICollectionV
...
@@ -535,7 +535,7 @@ extension FUSPKUserContributeListView: UICollectionViewDataSource, UICollectionV
func
collectionView
(
_
collectionView
:
UICollectionView
,
cellForItemAt
indexPath
:
IndexPath
)
->
UICollectionViewCell
{
func
collectionView
(
_
collectionView
:
UICollectionView
,
cellForItemAt
indexPath
:
IndexPath
)
->
UICollectionViewCell
{
if
indexPath
.
row
==
0
{
if
indexPath
.
row
==
0
{
let
cell
=
collectionView
.
dequeueReusableCell
(
withReuseIdentifier
:
FUSPKUserCountCell
.
FFPKUserCountC
ellIdentifier
,
for
:
indexPath
)
as!
FUSPKUserCountCell
let
cell
=
collectionView
.
dequeueReusableCell
(
withReuseIdentifier
:
FUSPKUserCountCell
.
c
ellIdentifier
,
for
:
indexPath
)
as!
FUSPKUserCountCell
cell
.
countLabel
.
text
=
"
\(
self
.
totalUser
)
"
cell
.
countLabel
.
text
=
"
\(
self
.
totalUser
)
"
return
cell
return
cell
}
else
{
}
else
{
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FUSPKControlContributionView.swift
View file @
c0758565
...
@@ -13,7 +13,7 @@ import SwiftyJSON
...
@@ -13,7 +13,7 @@ import SwiftyJSON
public
class
FUSPKControlContributionView
:
FUSPKControlSubBaseView
{
public
class
FUSPKControlContributionView
:
FUSPKControlSubBaseView
{
/// section的类型
/// section的类型
enum
F
F
PKControlContributionSectionType
:
Int
{
enum
F
US
PKControlContributionSectionType
:
Int
{
case
user
case
user
case
banner
case
banner
case
hotData
case
hotData
...
@@ -30,7 +30,7 @@ public class FUSPKControlContributionView: FUSPKControlSubBaseView {
...
@@ -30,7 +30,7 @@ public class FUSPKControlContributionView: FUSPKControlSubBaseView {
let
pkStatusBgView
=
FUSPKControlContributionPkStatusView
(
frame
:
.
zero
)
let
pkStatusBgView
=
FUSPKControlContributionPkStatusView
(
frame
:
.
zero
)
/// 控制section的显示
/// 控制section的显示
var
sectionTypeList
:
[
F
F
PKControlContributionSectionType
]
=
[
.
user
,
.
hotData
]
var
sectionTypeList
:
[
F
US
PKControlContributionSectionType
]
=
[
.
user
,
.
hotData
]
// 日期选择相关
// 日期选择相关
let
dateTitleList
:
[
String
]
=
[
.
fus_versionLocalString
(
"今日"
),
.
fus_versionLocalString
(
"昨日"
)]
let
dateTitleList
:
[
String
]
=
[
.
fus_versionLocalString
(
"今日"
),
.
fus_versionLocalString
(
"昨日"
)]
...
@@ -488,22 +488,22 @@ extension FUSPKControlContributionView: UITableViewDelegate, UITableViewDataSour
...
@@ -488,22 +488,22 @@ extension FUSPKControlContributionView: UITableViewDelegate, UITableViewDataSour
class
FUSPKControlContributionPkStatusView
:
FUSBaseView
{
class
FUSPKControlContributionPkStatusView
:
FUSBaseView
{
enum
F
F
PKControlContributionPkStatusType
:
Equatable
{
enum
F
US
PKControlContributionPkStatusType
:
Equatable
{
case
matching
case
matching
case
waitingAccept
case
waitingAccept
case
inPk
(
face
:
String
,
nickName
:
String
)
case
inPk
(
face
:
String
,
nickName
:
String
)
}
}
/// 点击事件
/// 点击事件
public
var
clickHanlde
:
((
F
F
PKControlContributionPkStatusType
)
->
Void
)?
public
var
clickHanlde
:
((
F
US
PKControlContributionPkStatusType
)
->
Void
)?
/// pk状态
/// pk状态
let
pkStatus
:
BehaviorRelay
<
F
F
PKControlContributionPkStatusType
>
=
.
init
(
value
:
.
matching
)
let
pkStatus
:
BehaviorRelay
<
F
US
PKControlContributionPkStatusType
>
=
.
init
(
value
:
.
matching
)
let
bgView
=
UIButton
(
type
:
.
custom
)
let
bgView
=
UIButton
(
type
:
.
custom
)
let
pkIconImageView
=
YYAnimatedImageView
(
image
:
FUSShowRoomCenterBunble
.
webpImageName
(
"live_pk_control_contribute_bottom_inpk_animate"
))
let
pkIconImageView
=
YYAnimatedImageView
(
image
:
FUSShowRoomCenterBunble
.
webpImageName
(
"live_pk_control_contribute_bottom_inpk_animate"
))
let
pkHeadImageView
=
UIImageView
(
image
:
FUSShowRoomCenterBunble
.
imageNamed
(
"live_pk_control_contribution_pkStatus_pk_avatar"
))
let
pkHeadImageView
=
UIImageView
(
image
:
FUSShowRoomCenterBunble
.
imageNamed
(
"live_pk_control_contribution_pkStatus_pk_avatar"
))
var
raderView
=
F
F
UserGuideRippleView
()
var
raderView
=
F
US
UserGuideRippleView
()
let
descLabel
=
UILabel
()
let
descLabel
=
UILabel
()
override
func
makeUI
()
{
override
func
makeUI
()
{
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FUSPKControlMatchingView.swift
View file @
c0758565
...
@@ -17,7 +17,7 @@ class FUSPKControlMatchingView: FUSPKControlSubBaseView {
...
@@ -17,7 +17,7 @@ class FUSPKControlMatchingView: FUSPKControlSubBaseView {
let
matchingNameLabel
=
UILabel
()
let
matchingNameLabel
=
UILabel
()
let
matchingStateLabel
=
UILabel
()
let
matchingStateLabel
=
UILabel
()
let
cancelBtn
=
FUSStyleButton
(
type
:
.
custom
)
let
cancelBtn
=
FUSStyleButton
(
type
:
.
custom
)
var
raderView
=
F
F
UserGuideRippleView
()
var
raderView
=
F
US
UserGuideRippleView
()
/// 选中的pk模式
/// 选中的pk模式
public
var
pkMode
:
FUSVSTypeGetListModel
?
public
var
pkMode
:
FUSVSTypeGetListModel
?
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/View/FUSPKScoreProgressLargeSmallView.swift
View file @
c0758565
...
@@ -427,7 +427,7 @@ class FUSPKScoreProgressLargeSmallView: FUSBaseView {
...
@@ -427,7 +427,7 @@ class FUSPKScoreProgressLargeSmallView: FUSBaseView {
func
fus_addPointImagePopAnim
(
_
left
:
Bool
)
{
func
fus_addPointImagePopAnim
(
_
left
:
Bool
)
{
let
animKey
=
"F
F
ScoreViePopAnim"
let
animKey
=
"F
US
ScoreViePopAnim"
let
anima
=
CAKeyframeAnimation
(
keyPath
:
"transform.scale"
)
let
anima
=
CAKeyframeAnimation
(
keyPath
:
"transform.scale"
)
// 字体变化大小
// 字体变化大小
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/ViewModel/FUSPKControlViewModel.swift
View file @
c0758565
...
@@ -53,7 +53,7 @@ public class FUSPKControlViewModel: NSObject {
...
@@ -53,7 +53,7 @@ public class FUSPKControlViewModel: NSObject {
/// 惩罚信息,punish需要
/// 惩罚信息,punish需要
public
var
arg_punishData
:
BehaviorRelay
<
FUSVSPunishGetListDataModel
?
>
=
.
init
(
value
:
nil
)
public
var
arg_punishData
:
BehaviorRelay
<
FUSVSPunishGetListDataModel
?
>
=
.
init
(
value
:
nil
)
/// 是否是当前直播间的激活惩罚数据,F
F
PKControlViewTypePunishActivate需要
/// 是否是当前直播间的激活惩罚数据,F
US
PKControlViewTypePunishActivate需要
public
var
arg_isLocalPunishActivateData
:
BehaviorRelay
<
Bool
>
=
.
init
(
value
:
true
)
public
var
arg_isLocalPunishActivateData
:
BehaviorRelay
<
Bool
>
=
.
init
(
value
:
true
)
/// 0:人气值 1:竞技规则 2:惩罚
/// 0:人气值 1:竞技规则 2:惩罚
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/
FF
UserGuideTipsView/FUSUserGuideCloseInfoAlertView.swift
→
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/UserGuideTipsView/FUSUserGuideCloseInfoAlertView.swift
View file @
c0758565
File moved
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/
FF
UserGuideTipsView/FUSUserGuideTipsHelper.swift
→
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/UserGuideTipsView/FUSUserGuideTipsHelper.swift
View file @
c0758565
File moved
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/
FF
UserGuideTipsView/FUSUserGuideTipsView.swift
→
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/UserGuideTipsView/FUSUserGuideTipsView.swift
View file @
c0758565
...
@@ -36,7 +36,7 @@ class FUSUserGuideTipsView: UIView {
...
@@ -36,7 +36,7 @@ class FUSUserGuideTipsView: UIView {
// private let layerView = UIView()
// private let layerView = UIView()
// private let rippleView = UIView()
// private let rippleView = UIView()
// private var radarAnimationView: RectRadarAnimationView?
// private var radarAnimationView: RectRadarAnimationView?
private
let
rippleView
=
F
F
UserGuideRippleView
(
frame
:
.
zero
)
private
let
rippleView
=
F
US
UserGuideRippleView
(
frame
:
.
zero
)
private
let
connectImageView
=
UIImageView
(
image
:
FUSShowRoomCenterBunble
.
imageNamed
(
"user_guide_tips_connect_upon_image"
))
private
let
connectImageView
=
UIImageView
(
image
:
FUSShowRoomCenterBunble
.
imageNamed
(
"user_guide_tips_connect_upon_image"
))
private
let
textContentBgView
=
UIView
()
private
let
textContentBgView
=
UIView
()
private
let
iconImageView
=
UIImageView
()
private
let
iconImageView
=
UIImageView
()
...
@@ -260,7 +260,7 @@ class FUSUserGuideTipsView: UIView {
...
@@ -260,7 +260,7 @@ class FUSUserGuideTipsView: UIView {
}
}
@objc
public
class
F
F
UserGuideRippleView
:
UIView
{
@objc
public
class
F
US
UserGuideRippleView
:
UIView
{
@objc
public
enum
FFUserGuideRippleViewAnimationType
:
Int
{
@objc
public
enum
FFUserGuideRippleViewAnimationType
:
Int
{
case
ripple
=
1
case
ripple
=
1
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/
FF
UserGuideTipsView/RectRadarAnimationView.swift
→
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/UserGuideTipsView/RectRadarAnimationView.swift
View file @
c0758565
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment