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
72a1a73f
authored
Aug 23, 2024
by
pierce
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、添加Facebook登录相关的配置
2、fixed bugs
parent
565b9f67
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
44 additions
and
6 deletions
DevelopmentPods/FUSCommon/FUSCommon/Classes/FUSAPPConfigs/FUSFuSiConfigs.m
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/FUSSocialLogin/FUSThirdAccountLoginHelper.m
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Helper/FUSSoundAndVibrateHelper.m
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Config/ConfigModels/FUSSDKConfig.h
FuSiLive/Info.plist
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/HomeMyPage/FUSMyView.m
DevelopmentPods/FUSCommon/FUSCommon/Classes/FUSAPPConfigs/FUSFuSiConfigs.m
View file @
72a1a73f
...
...
@@ -137,6 +137,26 @@
return
@"1155170616178706#yabolivetv-sandbox"
;
}
/// facebook key
-
(
NSString
*
)
facebookLoginKey
{
return
@"382456482257502"
;
}
/// facebook secret
-
(
NSString
*
)
facebookLoginSecret
{
return
@"045478b9202f7c4913ab5366eaf15f8a"
;
}
/// facebook key
-
(
NSString
*
)
facebookShareKey
{
return
@"948124033391771"
;
}
/// facebook secret
-
(
NSString
*
)
facebookShareSecret
{
return
@"0a161eeda8135dcd07ef3d46c7a9121c"
;
}
@end
#pragma mark -
...
...
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/FUSSocialLogin/FUSThirdAccountLoginHelper.m
View file @
72a1a73f
...
...
@@ -422,6 +422,10 @@ NSString * const FUSSocializedIsSafariLoginKey = @"FUSSocializedIsSafariLoginKey
[
FUSHttpManager
httpGetRequestWithUrl
:
@"https://facebook.com/"
params
:
nil
headers
:
nil
timeout
:
6
requestType
:
HTTPRequestType
responseType
:
HTTPResponseType
contentTypes
:
nil
success
:^
(
NSURLSessionDataTask
*
operation
,
id
responseObject
)
{
FBSDKSettings
.
appID
=
FUSConfig
.
sharedInstanced
.
sdkConfigs
.
facebookLoginKey
;
FBSDKSettings
.
clientToken
=
FUSConfig
.
sharedInstanced
.
sdkConfigs
.
facebookLoginSecret
;
if
(
!
_fbLoginManager
)
{
self
.
fbLoginManager
=
[[
FBSDKLoginManager
alloc
]
init
];
}
...
...
@@ -442,12 +446,17 @@ NSString * const FUSSocializedIsSafariLoginKey = @"FUSSocializedIsSafariLoginKey
[
self
fus_fetchFacebookUserInfoDictWithCompletion
:
^
(
NSDictionary
*
info
)
{
[
infoDict
addEntriesFromDictionary
:
info
];
if
(
self
.
loginSuccess
)
self
.
loginSuccess
(
infoDict
);
FBSDKSettings
.
appID
=
FUSConfig
.
sharedInstanced
.
sdkConfigs
.
facebookShareKey
;
FBSDKSettings
.
clientToken
=
FUSConfig
.
sharedInstanced
.
sdkConfigs
.
facebookShareSecret
;
}];
}];
}
failure
:^
(
NSURLSessionDataTask
*
operation
,
NSError
*
error
)
{
if
(
failure
)
failure
(
error
);
[
FUSDialogView
fus_showDialog
:
@"can not connect to Facebook"
autoDismissTime
:
2
];
FBSDKSettings
.
appID
=
FUSConfig
.
sharedInstanced
.
sdkConfigs
.
facebookShareKey
;
FBSDKSettings
.
clientToken
=
FUSConfig
.
sharedInstanced
.
sdkConfigs
.
facebookShareSecret
;
}];
}
}
...
...
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Helper/FUSSoundAndVibrateHelper.m
View file @
72a1a73f
...
...
@@ -15,8 +15,6 @@
static
NSString
*
const
kSETTINGSOUNDSWITCHBOOLUDKey
=
@"kSETTINGSOUNDSWITCHBOOLUDKey"
;
static
NSString
*
const
kSETTINGVIBRATESWITCHBOOLUDKey
=
@"kSETTINGVIBRATESWITCHBOOLUDKey"
;
//播放语音完成的回调
static
void
completionCallback
(
SystemSoundID
mySSID
)
{
AudioServicesPlaySystemSound
(
mySSID
);
...
...
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Config/ConfigModels/FUSSDKConfig.h
View file @
72a1a73f
...
...
@@ -17,6 +17,18 @@ NS_ASSUME_NONNULL_BEGIN
/// twitter secret
@property
(
nonatomic
,
copy
)
NSString
*
twitterSecret
;
/// facebook key
@property
(
nonatomic
,
copy
)
NSString
*
facebookLoginKey
;
/// facebook secret
@property
(
nonatomic
,
copy
)
NSString
*
facebookLoginSecret
;
/// facebook key
@property
(
nonatomic
,
copy
)
NSString
*
facebookShareKey
;
/// facebook secret
@property
(
nonatomic
,
copy
)
NSString
*
facebookShareSecret
;
/// TalkingData
@property
(
nonatomic
,
copy
)
NSString
*
talkingData
;
...
...
FuSiLive/Info.plist
View file @
72a1a73f
...
...
@@ -53,7 +53,7 @@
<
string
>
Editor
<
/string
>
<
k
e
y
>
CFBundleURLSchemes
<
/k
e
y
>
<
a
rr
a
y
>
<
string
>
fb
382456482257502
<
/string
>
<
string
>
fb
948124033391771
<
/string
>
<
/
a
rr
a
y
>
<
/
d
i
c
t
>
<
d
i
c
t
>
...
...
@@ -70,11 +70,11 @@
<
k
e
y
>
FacebookAdvertiserIDCollectionEnabled
<
/k
e
y
>
<
tru
e
/
>
<
k
e
y
>
FacebookAppID
<
/k
e
y
>
<
string
>
382456482257502
<
/string
>
<
string
>
948124033391771
<
/string
>
<
k
e
y
>
FacebookAutoLogAppEventsEnabled
<
/k
e
y
>
<
tru
e
/
>
<
k
e
y
>
FacebookClientToken
<
/k
e
y
>
<
string
>
0
45478b9202f7c4913ab5366eaf15f8a
<
/string
>
<
string
>
0
a161eeda8135dcd07ef3d46c7a9121c
<
/string
>
<
k
e
y
>
FacebookDisplayName
<
/k
e
y
>
<
string
>
FuSiLive
<
/string
>
<
k
e
y
>
ITSAppUsesNonExemptEncryption
<
/k
e
y
>
...
...
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/HomeMyPage/FUSMyView.m
View file @
72a1a73f
...
...
@@ -463,7 +463,6 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
}
break
;
case
FUSMyHeaderButtonTypeIntimacy
:{
if
(
FUSConfig
.
sharedInstanced
.
devConfigs
.
appStatus
)
return
;
[
FUSRouter
.
chatRouter
fus_enterFriendVC
];
}
break
;
...
...
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