Commit 2edc6e84 authored by jz's avatar jz

update

parent 8290cae9
...@@ -17,3 +17,8 @@ target 'GMShareSDK_Example' do ...@@ -17,3 +17,8 @@ target 'GMShareSDK_Example' do
end end
end end
pre_install do |installer|
# workaround for https://github.com/CocoaPods/CocoaPods/issues/3289
Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
end
...@@ -43,7 +43,7 @@ PODS: ...@@ -43,7 +43,7 @@ PODS:
- GMPhobos (1.3.5): - GMPhobos (1.3.5):
- GMCache - GMCache
- GMKit - GMKit
- GMShareSDK (0.1.5): - GMShareSDK (0.1.7):
- DouyinOpenSDK - DouyinOpenSDK
- GMFoundation - GMFoundation
- GMJSONModel - GMJSONModel
...@@ -94,7 +94,7 @@ SPEC CHECKSUMS: ...@@ -94,7 +94,7 @@ SPEC CHECKSUMS:
GMJSONModel: 5e81a98de668e9f93cf6ff77869f77b0d1a806be GMJSONModel: 5e81a98de668e9f93cf6ff77869f77b0d1a806be
GMKit: 2573350637f4d4e200c8cf3426b7b96a924af15e GMKit: 2573350637f4d4e200c8cf3426b7b96a924af15e
GMPhobos: 1e2d68c456b69bf156276d7242877498107474db GMPhobos: 1e2d68c456b69bf156276d7242877498107474db
GMShareSDK: 116ca081261a2cc1b2b1fbb9e2acae65dd9ffb46 GMShareSDK: 613edf194beed865a8ecf6addefec8227db24272
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201 Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9 MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
SDWebImage: 5bf6aec6481ae2a062bdc59f9d6c1d1e552090e0 SDWebImage: 5bf6aec6481ae2a062bdc59f9d6c1d1e552090e0
...@@ -102,6 +102,6 @@ SPEC CHECKSUMS: ...@@ -102,6 +102,6 @@ SPEC CHECKSUMS:
WechatOpenSDK: 368ae03b72ee3ea1328c4f11326fbb5d2721d118 WechatOpenSDK: 368ae03b72ee3ea1328c4f11326fbb5d2721d118
WeiboSDK: acb067053668102cf07d01aa7604350162c2e466 WeiboSDK: acb067053668102cf07d01aa7604350162c2e466
PODFILE CHECKSUM: 2ac9940f13453015746009e8a777570546d03d30 PODFILE CHECKSUM: 9e65a97d048be4488b587c55a43ca8a5aefe7417
COCOAPODS: 1.7.4 COCOAPODS: 1.7.4
../../../../../GMShareSDK/Classes/Share/GMWeixinShareView.h
\ No newline at end of file
../../../../../GMShareSDK/Classes/Share/GMWeixinShareView.h
\ No newline at end of file
{ {
"name": "GMShareSDK", "name": "GMShareSDK",
"version": "0.1.5", "version": "0.1.7",
"summary": "A short description of GMShareSDK.", "summary": "A short description of GMShareSDK.",
"description": "TODO: Add long description of the pod here.", "description": "TODO: Add long description of the pod here.",
"homepage": "http://git.wanmeizhensuo.com/gengmeiios/GMShareSDK.git", "homepage": "http://git.wanmeizhensuo.com/gengmeiios/GMShareSDK.git",
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
}, },
"source": { "source": {
"git": "git@git.wanmeizhensuo.com:gengmeiios/GMShareSDK.git", "git": "git@git.wanmeizhensuo.com:gengmeiios/GMShareSDK.git",
"tag": "0.1.5" "tag": "0.1.7"
}, },
"platforms": { "platforms": {
"ios": "8.0" "ios": "8.0"
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
"frameworks": [ "frameworks": [
"Photos" "Photos"
], ],
"static_framework": true,
"xcconfig": { "xcconfig": {
"VALID_ARCHS": "arm64 x86_64" "VALID_ARCHS": "arm64 x86_64"
} }
......
...@@ -43,7 +43,7 @@ PODS: ...@@ -43,7 +43,7 @@ PODS:
- GMPhobos (1.3.5): - GMPhobos (1.3.5):
- GMCache - GMCache
- GMKit - GMKit
- GMShareSDK (0.1.5): - GMShareSDK (0.1.7):
- DouyinOpenSDK - DouyinOpenSDK
- GMFoundation - GMFoundation
- GMJSONModel - GMJSONModel
...@@ -94,7 +94,7 @@ SPEC CHECKSUMS: ...@@ -94,7 +94,7 @@ SPEC CHECKSUMS:
GMJSONModel: 5e81a98de668e9f93cf6ff77869f77b0d1a806be GMJSONModel: 5e81a98de668e9f93cf6ff77869f77b0d1a806be
GMKit: 2573350637f4d4e200c8cf3426b7b96a924af15e GMKit: 2573350637f4d4e200c8cf3426b7b96a924af15e
GMPhobos: 1e2d68c456b69bf156276d7242877498107474db GMPhobos: 1e2d68c456b69bf156276d7242877498107474db
GMShareSDK: 116ca081261a2cc1b2b1fbb9e2acae65dd9ffb46 GMShareSDK: 613edf194beed865a8ecf6addefec8227db24272
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201 Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9 MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
SDWebImage: 5bf6aec6481ae2a062bdc59f9d6c1d1e552090e0 SDWebImage: 5bf6aec6481ae2a062bdc59f9d6c1d1e552090e0
...@@ -102,6 +102,6 @@ SPEC CHECKSUMS: ...@@ -102,6 +102,6 @@ SPEC CHECKSUMS:
WechatOpenSDK: 368ae03b72ee3ea1328c4f11326fbb5d2721d118 WechatOpenSDK: 368ae03b72ee3ea1328c4f11326fbb5d2721d118
WeiboSDK: acb067053668102cf07d01aa7604350162c2e466 WeiboSDK: acb067053668102cf07d01aa7604350162c2e466
PODFILE CHECKSUM: 2ac9940f13453015746009e8a777570546d03d30 PODFILE CHECKSUM: 9e65a97d048be4488b587c55a43ca8a5aefe7417
COCOAPODS: 1.7.4 COCOAPODS: 1.7.4
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -47,7 +47,7 @@ TODO: Add long description of the pod here. ...@@ -47,7 +47,7 @@ TODO: Add long description of the pod here.
s.frameworks = ['Photos'] s.frameworks = ['Photos']
# s.libraries = 'xml2', 'z', 'c++', 'sqlite3' # s.libraries = 'xml2', 'z', 'c++', 'sqlite3'
s.static_framework = true # s.static_framework = true
# s.resource_bundles = { # s.resource_bundles = {
# 'GMShareSDK' => ['GMShareSDK/Assets/*.png'] # 'GMShareSDK' => ['GMShareSDK/Assets/*.png']
# } # }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
// Created by Mikasa on 2019/1/10. // Created by Mikasa on 2019/1/10.
// Copyright © 2019 Gengmei. All rights reserved. // Copyright © 2019 Gengmei. All rights reserved.
// //
#import <GMThirdPartyDefine.h> #import "GMThirdPartyDefine.h"
@interface ALPlatformView : UIView @interface ALPlatformView : UIView
@property (nonatomic, copy) void(^sharePlatformClick)(GMSharePlatform platform); @property (nonatomic, copy) void(^sharePlatformClick)(GMSharePlatform platform);
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#import <GMKit/GMButton.h> #import <GMKit/GMButton.h>
#import <GMKit/Constant.h> #import <GMKit/Constant.h>
#import <MBProgressHUD/MBProgressHUD.h> #import <MBProgressHUD/MBProgressHUD.h>
#import <GMThirdPartyDefine.h>
@interface ALPlatformView() @interface ALPlatformView()
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import "GMShareCell.h" #import "GMShareCell.h"
#import <GMThirdPartyDefine.h>
#import "GMShareTopView.h" #import "GMShareTopView.h"
#import "WMShareObject.h" #import "WMShareObject.h"
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#import "UIImage+Compress.h" #import "UIImage+Compress.h"
#import "DouyinOpenSDKApi.h" #import "DouyinOpenSDKApi.h"
#import "UIAlertController+gm.h" #import "UIAlertController+gm.h"
#import <WechatOpenSDK/WXApi.h>
@interface GMShareSDK () @interface GMShareSDK ()
#warning TODO 待验证 #warning TODO 待验证
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#import <WeiboSDK/WeiboSDK.h> #import <WeiboSDK/WeiboSDK.h>
#import "GMThirdPartyDefine.h" #import "GMThirdPartyDefine.h"
#import "GMThirdPartyOauthManager.h" #import "GMThirdPartyOauthManager.h"
#import <TencentOpenAPI/TencentOAuth.h>
@implementation GMThirdPartyUser @implementation GMThirdPartyUser
......
...@@ -7,15 +7,11 @@ ...@@ -7,15 +7,11 @@
// //
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <WeiboSDK/WeiboSDK.h>
#import <WechatOpenSDK/WXApi.h>
#import "GMThirdPartyLoginHelper.h" #import "GMThirdPartyLoginHelper.h"
#import <TencentOpenAPI/TencentOAuth.h>
#import "DouyinOpenSDKApi.h"
//这里是接受三方授权的回调 //这里是接受三方授权的回调
@class TencentOAuth;
@interface GMThirdPartyOauthManager : NSObject<WeiboSDKDelegate, WBHttpRequestDelegate, TencentSessionDelegate, WXApiDelegate, DouyinOpenSDKApiDelegate, DouyinOpenSDKLogDelegate> @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,6 +10,14 @@ ...@@ -10,6 +10,14 @@
#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 "DouyinOpenSDKApi.h"
#import <WeiboSDK/WeiboSDK.h>
#import <WechatOpenSDK/WXApi.h>
@interface GMThirdPartyOauthManager()<WeiboSDKDelegate, WBHttpRequestDelegate, TencentSessionDelegate, WXApiDelegate, DouyinOpenSDKApiDelegate, DouyinOpenSDKLogDelegate>
@end
@implementation GMThirdPartyOauthManager @implementation GMThirdPartyOauthManager
+ (instancetype)shareInstance + (instancetype)shareInstance
......
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