Commit 32ee9730 authored by 乔金柱's avatar 乔金柱

Merge branch 'jz/master' into 'master'

bugfix GMShareSDK pod lib 不通过问题

See merge request !4
parents 781efd64 975171bf
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>BuildSystemType</key>
<string>Original</string>
<key>PreviewsEnabled</key> <key>PreviewsEnabled</key>
<false/> <false/>
</dict> </dict>
......
use_frameworks! use_frameworks!
#use_modular_headers!
inhibit_all_warnings! inhibit_all_warnings!
platform :ios, '9.0' platform :ios, '9.3'
#require 'pry' #require 'pry'
#open source #open source
...@@ -11,6 +12,8 @@ source 'git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git' ...@@ -11,6 +12,8 @@ source 'git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git'
target 'GMShareSDK_Example' do target 'GMShareSDK_Example' do
pod 'GMShareSDK', :path => '../' pod 'GMShareSDK', :path => '../'
pod 'MBProgressHUD', '0.9.2' pod 'MBProgressHUD', '0.9.2'
# pod "Weibo_SDK", :git => "https://github.com/sinaweibosdk/weibo_ios_sdk.git"
target 'GMShareSDK_Tests' do target 'GMShareSDK_Tests' do
inherit! :search_paths inherit! :search_paths
......
...@@ -104,7 +104,7 @@ SPEC CHECKSUMS: ...@@ -104,7 +104,7 @@ SPEC CHECKSUMS:
GMJSONModel: 5e81a98de668e9f93cf6ff77869f77b0d1a806be GMJSONModel: 5e81a98de668e9f93cf6ff77869f77b0d1a806be
GMKit: 09fe863069d9750c89fae2939770b08fc74b9027 GMKit: 09fe863069d9750c89fae2939770b08fc74b9027
GMPhobos: 1e2d68c456b69bf156276d7242877498107474db GMPhobos: 1e2d68c456b69bf156276d7242877498107474db
GMShareSDK: 1d8f739d51083ab5cee25bb978b5e9bfbb206d05 GMShareSDK: 9d54e70454a6d89c40634d82a1ca254d9a838e9c
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201 Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1 MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
SDWebImage: 4d5c027c935438f341ed33dbac53ff9f479922ca SDWebImage: 4d5c027c935438f341ed33dbac53ff9f479922ca
...@@ -113,6 +113,6 @@ SPEC CHECKSUMS: ...@@ -113,6 +113,6 @@ SPEC CHECKSUMS:
WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a
Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089 Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089
PODFILE CHECKSUM: 523c01af18a975157f015f06a4cf7471921d5423 PODFILE CHECKSUM: f2d7f758e43a69ecd149f6d39f973bab30e9a7fc
COCOAPODS: 1.9.1 COCOAPODS: 1.9.1
...@@ -26,7 +26,7 @@ TODO: Add long description of the pod here. ...@@ -26,7 +26,7 @@ TODO: Add long description of the pod here.
s.author = { 'Q14' => 'qiaojinzhu@igengmei.com' } s.author = { 'Q14' => 'qiaojinzhu@igengmei.com' }
s.source = { :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMShareSDK.git', :tag => s.version.to_s } s.source = { :git => 'git@git.wanmeizhensuo.com:gengmeiios/GMShareSDK.git', :tag => s.version.to_s }
s.ios.deployment_target = '8.0' s.ios.deployment_target = '9.0'
s.source_files = 'GMShareSDK/Classes/**/*' s.source_files = 'GMShareSDK/Classes/**/*'
s.vendored_frameworks = 'GMShareSDK/Frameworks/*.framework' s.vendored_frameworks = 'GMShareSDK/Frameworks/*.framework'
...@@ -42,6 +42,9 @@ TODO: Add long description of the pod here. ...@@ -42,6 +42,9 @@ TODO: Add long description of the pod here.
s.dependency 'Masonry' s.dependency 'Masonry'
s.frameworks = ['Photos'] s.frameworks = ['Photos']
s.pod_target_xcconfig = { 'VALID_ARCHS' => 'arm64 armv7 x86_64' }
# s.pod_target_xcconfig = { 'ARCHS[sdk=iphonesimulator*]' => '$(ARCHS_STANDARD_64_BIT)' }
s.static_framework = true s.static_framework = true
end end
...@@ -12,6 +12,14 @@ ...@@ -12,6 +12,14 @@
#import "GMThirdPartyDefine.h" #import "GMThirdPartyDefine.h"
#import "GMThirdPartyOauthManager.h" #import "GMThirdPartyOauthManager.h"
#import <TencentOpenAPI/TencentOAuth.h> #import <TencentOpenAPI/TencentOAuth.h>
#import <GMFoundation/NSString+GM.h>
#import <TencentOpenAPI/TencentOAuth.h>
#import <TencentOpenAPI/QQApiInterface.h>
#import <WechatOpenSDK/WXApi.h>
#import <Weibo_SDK/WeiboSDK.h>
#import <DouyinOpenSDK/DouyinOpenSDKApi.h>
#import <AuthenticationServices/AuthenticationServices.h>
@implementation GMThirdPartyUser @implementation GMThirdPartyUser
......
...@@ -8,15 +8,12 @@ ...@@ -8,15 +8,12 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "GMThirdPartyLoginHelper.h" #import "GMThirdPartyLoginHelper.h"
#import <TencentOpenAPI/TencentOAuth.h> #import "GMThirdPartyDefine.h"
#import <TencentOpenAPI/QQApiInterface.h>
#import <WechatOpenSDK/WXApi.h>
#import <Weibo_SDK/WeiboSDK.h>
#import <DouyinOpenSDK/DouyinOpenSDKApi.h>
#import <AuthenticationServices/AuthenticationServices.h>
//把这些都放在里面 为防止编译不通过问题: pod lib lint --verbose --no-clean --allow-warnings --sources='https://github.com/CocoaPods/Specs,git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git' --fail-fast --verbose
@class TencentOAuth;
//这里是接受三方授权的回调 //这里是接受三方授权的回调
@interface GMThirdPartyOauthManager : NSObject <TencentSessionDelegate, QQApiInterfaceDelegate, WXApiDelegate, WeiboSDKDelegate, DouyinOpenSDKApiDelegate> @interface GMThirdPartyOauthManager : NSObject
@property (nonatomic, strong) GMThirdPartyUser * user; @property (nonatomic, strong) GMThirdPartyUser * user;
@property (nonatomic, assign) GMSharePlatform currentShareType; @property (nonatomic, assign) GMSharePlatform currentShareType;
@property (strong, nonatomic) NSString *wbtoken; @property (strong, nonatomic) NSString *wbtoken;
......
...@@ -10,11 +10,15 @@ ...@@ -10,11 +10,15 @@
#import "GMThirdPartyLoginHelper.h" #import "GMThirdPartyLoginHelper.h"
#import "GMShareSDK.h" #import "GMShareSDK.h"
#import <GMFoundation/NSString+GM.h> #import <GMFoundation/NSString+GM.h>
#import <TencentOpenAPI/TencentOAuth.h>
#import <TencentOpenAPI/QQApiInterface.h>
#import <WechatOpenSDK/WXApi.h>
#import <Weibo_SDK/WeiboSDK.h>
#import <DouyinOpenSDK/DouyinOpenSDKApi.h>
#import <AuthenticationServices/AuthenticationServices.h>
@interface GMThirdPartyOauthManager()<WBHttpRequestDelegate, DouyinOpenSDKLogDelegate, ASAuthorizationControllerDelegate, ASAuthorizationControllerPresentationContextProviding,TencentSessionDelegate, QQApiInterfaceDelegate, WXApiDelegate, WeiboSDKDelegate, DouyinOpenSDKApiDelegate>
@interface GMThirdPartyOauthManager()<WBHttpRequestDelegate, DouyinOpenSDKLogDelegate, ASAuthorizationControllerDelegate, ASAuthorizationControllerPresentationContextProviding>
@end @end
@implementation GMThirdPartyOauthManager @implementation GMThirdPartyOauthManager
......
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 to comment