修复RCTEventEmitter bridge 为空无法分享图片问题

.gitignore

@@ -1,2 +1,62 @@
-/android/build
+# Logs
+logs
+*.log
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
+node_modules
+npm-debug.log
+
+# OSX
+#
+.DS_Store
+
+examples/
+
+# Xcode
+#
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
+project.xcworkspace
+
+# Android/IJ
+#
+react-native-dialogs.iml
 .idea
+.gradle
+local.properties
+android/*.iml

android/build.gradle

@@ -25,6 +25,6 @@ repositories {
 
 dependencies {
   compile 'com.facebook.react:react-native:+'
-  compile files('libs/open_sdk_r5793_lite.jar')
+  compile fileTree(dir: "libs", include: ["*.jar"])
 }
 

android/src/main/java/cn/reactnative/modules/qq/QQModule.java

@@ -164,6 +164,8 @@ private void _shareToQQ(ReadableMap data, int scene) {
         if (data.hasKey(RCTQQShareImageUrl)){
             bundle.putString(QQShare.SHARE_TO_QQ_IMAGE_URL, data.getString(RCTQQShareImageUrl));
         }
+
+
         if (data.hasKey("appName")){
             bundle.putString(QQShare.SHARE_TO_QQ_APP_NAME, data.getString("appName"));
         }
@@ -177,7 +179,10 @@ private void _shareToQQ(ReadableMap data, int scene) {
             bundle.putInt(QQShare.SHARE_TO_QQ_KEY_TYPE, QQShare.SHARE_TO_QQ_TYPE_DEFAULT);
         } else if (type.equals(RCTQQShareTypeImage)){
             bundle.putInt(QQShare.SHARE_TO_QQ_KEY_TYPE, QQShare.SHARE_TO_QQ_TYPE_IMAGE);
-            bundle.putString(QQShare.SHARE_TO_QQ_IMAGE_LOCAL_URL, data.getString(RCTQQShareImageUrl));
+            if (data.hasKey(RCTQQShareImageUrl)) {
+                bundle.putString(QQShare.SHARE_TO_QQ_IMAGE_LOCAL_URL, data.getString(RCTQQShareImageUrl));
+                bundle.remove(QQShare.SHARE_TO_QQ_IMAGE_URL);
+            }
         } else if (type.equals(RCTQQShareTypeAudio)) {
             bundle.putInt(QQShare.SHARE_TO_QQ_KEY_TYPE, QQShare.SHARE_TO_QQ_TYPE_AUDIO);
             if (data.hasKey("flashUrl")){

index.js

@@ -34,6 +34,7 @@ function waitForResponse(type) {
         }
         savedCallback = result => {
             if (result.type !== type) {
+            	reject(new Error('undefined type'));
                 return;
             }
             savedCallback = undefined;

ios/RCTQQAPI.xcodeproj/project.pbxproj

@@ -29,8 +29,6 @@
 		9139321F1C232D310085E3BA /* RCTQQAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTQQAPI.h; sourceTree = "<group>"; };
 		913932211C232D310085E3BA /* RCTQQAPI.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTQQAPI.m; sourceTree = "<group>"; };
 		913932401C232ED60085E3BA /* TencentOpenAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = TencentOpenAPI.framework; sourceTree = "<group>"; };
-		9139325C1C233E370085E3BA /* RCTQQAPI.debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RCTQQAPI.debug.xcconfig; sourceTree = "<group>"; };
-		9139325D1C233E480085E3BA /* RCTQQAPI.release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RCTQQAPI.release.xcconfig; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -47,8 +45,6 @@
 		913932131C232D310085E3BA = {
 			isa = PBXGroup;
 			children = (
-				9139325C1C233E370085E3BA /* RCTQQAPI.debug.xcconfig */,
-				9139325D1C233E480085E3BA /* RCTQQAPI.release.xcconfig */,
 				9139321E1C232D310085E3BA /* RCTQQAPI */,
 				9139321D1C232D310085E3BA /* Products */,
 			);
