Skip to content

Commit 637a0ce

Browse files
wanghenghengwanghengheng
committed
UMengSocial 转 UMengUShare 的一些。。处理
1 parent 90e238e commit 637a0ce

62 files changed

Lines changed: 58 additions & 2053 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Coding_iOS.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -673,9 +673,6 @@
673673
4EB52F611C7C5C4F00B5EBEA /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4EB52F591C7C5C4F00B5EBEA /* [email protected] */; };
674674
4EB52F621C7C5C4F00B5EBEA /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4EB52F5A1C7C5C4F00B5EBEA /* [email protected] */; };
675675
4EB52F631C7C5C4F00B5EBEA /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4EB52F5B1C7C5C4F00B5EBEA /* [email protected] */; };
676-
4EB5A9421BF1DB4600C23AC3 /* libSocialSinaSSO.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EB5A9341BF1DB4600C23AC3 /* libSocialSinaSSO.a */; };
677-
4EB5A9431BF1DB4600C23AC3 /* libWeiboSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EB5A9351BF1DB4600C23AC3 /* libWeiboSDK.a */; };
678-
4EB5A9441BF1DB4600C23AC3 /* WeiboSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 4EB5A93F1BF1DB4600C23AC3 /* WeiboSDK.bundle */; };
679676
4EB862AD1CABB21E008074D1 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4EB862AC1CABB21E008074D1 /* [email protected] */; };
680677
4EBB624C1A6F526C0045DAEF /* NJKWebViewProgress.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EBB62491A6F526C0045DAEF /* NJKWebViewProgress.m */; };
681678
4EBB624D1A6F526C0045DAEF /* NJKWebViewProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EBB624B1A6F526C0045DAEF /* NJKWebViewProgressView.m */; };
@@ -1184,6 +1181,7 @@
11841181
927AFF531BFF6DAD00AAE593 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 927AFF4B1BFF6DAD00AAE593 /* [email protected] */; };
11851182
927AFF581BFF755200AAE593 /* ExchangeGoodsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 927AFF571BFF755200AAE593 /* ExchangeGoodsViewController.m */; };
11861183
927AFF5B1BFF772A00AAE593 /* ShopOrderTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 927AFF5A1BFF772A00AAE593 /* ShopOrderTextFieldCell.m */; };
1184+
B12B63F61FE8A77200ACFDCC /* WeiboSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B12B63F51FE8A77200ACFDCC /* WeiboSDK.bundle */; };
11871185
B14689B41EE100B200B01371 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = B14689A41EE100B200B01371 /* [email protected] */; };
11881186
B14689B51EE100B200B01371 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = B14689A51EE100B200B01371 /* [email protected] */; };
11891187
B14689B61EE100B200B01371 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = B14689A61EE100B200B01371 /* [email protected] */; };
@@ -2382,20 +2380,6 @@
23822380
4EB52F591C7C5C4F00B5EBEA /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
23832381
4EB52F5A1C7C5C4F00B5EBEA /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
23842382
4EB52F5B1C7C5C4F00B5EBEA /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
2385-
4EB5A9341BF1DB4600C23AC3 /* libSocialSinaSSO.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libSocialSinaSSO.a; sourceTree = "<group>"; };
2386-
4EB5A9351BF1DB4600C23AC3 /* libWeiboSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWeiboSDK.a; sourceTree = "<group>"; };
2387-
4EB5A9361BF1DB4600C23AC3 /* UMSocialSinaSSOHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UMSocialSinaSSOHandler.h; sourceTree = "<group>"; };
2388-
4EB5A9371BF1DB4600C23AC3 /* WBHttpRequest+WeiboGame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WBHttpRequest+WeiboGame.h"; sourceTree = "<group>"; };
2389-
4EB5A9381BF1DB4600C23AC3 /* WBHttpRequest+WeiboShare.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WBHttpRequest+WeiboShare.h"; sourceTree = "<group>"; };
2390-
4EB5A9391BF1DB4600C23AC3 /* WBHttpRequest+WeiboToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WBHttpRequest+WeiboToken.h"; sourceTree = "<group>"; };
2391-
4EB5A93A1BF1DB4600C23AC3 /* WBHttpRequest+WeiboUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WBHttpRequest+WeiboUser.h"; sourceTree = "<group>"; };
2392-
4EB5A93B1BF1DB4600C23AC3 /* WBHttpRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WBHttpRequest.h; sourceTree = "<group>"; };
2393-
4EB5A93C1BF1DB4600C23AC3 /* WBSDKBasicButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WBSDKBasicButton.h; sourceTree = "<group>"; };
2394-
4EB5A93D1BF1DB4600C23AC3 /* WBSDKCommentButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WBSDKCommentButton.h; sourceTree = "<group>"; };
2395-
4EB5A93E1BF1DB4600C23AC3 /* WBSDKRelationshipButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WBSDKRelationshipButton.h; sourceTree = "<group>"; };
2396-
4EB5A93F1BF1DB4600C23AC3 /* WeiboSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = WeiboSDK.bundle; sourceTree = "<group>"; };
2397-
4EB5A9401BF1DB4600C23AC3 /* WeiboSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeiboSDK.h; sourceTree = "<group>"; };
2398-
4EB5A9411BF1DB4600C23AC3 /* WeiboUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeiboUser.h; sourceTree = "<group>"; };
23992383
4EB862AC1CABB21E008074D1 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
24002384
4EBB62481A6F526C0045DAEF /* NJKWebViewProgress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NJKWebViewProgress.h; sourceTree = "<group>"; };
24012385
4EBB62491A6F526C0045DAEF /* NJKWebViewProgress.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NJKWebViewProgress.m; sourceTree = "<group>"; };
@@ -3170,6 +3154,7 @@
31703154
927AFF571BFF755200AAE593 /* ExchangeGoodsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ExchangeGoodsViewController.m; sourceTree = "<group>"; };
31713155
927AFF591BFF772A00AAE593 /* ShopOrderTextFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopOrderTextFieldCell.h; sourceTree = "<group>"; };
31723156
927AFF5A1BFF772A00AAE593 /* ShopOrderTextFieldCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopOrderTextFieldCell.m; sourceTree = "<group>"; };
3157+
B12B63F51FE8A77200ACFDCC /* WeiboSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = WeiboSDK.bundle; sourceTree = "<group>"; };
31733158
B14689A41EE100B200B01371 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
31743159
B14689A51EE100B200B01371 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
31753160
B14689A61EE100B200B01371 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
@@ -3439,9 +3424,7 @@
34393424
4EDD8F541A36F4AC00E9E232 /* CFNetwork.framework in Frameworks */,
34403425
4E96E7C81A1B46740037C098 /* QuickLook.framework in Frameworks */,
34413426
8E03D4A419F696970092F8C8 /* libz.dylib in Frameworks */,
3442-
4EB5A9431BF1DB4600C23AC3 /* libWeiboSDK.a in Frameworks */,
34433427
8EF5E74519C68CC7009346D5 /* libicucore.dylib in Frameworks */,
3444-
4EB5A9421BF1DB4600C23AC3 /* libSocialSinaSSO.a in Frameworks */,
34453428
4EDD8F511A36F42200E9E232 /* libXG-SDK.a in Frameworks */,
34463429
7EB02FE81B6D0F3E00D2166C /* libopencore-amrnb.a in Frameworks */,
34473430
8E61D27B19C028CC00C00414 /* AssetsLibrary.framework in Frameworks */,
@@ -4645,27 +4628,6 @@
46454628
path = task_resource_reference;
46464629
sourceTree = "<group>";
46474630
};
4648-
4EB5A9331BF1DB4600C23AC3 /* SinaSSO */ = {
4649-
isa = PBXGroup;
4650-
children = (
4651-
4EB5A9341BF1DB4600C23AC3 /* libSocialSinaSSO.a */,
4652-
4EB5A9351BF1DB4600C23AC3 /* libWeiboSDK.a */,
4653-
4EB5A9361BF1DB4600C23AC3 /* UMSocialSinaSSOHandler.h */,
4654-
4EB5A9371BF1DB4600C23AC3 /* WBHttpRequest+WeiboGame.h */,
4655-
4EB5A9381BF1DB4600C23AC3 /* WBHttpRequest+WeiboShare.h */,
4656-
4EB5A9391BF1DB4600C23AC3 /* WBHttpRequest+WeiboToken.h */,
4657-
4EB5A93A1BF1DB4600C23AC3 /* WBHttpRequest+WeiboUser.h */,
4658-
4EB5A93B1BF1DB4600C23AC3 /* WBHttpRequest.h */,
4659-
4EB5A93C1BF1DB4600C23AC3 /* WBSDKBasicButton.h */,
4660-
4EB5A93D1BF1DB4600C23AC3 /* WBSDKCommentButton.h */,
4661-
4EB5A93E1BF1DB4600C23AC3 /* WBSDKRelationshipButton.h */,
4662-
4EB5A93F1BF1DB4600C23AC3 /* WeiboSDK.bundle */,
4663-
4EB5A9401BF1DB4600C23AC3 /* WeiboSDK.h */,
4664-
4EB5A9411BF1DB4600C23AC3 /* WeiboUser.h */,
4665-
);
4666-
path = SinaSSO;
4667-
sourceTree = "<group>";
4668-
};
46694631
4EBB62471A6F526C0045DAEF /* NJKWebViewProgress */ = {
46704632
isa = PBXGroup;
46714633
children = (
@@ -4871,14 +4833,6 @@
48714833
path = TableListView;
48724834
sourceTree = "<group>";
48734835
};
4874-
4EE956521B9C1C500009EDA9 /* UMSocial_Sdk_4.3.0_Extra */ = {
4875-
isa = PBXGroup;
4876-
children = (
4877-
4EB5A9331BF1DB4600C23AC3 /* SinaSSO */,
4878-
);
4879-
path = UMSocial_Sdk_4.3.0_Extra;
4880-
sourceTree = "<group>";
4881-
};
48824836
4EF17E761B3BF320003CDD2D /* introduction */ = {
48834837
isa = PBXGroup;
48844838
children = (
@@ -6061,10 +6015,10 @@
60616015
8EA6D03E19E240C40076D59C /* Vendor */ = {
60626016
isa = PBXGroup;
60636017
children = (
6018+
B12B63F41FE8A77200ACFDCC /* SinaSDK */,
60646019
B19D4EF81F7247BA00C598F3 /* AlipaySDK */,
60656020
D031F5D81BFAD6690008E964 /* FRDLivelyButton */,
60666021
4E5D12FB1C0C5EE600985AEB /* RRFPSBar */,
6067-
4EE956521B9C1C500009EDA9 /* UMSocial_Sdk_4.3.0_Extra */,
60686022
4E93F2301B84243D00017916 /* KxMenu */,
60696023
4E0022971B735075005308DE /* EAIntroView */,
60706024
4E0022931B73506A005308DE /* EARestrictedScrollView */,
@@ -6515,6 +6469,14 @@
65156469
path = shop;
65166470
sourceTree = "<group>";
65176471
};
6472+
B12B63F41FE8A77200ACFDCC /* SinaSDK */ = {
6473+
isa = PBXGroup;
6474+
children = (
6475+
B12B63F51FE8A77200ACFDCC /* WeiboSDK.bundle */,
6476+
);
6477+
path = SinaSDK;
6478+
sourceTree = "<group>";
6479+
};
65186480
B14689A31EE100B200B01371 /* vip */ = {
65196481
isa = PBXGroup;
65206482
children = (
@@ -6983,6 +6945,7 @@
69836945
4E6383AD1B3262D300D98648 /* [email protected] in Resources */,
69846946
8E97CEA91A0C7E26006F9AD7 /* [email protected] in Resources */,
69856947
4ED4B4861D82646100EED8C6 /* [email protected] in Resources */,
6948+
B12B63F61FE8A77200ACFDCC /* WeiboSDK.bundle in Resources */,
69866949
B1BCB8901FCE61D60098B87B /* EAPayViewController.xib in Resources */,
69876950
B1C871801EB18599003DACF0 /* [email protected] in Resources */,
69886951
4ED4B4871D82646100EED8C6 /* [email protected] in Resources */,
@@ -7404,7 +7367,6 @@
74047367
B1C8716A1EB182C7003DACF0 /* [email protected] in Resources */,
74057368
4E9423DA1E69401B0095F1CD /* [email protected] in Resources */,
74067369
8E97CEB81A0C7E26006F9AD7 /* [email protected] in Resources */,
7407-
4EB5A9441BF1DB4600C23AC3 /* WeiboSDK.bundle in Resources */,
74087370
8E97CEAE1A0C7E26006F9AD7 /* [email protected] in Resources */,
74097371
4E6383E11B32676600D98648 /* [email protected] in Resources */,
74107372
8EA6D19D19E240C40076D59C /* [email protected] in Resources */,
@@ -7520,19 +7482,6 @@
75207482
inputPaths = (
75217483
"${SRCROOT}/Pods/Target Support Files/Pods-Coding_iOS/Pods-Coding_iOS-resources.sh",
75227484
"${PODS_ROOT}/FontAwesome+iOS/Resources/FontAwesome.ttf",
7523-
"${PODS_ROOT}/UMengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/UMSocialSDKResourcesNew.bundle",
7524-
"${PODS_ROOT}/UMengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/TencentOpenAPI/TencentOpenApi_IOS_Bundle.bundle",
7525-
"${PODS_ROOT}/UMengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/SinaSSO/WeiboSDK.bundle",
7526-
"${PODS_ROOT}/UMengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/SocialSDKXib/UMSCommentDetailController.xib",
7527-
"${PODS_ROOT}/UMengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/SocialSDKXib/UMSCommentInputController.xib",
7528-
"${PODS_ROOT}/UMengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/SocialSDKXib/UMSCommentInputControlleriPad.xib",
7529-
"${PODS_ROOT}/UMengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/SocialSDKXib/UMShareEditViewController.xib",
7530-
"${PODS_ROOT}/UMengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/SocialSDKXib/UMShareEditViewControlleriPad.xib",
7531-
"${PODS_ROOT}/UMengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/SocialSDKXib/UMSLoginViewController.xib",
7532-
"${PODS_ROOT}/UMengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/SocialSDKXib/UMSnsAccountViewController.xib",
7533-
"${PODS_ROOT}/UMengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/SocialSDKXib/UMSShareListController.xib",
7534-
"${PODS_ROOT}/UMengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/en.lproj",
7535-
"${PODS_ROOT}/UMengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/zh-Hans.lproj",
75367485
"${PODS_ROOT}/UMengUShare/UShareSDK/UMSocialSDK/UMSocialSDKPromptResources.bundle",
75377486
"${PODS_ROOT}/UMengUShare/UShareSDK/SocialLibraries/QQ/QQSDK/TencentOpenApi_IOS_Bundle.bundle",
75387487
"${PODS_ROOT}/UMengUShare/UShareSDK/SocialLibraries/Sina/SinaSDK/WeiboSDK.bundle",
@@ -8273,13 +8222,12 @@
82738222
"$(SRCROOT)/Carthage/Build/iOS/ObjectiveGit.framework/Headers/",
82748223
);
82758224
INFOPLIST_FILE = "Coding_iOS/Coding_iOS-Info.plist";
8276-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
8225+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
82778226
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
82788227
LIBRARY_SEARCH_PATHS = (
82798228
"$(inherited)",
82808229
"$(PROJECT_DIR)/Coding_iOS/Vendor/XGPush",
82818230
"$(PROJECT_DIR)/Coding_iOS/Util/Audio/opencore-amr-iOS/lib",
8282-
"$(PROJECT_DIR)/Coding_iOS/Vendor/UMSocial_Sdk_4.3.0_Extra/SinaSSO",
82838231
);
82848232
PRODUCT_BUNDLE_IDENTIFIER = net.coding.CodingForiOS;
82858233
PRODUCT_NAME = Coding_iOS;
@@ -8319,13 +8267,12 @@
83198267
"$(SRCROOT)/Carthage/Build/iOS/ObjectiveGit.framework/Headers/",
83208268
);
83218269
INFOPLIST_FILE = "Coding_iOS/Coding_iOS-Info.plist";
8322-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
8270+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
83238271
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
83248272
LIBRARY_SEARCH_PATHS = (
83258273
"$(inherited)",
83268274
"$(PROJECT_DIR)/Coding_iOS/Vendor/XGPush",
83278275
"$(PROJECT_DIR)/Coding_iOS/Util/Audio/opencore-amr-iOS/lib",
8328-
"$(PROJECT_DIR)/Coding_iOS/Vendor/UMSocial_Sdk_4.3.0_Extra/SinaSSO",
83298276
);
83308277
PRODUCT_BUNDLE_IDENTIFIER = net.coding.CodingForiOS;
83318278
PRODUCT_NAME = Coding_iOS;

‎Coding_iOS/.DS_Store‎

0 Bytes
Binary file not shown.

‎Coding_iOS/AppDelegate.m‎

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,8 @@
3232
#import "OTPListViewController.h"
3333

3434
#import "FunctionIntroManager.h"
35-
#import <UMengSocial/UMSocial.h>
36-
#import <UMengSocial/UMSocialWechatHandler.h>
37-
#import <UMengSocial/UMSocialQQHandler.h>
3835
#import <evernote-cloud-sdk-ios/ENSDK/ENSDK.h>
39-
#import "UMSocialSinaSSOHandler.h"
36+
//#import "UMSocialSinaSSOHandler.h"
4037
#import "Coding_NetAPIManager.h"
4138
#import "EADeviceToServerLog.h"
4239
#import <UMSocialCore/UMSocialCore.h>
@@ -128,36 +125,14 @@ - (void)completionStartAnimationWithOptions:(NSDictionary *)launchOptions{
128125
UMConfigInstance.appKey = kUmeng_AppKey;
129126
[MobClick startWithConfigure:UMConfigInstance];
130127

131-
// UMENG Social Account
132-
[UMSocialData setAppKey:kUmeng_AppKey];
133-
[UMSocialWechatHandler setWXAppId:kSocial_WX_ID appSecret:kSocial_WX_Secret url:[NSObject baseURLStr]];
134-
[UMSocialQQHandler setQQWithAppId:kSocial_QQ_ID appKey:kSocial_QQ_Secret url:[NSObject baseURLStr]];
135-
[ENSession setSharedSessionConsumerKey:kSocial_EN_Key consumerSecret:kSocial_EN_Secret optionalHost:nil];
136-
[UMSocialSinaSSOHandler openNewSinaSSOWithRedirectURL:kSocial_Sina_RedirectURL];
137-
138-
// UMENG Social Config
139-
[UMSocialConfig setFollowWeiboUids:@{UMShareToSina : kSocial_Sina_OfficailAccount}];//设置默认关注官方账号
140-
[UMSocialConfig setFinishToastIsHidden:YES position:UMSocialiToastPositionCenter];
141-
[UMSocialConfig setNavigationBarConfig:^(UINavigationBar *bar, UIButton *closeButton, UIButton *backButton, UIButton *postButton, UIButton *refreshButton, UINavigationItem *navigationItem) {
142-
if (bar) {
143-
[bar setBackgroundImage:[UIImage imageWithColor:kColorNavBG] forBarMetrics:UIBarMetricsDefault];
144-
}
145-
if (navigationItem) {
146-
if ([[navigationItem titleView] isKindOfClass:[UILabel class]]) {
147-
UILabel *titleL = (UILabel *)[navigationItem titleView];
148-
titleL.font = [UIFont boldSystemFontOfSize:kNavTitleFontSize];
149-
titleL.textColor = [UIColor whiteColor];
150-
}
151-
}
152-
}];
153-
154128
//UMSocialManager 第三方登录
155129
[[UMSocialManager defaultManager] openLog:YES];
130+
[UMSocialGlobal shareInstance].isUsingHttpsWhenShareContent = NO;
156131
[[UMSocialManager defaultManager] setUmSocialAppkey:kUmeng_AppKey];
157132
[[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_WechatSession appKey:kSocial_WX_ID appSecret:kSocial_WX_Secret redirectURL:nil];
158133
[[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_QQ appKey:kSocial_QQ_ID appSecret:kSocial_QQ_Secret redirectURL:nil];
159-
// [[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_Sina appKey:kWeiBo_Key appSecret:kWeiBo_Secret redirectURL:kSocial_Sina_RedirectURL];
160-
134+
[[UMSocialManager defaultManager] setPlaform:UMSocialPlatformType_Sina appKey:kSocial_Sina_ID appSecret:kSocial_Sina_Secret redirectURL:kSocial_Sina_RedirectURL];
135+
[ENSession setSharedSessionConsumerKey:kSocial_EN_Key consumerSecret:kSocial_EN_Secret optionalHost:nil];
161136

162137
// 信鸽推送
163138
[XGPush startApp:kXGPush_Id appKey:kXGPush_Key];
@@ -319,7 +294,7 @@ - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceAppl
319294
}else if ([url.absoluteString hasPrefix:@"en-:"]){
320295
return [[ENSession sharedSession] handleOpenURL:url];
321296
}else{
322-
return [UMSocialSnsService handleOpenURL:url];
297+
return [[UMSocialManager defaultManager] handleOpenURL:url sourceApplication:sourceApplication annotation:annotation];
323298
}
324299
return YES;
325300
}

‎Coding_iOS/Coding_iOS-Info.plist‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<string>coding-net</string>
3131
<string>wb600921819</string>
3232
<string>QQ41C16356</string>
33+
<string>tencent1103192918</string>
3334
<string>wx6ef6df9e9706b1bd</string>
3435
<string>en-</string>
3536
</array>

‎Coding_iOS/Controllers/EAPayViewController.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#import "EAPayViewController.h"
1010

1111
#import <AlipaySDK/AlipaySDK.h>
12-
#import <UMengSocial/WXApi.h>
13-
#import <UMengSocial/WXApiObject.h>
12+
#import <UMengUShare/WXApi.h>
13+
#import <UMengUShare/WXApiObject.h>
1414

1515
#import "Coding_NetAPIManager.h"
1616

Coding_iOS/Vendor/UMSocial_Sdk_4.3.0_Extra/SinaSSO/WeiboSDK.bundle/images/[email protected] renamed to Coding_iOS/Vendor/SinaSDK/WeiboSDK.bundle/images/[email protected]

File renamed without changes.

Coding_iOS/Vendor/UMSocial_Sdk_4.3.0_Extra/SinaSSO/WeiboSDK.bundle/images/[email protected] renamed to Coding_iOS/Vendor/SinaSDK/WeiboSDK.bundle/images/[email protected]

File renamed without changes.

Coding_iOS/Vendor/UMSocial_Sdk_4.3.0_Extra/SinaSSO/WeiboSDK.bundle/images/[email protected] renamed to Coding_iOS/Vendor/SinaSDK/WeiboSDK.bundle/images/[email protected]

File renamed without changes.

Coding_iOS/Vendor/UMSocial_Sdk_4.3.0_Extra/SinaSSO/WeiboSDK.bundle/others/mfp.cer renamed to Coding_iOS/Vendor/SinaSDK/WeiboSDK.bundle/others/mfp.cer

File renamed without changes.

‎Coding_iOS/Vendor/UMSocial_Sdk_4.3.0_Extra/SinaSSO/UMSocialSinaSSOHandler.h‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)