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
dc229f8e
authored
Mar 24, 2026
by
suolong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改部分 修改需求
parent
fc0f0608
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
2 deletions
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBottomToolView.h
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBottomToolView.m
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveChatInputHelper.m
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBottomToolView.h
View file @
dc229f8e
...
@@ -189,7 +189,7 @@ typedef NS_ENUM(NSUInteger, FUSLiveChatToolBeautyType) { //美颜工具按钮
...
@@ -189,7 +189,7 @@ typedef NS_ENUM(NSUInteger, FUSLiveChatToolBeautyType) { //美颜工具按钮
/// @param type 按钮类型
/// @param type 按钮类型
/// @param image 图片
/// @param image 图片
/// @param state 按钮的状态
/// @param state 按钮的状态
-
(
void
)
fus_updateBtnImageWithType
:(
FUSLiveBottomToolType
)
type
image
:(
UIImage
*
)
image
state
:(
UIControlState
*
)
state
;
-
(
void
)
fus_updateBtnImageWithType
:(
FUSLiveBottomToolType
)
type
image
:(
UIImage
*
)
image
state
:(
UIControlState
)
state
;
/**
/**
停止pk匹配计时器
停止pk匹配计时器
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBottomToolView.m
View file @
dc229f8e
...
@@ -583,7 +583,7 @@
...
@@ -583,7 +583,7 @@
}
}
}
}
-
(
void
)
fus_updateBtnImageWithType
:
(
FUSLiveBottomToolType
)
type
image
:
(
UIImage
*
)
image
state
:
(
UIControlState
*
)
state
{
-
(
void
)
fus_updateBtnImageWithType
:
(
FUSLiveBottomToolType
)
type
image
:
(
UIImage
*
)
image
state
:
(
UIControlState
)
state
{
for
(
UIButton
*
btn
in
_allBtns
)
{
for
(
UIButton
*
btn
in
_allBtns
)
{
if
(
btn
.
tag
==
type
)
{
if
(
btn
.
tag
==
type
)
{
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveChatInputHelper.m
View file @
dc229f8e
...
@@ -993,6 +993,7 @@
...
@@ -993,6 +993,7 @@
-
(
void
)
fus_bottomToolView
:
(
FUSLiveBottomToolView
*
)
bottomToolView
didClickShowTimeOnView
:
(
UIView
*
)
containerView
{
-
(
void
)
fus_bottomToolView
:
(
FUSLiveBottomToolView
*
)
bottomToolView
didClickShowTimeOnView
:
(
UIView
*
)
containerView
{
UIView
*
popContainer
=
(
containerView
?:
[
UIViewController
fus_topViewController
].
view
);
UIView
*
popContainer
=
(
containerView
?:
[
UIViewController
fus_topViewController
].
view
);
__weak
typeof
(
self
)
weakSelf
=
self
;
__weak
typeof
(
self
)
weakSelf
=
self
;
__weak
typeof
(
bottomToolView
)
weakBottomToolView
=
bottomToolView
;
FUSRoomTicketShowConfig
*
ticketShowConfig
=
[
FUSLiveHelper
shareInstance
].
liveBeforeReadyInfo
.
ticketShowConfig
;
FUSRoomTicketShowConfig
*
ticketShowConfig
=
[
FUSLiveHelper
shareInstance
].
liveBeforeReadyInfo
.
ticketShowConfig
;
NSString
*
defaultThemeText
=
[
FUSLiveHelper
shareInstance
].
roomInfoModel
.
introduce
;
NSString
*
defaultThemeText
=
[
FUSLiveHelper
shareInstance
].
roomInfoModel
.
introduce
;
FUSLiveShowTimePopView
*
popView
=
[
FUSLiveShowTimePopView
fus_showOnView
:
popContainer
ticketShowConfig
:
ticketShowConfig
themeText
:
defaultThemeText
];
FUSLiveShowTimePopView
*
popView
=
[
FUSLiveShowTimePopView
fus_showOnView
:
popContainer
ticketShowConfig
:
ticketShowConfig
themeText
:
defaultThemeText
];
...
@@ -1002,6 +1003,11 @@
...
@@ -1002,6 +1003,11 @@
return
;
return
;
}
}
BOOL
tool2ExistedBeforeStart
=
NO
;
if
(
weakBottomToolView
)
{
tool2ExistedBeforeStart
=
!
CGRectEqualToRect
([
weakBottomToolView
fus_getBtnFrameWithToolType
:
FUSLiveBottomToolTypeTool2
],
CGRectZero
);
}
UIView
*
onView
=
[[
FUSLiveHelper
shareInstance
].
currentFunctionView
fus_viewWithLayer
:
FUSLiveFunctionLayerFunctionButtons
];
UIView
*
onView
=
[[
FUSLiveHelper
shareInstance
].
currentFunctionView
fus_viewWithLayer
:
FUSLiveFunctionLayerFunctionButtons
];
if
(
!
onView
)
{
if
(
!
onView
)
{
onView
=
[
FUSLiveHelper
shareInstance
].
currentLiveVCView
?:
popContainer
;
onView
=
[
FUSLiveHelper
shareInstance
].
currentLiveVCView
?:
popContainer
;
...
@@ -1049,6 +1055,15 @@
...
@@ -1049,6 +1055,15 @@
[
innerSelf
.
showTimeFrostedView
removeFromSuperview
];
[
innerSelf
.
showTimeFrostedView
removeFromSuperview
];
}
}
if
(
FUSLiveHelper
.
shareInstance
.
liveType
==
FUSLiveTypeAnchor
&&
weakBottomToolView
)
{
[
weakBottomToolView
fus_removeBtnWithType
:
FUSLiveBottomToolTypeTool2
];
UIImage
*
ticketImage
=
[
FUSShowRoomCenterBunble
imageNamed
:
@"Live_bottom_ticket"
];
if
(
ticketImage
)
{
[
weakBottomToolView
fus_updateBtnImageWithType
:
FUSLiveBottomToolTypeRoomScope
image
:
ticketImage
state
:
UIControlStateNormal
];
[
weakBottomToolView
fus_updateBtnImageWithType
:
FUSLiveBottomToolTypeRoomScope
image
:
ticketImage
state
:
UIControlStateHighlighted
];
}
}
FUSLiveShowTimeCollectFrostedView
*
bar
=
[
FUSLiveShowTimeCollectFrostedView
fus_showOnView
:
onView
];
FUSLiveShowTimeCollectFrostedView
*
bar
=
[
FUSLiveShowTimeCollectFrostedView
fus_showOnView
:
onView
];
innerSelf
.
showTimeFrostedView
=
bar
;
innerSelf
.
showTimeFrostedView
=
bar
;
innerSelf
.
showTimeRoundId
=
model
.
stageData
.
roundId
?:
@""
;
innerSelf
.
showTimeRoundId
=
model
.
stageData
.
roundId
?:
@""
;
...
@@ -1071,6 +1086,12 @@
...
@@ -1071,6 +1086,12 @@
[
FUSLoadingView
fus_dismissProgressView
];
[
FUSLoadingView
fus_dismissProgressView
];
[
cancelSelf
fus_destroyShowTimeFrostedIfNeeded
];
[
cancelSelf
fus_destroyShowTimeFrostedIfNeeded
];
cancelSelf
.
showTimeRoundId
=
@""
;
cancelSelf
.
showTimeRoundId
=
@""
;
if
(
FUSLiveHelper
.
shareInstance
.
liveType
==
FUSLiveTypeAnchor
&&
weakBottomToolView
)
{
if
(
tool2ExistedBeforeStart
)
{
[
weakBottomToolView
fus_insertBtnWithType
:
FUSLiveBottomToolTypeTool2
index
:
2
];
}
[
weakBottomToolView
fus_updateRoomScoreType
];
}
});
});
}
failure
:^
(
NSString
*
_Nonnull
msg
,
NSInteger
code
)
{
}
failure
:^
(
NSString
*
_Nonnull
msg
,
NSInteger
code
)
{
dispatch_async
(
dispatch_get_main_queue
(),
^
{
dispatch_async
(
dispatch_get_main_queue
(),
^
{
...
...
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