@@ -111,6 +107,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 913932131C232D310085E3BA;
@@ -171,7 +168,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -208,7 +205,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
@@ -217,7 +214,6 @@
 		};
 		913932261C232D310085E3BA /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9139325C1C233E370085E3BA /* RCTQQAPI.debug.xcconfig */;
 			buildSettings = {
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -239,7 +235,6 @@
 		};
 		913932271C232D310085E3BA /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9139325D1C233E480085E3BA /* RCTQQAPI.release.xcconfig */;
 			buildSettings = {
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

ios/RCTQQAPI/RCTQQAPI.h

@@ -21,6 +21,6 @@
 #define RCTQQShareWebpageUrl @"webpageUrl"
 #define RCTQQShareImageUrl @"imageUrl"
 
-@interface RCTQQAPI : RCTEventEmitter<RCTBridgeModule>
+@interface RCTQQAPI : RCTEventEmitter
 
 @end

ios/RCTQQAPI/RCTQQAPI.m

@@ -8,7 +8,6 @@
 
 #import "RCTQQAPI.h"
 #import <TencentOpenAPI/TencentOAuth.h>
-#import <TencentOpenAPI/TencentOAuthObject.h>
 #import <TencentOpenAPI/QQApiInterface.h>
 #import <TencentOpenAPI/QQApiInterfaceObject.h>
 
@@ -29,7 +28,7 @@ @interface RCTQQAPI()<QQApiInterfaceDelegate, TencentSessionDelegate> {
 
 @implementation RCTQQAPI
 
-@synthesize bridge = _bridge;
+//@synthesize bridge = _bridge;
 
 RCT_EXPORT_MODULE();
 
@@ -124,13 +123,13 @@ - (void)handleOpenURL:(NSNotification *)note
 
 - (void)_shareToQQWithData:(NSDictionary *)aData scene:(int)aScene resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject{
     NSString *imageUrl = aData[RCTQQShareImageUrl];
-    if (imageUrl.length && _bridge.imageLoader) {
+    if (imageUrl.length && self.bridge.imageLoader) {
         CGSize size = CGSizeZero;
         if (![aData[RCTQQShareType] isEqualToString:RCTQQShareTypeImage]) {
             CGFloat thumbImageSize = 80;
             size = CGSizeMake(thumbImageSize,thumbImageSize);
         }
-        [_bridge.imageLoader loadImageWithURLRequest:[RCTConvert NSURLRequest:imageUrl] callback:^(NSError *error, UIImage *image) {
+        [self.bridge.imageLoader loadImageWithURLRequest:[RCTConvert NSURLRequest:imageUrl] callback:^(NSError *error, UIImage *image) {
             dispatch_async(dispatch_get_main_queue(), ^{
                 [self _shareToQQWithData:aData image:image scene:aScene resolve:resolve reject:reject];
             });

ios/RCTQQAPI/TencentOpenAPI.framework/Headers/QQApiInterface.h

@@ -9,6 +9,8 @@
 #import <Foundation/Foundation.h>
 #import "QQApiInterfaceObject.h"
 
+typedef void (^sendResultBlock)(NSDictionary *result);
+
 /**
  \brief 处理来至QQ的请求及响应的回调协议
  */
@@ -51,6 +53,7 @@
  */
 + (QQApiSendResultCode)sendReq:(QQBaseReq *)req;
 
+
 /**
  向手Q QZone结合版发起分享请求
  \note H5分享只支持单张网络图片的传递
@@ -60,37 +63,39 @@
 + (QQApiSendResultCode)SendReqToQZone:(QQBaseReq *)req;
 
 /**
- 向手Q 群部落发起分享请求
- \note H5分享只支持单张网络图片的传递
+ 向手Q发起设置QQ头像
  \param req 分享内容的请求
  \return 请求发送结果码
  */
-+ (QQApiSendResultCode)SendReqToQQGroupTribe:(QQBaseReq *)req;
++ (QQApiSendResultCode)sendMessageToQQAvatarWithReq:(QQBaseReq*)req;
 
 /**
- 向手Q发送应答消息
- \param resp 应答消息
- \return 应答发送结果码
+ 向手Q发起组图分享到表情收藏
+ \param req 分享内容的请求
+ \return 请求发送结果码
  */
-+ (QQApiSendResultCode)sendResp:(QQBaseResp *)resp;
++ (QQApiSendResultCode)sendMessageToFaceCollectionWithReq:(QQBaseReq*)req;
 
 /**
  检测是否已安装QQ
  \return 如果QQ已安装则返回YES，否则返回NO
+
+ \note SDK目前已经支持QQ、TIM授权登录及分享功能， 会按照QQ>TIM的顺序进行调用。
+ 只要用户安装了QQ、TIM中任意一个应用，都可为第三方应用进行授权登录、分享功能。
+ 第三方应用在接入SDK时不需要判断是否安装QQ、TIM。若有判断安装QQ、TIM的逻辑建议移除。
  */
 + (BOOL)isQQInstalled;
 
 /**
  检测是否已安装TIM
  \return 如果TIM已安装则返回YES，否则返回NO
+
+ \note SDK目前已经支持QQ、TIM授权登录及分享功能， 会按照QQ>TIM的顺序进行调用。
+ 只要用户安装了QQ、TIM中任意一个应用，都可为第三方应用进行授权登录、分享功能。
+ 第三方应用在接入SDK时不需要判断是否安装QQ、TIM。若有判断安装QQ、TIM的逻辑建议移除。
  */
 + (BOOL)isTIMInstalled;
 
-/**
- 批量检测QQ号码是否在线
- */
-+ (void)getQQUinOnlineStatues:(NSArray *)QQUins delegate:(id<QQApiInterfaceDelegate>)delegate;
-
 /**
  检测QQ是否支持API调用
  \return 如果当前安装QQ版本支持API调用则返回YES，否则返回NO
@@ -101,7 +106,19 @@
  检测TIM是否支持API调用
  \return 如果当前安装TIM版本支持API调用则返回YES，否则返回NO
  */
-+ (BOOL)isTIMSupportApi;
++ (BOOL)isTIMSupportApi __attribute__((deprecated("已过期, 建议删除调用，调用地方用YES替代。")));
+
+/**
+ 检测是否支持分享
+ \return 如果当前已安装QQ且QQ版本支持API调用 或者 当前已安装TIM且TIM版本支持API调用则返回YES，否则返回NO
+ */
++ (BOOL)isSupportShareToQQ;
+
+/**
+ 检测是否支持分享到QQ结合版QZone
+ \return 如果当前已安装QQ且QQ版本支持API调用则返回YES，否则返回NO
+ */
++ (BOOL)isSupportPushToQZone;
 
 /**
  启动QQ
@@ -126,9 +143,8 @@
 /**
  获取TIM下载地址
 
- 如果App通过<code>QQApiInterface#isTIMInstalled</code>和<code>QQApiInterface#isTIMSupportApi</code>检测发现TIM没安装或当前版本TIM不支持API调用，可引导用户通过打开此链接下载最新版TIM。
+ 如果App通过<code>QQApiInterface#isTIMInstalled</code>检测发现TIM没安装或当前版本TIM不支持API调用，可引导用户通过打开此链接下载最新版TIM。
  \return iPhoneTIM下载地址
  */
 + (NSString *)getTIMInstallUrl;
-
 @end