Skip to content

pidan / FuSiLive

Go to a project
Commit 3532edba by pierce
Options

1、fixed google 登陆异常 

2、fixed 客服进不去的问题
parent 1a2914c2
Inline Side-by-side
Showing with 47 additions and 66 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/FUSSocialLogin/FUSThirdAccountLoginHelper.m
...@@ -168,7 +168,7 @@ NSString * const FUSSocializedIsSafariLoginKey = @"FUSSocializedIsSafariLoginKey ...@@ -168,7 +168,7 @@ NSString * const FUSSocializedIsSafariLoginKey = @"FUSSocializedIsSafariLoginKey
// Google 配置 // Google 配置
GIDSignIn *signIn = [GIDSignIn sharedInstance]; GIDSignIn *signIn = [GIDSignIn sharedInstance];
[signIn setDelegate:self]; [signIn setDelegate:self];
signIn.clientID = @"157728719754-5afchcmuccmng1j98tarln8kvsuo8i97.apps.googleusercontent.com"; signIn.clientID = @"157728719754-gr7kj1ks31ll54397jp79gc61q20opv2.apps.googleusercontent.com";
} }
/** /**
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/WebView/FUSWKWebViewController.m
...@@ -252,45 +252,45 @@ ...@@ -252,45 +252,45 @@
*/ */
- (void)fus_showTopLeftServiceBtn:(BOOL)needShow { - (void)fus_showTopLeftServiceBtn:(BOOL)needShow {
[self enableNavigationLeftBtns]; // [self enableNavigationLeftBtns];
if (needShow && !self.serviceBtn) { // if (needShow && !self.serviceBtn) {
//
if (!self.serviceBtn) { // if (!self.serviceBtn) {
// 客服按钮 // // 客服按钮
self.serviceBtn = [UIButton buttonWithType:UIButtonTypeCustom]; // self.serviceBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.serviceBtn.frame = CGRectMake(0, 0, 40, 40); // self.serviceBtn.frame = CGRectMake(0, 0, 40, 40);
[self.serviceBtn addTarget:self action:@selector(fus_enterServiceRoom) forControlEvents:UIControlEventTouchUpInside]; // [self.serviceBtn addTarget:self action:@selector(fus_enterServiceRoom) forControlEvents:UIControlEventTouchUpInside];
NSMutableArray *array = UIImage.fus_service; // NSMutableArray *array = UIImage.fus_service;
UIImage *image = [UIImage animatedImageWithImages:array duration:1]; // UIImage *image = [UIImage animatedImageWithImages:array duration:1];
[self.serviceBtn setImage:image forState:UIControlStateNormal]; // [self.serviceBtn setImage:image forState:UIControlStateNormal];
self.serviceBtn.imageEdgeInsets = UIEdgeInsetsMake(0, -10, 0, 10); // self.serviceBtn.imageEdgeInsets = UIEdgeInsetsMake(0, -10, 0, 10);
} // }
[self.serviceBtn removeFromSuperview]; // [self.serviceBtn removeFromSuperview];
[self.serviceBtn.superview removeFromSuperview]; // [self.serviceBtn.superview removeFromSuperview];
//
if (self.needHideWebTitleBar) { // if (self.needHideWebTitleBar) {
[self.view addSubview:self.serviceBtn]; // [self.view addSubview:self.serviceBtn];
self.serviceBtn.x = self.closeBtn.right + 16; // self.serviceBtn.x = self.closeBtn.right + 16;
self.serviceBtn.centerY = self.closeBtn.centerY; // self.serviceBtn.centerY = self.closeBtn.centerY;
} else { // } else {
UIBarButtonItem *serviceBarItem = [[UIBarButtonItem alloc] initWithCustomView:self.serviceBtn]; // UIBarButtonItem *serviceBarItem = [[UIBarButtonItem alloc] initWithCustomView:self.serviceBtn];
NSMutableArray<UIBarButtonItem *> *leftBarButtonItems = [NSMutableArray arrayWithArray:self.navigationItem.leftBarButtonItems]; // NSMutableArray<UIBarButtonItem *> *leftBarButtonItems = [NSMutableArray arrayWithArray:self.navigationItem.leftBarButtonItems];
[leftBarButtonItems addObject:serviceBarItem]; // [leftBarButtonItems addObject:serviceBarItem];
self.navigationItem.leftBarButtonItems = leftBarButtonItems; // self.navigationItem.leftBarButtonItems = leftBarButtonItems;
} // }
} else if (self.serviceBtn && !needShow) { // } else if (self.serviceBtn && !needShow) {
//
NSMutableArray<UIBarButtonItem *> *leftBarButtonItems = [NSMutableArray arrayWithArray:self.navigationItem.leftBarButtonItems]; // NSMutableArray<UIBarButtonItem *> *leftBarButtonItems = [NSMutableArray arrayWithArray:self.navigationItem.leftBarButtonItems];
for (UIBarButtonItem *item in leftBarButtonItems) { // for (UIBarButtonItem *item in leftBarButtonItems) {
if ([item.customView isEqual:self.serviceBtn]) { // if ([item.customView isEqual:self.serviceBtn]) {
[leftBarButtonItems removeObject:item]; // [leftBarButtonItems removeObject:item];
break; // break;
} // }
} // }
self.navigationItem.leftBarButtonItems = leftBarButtonItems; // self.navigationItem.leftBarButtonItems = leftBarButtonItems;
[self.serviceBtn removeFromSuperview]; // [self.serviceBtn removeFromSuperview];
self.serviceBtn = nil; // self.serviceBtn = nil;
} // }
} }
/** /**
......
FuSiLive/Info.plist
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<string>Editor</string> <string>Editor</string>
<key>CFBundleURLSchemes</key> <key>CFBundleURLSchemes</key>
<array> <array>
<string>com.googleusercontent.apps.157728719754-5afchcmuccmng1j98tarln8kvsuo8i97</string> <string>apps.googleusercontent.com.157728719754-gr7kj1ks31ll54397jp79gc61q20opv2</string>
</array> </array>
</dict> </dict>
<dict> <dict>
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Router/FUSChatCenterRouter.m
...@@ -371,32 +371,13 @@ ...@@ -371,32 +371,13 @@
if ([FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.model == 1) { if ([FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.model == 1) {
if (FUSConfig.sharedInstanced.devConfigs.appStatus) { FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:serviceUID face:facePath nikename:nikename];
serviceChat.isServiceAccount = YES;
FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:serviceUID face:facePath nikename:nikename]; if (![NSString isNull:welcomeStr]) {
serviceChat.isServiceAccount = YES; serviceChat.welcomeStr = welcomeStr;
if (![NSString isNull:welcomeStr]) {
serviceChat.welcomeStr = welcomeStr;
}
vc = serviceChat;
} else {
FUSWKWebViewController *webVC = [[FUSWKWebViewController alloc] init];
NSString *webURL = FUSCommonWebURLs.fus_help;
webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID];
vc = webVC;
[self fus_updateWebServicesReadStatus:serviceUID];
__weak typeof(self) weakSelf = self;
webVC.closeWebViewHandler = ^(NSInteger cidType) {
// 更新未读
[weakSelf fus_updateWebServicesReadStatus:serviceUID];
};
webVC.onClickBackHandle = ^{
// 更新未读
[weakSelf fus_updateWebServicesReadStatus:serviceUID];
};
} }
vc = serviceChat;
}else if ([FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.model == 2) { }else if ([FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.model == 2) {
FUSWKWebViewController *webVC = [[FUSWKWebViewController alloc] init]; FUSWKWebViewController *webVC = [[FUSWKWebViewController alloc] init];
......
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