Commit 72a1a73f by pierce

1、添加Facebook登录相关的配置

2、fixed bugs
parent 565b9f67
......@@ -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 -
......
......@@ -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;
}];
}
}
......
......@@ -15,8 +15,6 @@
static NSString *const kSETTINGSOUNDSWITCHBOOLUDKey = @"kSETTINGSOUNDSWITCHBOOLUDKey";
static NSString *const kSETTINGVIBRATESWITCHBOOLUDKey = @"kSETTINGVIBRATESWITCHBOOLUDKey";
//播放语音完成的回调
static void completionCallback(SystemSoundID mySSID) {
AudioServicesPlaySystemSound(mySSID);
......
......@@ -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;
......
......@@ -53,7 +53,7 @@
<string>Editor</string>
<key>CFBundleURLSchemes</key>
<array>
<string>fb382456482257502</string>
<string>fb948124033391771</string>
</array>
</dict>
<dict>
......@@ -70,11 +70,11 @@
<key>FacebookAdvertiserIDCollectionEnabled</key>
<true/>
<key>FacebookAppID</key>
<string>382456482257502</string>
<string>948124033391771</string>
<key>FacebookAutoLogAppEventsEnabled</key>
<true/>
<key>FacebookClientToken</key>
<string>045478b9202f7c4913ab5366eaf15f8a</string>
<string>0a161eeda8135dcd07ef3d46c7a9121c</string>
<key>FacebookDisplayName</key>
<string>FuSiLive</string>
<key>ITSAppUsesNonExemptEncryption</key>
......
......@@ -463,7 +463,6 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
}
break;
case FUSMyHeaderButtonTypeIntimacy:{
if (FUSConfig.sharedInstanced.devConfigs.appStatus) return;
[FUSRouter.chatRouter fus_enterFriendVC];
}
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment