From 358f1b237ba2c5d1648991af039f3d9b01f4992c Mon Sep 17 00:00:00 2001 From: changqing Date: Wed, 2 May 2018 15:10:49 +0800 Subject: [PATCH 1/6] Update AliModule.m --- ios/ali/AliModule.m | 1 + 1 file changed, 1 insertion(+) diff --git a/ios/ali/AliModule.m b/ios/ali/AliModule.m index bed35cc..ca2f94c 100644 --- a/ios/ali/AliModule.m +++ b/ios/ali/AliModule.m @@ -16,6 +16,7 @@ + (BOOL)handleUrl:(NSURL *)url { }]; return YES; } + return NO; } RCT_EXPORT_MODULE(Ali); From f3b0b9ac0d6c83c6ed68c9883b747d7708de22ab Mon Sep 17 00:00:00 2001 From: changqing Date: Wed, 2 May 2018 15:53:19 +0800 Subject: [PATCH 2/6] fix build error --- ios/weixin/WeixinModule.m | 1 + 1 file changed, 1 insertion(+) diff --git a/ios/weixin/WeixinModule.m b/ios/weixin/WeixinModule.m index f7750a8..a79df5c 100644 --- a/ios/weixin/WeixinModule.m +++ b/ios/weixin/WeixinModule.m @@ -194,6 +194,7 @@ - (void)getImgaeWithUrl:(NSString *)url clipped:NO resizeMode:RCTResizeModeStretch progressBlock:nil + partialLoadBlock:nil completionBlock:^(NSError *error, UIImage *image) { completionBlock(error, image); }]; From 7a8e50c320b409d420076d3664de7db7f421da9e Mon Sep 17 00:00:00 2001 From: changqing Date: Wed, 2 May 2018 20:57:43 +0800 Subject: [PATCH 3/6] Update QQModule.java --- .../com/yoai/reactnative/social/qq/QQModule.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/android/src/main/java/com/yoai/reactnative/social/qq/QQModule.java b/android/src/main/java/com/yoai/reactnative/social/qq/QQModule.java index 12792c9..ab86b01 100644 --- a/android/src/main/java/com/yoai/reactnative/social/qq/QQModule.java +++ b/android/src/main/java/com/yoai/reactnative/social/qq/QQModule.java @@ -1,5 +1,6 @@ package com.yoai.reactnative.social.qq; +import android.app.Activity; import android.content.Intent; import android.os.Bundle; @@ -198,14 +199,20 @@ private void invokeCallback() { } } + + private void info(String msg) { + Utils.info(TAG, msg); + } + @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { + public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) { if (listener != null) { Tencent.onActivityResultData(requestCode, resultCode, data, listener); } } - private void info(String msg) { - Utils.info(TAG, msg); + @Override + public void onNewIntent(Intent intent) { + } } From 43e7d16b621f978111eebdbbd81411339088aee7 Mon Sep 17 00:00:00 2001 From: changqing Date: Wed, 2 May 2018 20:58:22 +0800 Subject: [PATCH 4/6] Update WeiboModule.java --- .../reactnative/social/weibo/WeiboModule.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/android/src/main/java/com/yoai/reactnative/social/weibo/WeiboModule.java b/android/src/main/java/com/yoai/reactnative/social/weibo/WeiboModule.java index 4f8fd46..87cfc91 100644 --- a/android/src/main/java/com/yoai/reactnative/social/weibo/WeiboModule.java +++ b/android/src/main/java/com/yoai/reactnative/social/weibo/WeiboModule.java @@ -249,12 +249,6 @@ private void parseCommon(ReadableMap config, BaseMediaObject mediaObject) { } } - @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { - if (ssoHandler != null) { - ssoHandler.authorizeCallBack(requestCode, resultCode, data); - } - } private static void info(String msg) { Utils.info(TAG, msg); @@ -264,6 +258,18 @@ private String buildTransaction(final String type) { return (type == null) ? String.valueOf(System.currentTimeMillis()) : type + System.currentTimeMillis(); } + @Override + public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) { + if (ssoHandler != null) { + ssoHandler.authorizeCallBack(requestCode, resultCode, data); + } + } + + @Override + public void onNewIntent(Intent intent) { + + } + /** * 微博SDK需要传入的responseHandler为Activity类型,所以这里伪造一个假的Activity */ From cfdf3beea1cd1e4507b7561d15390e46924ca7d9 Mon Sep 17 00:00:00 2001 From: changqing Date: Tue, 22 May 2018 12:17:31 +0800 Subject: [PATCH 5/6] Update WeiboModule.java --- .../reactnative/social/weibo/WeiboModule.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/android/src/main/java/com/yoai/reactnative/social/weibo/WeiboModule.java b/android/src/main/java/com/yoai/reactnative/social/weibo/WeiboModule.java index 87cfc91..d196ce2 100644 --- a/android/src/main/java/com/yoai/reactnative/social/weibo/WeiboModule.java +++ b/android/src/main/java/com/yoai/reactnative/social/weibo/WeiboModule.java @@ -249,17 +249,8 @@ private void parseCommon(ReadableMap config, BaseMediaObject mediaObject) { } } - - private static void info(String msg) { - Utils.info(TAG, msg); - } - - private String buildTransaction(final String type) { - return (type == null) ? String.valueOf(System.currentTimeMillis()) : type + System.currentTimeMillis(); - } - @Override - public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) { + public void onActivityResult(Activity activity,int requestCode, int resultCode, Intent data) { if (ssoHandler != null) { ssoHandler.authorizeCallBack(requestCode, resultCode, data); } @@ -267,7 +258,15 @@ public void onActivityResult(Activity activity, int requestCode, int resultCode, @Override public void onNewIntent(Intent intent) { + + } + + private static void info(String msg) { + Utils.info(TAG, msg); + } + private String buildTransaction(final String type) { + return (type == null) ? String.valueOf(System.currentTimeMillis()) : type + System.currentTimeMillis(); } /** From 744b1e7df4aab6b70e9d760f67b43464c5a08f96 Mon Sep 17 00:00:00 2001 From: changqing Date: Tue, 22 May 2018 14:44:32 +0800 Subject: [PATCH 6/6] Update react-native-social-kit.podspec --- react-native-social-kit.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/react-native-social-kit.podspec b/react-native-social-kit.podspec index 21b4341..de0ddf3 100644 --- a/react-native-social-kit.podspec +++ b/react-native-social-kit.podspec @@ -6,8 +6,8 @@ Pod::Spec.new do |s| s.authors = "zt" s.license = "MIT" s.summary = "social sdk" - s.homepage = "https://github.com/yoaicom/react-native-social-kit" - s.source = { :git => "https://github.com/yoaicom/react-native-social-kit.git"} + s.homepage = "https://github.com/cqingwang/react-native-social-kit" + s.source = { :git => "https://github.com/cqingwang/react-native-social-kit.git"} s.subspec 'Weixin' do |ss| ss.source_files ="ios/weixin/*.{h,m}","ios/weixin/WeixinSDK/*.{h,m}" ss.resource = 'ios/weixin/WeixinSDK/*.bundle'