Skip to content

fix build error #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cqingwang wants to merge 6 commits into
base: master
Choose a base branch
from
Open

fix build error #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
358f1b2
Update AliModule.m
cqingwang May 2, 2018
f3b0b9a
fix build error
cqingwang May 2, 2018
7a8e50c
Update QQModule.java
cqingwang May 2, 2018
43e7d16
Update WeiboModule.java
cqingwang May 2, 2018
cfdf3be
Update WeiboModule.java
cqingwang May 22, 2018
744b1e7
Update react-native-social-kit.podspec
cqingwang May 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions android/src/main/java/com/yoai/reactnative/social/qq/QQModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.yoai.reactnative.social.qq;

import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;

Expand Down Expand Up @@ -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) {

}
}
7 changes: 6 additions & 1 deletion android/src/main/java/com/yoai/reactnative/social/weibo/WeiboModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,12 +250,17 @@ private void parseCommon(ReadableMap config, BaseMediaObject mediaObject) {
}

@Override
public void onActivityResult(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);
}
}

@Override
public void onNewIntent(Intent intent) {

}

private static void info(String msg) {
Utils.info(TAG, msg);
}
Expand Down
1 change: 1 addition & 0 deletions ios/ali/AliModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ + (BOOL)handleUrl:(NSURL *)url {
}];
return YES;
}
return NO;
}

RCT_EXPORT_MODULE(Ali);
Expand Down
1 change: 1 addition & 0 deletions ios/weixin/WeixinModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ - (void)getImgaeWithUrl:(NSString *)url
clipped:NO
resizeMode:RCTResizeModeStretch
progressBlock:nil
partialLoadBlock:nil
completionBlock:^(NSError *error, UIImage *image) {
completionBlock(error, image);
}];
Expand Down
4 changes: 2 additions & 2 deletions react-native-social-kit.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down