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
9d4b33cf
authored
Jul 02, 2025
by
ludi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
通知打开增加了一个判定登陆状态,修复一些bug
parent
68c066f7
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
66 additions
and
41 deletions
FuSiLive.xcodeproj/project.pbxproj
FuSiLive.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
FuSiLive/AppDelegate.m
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/BindAgentVC/FUSRegisteredBindAgentInfoAlertView.swift
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/FUSMyEmissaryQRCodeController.swift
FuSiLive.xcodeproj/project.pbxproj
View file @
9d4b33cf
...
...
@@ -672,7 +672,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME
=
AccentColor
;
CODE_SIGN_ENTITLEMENTS
=
FuSiLive/FuSiLive.entitlements
;
CODE_SIGN_STYLE
=
Automatic
;
CURRENT_PROJECT_VERSION
=
20250626001
2
;
CURRENT_PROJECT_VERSION
=
20250626001
3
;
DEFINES_MODULE
=
YES
;
DEVELOPMENT_TEAM
=
6GG26BHUMC
;
ENABLE_ON_DEMAND_RESOURCES
=
NO
;
...
...
@@ -940,7 +940,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME
=
AccentColor
;
CODE_SIGN_ENTITLEMENTS
=
FuSiLive/FuSiLive.entitlements
;
CODE_SIGN_STYLE
=
Automatic
;
CURRENT_PROJECT_VERSION
=
20250626001
2
;
CURRENT_PROJECT_VERSION
=
20250626001
3
;
DEFINES_MODULE
=
YES
;
DEVELOPMENT_TEAM
=
6GG26BHUMC
;
ENABLE_ON_DEMAND_RESOURCES
=
NO
;
...
...
FuSiLive.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
View file @
9d4b33cf
...
...
@@ -12,7 +12,7 @@
<
k
e
y
>
NotificationService.xcscheme_
^#
shared
#^
_
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
orderHint
<
/k
e
y
>
<
int
e
g
e
r
>
8
4
<
/int
e
g
e
r
>
<
int
e
g
e
r
>
8
5
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
/
d
i
c
t
>
<
/
d
i
c
t
>
...
...
FuSiLive/AppDelegate.m
View file @
9d4b33cf
...
...
@@ -367,41 +367,45 @@ typedef NS_ENUM(NSInteger, FFOutsideJumpAPPType) {
}
if
([
NSDictionary
isNull
:
transmissionContent
]
==
NO
)
{
dispatch_after
(
dispatch_time
(
DISPATCH_TIME_NOW
,
(
int64_t
)(
1
*
NSEC_PER_SEC
)),
dispatch_get_main_queue
(),
^
{
if
(
FUSCacheDataShare
.
shareStore
.
userDetailInfo
.
uid
)
{
// 准备上报的材料
NSMutableDictionary
*
reqDataJSON
=
[[
NSMutableDictionary
alloc
]
initWithDictionary
:[
transmissionContent
copy
]];
reqDataJSON
[
@"data"
][
@"title"
]
=
notificontent
.
title
;
if
([
reqDataJSON
[
@"data"
][
@"text"
]
stringValue
].
length
<=
0
)
{
reqDataJSON
[
@"data"
][
@"text"
]
=
notificontent
.
body
;
}
if
(
isChatNotification
==
NO
)
{
// 个推打开的,增加一个media
MJWeakSelf
[
FUSRouter
.
userRouter
fus_loginSucceedListener
:
^
{
dispatch_after
(
dispatch_time
(
DISPATCH_TIME_NOW
,
(
int64_t
)(
1
*
NSEC_PER_SEC
)),
dispatch_get_main_queue
(),
^
{
if
(
FUSCacheDataShare
.
shareStore
.
userDetailInfo
.
uid
)
{
// 准备上报的材料
NSMutableDictionary
*
reqDataJSON
=
[[
NSMutableDictionary
alloc
]
initWithDictionary
:[
transmissionContent
copy
]];
reqDataJSON
[
@"data"
][
@"title"
]
=
notificontent
.
title
;
NSArray
*
grinfo
=
content
[
@"_grinfo_"
];
if
(
grinfo
!=
nil
&&
[
grinfo
isKindOfClass
:[
NSArray
class
]]
&&
[
grinfo
count
]
>
0
)
{
NSDictionary
*
grinfoFirst
=
[
grinfo
firstObject
];
NSString
*
grinfoUrl
=
[
grinfoFirst
[
@"url"
]
stringValue
];
reqDataJSON
[
@"data"
][
@"media"
]
=
grinfoUrl
;
if
([
reqDataJSON
[
@"data"
][
@"text"
]
stringValue
].
length
<=
0
)
{
reqDataJSON
[
@"data"
][
@"text"
]
=
notificontent
.
body
;
}
if
(
isChatNotification
==
NO
)
{
// 个推打开的,增加一个media
NSArray
*
grinfo
=
content
[
@"_grinfo_"
];
if
(
grinfo
!=
nil
&&
[
grinfo
isKindOfClass
:[
NSArray
class
]]
&&
[
grinfo
count
]
>
0
)
{
NSDictionary
*
grinfoFirst
=
[
grinfo
firstObject
];
NSString
*
grinfoUrl
=
[
grinfoFirst
[
@"url"
]
stringValue
];
reqDataJSON
[
@"data"
][
@"media"
]
=
grinfoUrl
;
}
}
// 2. 转换为 JSON Data
NSError
*
jsonError
;
NSData
*
jsonData
=
[
NSJSONSerialization
dataWithJSONObject
:
reqDataJSON
options
:
NSJSONWritingPrettyPrinted
error:
&
jsonError
];
NSString
*
jsonString
=
@""
;
if
(
jsonError
==
nil
)
{
jsonString
=
[[
NSString
alloc
]
initWithData
:
jsonData
encoding
:
NSUTF8StringEncoding
];
}
[
FUSDataStatisticsManager
fus_behaviorExternalCallLogWithReqType
:
5
reqEventType
:
-
1
reqJson
:
jsonString
];
[
weakSelf
startJumpIntoPage
:
transmissionContent
logExtraJson
:
jsonString
];
}
// 2. 转换为 JSON Data
NSError
*
jsonError
;
NSData
*
jsonData
=
[
NSJSONSerialization
dataWithJSONObject
:
reqDataJSON
options
:
NSJSONWritingPrettyPrinted
error:
&
jsonError
];
NSString
*
jsonString
=
@""
;
if
(
jsonError
==
nil
)
{
jsonString
=
[[
NSString
alloc
]
initWithData
:
jsonData
encoding
:
NSUTF8StringEncoding
];
}
[
FUSDataStatisticsManager
fus_behaviorExternalCallLogWithReqType
:
5
reqEventType
:
-
1
reqJson
:
jsonString
];
[
self
startJumpIntoPage
:
transmissionContent
logExtraJson
:
jsonString
];
}
});
});
}];
}
}
...
...
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
View file @
9d4b33cf
...
...
@@ -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
>
8
3
<
/int
e
g
e
r
>
<
int
e
g
e
r
>
8
4
<
/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
>
8
8
<
/int
e
g
e
r
>
<
int
e
g
e
r
>
8
7
<
/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 @
9d4b33cf
...
...
@@ -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
>
8
7
<
/int
e
g
e
r
>
<
int
e
g
e
r
>
8
8
<
/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
>
8
9
<
/int
e
g
e
r
>
<
int
e
g
e
r
>
8
6
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
/
d
i
c
t
>
<
/
d
i
c
t
>
...
...
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
View file @
9d4b33cf
...
...
@@ -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
>
8
6
<
/int
e
g
e
r
>
<
int
e
g
e
r
>
8
3
<
/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
>
8
5
<
/int
e
g
e
r
>
<
int
e
g
e
r
>
8
9
<
/int
e
g
e
r
>
<
/
d
i
c
t
>
<
/
d
i
c
t
>
<
/
d
i
c
t
>
...
...
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/BindAgentVC/FUSRegisteredBindAgentInfoAlertView.swift
View file @
9d4b33cf
...
...
@@ -45,6 +45,9 @@ class FUSRegisteredBindAgentInfoAlertView: FUSBaseView {
self
.
backgroundColor
=
.
fus_alertViewBackground
()
contentView
.
isUserInteractionEnabled
=
true
contentView
.
backgroundColor
=
.
white
contentView
.
layer
.
cornerRadius
=
12
contentView
.
layer
.
masksToBounds
=
true
self
.
addSubview
(
contentView
)
contentView
.
snp
.
makeConstraints
{
make
in
make
.
center
.
equalToSuperview
()
...
...
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/FUSMyEmissaryQRCodeController.swift
View file @
9d4b33cf
...
...
@@ -53,6 +53,8 @@ class FUSMyEmissaryQRCodeController: FUSBaseViewController {
make
.
centerX
.
equalToSuperview
()
make
.
size
.
equalTo
(
CGSizeMake
(
260
,
44
))
}
fus_addRightBtns
()
}
func
bindViewModel
()
{
...
...
@@ -71,5 +73,21 @@ class FUSMyEmissaryQRCodeController: FUSBaseViewController {
})
.
disposed
(
by
:
disposeBag
)
}
func
fus_addRightBtns
(){
let
serviceBtn
=
UIButton
(
type
:
.
custom
)
serviceBtn
.
setImage
(
.
com_ImageNamed
(
"fus_common_navi_service_btn"
),
for
:
.
normal
)
serviceBtn
.
snp
.
makeConstraints
{
make
in
make
.
size
.
equalTo
(
CGSizeMake
(
26
,
26
))
}
serviceBtn
.
rx
.
tap
.
subscribe
(
onNext
:
{
_
in
// 点击客服
FUSRouter
.
chatRouter
()
.
fus_pushToServiceController
(
withAnimate
:
true
)
})
.
disposed
(
by
:
disposeBag
)
self
.
fus_addRightNavigationButton
(
with
:
[
serviceBtn
])
}
}
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