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
ca62e7a5
authored
Jan 17, 2025
by
ludi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复一些bug
parent
6df54f9b
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
21 additions
and
12 deletions
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/LiveThemeView/FUSLiveThemeView.m
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PopularListView/FUSShowRoomUserContributionListView.h
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PopularListView/FUSShowRoomUserContributionListView.m
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/TreasureBox/View/FUSLiveBoxDetailSettingView.m
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
Pods/Pods.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
View file @
ca62e7a5
...
...
@@ -7,12 +7,12 @@
<
k
e
y
>
FUSChatCenterBundle.xcscheme_
^#
shared
#^
_
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
7
2
<
/int
e
g
e
r
>
<
int
e
g
e
r
>
7
5
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
FUSChatCenterModule.xcscheme_
^#
shared
#^
_
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
7
6
<
/int
e
g
e
r
>
<
int
e
g
e
r
>
7
4
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
/
d
i
c
t
>
<
/
d
i
c
t
>
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
View file @
ca62e7a5
...
...
@@ -7,12 +7,12 @@
<
k
e
y
>
FUSShowRoomBundle.xcscheme_
^#
shared
#^
_
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
7
5
<
/int
e
g
e
r
>
<
int
e
g
e
r
>
7
3
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
FUSShowRoomModule.xcscheme_
^#
shared
#^
_
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
7
4
<
/int
e
g
e
r
>
<
int
e
g
e
r
>
7
7
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
/
d
i
c
t
>
<
/
d
i
c
t
>
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m
View file @
ca62e7a5
...
...
@@ -6167,6 +6167,7 @@ UIGestureRecognizerDelegate
[
FUSTalkingData
fus_trackEvent
:
FUSLiveEventTrackParams
.
fus_EVENT_ROOM_HOTRANK
label
:
nil
parameters
:
nil
];
MJWeakSelf
// 避免重复显示
if
(
self
.
contributionListView
)
return
;
self
.
contributionListView
=
[
FUSShowRoomUserContributionListView
fus_showContributionListView
];
...
...
@@ -6174,6 +6175,9 @@ UIGestureRecognizerDelegate
[[
FUSLiveHelper
shareInstance
]
fus_setupScrollToSwitchRoomEnable
:
YES
];
}];
[[
FUSLiveHelper
shareInstance
]
fus_setupScrollToSwitchRoomEnable
:
NO
];
[
self
.
contributionListView
setHandleClickUserAction
:
^
(
FUSRoomUserInfoModel
*
_Nonnull
model
)
{
[
weakSelf
.
userInfoView
fus_showUserInfoViewWithUserInfoViewType
:
FUSUserInfoViewTypeLive
userInfoModel
:
model
shouldRequestData
:
YES
];
}];
}
-
(
void
)
fus_headViewLikeSucceed
{
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/LiveThemeView/FUSLiveThemeView.m
View file @
ca62e7a5
...
...
@@ -120,8 +120,8 @@
switch
(
gesture
.
state
)
{
case
UIGestureRecognizerStateBegan
:
{
self
.
gestureBeginPoint
=
self
.
origin
;
CGFloat
y
=
self
.
gestureBeginPoint
.
y
;
CGFloat
x
=
self
.
gestureBeginPoint
.
x
;
CGFloat
y
=
self
.
gestureBeginPoint
.
y
+
offset
.
y
;
CGFloat
x
=
self
.
gestureBeginPoint
.
x
+
offset
.
x
;
frame
.
origin
=
CGPointMake
(
x
,
y
);
self
.
frame
=
frame
;
self
.
hasMoved
=
YES
;
...
...
@@ -129,8 +129,8 @@
}
case
UIGestureRecognizerStateChanged
:
{
CGFloat
y
=
self
.
gestureBeginPoint
.
y
;
CGFloat
x
=
self
.
gestureBeginPoint
.
x
;
CGFloat
y
=
self
.
gestureBeginPoint
.
y
+
offset
.
y
;
CGFloat
x
=
self
.
gestureBeginPoint
.
x
+
offset
.
x
;
frame
.
origin
=
CGPointMake
(
x
,
y
);
self
.
frame
=
frame
;
break
;
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PopularListView/FUSShowRoomUserContributionListView.h
View file @
ca62e7a5
...
...
@@ -13,6 +13,8 @@ NS_ASSUME_NONNULL_BEGIN
@property
(
nonatomic
,
copy
)
void
(
^
handleDismissViewAction
)(
void
);
@property
(
nonatomic
,
copy
)
void
(
^
handleClickUserAction
)(
FUSRoomUserInfoModel
*
model
);
+
(
FUSShowRoomUserContributionListView
*
)
fus_showContributionListView
;
-
(
void
)
fus_hideViewWithAnim
;
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PopularListView/FUSShowRoomUserContributionListView.m
View file @
ca62e7a5
...
...
@@ -233,6 +233,9 @@
model
.
uid
=
userModel
.
uid
;
model
.
isHide
=
[
NSString
stringWithFormat
:
@"%ld"
,
userModel
.
inHide
];
//TODO:跳转: added By Pidan
if
(
self
.
handleClickUserAction
)
{
self
.
handleClickUserAction
(
model
);
}
[
self
fus_hideViewWithAnim
];
}
...
...
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/TreasureBox/View/FUSLiveBoxDetailSettingView.m
View file @
ca62e7a5
...
...
@@ -72,7 +72,7 @@
self
.
optionsList
=
optionsModel
.
optionsList
;
_orderTextField
.
backgroundColor
=
[
UIColor
colorWithHex
:
@"#F0EEEF"
];
_orderTextField
.
textMaxLength
=
3
0
;
_orderTextField
.
textMaxLength
=
6
0
;
_orderTextField
.
layer
.
cornerRadius
=
4
;
_orderTextField
.
layer
.
masksToBounds
=
YES
;
...
...
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
View file @
ca62e7a5
...
...
@@ -7,12 +7,12 @@
<
k
e
y
>
FUSUserCenterModule.xcscheme_
^#
shared
#^
_
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
7
3
<
/int
e
g
e
r
>
<
int
e
g
e
r
>
7
8
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
FUSUserCenterModuleBundle.xcscheme_
^#
shared
#^
_
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
7
7
<
/int
e
g
e
r
>
<
int
e
g
e
r
>
7
6
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
/
d
i
c
t
>
<
/
d
i
c
t
>
...
...
Pods/Pods.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
View file @
ca62e7a5
...
...
@@ -392,7 +392,7 @@
<
k
e
y
>
SSZipArchive.xcscheme_
^#
shared
#^
_
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
7
8
<
/int
e
g
e
r
>
<
int
e
g
e
r
>
7
2
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
k
e
y
>
SnapKit-SnapKit_Privacy.xcscheme
<
/k
e
y
>
<
d
i
c
t
>
...
...
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