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
ddc3586e
authored
Jul 15, 2024
by
pierce
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed bugs
parent
fde78eb3
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
8 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/BaseModel/FUSBaseModel.m
FuSiLive/Classes/BaoFang/Broadcast/Model/FUSBroadcastModel.m
FuSiLive/Classes/BaoFang/Broadcast/View/FUSAnimationLabel.m
FuSiLive/Classes/InstantMessaging/Controller/FUSChatDetailViewController.m
FuSiLive/Classes/NewLive/Main/View/FunctionView/GiftView/FUSLiveGiftView.m
FuSiLive/Classes/NewLive/Main/View/FunctionView/PK/View/PKPrepareView/FUSPKRecordHeaderView.m
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/BaseModel/FUSBaseModel.m
View file @
ddc3586e
...
...
@@ -20,7 +20,7 @@
*
* @return 返回对象
*/
+
(
instancetype
)
fus_modelWithDict
:(
NSDictionary
*
)
jsonDict
{
+
(
instancetype
)
fus_modelWithDict
:(
NSDictionary
*
)
jsonDict
{
return
[
self
modelWithDictionary
:
jsonDict
];
}
...
...
FuSiLive/Classes/BaoFang/Broadcast/Model/FUSBroadcastModel.m
View file @
ddc3586e
...
...
@@ -96,7 +96,7 @@
}
}
_languageContent
=
[
FUSFormatContentHelper
fus_replaceFusiLevelImg
:
_languageContent
whiteBg
:
YES
];
_languageContent
=
[
FUSFormatContentHelper
fus_replaceFusiLevelImg
:
_languageContent
];
return
_languageContent
;
}
...
...
FuSiLive/Classes/BaoFang/Broadcast/View/FUSAnimationLabel.m
View file @
ddc3586e
...
...
@@ -178,7 +178,7 @@
FUSFormatContentModel
*
contentModel
=
[[
FUSFormatContentModel
alloc
]
init
];
contentModel
.
languageContent
=
string
;
NSMutableAttributedString
*
attributedString
=
[
FUSFormatContentHelper
fus_createContentAttributedStringWithModel
:
contentModel
font
:
self
.
animationLabel
.
font
levelImageSize
:
CGSizeMake
(
45
,
27
)];
NSMutableAttributedString
*
attributedString
=
[
FUSFormatContentHelper
fus_createContentAttributedStringWithModel
:
contentModel
font
:
self
.
animationLabel
.
font
levelImageSize
:
CGSizeMake
(
0
,
14
)];
dispatch_async
(
dispatch_get_main_queue
(),
^
{
complete
(
attributedString
);
});
...
...
FuSiLive/Classes/InstantMessaging/Controller/FUSChatDetailViewController.m
View file @
ddc3586e
...
...
@@ -1475,6 +1475,7 @@
for
(
FUSChatDetailFrameModel
*
frameModel
in
self
.
chatDetailArr
)
{
if
([
model
.
msgModel
.
messageID
isEqualToString
:
frameModel
.
msgModel
.
messageID
])
{
[
frameModel
fus_setValueWithModel
:
model
];
frameModel
.
msgModel
=
model
.
msgModel
;
[
self
fus_judgeMessageTimeIsNeedShowWithIsNewMessage
:
YES
];
FUSIMChatDetailCell
*
cell
=
[
self
.
tableView
cellForRowAtIndexPath
:[
NSIndexPath
indexPathForRow
:[
self
.
chatDetailArr
indexOfObject
:
frameModel
]
inSection
:
0
]];
[
cell
fus_setCellDetailContentWithModel
:
frameModel
];
...
...
FuSiLive/Classes/NewLive/Main/View/FunctionView/GiftView/FUSLiveGiftView.m
View file @
ddc3586e
...
...
@@ -1232,12 +1232,13 @@ static FUSLiveGiftView *giftView = nil;
_broadcastNewsHaveData
=
YES
;
__block
int
newsIndex
=
0
;
FUSBroadcastModel
*
model
=
broadcastNewsDic
[
@"newsModel"
][
newsIndex
];
__weak
typeof
(
self
)
weakSelf
=
self
;
[
_jackpotScrollInfoView
.
animationLabel
changeTextColorWithString
:
model
.
languageContent
complete
:
^
(
NSMutableAttributedString
*
attributedString
)
{
[
_
jackpotScrollInfoView
.
animationLabel
fus_setAnimationattrContent
:
attributedString
];
[
_
jackpotScrollInfoView
.
animationLabel
fus_startAnimation
];
[
weakSelf
.
jackpotScrollInfoView
.
animationLabel
fus_setAnimationattrContent
:
attributedString
];
[
weakSelf
.
jackpotScrollInfoView
.
animationLabel
fus_startAnimation
];
}];
__weak
typeof
(
self
)
weakSelf
=
self
;
_jackpotScrollInfoView
.
animationLabel
.
endBlock
=
^
{
if
(
weakSelf
.
giftPanelIsShow
==
YES
&&
newsArr
.
count
>
0
)
{
...
...
FuSiLive/Classes/NewLive/Main/View/FunctionView/PK/View/PKPrepareView/FUSPKRecordHeaderView.m
View file @
ddc3586e
...
...
@@ -35,15 +35,16 @@
self
.
sessionLocalLabel
.
text
=
[
NSString
fus_localString
:
@"场次"
];
self
.
winRateLocalLabel
.
text
=
[
NSString
fus_localString
:
@"胜率"
];
_circleView
=
[[
FUSCircleProgressView
alloc
]
initWithFrame
:
CGRectMake
(
8
,
5
.
5
,
75
,
75
)];
_circleView
=
[[
FUSCircleProgressView
alloc
]
initWithFrame
:
CGRectMake
(
-
2
,
-
2
,
94
,
94
)];
// _circleView.textfont = [UIFont systemFontOfSize:11];
// _circleView.textColor = [UIColor clearColor];
// _circleView.processStr = nil;
_circleView
.
proessBgColor
=
[
UIColor
colorWithHex
:
@"#EEEEEE"
];
//
_circleView.processColor = [UIColor colorWithHex:@"#FFC231"];
_circleView
.
processColor
=
[
UIColor
colorWithHex
:
@"#FFC231"
];
_circleView
.
processGradientColor
=
@[(
id
)[
UIColor
colorWithHex
:
@"#FFC231"
].
CGColor
,(
id
)[
UIColor
colorWithHex
:
@"#FADA8D"
].
CGColor
];
_circleView
.
processWidth
=
4
;
_circleView
.
isAnimate
=
YES
;
_circleView
.
clockwise
=
YES
;
[
self
.
winRateBgView
addSubview
:
_circleView
];
[
_circleView
startDrawCircleProcessView
];
[
_circleView
animateToProgress
:
0
.
0
];
...
...
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