diff --git a/README.md b/README.md index 97b96fd..afec97e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # react-native-wechat +- iOS SDK VERSION 1.8.3 +- Android SDK VERSION 5.1.6 + ## 安装 ```bash @@ -292,9 +295,9 @@ wechat.registerApp({ wechat.isWXAppInstalled() ``` -#### isWXAppSupportApi 检测当前版本微信是否支持 Api +#### isWXAppSupportApi 检测当前版本微信是否支持 Api iosOnly -```javascript +```javascript // @return Boolean wechat.isWXAppSupportApi() ``` diff --git a/RNWechat.podspec b/RNWechat.podspec index 8da192c..07bd60d 100644 --- a/RNWechat.podspec +++ b/RNWechat.podspec @@ -15,5 +15,5 @@ Pod::Spec.new do |s| s.requires_arc = true s.platform = :ios, '8.0' s.source_files = 'ios/RNWechat.{h,m}', 'ios/Handler/*.{h,m}', 'ios/Helper/*.{h,m}' - s.dependency 'WechatOpenSDK', '= 1.8.2' + s.dependency 'WechatOpenSDK', '= 1.8.3' end diff --git a/android/build.gradle b/android/build.gradle index 65accd8..7a7fc4f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -31,5 +31,5 @@ repositories { dependencies { compile 'com.facebook.react:react-native:+' - compile 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:5.1.4' + compile 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:5.1.6' } diff --git a/android/src/main/java/com/rnlib/wechat/RNWechatModule.java b/android/src/main/java/com/rnlib/wechat/RNWechatModule.java index 4f44105..ef0b91a 100644 --- a/android/src/main/java/com/rnlib/wechat/RNWechatModule.java +++ b/android/src/main/java/com/rnlib/wechat/RNWechatModule.java @@ -118,14 +118,6 @@ public class RNWechatModule extends ReactContextBaseJavaModule { promise.resolve(api.isWXAppInstalled()); } - /** - * 安装版本微信是否支持 api - */ - @ReactMethod - public void isWXAppSupportApi(Promise promise) { - promise.resolve(api.isWXAppSupportAPI()); - } - /** * 打开微信 */ diff --git a/ios/SDK/README.txt b/ios/SDK/README.txt index 915cb4c..bce0454 100644 --- a/ios/SDK/README.txt +++ b/ios/SDK/README.txt @@ -1,4 +1,9 @@ 重要! +SDK1.8.3 +1. SDK增加调起微信刷卡支付接口 +2. SDK增加小程序订阅消息接口 +3. 修复小程序订阅消息接口没有resp的问题 + SDK1.8.2 1. SDK增加开发票授权 WXInvoiceAuthInsert 2. SDK增加非税接口 WXNontaxPay diff --git a/ios/SDK/WXApiObject.h b/ios/SDK/WXApiObject.h index 8ec14c8..7e4eab5 100644 --- a/ios/SDK/WXApiObject.h +++ b/ios/SDK/WXApiObject.h @@ -26,13 +26,13 @@ enum WXErrCode { * */ enum WXScene { - WXSceneSession = 0, /**< 聊天界面 */ - WXSceneTimeline = 1, /**< 朋友圈 */ - WXSceneFavorite = 2, /**< 收藏 */ + WXSceneSession = 0, /**< 聊天界面 */ + WXSceneTimeline = 1, /**< 朋友圈 */ + WXSceneFavorite = 2, /**< 收藏 */ + WXSceneSpecifiedSession = 3, /**< 指定联系人 */ }; - enum WXAPISupport { WXAPISupportSession = 0, }; @@ -160,10 +160,6 @@ typedef void(^WXLogBolock)(NSString * log); @end -#endif - - -#ifndef BUILD_WITHOUT_PAY #pragma mark - PayResp /*! @brief 微信终端返回给第三方的关于支付结果的结构体 @@ -177,6 +173,24 @@ typedef void(^WXLogBolock)(NSString * log); @end + +#pragma mark - WXOfflinePay +/*! @brief 第三方向微信终端发起离线支付 + * + * 第三方向微信终端发起离线支付的消息结构体 + */ +@interface WXOfflinePayReq : BaseReq + +@end + +/*! @brief 第三方向微信终端发起离线支付返回 + * + * 第三方向微信终端发起离线支付返回的消息结构体 + */ +@interface WXOfflinePayResp : BaseResp + +@end + #endif @@ -243,7 +257,8 @@ typedef void(^WXLogBolock)(NSString * log); * @see WXScene */ @property (nonatomic, assign) int scene; - +/** 指定发送消息的人,WXSceneSpecifiedSession时有效 */ +@property (nonatomic, retain) NSString* toUserOpenId; @end @@ -379,6 +394,45 @@ typedef void(^WXLogBolock)(NSString * log); @end + +#pragma mark - WXOpenBusinessWebViewReq +/*! @brief 第三方通知微信启动内部浏览器,打开指定业务的网页 + * + * + */ +@interface WXOpenBusinessWebViewReq : BaseReq + +/** 网页业务类型 + * @attention + */ +@property (nonatomic, assign) UInt32 businessType; + +/** 网页业务参数 + * @attention + */ +@property (nonatomic, retain) NSDictionary *queryInfoDic; + +@end + +#pragma mark - WXOpenBusinessWebViewResp +/*! @brief 微信终端向第三方程序返回的WXOpenBusinessWebViewResp处理结果。 + * + * 第三方程序向微信终端发送WXOpenBusinessWebViewReq后,微信发送回来的处理结果,该结果用WXOpenBusinessWebViewResp表示。 + */ +@interface WXOpenBusinessWebViewResp : BaseResp +/** 第三方程序自定义简单数据,微信终端会回传给第三方程序处理 + * @attention 长度不能超过2k + */ +@property (nonatomic, retain) NSString *result; + +/** 网页业务类型 + * @attention + */ +@property (nonatomic, assign) UInt32 businessType; + +@end + + #pragma mark - OpenRankListReq /* ! @brief 第三方通知微信,打开硬件排行榜 * @@ -584,6 +638,23 @@ typedef void(^WXLogBolock)(NSString * log); @end +#pragma mark - WXSubscribeMiniProgramMsg +/** ! @brief 微信返回第三方请求选择发票结果 + * + */ +@interface WXSubscribeMiniProgramMsgReq : BaseReq +@property (nonatomic, strong) NSString * miniProgramAppid; +@end + +#pragma mark - WXSubscriptionReq +@interface WXSubscribeMiniProgramMsgResp : BaseResp + +@property(nonatomic, strong) NSString *openId; // 小程序openid +@property(nonatomic, strong) NSString *unionId; // unionId +@property(nonatomic, strong) NSString *nickName; // 用户昵称 + +@end + #pragma mark - WXinvoiceAuthInsertReq @interface WXInvoiceAuthInsertReq : BaseReq diff --git a/ios/SDK/libWeChatSDK.a b/ios/SDK/libWeChatSDK.a index 49cdb65..0b29350 100644 Binary files a/ios/SDK/libWeChatSDK.a and b/ios/SDK/libWeChatSDK.a differ diff --git a/src/index.js b/src/index.js index f371c18..34d6f8f 100644 --- a/src/index.js +++ b/src/index.js @@ -19,10 +19,13 @@ export const registerApp = ({ appId, isDebug = false }) => { export const isWXAppInstalled = () => RNWechat.isWXAppInstalled() /** - * 当前版本微信是否支持 OpenApi + * 当前版本微信是否支持 OpenApi iosOnly * @return {Boolean} */ -export const isWXAppSupportApi = () => RNWechat.isWXAppSupportApi() +export const isWXAppSupportApi = () => { + // Android 5.1.6 版本 SDK 移除了该方法 + return Platform.OS === 'ios' ? RNWechat.isWXAppSupportApi() : true +} /** * 获取微信的itunes安装地址 iosOnly