Skip to content

pidan / FuSiLive

Go to a project
Commit dac30afc by ludi
Options

完成推特登录，准备搞line登录，需要将line的sdk替换成swift的

parent fb862b47
Inline Side-by-side
Showing with 254 additions and 65 deletions
DevelopmentPods/FUSCommon/FUSCommon/Assets/Asset.xcassets/Setting/socialPlat_line_dark.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "socialPlat_line_dark@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSCommon/FUSCommon/Assets/Asset.xcassets/Setting/socialPlat_line_light.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "socialPlat_line_light@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSCommon/FUSCommon/Assets/Asset.xcassets/Setting/socialPlat_twitter_dark.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "socialPlat_twitter_dark@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSCommon/FUSCommon/Assets/Asset.xcassets/Setting/socialPlat_twitter_light.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "socialPlat_twitter_light@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSCommon/FUSCommon/Classes/FUSAPPConfigs/FUSFuSiWebViewEventHelper.m
......@@ -182,14 +182,11 @@ NSString * const kEVENT_RECHARGE_FIRST_RECHARGE_WINDOW_RECEIVE_OFFICIAL_RECAHARG
return ;
}
if ([webView isKindOfClass:[FUSWKWebView class]]) {
FUSWKWebView *tempWebView = webView;
if (tempWebView.decidePolicyHandler != nil) {
WKNavigationActionPolicy *policy = tempWebView.decidePolicyHandler(webView, navigationAction);
if (self.webview.decidePolicyHandler != nil) {
WKNavigationActionPolicy *policy = self.webview.decidePolicyHandler(self.webview, navigationAction);
decisionHandler(policy);
return;
}
}
decisionHandler(WKNavigationActionPolicyAllow);
}
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/FUSSocialLogin/FUSThirdAccountLoginHelper.m
......@@ -140,7 +140,7 @@ NSString * const FUSSocializedIsSafariLoginKey = @"FUSSocializedIsSafariLoginKey
- (void)fus_setupAbroadSocializedHelperWithApplication:(UIApplication *)application
Options:(NSDictionary *)options
{
dispatch_async(dispatch_get_global_queue(0, 0), ^{
// dispatch_async(dispatch_get_global_queue(0, 0), ^{
// 配置 google
[self setupGoogle];
......@@ -148,11 +148,11 @@ NSString * const FUSSocializedIsSafariLoginKey = @"FUSSocializedIsSafariLoginKey
[self setupFacebookWithApplication:application
Options:options];
// 配置 Twitter
// [self setupTwitter];
[self setupTwitter];
// 配置 line
// [self setupLine];
});
[self setupLine];
// });
}
/**
......@@ -187,7 +187,11 @@ NSString * const FUSSocializedIsSafariLoginKey = @"FUSSocializedIsSafariLoginKey
*/
- (void)setupTwitter
{
[[Twitter sharedInstance] startWithConsumerKey:FUSConfig.sharedInstanced.sdkConfigs.twitterKey consumerSecret:FUSConfig.sharedInstanced.sdkConfigs.twitterSecret];
// [[Twitter sharedInstance] startWithConsumerKey:FUSConfig.sharedInstanced.sdkConfigs.twitterKey consumerSecret:FUSConfig.sharedInstanced.sdkConfigs.twitterSecret];
dispatch_async(dispatch_get_main_queue(), ^{
[[TWTRTwitter sharedInstance] startWithConsumerKey:FUSConfig.sharedInstanced.sdkConfigs.twitterKey consumerSecret:FUSConfig.sharedInstanced.sdkConfigs.twitterSecret];
});
}
- (FBSDKLoginManager *)fbLoginManager{
......@@ -365,17 +369,28 @@ NSString * const FUSSocializedIsSafariLoginKey = @"FUSSocializedIsSafariLoginKey
} else {
[FUSTwitterLoginHelper fus_loginWithSucceed:^(NSString * _Nonnull token, NSString * _Nonnull secrect, NSString * _Nonnull userId, NSString * _Nonnull userName) {
[[TWTRTwitter sharedInstance].sessionStore saveSession:[FUSTwitterLoginHelper shared].oauthToken completion:^(id<TWTRAuthSession> _Nullable session, NSError * _Nullable error) {
[[TWTRTwitter sharedInstance].sessionStore saveSessionWithAuthToken:[FUSTwitterLoginHelper shared].oauthToken authTokenSecret:FUSConfig.sharedInstanced.sdkConfigs.twitterSecret completion:^(id<TWTRAuthSession> _Nullable session, NSError * _Nullable error) {
}];
[self fus_fetchTwitterUserInfoDictWithCompletion:^(NSDictionary *userDic) {
NSMutableDictionary *infoDict = [NSMutableDictionary dictionaryWithDictionary:userDic];
NSMutableDictionary *infoDict = [NSMutableDictionary dictionary];
if (userId) [infoDict setObject:userId forKey:FUSSocializedFetchOpenIdKey];
[infoDict setObject:@"" forKey:FUSSocializedFetchFacepathKey];
if (userName) [infoDict setObject:userName forKey:FUSSocializedFetchNikeNameKey];
[infoDict setObject:@"1" forKey:FUSSocializedFetchSexKey];
[infoDict setObject:@"5" forKey:FUSSocializedFetchOpenTypeKey];
if (token) [infoDict setObject:token forKey:FUSSocializedFetchIDTokenKey];
if (secrect) [infoDict setObject:secrect forKey:FUSSocializedFetchTokenSecretKey];
if (userId) [infoDict setObject:userId forKey:FUSSocializedFetchOpenIdKey];
if (self.loginSuccess) self.loginSuccess(infoDict);
}];
// [self fus_fetchTwitterUserInfoDictWithCompletion:^(NSDictionary *userDic) {
// NSMutableDictionary *infoDict = [NSMutableDictionary dictionaryWithDictionary:userDic];
// if (token) [infoDict setObject:token forKey:FUSSocializedFetchIDTokenKey];
// if (secrect) [infoDict setObject:secrect forKey:FUSSocializedFetchTokenSecretKey];
// if (userId) [infoDict setObject:userId forKey:FUSSocializedFetchOpenIdKey];
// if (self.loginSuccess) self.loginSuccess(infoDict);
// }];
} failed:^(NSError * _Nonnull error) {
if (failure) failure(error);
......@@ -615,10 +630,10 @@ NSString * const FUSSocializedIsSafariLoginKey = @"FUSSocializedIsSafariLoginKey
[ShareSDK cancelAuthorize:SSDKPlatformTypeWechat result:nil];
//TODO:暂时没有twitter 登录: added By Pidan
// // twitter
// if (![NSString isNull:[TWTRAPIClient clientWithCurrentUser].userID]) {
// [[[TWTRTwitter sharedInstance] sessionStore] logOutUserID:[TWTRAPIClient clientWithCurrentUser].userID];
// }
// twitter
if (![NSString isNull:[TWTRAPIClient clientWithCurrentUser].userID]) {
[[[TWTRTwitter sharedInstance] sessionStore] logOutUserID:[TWTRAPIClient clientWithCurrentUser].userID];
}
//TODO:暂时没有Line 登录: added By Pidan
// LineSDKConfiguration *confg = [LineSDKConfiguration defaultConfig];
// [[[LineSDKAPI alloc] initWithConfiguration:confg] logoutWithCompletion:^(BOOL success, NSError * _Nullable error) {
......@@ -725,7 +740,8 @@ NSString * const FUSSocializedIsSafariLoginKey = @"FUSSocializedIsSafariLoginKey
break;
case FUSSocializedPlatformTwitter:
{
return [[Twitter sharedInstance] application:application openURL:url options:options];
// return [[Twitter sharedInstance] application:application openURL:url options:options];
return [[TWTRTwitter sharedInstance] application:application openURL:url options:options];
}
break;
case FUSSocializedPlatformFacebook:
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/FormatContent/FUSFormatContentHelper.h
......@@ -31,6 +31,16 @@ NS_ASSUME_NONNULL_BEGIN
font:(UIFont *)font
levelImageSize:(CGSize)levelSize;
/// 根据给定的html字符串转化为富文本
/// @param htmlString 字符串
/// @param font 转换字体，默认为系统字体14号
/// @param defaultColor 默认颜色
/// @param imageSize 转换中的等级图标大小，传 CGSizeZero 则使用默认值
+ (NSMutableAttributedString *)fus_createContentAttributedStringWithHTMLString:(NSString *)htmlString
font:(UIFont *)font
defaultColor:(UIColor *)defaultColor
imageSize:(CGSize)imageSize;
/// 获取dictionary里面的HTML Content字段，如果有多语言的文案，则匹配多语言的文案
+ (NSString *)fus_getContentFromDict:(NSDictionary *)dict;
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/FormatContent/FUSFormatContentHelper.m
......@@ -225,6 +225,32 @@
return [[NSMutableAttributedString alloc] initWithAttributedString:attr];
}
+ (NSMutableAttributedString *)fus_createContentAttributedStringWithHTMLString:(NSString *)htmlString font:(UIFont *)font defaultColor:(UIColor *)defaultColor imageSize:(CGSize)imageSize{
if (![NSString isNullWithString:htmlString]) {
// 替换针对版本性的东西
NSString *languageContentString = htmlString;
NSDictionary *dataTemplateDict = [FUSFormatContentHelper sharedInstance].settingDataTemplateGetList;
if (dataTemplateDict != nil && dataTemplateDict.allKeys.count > 0) {
for (NSString *dataTemplateKey in dataTemplateDict.allKeys) {
if ([dataTemplateDict[dataTemplateKey] isKindOfClass:[NSString class]]) {
if ([languageContentString rangeOfString:dataTemplateKey].location != NSNotFound) {
NSString *tempValue = dataTemplateDict[dataTemplateKey];
if (tempValue.length > 0) {
languageContentString = [languageContentString stringByReplacingOccurrencesOfString:dataTemplateKey withString:[NSString stringWithFormat:@"\"%@\"",dataTemplateDict[dataTemplateKey]]];
}
}
}
}
}
NSMutableAttributedString *attr = [NSMutableAttributedString fus_attributeStringWithHTMLString:languageContentString baseColor:[defaultColor hexString] font:font imgHeight:imageSize.height imgWidth:imageSize.width];
return attr;
}
return [[NSMutableAttributedString alloc] initWithString:@""];
}
// 根据 string 创建一个可变的可变富文本
+ (NSMutableAttributedString *)fus_createAttributedStringForString:(NSString *)string font:(UIFont *)font
{
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/ThirdParty/TwitterHelper/FUSTwitterLoginHelper.swift
......@@ -16,7 +16,7 @@ struct FUSTwitterConfig {
@objcMembers public class FUSTwitterLoginHelper: NSObject {
var client = TwitterAPIClient(consumerKey: FUSConfig.sharedInstanced().sdkConfigs.twitterKey, consumerSecret: FUSConfig.sharedInstanced().sdkConfigs.twitterSecret, oauthToken: "", oauthTokenSecret: "")
public var client = TwitterAPIClient(consumerKey: FUSConfig.sharedInstanced().sdkConfigs.twitterKey, consumerSecret: FUSConfig.sharedInstanced().sdkConfigs.twitterSecret, oauthToken: "", oauthTokenSecret: "")
private var p_oauthToken:String? = nil
public var oauthToken:String {
......@@ -70,14 +70,14 @@ struct FUSTwitterConfig {
let tokenSecret = tokenSecretComponents[1]
FUSLog.info("Token: \(token), Token Secret: \(tokenSecret)")
// DispatchQueue.main.async {
DispatchQueue.main.async {
// 加载 Twitter 登录页面
let oauthTokenurl = FUSTwitterLoginHelper.shared.client.auth.makeOAuthAuthorizeURL(.init(oauthToken: token))?.absoluteString ?? FUSTwitterConfig.authorizationEndpoint + "?oauth_token=\(token)"
let webVC = FUSWKWebViewController()
webVC.webView.clearCache = false
webVC.webView.shouldIncludeIdentifyInfo = false
webVC.webView.decidePolicyHandler = { webView, navigationAction in
webVC.webView?.clearCache = false
webVC.webView?.shouldIncludeIdentifyInfo = false
webVC.webView?.decidePolicyHandler = { webView, navigationAction in
if let url = navigationAction.request.url {
FUSLog.info("pidan web x login:\(url)")
......@@ -100,7 +100,7 @@ struct FUSTwitterConfig {
webVC.webUrlString = oauthTokenurl
UIViewController.fus_top()?.navigationController?.pushViewController(webVC, animated: true)
// }
}
return
}
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/WebView/FUSWKWebViewController.m
......@@ -48,6 +48,7 @@
self.clearCache = YES;
self.isCloseBtnHidden = NO;
_webView = [[FUSWKWebView alloc] init];
}
return self;
}
......@@ -102,7 +103,8 @@
#pragma mark - 初始化参数
- (void)initUI{
_webView = [[FUSWKWebView alloc] initWithFrame:self.view.bounds];
// _webView = [[FUSWKWebView alloc] initWithFrame:self.view.bounds];
self.webView.frame = self.view.bounds;
__weak typeof(self) weakSelf = self;
_webView.webTitleDidChangedHandler = ^(NSString * _Nonnull title) {
weakSelf.title = title;
......
FuSiLive.xcodeproj/project.pbxproj
......@@ -292,7 +292,8 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if [ \"${CONFIGURATION}\" = \"Debug\" ]; then\n # 获取当前Build版本号并自增\n buildNumber=$((CURRENT_PROJECT_VERSION + 1))\n # 更新项目设置中的版本号变量\n /usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $buildNumber\" \"${PROJECT_DIR}/${INFOPLIST_FILE}\"\n # 同步到项目配置文件（确保后续构建使用新值）\n agvtool new-version -all $buildNumber >/dev/null 2>&1\nfi\n";
shellScript = "
";
};
E4508BFDD31A448835C4240A /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
......@@ -484,7 +485,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2025040140;
CURRENT_PROJECT_VERSION = 20250402113529;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO;
......@@ -752,7 +753,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2025040140;
CURRENT_PROJECT_VERSION = 20250402113529;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO;
......
FuSiLive/Info.plist
......@@ -74,7 +74,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>2025040140</string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>FacebookAdvertiserIDCollectionEnabled</key>
<true/>
<key>FacebookAppID</key>
......
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -7,12 +7,12 @@
<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>76</integer>
<integer>74</integer>
</dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>74</integer>
<integer>73</integer>
</dict>
</dict>
</dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -7,12 +7,12 @@
<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>77</integer>
<integer>76</integer>
</dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>73</integer>
<integer>77</integer>
</dict>
</dict>
</dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteRewardMyClansmanCell.swift
......@@ -114,6 +114,7 @@ class FUSInviteRewardMyClansmanCell: UITableViewCell {
func fus_setup(_ model: FUSInviteDataMyselfDauGetListDataModel, indexPath: IndexPath, maxRowCount: Int) {
self.nickNameLabel.text = model.uidNickName
self.nickNameLabel.textColor = .fus_textColorMedium()
if model.isVip == 1 {
self.avatarView.fus_setupIcon(withFacePath: model.uidFace, level: model.vipLevel)
......@@ -126,9 +127,15 @@ class FUSInviteRewardMyClansmanCell: UITableViewCell {
}
}else {
// 如果服务器配置了0级，则使用0级的颜色
let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level: 0)
if let color = levelmodel?.color,
color.count > 0{
self.nickNameLabel.textColor = .init(hexString: color)
}
self.avatarView.fus_setupIcon(withFacePath: model.uidFace, level:0)
self.vipLevelImageView.isHidden = true
self.nickNameLabel.textColor = .fus_textColorMedium()
self.nickNameLabel.snp.updateConstraints { make in
make.left.equalToSuperview().offset(2)
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteRewardMyHeaderCell.swift
......@@ -188,6 +188,7 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell {
func fus_setup(model: FUSInviteDataMyselfGetInfoModel) {
self.nickNameLabel.text = model.agentFactor.userInfo.userNick
self.nickNameLabel.textColor = .fus_textColorMedium()
if model.agentFactor.userInfo.userIsVip == 1 {
self.avatarView.fus_setupIcon(withFacePath: model.agentFactor.userInfo.userFace, level: model.agentFactor.userInfo.userLevel)
......@@ -200,9 +201,13 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell {
}
}else {
let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level:0)
self.avatarView.fus_setupIcon(withFacePath: model.agentFactor.userInfo.userFace, level:0)
self.vipLevelImageView.isHidden = true
self.nickNameLabel.textColor = .white
if let nickNameColor = levelmodel?.color,
isValidString(nickNameColor) == false{
self.nickNameLabel.textColor = .init(hexString: nickNameColor)
}
self.nickNameLabel.snp.updateConstraints { make in
make.left.equalToSuperview().offset(2)
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteRewardTaskCommonCell.swift
......@@ -232,11 +232,7 @@ extension FUSInviteDataAwardGetListDataModel {
public func fus_getTitleAttr() -> NSAttributedString? {
let titleFormatContentModel = FUSFormatContentModel()
titleFormatContentModel.languageContent = self.title
let attr2 = FUSFormatContentHelper.fus_createContentAttributedString(with: titleFormatContentModel, font: .fus_themeMediumFont(15), levelImageSize: CGSizeMake(24, 24))
return attr2
return FUSFormatContentHelper.fus_createContentAttributedString(withHTMLString: self.title, font: .fus_themeMediumFont(15), defaultColor: .fus_textColorDeep(), imageSize: CGSizeMake(24, 24))
}
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Model/FUSInviteDataIndexGetInfoModel.m
......@@ -15,10 +15,7 @@
defaultFont = font;
}
FUSFormatContentModel *contentModel = [[FUSFormatContentModel alloc] init];
contentModel.languageContent = content;
NSMutableAttributedString *attr1 = [FUSFormatContentHelper fus_createContentAttributedStringWithModel:contentModel font:defaultFont levelImageSize:CGSizeMake(24, 24)];
NSMutableAttributedString *attr1 = [FUSFormatContentHelper fus_createContentAttributedStringWithHTMLString:content font:defaultFont defaultColor:[UIColor fus_textColorRich] imageSize:CGSizeMake(24, 24)];
if (isCenter) {
NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
paragraphStyle.alignment = NSTextAlignmentCenter;
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Model/FUSInviteDataMyselfGetInfoModel.m
......@@ -28,12 +28,7 @@
- (NSAttributedString *)fus_getContentAttr{
FUSFormatContentModel *contentModel = [[FUSFormatContentModel alloc] init];
contentModel.languageContent = self.name;
NSMutableAttributedString *attr1 = [FUSFormatContentHelper fus_createContentAttributedStringWithModel:contentModel font:[UIFont fus_themeFont:13] levelImageSize:CGSizeMake(24, 24)];
return attr1;
return [FUSFormatContentHelper fus_createContentAttributedStringWithHTMLString:self.name font:[UIFont fus_themeFont:13] defaultColor:[UIColor fus_textColorRich] imageSize:CGSizeMake(24, 24)];
}
@end
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Login/Controller/FUSStartPageViewController.m
......@@ -22,7 +22,6 @@
#import "FUSDataStatisticsManager.h"
#import <FirebaseAnalytics/FirebaseAnalytics.h>
#import <LineSDK/LineSDK.h>
//#import <GTSDK/GeTuiSdk.h>
#import "FUSSocketDelegate.h"
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/Other/FUSSettingHttpRequest.m
......@@ -111,7 +111,7 @@
/**
* 获取第三方账号信息
* 获取第三方账号信息 账户类型（1：QQ 2：微信 3：微博 4：Google 5：Twitter 6：FaceBook 7：YaboID或手机号码 8：lina ）
*
* @param success 成功回调
* @param failure 失败回调
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/SocialBind/FUSSocialBindSettingViewController.m
......@@ -39,6 +39,8 @@
@property (nonatomic, strong) FUSCustomSettingItem *googleItem;
@property (nonatomic, strong) FUSCustomSettingItem *appleItem;
@property (nonatomic, strong) FUSCustomSettingItem *phoneItem;
@property (nonatomic, strong) FUSCustomSettingItem *twitterItem;
@property (nonatomic, strong) FUSCustomSettingItem *lineItem;
// 第三方绑定中
@property (nonatomic, assign) BOOL isBindingThirdCount;
......@@ -194,7 +196,29 @@
[weakSelf fus_doBindingThirdPartyWithIndex:5];
};
group.items = @[self.facebookItem, self.googleItem, self.appleItem, self.phoneItem];
self.twitterItem = [FUSCustomSettingItem fus_itemWithTitle:@"X" type:CustomSettingItemTypeShowTextAndArrow];
self.twitterItem.titleColor = [UIColor fus_textColorRich];
self.twitterItem.rightShowTextFont = [UIFont fus_themeFont:13];
self.twitterItem.rightShowTextColor = [UIColor colorWithHex:@"717171"];
self.twitterItem.showSeparatorLine = YES;
self.twitterItem.rightShowText = [NSString fus_localString:@"未绑定"];
self.twitterItem.icon = @"socialPlat_twitter_dark";
self.twitterItem.itemClick = ^(FUSCustomSettingItem *item) {
[weakSelf fus_doBindingThirdPartyWithIndex:2];
};
self.lineItem = [FUSCustomSettingItem fus_itemWithTitle:@"Line" type:CustomSettingItemTypeShowTextAndArrow];
self.lineItem.titleColor = [UIColor fus_textColorRich];
self.lineItem.rightShowTextFont = [UIFont fus_themeFont:13];
self.lineItem.rightShowTextColor = [UIColor colorWithHex:@"717171"];
self.lineItem.showSeparatorLine = YES;
self.lineItem.rightShowText = [NSString fus_localString:@"未绑定"];
self.lineItem.icon = @"socialPlat_line_dark";
self.lineItem.itemClick = ^(FUSCustomSettingItem *item) {
[weakSelf fus_doBindingThirdPartyWithIndex:3];
};
group.items = @[self.facebookItem, self.googleItem, self.appleItem, self.phoneItem, self.twitterItem];
[self.tableView.allGroups appendObject:group];
[self fus_updateSoicials];
......@@ -231,6 +255,16 @@
self.appleItem.icon = @"socialPlat_apple_light";
}
break;
case 5: // twitter
{
self.twitterItem.rightShowText = [NSString fus_localString:@"已绑定"];
self.twitterItem.icon = @"socialPlat_twitter_light";
}
case 8:
{
self.lineItem.rightShowText = [NSString fus_localString:@"已绑定"];
self.lineItem.icon = @"socialPlat_line_light";
}
default:
break;
}
......@@ -260,26 +294,46 @@
}];
}
break;
// case 2: // Twitter
// {
// [FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_SETTING_BINDACOUNT_TWITTER];
case 2: // Twitter
{
[FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_SETTING_BINDACOUNT_TWITTER];
// [[FUSThirdAccountLoginHelper sharedInstanse] fus_loginWithPlatform:FUSSocializedPlatformTwitter facebookFromWeb:NO success:^(NSDictionary *thirdInfoDict) {
// [weakSelf fus_requestServerToBindThirdPlatForm:thirdInfoDict];
// } failure:^(NSError *error) {
// weakSelf.isBindingThirdCount = NO;
// }];
// }
// break;
// case 3: // Line
// {
// [FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_SETTING_BINDACOUNT_LINE];
[FUSLoadingView fus_showProgressViewWithMessage:@""];
[[FUSThirdAccountLoginHelper sharedInstanse] fus_loginWithPlatform:FUSSocializedPlatformTwitter facebookFromWeb:NO viewController:self loadingFinish:^{
} success:^(NSDictionary *infoDict) {
[FUSLoadingView fus_dismissProgressView];
[weakSelf fus_requestServerToBindThirdPlatForm:infoDict];
} failure:^(NSError *error) {
[FUSLoadingView fus_dismissProgressView];
weakSelf.isBindingThirdCount = NO;
}];
}
break;
case 3: // Line
{
[FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_SETTING_BINDACOUNT_LINE];
// [[FUSThirdAccountLoginHelper sharedInstanse] fus_loginWithPlatform:FUSSocializedPlatformLine facebookFromWeb:YES success:^(NSDictionary *thirdInfoDict) {
// [weakSelf fus_requestServerToBindThirdPlatForm:thirdInfoDict];
// } failure:^(NSError *error) {
// weakSelf.isBindingThirdCount = NO;
// }];
// }
// break;
[FUSLoadingView fus_showProgressViewWithMessage:@""];
[[FUSThirdAccountLoginHelper sharedInstanse] fus_loginWithPlatform:FUSSocializedPlatformLine facebookFromWeb:YES viewController:self loadingFinish:^{
} success:^(NSDictionary *infoDict) {
[FUSLoadingView fus_dismissProgressView];
[weakSelf fus_requestServerToBindThirdPlatForm:infoDict];
} failure:^(NSError *error) {
[FUSLoadingView fus_dismissProgressView];
weakSelf.isBindingThirdCount = NO;
}];
}
break;
// case 4: // 微信
// {
// [FUSTalkingData fus_trackEvent:FUSUserEventTrackParams.fus_EVENT_ME_SETTING_BINDACOUNT_WECHAT];
......
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