提交 40d15b09 authored 作者: JarvanMo's avatar JarvanMo

ios sdk upgrade to 1.8.6.1

上级 fce63253
...@@ -14,8 +14,8 @@ EXTERNAL SOURCES: ...@@ -14,8 +14,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/fluwx/ios" :path: ".symlinks/plugins/fluwx/ios"
SPEC CHECKSUMS: SPEC CHECKSUMS:
Flutter: 58dd7d1b27887414a370fcccb9e645c08ffd7a6a Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
fluwx: 19524c5e4c9c539a646407259139c9c1e4eaf9e5 fluwx: 765c6052398eaf6fe13c73409488b0d0b9d00fd6
PODFILE CHECKSUM: 348e15598a1c6ea25d3ed63919d5ffb9bd1c2ba6 PODFILE CHECKSUM: 348e15598a1c6ea25d3ed63919d5ffb9bd1c2ba6
......
...@@ -451,7 +451,7 @@ ...@@ -451,7 +451,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.jarvanmo.fluwxexample1; PRODUCT_BUNDLE_IDENTIFIER = com.jarvanmo.fluwxexample2;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = 1; TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = "\"${PROJECT_DIR}/../..\"/** \"${PROJECT_DIR}/../..\"/**"; USER_HEADER_SEARCH_PATHS = "\"${PROJECT_DIR}/../..\"/** \"${PROJECT_DIR}/../..\"/**";
...@@ -479,7 +479,7 @@ ...@@ -479,7 +479,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.jarvanmo.fluwxexample1; PRODUCT_BUNDLE_IDENTIFIER = com.jarvanmo.fluwxexample2;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = 1; TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = "\"${PROJECT_DIR}/../..\"/** \"${PROJECT_DIR}/../..\"/**"; USER_HEADER_SEARCH_PATHS = "\"${PROJECT_DIR}/../..\"/** \"${PROJECT_DIR}/../..\"/**";
......
...@@ -133,6 +133,11 @@ FluwxAutoDeductHandler *_fluwxAutoDeductHandler; ...@@ -133,6 +133,11 @@ FluwxAutoDeductHandler *_fluwxAutoDeductHandler;
return [WXApi handleOpenURL:url delegate:[FluwxResponseHandler defaultManager]]; return [WXApi handleOpenURL:url delegate:[FluwxResponseHandler defaultManager]];
} }
- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void(^)(NSArray<id<UIUserActivityRestoring>> * __nullable restorableObjects))restorationHandler
{
return [WXApi handleOpenUniversalLink:userActivity delegate:[FluwxResponseHandler defaultManager]];
}
- (BOOL)handleOpenURL:(NSNotification *)aNotification { - (BOOL)handleOpenURL:(NSNotification *)aNotification {
......
...@@ -25,10 +25,9 @@ FlutterMethodChannel *_fluwxMethodChannel = nil; ...@@ -25,10 +25,9 @@ FlutterMethodChannel *_fluwxMethodChannel = nil;
- (void)handleAuth:(FlutterMethodCall *)call result:(FlutterResult)result { - (void)handleAuth:(FlutterMethodCall *)call result:(FlutterResult)result {
NSString *openId = call.arguments[@"openId"]; NSString *openId = call.arguments[@"openId"];
BOOL done = [WXApiRequestHandler sendAuthRequestScope:call.arguments[@"scope"] [WXApiRequestHandler sendAuthRequestScope:call.arguments[@"scope"]
State:(call.arguments[@"state"] == (id) [NSNull null]) ? nil : call.arguments[@"state"] State:(call.arguments[@"state"] == (id) [NSNull null]) ? nil : call.arguments[@"state"]
OpenID:(openId == (id) [NSNull null]) ? nil : openId]; OpenID:(openId == (id) [NSNull null]) ? nil : openId completion:^(BOOL done) {result(@(done));}];
result(@(done));
} }
- (void)authByQRCode:(FlutterMethodCall *)call result:(FlutterResult)result { - (void)authByQRCode:(FlutterMethodCall *)call result:(FlutterResult)result {
......
...@@ -27,9 +27,11 @@ ...@@ -27,9 +27,11 @@
NSNumber *businessType = call.arguments[@"businessType"]; NSNumber *businessType = call.arguments[@"businessType"];
req.businessType = [businessType unsignedIntValue]; req.businessType = [businessType unsignedIntValue];
req.queryInfoDic = paramsFromDart; req.queryInfoDic = paramsFromDart;
BOOL b = [WXApi sendReq:req]; [WXApi sendReq:req completion:^(BOOL done) {
result(@(done));
}];
result(@(b));
} }
- (NSString *)convertToJsonData:(NSDictionary *)dict { - (NSString *)convertToJsonData:(NSDictionary *)dict {
......
...@@ -26,9 +26,10 @@ ...@@ -26,9 +26,10 @@
miniProgramType = WXMiniProgramTypePreview; miniProgramType = WXMiniProgramTypePreview;
} }
BOOL done = [WXApiRequestHandler launchMiniProgramWithUserName:userName [WXApiRequestHandler launchMiniProgramWithUserName:userName
path:path path:path
type:miniProgramType]; type:miniProgramType completion:^(BOOL done) {
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)}); result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
}];
} }
@end @end
...@@ -31,13 +31,14 @@ ...@@ -31,13 +31,14 @@
NSString *nonceStr = call.arguments[@"nonceStr"]; NSString *nonceStr = call.arguments[@"nonceStr"];
UInt32 timeStamp = [timestamp unsignedIntValue]; UInt32 timeStamp = [timestamp unsignedIntValue];
NSString *sign = call.arguments[@"sign"]; NSString *sign = call.arguments[@"sign"];
BOOL done = [WXApiRequestHandler sendPayment:call.arguments[@"appId"] [WXApiRequestHandler sendPayment:call.arguments[@"appId"]
PartnerId:partnerId PartnerId:partnerId
PrepayId:prepayId PrepayId:prepayId
NonceStr:nonceStr NonceStr:nonceStr
Timestamp:timeStamp Timestamp:timeStamp
Package:packageValue Package:packageValue
Sign:sign]; Sign:sign completion:^(BOOL done) {
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)}); result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
}];
} }
@end @end
...@@ -63,8 +63,10 @@ NSObject <FlutterPluginRegistrar> *_registrar; ...@@ -63,8 +63,10 @@ NSObject <FlutterPluginRegistrar> *_registrar;
- (void)shareText:(FlutterMethodCall *)call result:(FlutterResult)result { - (void)shareText:(FlutterMethodCall *)call result:(FlutterResult)result {
NSString *text = call.arguments[fluwxKeyText]; NSString *text = call.arguments[fluwxKeyText];
NSString *scene = call.arguments[fluwxKeyScene]; NSString *scene = call.arguments[fluwxKeyScene];
BOOL done = [WXApiRequestHandler sendText:text InScene:[StringToWeChatScene toScene:scene]]; [WXApiRequestHandler sendText:text InScene:[StringToWeChatScene toScene:scene] completion:^(BOOL done) {
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)}); result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
}];
} }
- (void)shareImage:(FlutterMethodCall *)call result:(FlutterResult)result { - (void)shareImage:(FlutterMethodCall *)call result:(FlutterResult)result {
...@@ -111,16 +113,18 @@ NSObject <FlutterPluginRegistrar> *_registrar; ...@@ -111,16 +113,18 @@ NSObject <FlutterPluginRegistrar> *_registrar;
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
NSString *scene = call.arguments[fluwxKeyScene]; NSString *scene = call.arguments[fluwxKeyScene];
BOOL done = [WXApiRequestHandler sendImageData:imageData [WXApiRequestHandler sendImageData:imageData
TagName:call.arguments[fluwxKeyMediaTagName] TagName:call.arguments[fluwxKeyMediaTagName]
MessageExt:call.arguments[fluwxKeyMessageExt] MessageExt:call.arguments[fluwxKeyMessageExt]
Action:call.arguments[fluwxKeyMessageAction] Action:call.arguments[fluwxKeyMessageAction]
ThumbImage:thumbnailImage ThumbImage:thumbnailImage
InScene:[StringToWeChatScene toScene:scene] InScene:[StringToWeChatScene toScene:scene]
title:call.arguments[fluwxKeyTitle] title:call.arguments[fluwxKeyTitle]
description:call.arguments[fluwxKeyDescription] description:call.arguments[fluwxKeyDescription]
completion:^(BOOL done) {
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
}
]; ];
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
}); });
...@@ -153,16 +157,18 @@ NSObject <FlutterPluginRegistrar> *_registrar; ...@@ -153,16 +157,18 @@ NSObject <FlutterPluginRegistrar> *_registrar;
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
NSString *scene = call.arguments[fluwxKeyScene]; NSString *scene = call.arguments[fluwxKeyScene];
BOOL done = [WXApiRequestHandler sendImageData:imageData [WXApiRequestHandler sendImageData:imageData
TagName:call.arguments[fluwxKeyMediaTagName] TagName:call.arguments[fluwxKeyMediaTagName]
MessageExt:call.arguments[fluwxKeyMessageExt] MessageExt:call.arguments[fluwxKeyMessageExt]
Action:call.arguments[fluwxKeyMessageAction] Action:call.arguments[fluwxKeyMessageAction]
ThumbImage:thumbnailImage ThumbImage:thumbnailImage
InScene:[StringToWeChatScene toScene:scene] InScene:[StringToWeChatScene toScene:scene]
title:call.arguments[fluwxKeyTitle] title:call.arguments[fluwxKeyTitle]
description:call.arguments[fluwxKeyDescription] description:call.arguments[fluwxKeyDescription]
completion:^(BOOL done) {
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
}
]; ];
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
}); });
...@@ -198,16 +204,18 @@ NSObject <FlutterPluginRegistrar> *_registrar; ...@@ -198,16 +204,18 @@ NSObject <FlutterPluginRegistrar> *_registrar;
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
NSString *scene = call.arguments[fluwxKeyScene]; NSString *scene = call.arguments[fluwxKeyScene];
BOOL done = [WXApiRequestHandler sendImageData:imageData [WXApiRequestHandler sendImageData:imageData
TagName:call.arguments[fluwxKeyMediaTagName] TagName:call.arguments[fluwxKeyMediaTagName]
MessageExt:call.arguments[fluwxKeyMessageExt] MessageExt:call.arguments[fluwxKeyMessageExt]
Action:call.arguments[fluwxKeyMessageAction] Action:call.arguments[fluwxKeyMessageAction]
ThumbImage:thumbnailImage ThumbImage:thumbnailImage
InScene:[StringToWeChatScene toScene:scene] InScene:[StringToWeChatScene toScene:scene]
title:call.arguments[fluwxKeyTitle] title:call.arguments[fluwxKeyTitle]
description:call.arguments[fluwxKeyDescription] description:call.arguments[fluwxKeyDescription]
completion:^(BOOL done) {
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
}
]; ];
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
}); });
...@@ -242,15 +250,18 @@ NSObject <FlutterPluginRegistrar> *_registrar; ...@@ -242,15 +250,18 @@ NSObject <FlutterPluginRegistrar> *_registrar;
// Action:fluwxKeyMessageAction // Action:fluwxKeyMessageAction
// ThumbImage:thumbnailImage // ThumbImage:thumbnailImage
// InScene:[StringToWeChatScene toScene:scene]]; // InScene:[StringToWeChatScene toScene:scene]];
BOOL done = [WXApiRequestHandler sendImageData:imageData [WXApiRequestHandler sendImageData:imageData
TagName:call.arguments[fluwxKeyMediaTagName] TagName:call.arguments[fluwxKeyMediaTagName]
MessageExt:call.arguments[fluwxKeyMessageExt] MessageExt:call.arguments[fluwxKeyMessageExt]
Action:call.arguments[fluwxKeyMessageAction] Action:call.arguments[fluwxKeyMessageAction]
ThumbImage:thumbnailImage ThumbImage:thumbnailImage
InScene:[StringToWeChatScene toScene:scene] InScene:[StringToWeChatScene toScene:scene]
title:call.arguments[fluwxKeyTitle] title:call.arguments[fluwxKeyTitle]
description:call.arguments[fluwxKeyDescription]]; description:call.arguments[fluwxKeyDescription]
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)}); completion:^(BOOL done) {
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
}
];
}); });
...@@ -273,15 +284,18 @@ NSObject <FlutterPluginRegistrar> *_registrar; ...@@ -273,15 +284,18 @@ NSObject <FlutterPluginRegistrar> *_registrar;
NSString *webPageUrl = call.arguments[@"webPage"]; NSString *webPageUrl = call.arguments[@"webPage"];
NSString *scene = call.arguments[fluwxKeyScene]; NSString *scene = call.arguments[fluwxKeyScene];
BOOL done = [WXApiRequestHandler sendLinkURL:webPageUrl [WXApiRequestHandler sendLinkURL:webPageUrl
TagName:call.arguments[fluwxKeyMediaTagName] TagName:call.arguments[fluwxKeyMediaTagName]
Title:call.arguments[fluwxKeyTitle] Title:call.arguments[fluwxKeyTitle]
Description:call.arguments[fluwxKeyDescription] Description:call.arguments[fluwxKeyDescription]
ThumbImage:thumbnailImage ThumbImage:thumbnailImage
MessageExt:call.arguments[fluwxKeyMessageExt] MessageExt:call.arguments[fluwxKeyMessageExt]
MessageAction:call.arguments[fluwxKeyMessageAction] MessageAction:call.arguments[fluwxKeyMessageAction]
InScene:[StringToWeChatScene toScene:scene]]; InScene:[StringToWeChatScene toScene:scene]
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
completion:^(BOOL done) {
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
}];
}); });
...@@ -303,18 +317,21 @@ NSObject <FlutterPluginRegistrar> *_registrar; ...@@ -303,18 +317,21 @@ NSObject <FlutterPluginRegistrar> *_registrar;
NSString *scene = call.arguments[fluwxKeyScene]; NSString *scene = call.arguments[fluwxKeyScene];
BOOL done = [WXApiRequestHandler sendMusicURL:call.arguments[@"musicUrl"] [WXApiRequestHandler sendMusicURL:call.arguments[@"musicUrl"]
dataURL:call.arguments[@"musicDataUrl"] dataURL:call.arguments[@"musicDataUrl"]
MusicLowBandUrl:call.arguments[@"musicLowBandUrl"] MusicLowBandUrl:call.arguments[@"musicLowBandUrl"]
MusicLowBandDataUrl:call.arguments[@"musicLowBandDataUrl"] MusicLowBandDataUrl:call.arguments[@"musicLowBandDataUrl"]
Title:call.arguments[fluwxKeyTitle] Title:call.arguments[fluwxKeyTitle]
Description:call.arguments[fluwxKeyDescription] Description:call.arguments[fluwxKeyDescription]
ThumbImage:thumbnailImage ThumbImage:thumbnailImage
MessageExt:call.arguments[fluwxKeyMessageExt] MessageExt:call.arguments[fluwxKeyMessageExt]
MessageAction:call.arguments[fluwxKeyMessageAction] MessageAction:call.arguments[fluwxKeyMessageAction]
TagName:call.arguments[fluwxKeyMediaTagName] TagName:call.arguments[fluwxKeyMediaTagName]
InScene:[StringToWeChatScene toScene:scene]]; InScene:[StringToWeChatScene toScene:scene]
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)}); completion:^(BOOL done) {
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
}
];
}); });
...@@ -335,16 +352,18 @@ NSObject <FlutterPluginRegistrar> *_registrar; ...@@ -335,16 +352,18 @@ NSObject <FlutterPluginRegistrar> *_registrar;
NSString *scene = call.arguments[fluwxKeyScene]; NSString *scene = call.arguments[fluwxKeyScene];
BOOL done = [WXApiRequestHandler sendVideoURL:call.arguments[@"videoUrl"] [WXApiRequestHandler sendVideoURL:call.arguments[@"videoUrl"]
VideoLowBandUrl:call.arguments[@"videoLowBandUrl"] VideoLowBandUrl:call.arguments[@"videoLowBandUrl"]
Title:call.arguments[fluwxKeyTitle] Title:call.arguments[fluwxKeyTitle]
Description:call.arguments[fluwxKeyDescription] Description:call.arguments[fluwxKeyDescription]
ThumbImage:thumbnailImage ThumbImage:thumbnailImage
MessageExt:call.arguments[fluwxKeyMessageExt] MessageExt:call.arguments[fluwxKeyMessageExt]
MessageAction:call.arguments[fluwxKeyMessageAction] MessageAction:call.arguments[fluwxKeyMessageAction]
TagName:call.arguments[fluwxKeyMediaTagName] TagName:call.arguments[fluwxKeyMediaTagName]
InScene:[StringToWeChatScene toScene:scene]]; InScene:[StringToWeChatScene toScene:scene]
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)}); completion:^(BOOL done) {
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
}];
}); });
...@@ -394,20 +413,23 @@ NSObject <FlutterPluginRegistrar> *_registrar; ...@@ -394,20 +413,23 @@ NSObject <FlutterPluginRegistrar> *_registrar;
miniProgramType = WXMiniProgramTypePreview; miniProgramType = WXMiniProgramTypePreview;
} }
BOOL done = [WXApiRequestHandler sendMiniProgramWebpageUrl:call.arguments[@"webPageUrl"] [WXApiRequestHandler sendMiniProgramWebpageUrl:call.arguments[@"webPageUrl"]
userName:call.arguments[@"userName"] userName:call.arguments[@"userName"]
path:call.arguments[@"path"] path:call.arguments[@"path"]
title:call.arguments[fluwxKeyTitle] title:call.arguments[fluwxKeyTitle]
Description:call.arguments[fluwxKeyDescription] Description:call.arguments[fluwxKeyDescription]
ThumbImage:thumbnailImage ThumbImage:thumbnailImage
hdImageData:hdImageData hdImageData:hdImageData
withShareTicket:[call.arguments[@"withShareTicket"] boolValue] withShareTicket:[call.arguments[@"withShareTicket"] boolValue]
miniProgramType:miniProgramType miniProgramType:miniProgramType
MessageExt:call.arguments[fluwxKeyMessageExt] MessageExt:call.arguments[fluwxKeyMessageExt]
MessageAction:call.arguments[fluwxKeyMessageAction] MessageAction:call.arguments[fluwxKeyMessageAction]
TagName:call.arguments[fluwxKeyMediaTagName] TagName:call.arguments[fluwxKeyMediaTagName]
InScene:[StringToWeChatScene toScene:scene]]; InScene:[StringToWeChatScene toScene:scene]
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)}); completion:^(BOOL done) {
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
}
];
}); });
......
...@@ -32,9 +32,9 @@ ...@@ -32,9 +32,9 @@
req.reserved = reserved; req.reserved = reserved;
req.openID = appId; req.openID = appId;
BOOL b = [WXApi sendReq:req]; [WXApi sendReq:req completion:^(BOOL done) {result(@(done));}];
result(@(b));
} }
......
...@@ -28,10 +28,20 @@ ...@@ -28,10 +28,20 @@
return; return;
} }
NSString *universalLink = call.arguments[@"universalLink"];
isWeChatRegistered = [WXApi registerApp:appId enableMTA:[call.arguments[@"enableMTA"] boolValue]]; if ([StringUtil isBlank:universalLink]) {
UInt64 typeFlag = MMAPP_SUPPORT_TEXT | MMAPP_SUPPORT_PICTURE | MMAPP_SUPPORT_LOCATION | MMAPP_SUPPORT_VIDEO | MMAPP_SUPPORT_AUDIO | MMAPP_SUPPORT_WEBPAGE | MMAPP_SUPPORT_DOC | MMAPP_SUPPORT_DOCX | MMAPP_SUPPORT_PPT | MMAPP_SUPPORT_PPTX | MMAPP_SUPPORT_XLS | MMAPP_SUPPORT_XLSX | MMAPP_SUPPORT_PDF; result([FlutterError errorWithCode:@"invalid universal link" message:@"are you sure your universal link is correct ? " details:universalLink]);
[WXApi registerAppSupportContentFlag:typeFlag]; return;
}
// isWeChatRegistered = [WXApi registerApp:appId enableMTA:[call.arguments[@"enableMTA"] boolValue]];
isWeChatRegistered = [WXApi registerApp:appId universalLink:universalLink];
// UInt64 typeFlag = MMAPP_SUPPORT_TEXT | MMAPP_SUPPORT_PICTURE | MMAPP_SUPPORT_LOCATION | MMAPP_SUPPORT_VIDEO | MMAPP_SUPPORT_AUDIO | MMAPP_SUPPORT_WEBPAGE | MMAPP_SUPPORT_DOC | MMAPP_SUPPORT_DOCX | MMAPP_SUPPORT_PPT | MMAPP_SUPPORT_PPTX | MMAPP_SUPPORT_XLS | MMAPP_SUPPORT_XLSX | MMAPP_SUPPORT_PDF;
// [WXApi registerAppSupportContentFlag:typeFlag];
//
// wx
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(isWeChatRegistered)}); result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(isWeChatRegistered)});
} }
......
...@@ -12,28 +12,31 @@ ...@@ -12,28 +12,31 @@
@interface WXApiRequestHandler : NSObject @interface WXApiRequestHandler : NSObject
+ (BOOL)sendText:(NSString *)text + (void)sendText:(NSString *)text
InScene:(enum WXScene)scene; InScene:(enum WXScene)scene
completion:(void (^ __nullable)(BOOL success))completion;
+ (BOOL)sendImageData:(NSData *)imageData + (void)sendImageData:(NSData *)imageData
TagName:(NSString *)tagName TagName:(NSString *)tagName
MessageExt:(NSString *)messageExt MessageExt:(NSString *)messageExt
Action:(NSString *)action Action:(NSString *)action
ThumbImage:(UIImage *)thumbImage ThumbImage:(UIImage *)thumbImage
InScene:(enum WXScene)scene InScene:(enum WXScene)scene
title:(NSString *)title title:(NSString *)title
description:(NSString *)description; description:(NSString *)description
completion:(void (^ __nullable)(BOOL success))completion;
+ (BOOL)sendLinkURL:(NSString *)urlString + (void)sendLinkURL:(NSString *)urlString
TagName:(NSString *)tagName TagName:(NSString *)tagName
Title:(NSString *)title Title:(NSString *)title
Description:(NSString *)description Description:(NSString *)description
ThumbImage:(UIImage *)thumbImage ThumbImage:(UIImage *)thumbImage
MessageExt:(NSString *)messageExt MessageExt:(NSString *)messageExt
MessageAction:(NSString *)messageAction MessageAction:(NSString *)messageAction
InScene:(enum WXScene)scene; InScene:(enum WXScene)scene
completion:(void (^ __nullable)(BOOL success))completion;
+ (BOOL)sendMusicURL:(NSString *)musicURL + (void)sendMusicURL:(NSString *)musicURL
dataURL:(NSString *)dataURL dataURL:(NSString *)dataURL
MusicLowBandUrl:(NSString *)musicLowBandUrl MusicLowBandUrl:(NSString *)musicLowBandUrl
MusicLowBandDataUrl:(NSString *)musicLowBandDataUrl MusicLowBandDataUrl:(NSString *)musicLowBandDataUrl
...@@ -43,9 +46,10 @@ ...@@ -43,9 +46,10 @@
MessageExt:(NSString *)messageExt MessageExt:(NSString *)messageExt
MessageAction:(NSString *)messageAction MessageAction:(NSString *)messageAction
TagName:(NSString *)tagName TagName:(NSString *)tagName
InScene:(enum WXScene)scene; InScene:(enum WXScene)scene
completion:(void (^ __nullable)(BOOL success))completion;
+ (BOOL)sendVideoURL:(NSString *)videoURL + (void)sendVideoURL:(NSString *)videoURL
VideoLowBandUrl:(NSString *)videoLowBandUrl VideoLowBandUrl:(NSString *)videoLowBandUrl
Title:(NSString *)title Title:(NSString *)title
Description:(NSString *)description Description:(NSString *)description
...@@ -53,20 +57,22 @@ ...@@ -53,20 +57,22 @@
MessageExt:(NSString *)messageExt MessageExt:(NSString *)messageExt
MessageAction:(NSString *)messageAction MessageAction:(NSString *)messageAction
TagName:(NSString *)tagName TagName:(NSString *)tagName
InScene:(enum WXScene)scene; InScene:(enum WXScene)scene
completion:(void (^ __nullable)(BOOL success))completion;
+ (BOOL)sendEmotionData:(NSData *)emotionData + (void)sendEmotionData:(NSData *)emotionData
ThumbImage:(UIImage *)thumbImage ThumbImage:(UIImage *)thumbImage
InScene:(enum WXScene)scene; InScene:(enum WXScene)scene;
+ (BOOL)sendFileData:(NSData *)fileData + (void)sendFileData:(NSData *)fileData
fileExtension:(NSString *)extension fileExtension:(NSString *)extension
Title:(NSString *)title Title:(NSString *)title
Description:(NSString *)description Description:(NSString *)description
ThumbImage:(UIImage *)thumbImage ThumbImage:(UIImage *)thumbImage
InScene:(enum WXScene)scene; InScene:(enum WXScene)scene
completion:(void (^ __nullable)(BOOL success))completion;
+ (BOOL)sendMiniProgramWebpageUrl:(NSString *)webpageUrl + (void)sendMiniProgramWebpageUrl:(NSString *)webpageUrl
userName:(NSString *)userName userName:(NSString *)userName
path:(NSString *)path path:(NSString *)path
title:(NSString *)title title:(NSString *)title
...@@ -78,13 +84,15 @@ ...@@ -78,13 +84,15 @@
MessageExt:(NSString *)messageExt MessageExt:(NSString *)messageExt
MessageAction:(NSString *)messageAction MessageAction:(NSString *)messageAction
TagName:(NSString *)tagName TagName:(NSString *)tagName
InScene:(enum WXScene)scene; InScene:(enum WXScene)scene
completion:(void (^ __nullable)(BOOL success))completion;
+ (BOOL)launchMiniProgramWithUserName:(NSString *)userName + (void)launchMiniProgramWithUserName:(NSString *)userName
path:(NSString *)path path:(NSString *)path
type:(WXMiniProgramType)miniProgramType; type:(WXMiniProgramType)miniProgramType
completion:(void (^ __nullable)(BOOL success))completion;
+ (BOOL)sendAppContentData:(NSData *)data + (void)sendAppContentData:(NSData *)data
ExtInfo:(NSString *)info ExtInfo:(NSString *)info
ExtURL:(NSString *)url ExtURL:(NSString *)url
Title:(NSString *)title Title:(NSString *)title
...@@ -92,50 +100,49 @@ ...@@ -92,50 +100,49 @@
MessageExt:(NSString *)messageExt MessageExt:(NSString *)messageExt
MessageAction:(NSString *)action MessageAction:(NSString *)action
ThumbImage:(UIImage *)thumbImage ThumbImage:(UIImage *)thumbImage
InScene:(enum WXScene)scene; InScene:(enum WXScene)scene
completion:(void (^ __nullable)(BOOL success))completion;
+ (BOOL)addCardsToCardPackage:(NSArray *)cardIds cardExts:(NSArray *)cardExts; + (void)addCardsToCardPackage:(NSArray *)cardIds cardExts:(NSArray *)cardExts
completion:(void (^ __nullable)(BOOL success))completion;
+ (BOOL)sendAuthRequestScope:(NSString *)scope + (void)sendAuthRequestScope:(NSString *)scope
State:(NSString *)state State:(NSString *)state
OpenID:(NSString *)openID OpenID:(NSString *)openID
InViewController:(UIViewController *)viewController; InViewController:(UIViewController *)viewController
completion:(void (^ __nullable)(BOOL success))completion;
+ (BOOL)sendAuthRequestScope:(NSString *)scope + (void)sendAuthRequestScope:(NSString *)scope
State:(NSString *)state State:(NSString *)state
OpenID:(NSString *)openID; OpenID:(NSString *)openID
completion:(void (^ __nullable)(BOOL success))completion;
+ (BOOL)openProfileWithAppID:(NSString *)appID
Description:(NSString *)description
UserName:(NSString *)userName
ExtMsg:(NSString *)extMessage;
+ (BOOL)jumpToBizWebviewWithAppID:(NSString *)appID
Description:(NSString *)description
tousrname:(NSString *)tousrname
ExtMsg:(NSString *)extMsg;
+ (BOOL)chooseCard:(NSString *)appid + (void)chooseCard:(NSString *)appid
cardSign:(NSString *)cardSign cardSign:(NSString *)cardSign
nonceStr:(NSString *)nonceStr nonceStr:(NSString *)nonceStr
signType:(NSString *)signType signType:(NSString *)signType
timestamp:(UInt32)timestamp; timestamp:(UInt32)timestamp
completion:(void (^ __nullable)(BOOL success))completion;
+ (BOOL)openUrl:(NSString *)url; + (void)openUrl:(NSString *)url
completion:(void (^ __nullable)(BOOL success))completion;
+ (BOOL)chooseInvoice:(NSString *)appid + (void)chooseInvoice:(NSString *)appid
cardSign:(NSString *)cardSign cardSign:(NSString *)cardSign
nonceStr:(NSString *)nonceStr nonceStr:(NSString *)nonceStr
signType:(NSString *)signType signType:(NSString *)signType
timestamp:(UInt32)timestamp; timestamp:(UInt32)timestamp
completion:(void (^ __nullable)(BOOL success))completion;
+ (BOOL)sendPayment:(NSString *)appId + (void)sendPayment:(NSString *)appId
PartnerId:(NSString *)partnerId PartnerId:(NSString *)partnerId
PrepayId:(NSString *)prepayId PrepayId:(NSString *)prepayId
NonceStr:(NSString *)nonceStr NonceStr:(NSString *)nonceStr
Timestamp:(UInt32)timestamp Timestamp:(UInt32)timestamp
Package:(NSString *)package Package:(NSString *)package
Sign:(NSString *)sign; Sign:(NSString *)sign
completion:(void (^ __nullable)(BOOL success))completion;
@end @end
...@@ -16,23 +16,26 @@ ...@@ -16,23 +16,26 @@
#pragma mark - Public Methods #pragma mark - Public Methods
+ (BOOL)sendText:(NSString *)text + (void)sendText:(NSString *)text
InScene:(enum WXScene)scene { InScene:(enum WXScene)scene
completion:(void (^ __nullable)(BOOL success))completion {
SendMessageToWXReq *req = [SendMessageToWXReq requestWithText:text SendMessageToWXReq *req = [SendMessageToWXReq requestWithText:text
OrMediaMessage:nil OrMediaMessage:nil
bText:YES bText:YES
InScene:scene]; InScene:scene];
return [WXApi sendReq:req];
[WXApi sendReq:req completion:completion];
} }
+ (BOOL)sendImageData:(NSData *)imageData + (void)sendImageData:(NSData *)imageData
TagName:(NSString *)tagName TagName:(NSString *)tagName
MessageExt:(NSString *)messageExt MessageExt:(NSString *)messageExt
Action:(NSString *)action Action:(NSString *)action
ThumbImage:(UIImage *)thumbImage ThumbImage:(UIImage *)thumbImage
InScene:(enum WXScene)scene InScene:(enum WXScene)scene
title:(NSString *)title title:(NSString *)title
description:(NSString *)description { description:(NSString *)description
completion:(void (^ __nullable)(BOOL success))completion {
WXImageObject *ext = [WXImageObject object]; WXImageObject *ext = [WXImageObject object];
ext.imageData = imageData; ext.imageData = imageData;
...@@ -50,17 +53,18 @@ ...@@ -50,17 +53,18 @@
bText:NO bText:NO
InScene:scene]; InScene:scene];
return [WXApi sendReq:req]; [WXApi sendReq:req completion:completion];
} }
+ (BOOL)sendLinkURL:(NSString *)urlString + (void)sendLinkURL:(NSString *)urlString
TagName:(NSString *)tagName TagName:(NSString *)tagName
Title:(NSString *)title Title:(NSString *)title
Description:(NSString *)description Description:(NSString *)description
ThumbImage:(UIImage *)thumbImage ThumbImage:(UIImage *)thumbImage
MessageExt:(NSString *)messageExt MessageExt:(NSString *)messageExt
MessageAction:(NSString *)messageAction MessageAction:(NSString *)messageAction
InScene:(enum WXScene)scene { InScene:(enum WXScene)scene
completion:(void (^ __nullable)(BOOL success))completion {
WXWebpageObject *ext = [WXWebpageObject object]; WXWebpageObject *ext = [WXWebpageObject object];
ext.webpageUrl = urlString; ext.webpageUrl = urlString;
...@@ -76,10 +80,10 @@ ...@@ -76,10 +80,10 @@
OrMediaMessage:message OrMediaMessage:message
bText:NO bText:NO
InScene:scene]; InScene:scene];
return [WXApi sendReq:req]; [WXApi sendReq:req completion:completion];
} }
+ (BOOL)sendMusicURL:(NSString *)musicURL + (void)sendMusicURL:(NSString *)musicURL
dataURL:(NSString *)dataURL dataURL:(NSString *)dataURL
MusicLowBandUrl:(NSString *)musicLowBandUrl MusicLowBandUrl:(NSString *)musicLowBandUrl
MusicLowBandDataUrl:(NSString *)musicLowBandDataUrl MusicLowBandDataUrl:(NSString *)musicLowBandDataUrl
...@@ -89,7 +93,8 @@ ...@@ -89,7 +93,8 @@
MessageExt:(NSString *)messageExt MessageExt:(NSString *)messageExt
MessageAction:(NSString *)messageAction MessageAction:(NSString *)messageAction
TagName:(NSString *)tagName TagName:(NSString *)tagName
InScene:(enum WXScene)scene { InScene:(enum WXScene)scene
completion:(void (^ __nullable)(BOOL success))completion {
WXMusicObject *ext = [WXMusicObject object]; WXMusicObject *ext = [WXMusicObject object];
if ([StringUtil isBlank:musicURL]) { if ([StringUtil isBlank:musicURL]) {
...@@ -114,10 +119,10 @@ ...@@ -114,10 +119,10 @@
bText:NO bText:NO
InScene:scene]; InScene:scene];
return [WXApi sendReq:req]; [WXApi sendReq:req completion:completion];
} }
+ (BOOL)sendVideoURL:(NSString *)videoURL + (void)sendVideoURL:(NSString *)videoURL
VideoLowBandUrl:(NSString *)videoLowBandUrl VideoLowBandUrl:(NSString *)videoLowBandUrl
Title:(NSString *)title Title:(NSString *)title
Description:(NSString *)description Description:(NSString *)description
...@@ -125,7 +130,8 @@ ...@@ -125,7 +130,8 @@
MessageExt:(NSString *)messageExt MessageExt:(NSString *)messageExt
MessageAction:(NSString *)messageAction MessageAction:(NSString *)messageAction
TagName:(NSString *)tagName TagName:(NSString *)tagName
InScene:(enum WXScene)scene { InScene:(enum WXScene)scene
completion:(void (^ __nullable)(BOOL success))completion {
WXMediaMessage *message = [WXMediaMessage message]; WXMediaMessage *message = [WXMediaMessage message];
message.title = (title == (id) [NSNull null]) ? nil : title; message.title = (title == (id) [NSNull null]) ? nil : title;
message.description = (description == (id) [NSNull null]) ? nil : description; message.description = (description == (id) [NSNull null]) ? nil : description;
...@@ -146,12 +152,13 @@ ...@@ -146,12 +152,13 @@
OrMediaMessage:message OrMediaMessage:message
bText:NO bText:NO
InScene:scene]; InScene:scene];
return [WXApi sendReq:req]; [WXApi sendReq:req completion:completion];
} }
+ (BOOL)sendEmotionData:(NSData *)emotionData + (void)sendEmotionData:(NSData *)emotionData
ThumbImage:(UIImage *)thumbImage ThumbImage:(UIImage *)thumbImage
InScene:(enum WXScene)scene { InScene:(enum WXScene)scene
completion:(void (^ __nullable)(BOOL success))completion {
WXMediaMessage *message = [WXMediaMessage message]; WXMediaMessage *message = [WXMediaMessage message];
[message setThumbImage:thumbImage]; [message setThumbImage:thumbImage];
...@@ -164,15 +171,16 @@ ...@@ -164,15 +171,16 @@
OrMediaMessage:message OrMediaMessage:message
bText:NO bText:NO
InScene:scene]; InScene:scene];
return [WXApi sendReq:req]; [WXApi sendReq:req completion:completion];
} }
+ (BOOL)sendFileData:(NSData *)fileData + (void)sendFileData:(NSData *)fileData
fileExtension:(NSString *)extension fileExtension:(NSString *)extension
Title:(NSString *)title Title:(NSString *)title
Description:(NSString *)description Description:(NSString *)description
ThumbImage:(UIImage *)thumbImage ThumbImage:(UIImage *)thumbImage
InScene:(enum WXScene)scene { InScene:(enum WXScene)scene
completion:(void (^ __nullable)(BOOL success))completion {
WXMediaMessage *message = [WXMediaMessage message]; WXMediaMessage *message = [WXMediaMessage message];
message.title = title; message.title = title;
message.description = description; message.description = description;
...@@ -188,10 +196,10 @@ ...@@ -188,10 +196,10 @@
OrMediaMessage:message OrMediaMessage:message
bText:NO bText:NO
InScene:scene]; InScene:scene];
return [WXApi sendReq:req]; [WXApi sendReq:req completion:completion];
} }
+ (BOOL)sendMiniProgramWebpageUrl:(NSString *)webpageUrl + (void)sendMiniProgramWebpageUrl:(NSString *)webpageUrl
userName:(NSString *)userName userName:(NSString *)userName
path:(NSString *)path path:(NSString *)path
title:(NSString *)title title:(NSString *)title
...@@ -203,7 +211,8 @@ ...@@ -203,7 +211,8 @@
MessageExt:(NSString *)messageExt MessageExt:(NSString *)messageExt
MessageAction:(NSString *)messageAction MessageAction:(NSString *)messageAction
TagName:(NSString *)tagName TagName:(NSString *)tagName
InScene:(enum WXScene)scene { InScene:(enum WXScene)scene
completion:(void (^ __nullable)(BOOL success))completion {
WXMiniProgramObject *ext = [WXMiniProgramObject object]; WXMiniProgramObject *ext = [WXMiniProgramObject object];
ext.webpageUrl = (webpageUrl == (id) [NSNull null]) ? nil : webpageUrl; ext.webpageUrl = (webpageUrl == (id) [NSNull null]) ? nil : webpageUrl;
ext.userName = (userName == (id) [NSNull null]) ? nil : userName; ext.userName = (userName == (id) [NSNull null]) ? nil : userName;
...@@ -236,22 +245,23 @@ ...@@ -236,22 +245,23 @@
bText:NO bText:NO
InScene:scene]; InScene:scene];
return [WXApi sendReq:req]; [WXApi sendReq:req completion:completion];
} }
+ (BOOL)launchMiniProgramWithUserName:(NSString *)userName + (void)launchMiniProgramWithUserName:(NSString *)userName
path:(NSString *)path path:(NSString *)path
type:(WXMiniProgramType)miniProgramType { type:(WXMiniProgramType)miniProgramType
completion:(void (^ __nullable)(BOOL success))completion {
WXLaunchMiniProgramReq *launchMiniProgramReq = [WXLaunchMiniProgramReq object]; WXLaunchMiniProgramReq *launchMiniProgramReq = [WXLaunchMiniProgramReq object];
launchMiniProgramReq.userName = userName; launchMiniProgramReq.userName = userName;
launchMiniProgramReq.path = (path == (id) [NSNull null]) ? nil : path; launchMiniProgramReq.path = (path == (id) [NSNull null]) ? nil : path;
launchMiniProgramReq.miniProgramType = miniProgramType; launchMiniProgramReq.miniProgramType = miniProgramType;
return [WXApi sendReq:launchMiniProgramReq]; [WXApi sendReq:launchMiniProgramReq completion:completion];
} }
+ (BOOL)sendAppContentData:(NSData *)data + (void)sendAppContentData:(NSData *)data
ExtInfo:(NSString *)info ExtInfo:(NSString *)info
ExtURL:(NSString *)url ExtURL:(NSString *)url
Title:(NSString *)title Title:(NSString *)title
...@@ -259,7 +269,8 @@ ...@@ -259,7 +269,8 @@
MessageExt:(NSString *)messageExt MessageExt:(NSString *)messageExt
MessageAction:(NSString *)action MessageAction:(NSString *)action
ThumbImage:(UIImage *)thumbImage ThumbImage:(UIImage *)thumbImage
InScene:(enum WXScene)scene { InScene:(enum WXScene)scene
completion:(void (^ __nullable)(BOOL success))completion {
WXAppExtendObject *ext = [WXAppExtendObject object]; WXAppExtendObject *ext = [WXAppExtendObject object];
ext.extInfo = info; ext.extInfo = info;
ext.url = url; ext.url = url;
...@@ -277,11 +288,12 @@ ...@@ -277,11 +288,12 @@
OrMediaMessage:message OrMediaMessage:message
bText:NO bText:NO
InScene:scene]; InScene:scene];
return [WXApi sendReq:req]; [WXApi sendReq:req completion:completion];
} }
+ (BOOL)addCardsToCardPackage:(NSArray *)cardIds cardExts:(NSArray *)cardExts { + (void)addCardsToCardPackage:(NSArray *)cardIds cardExts:(NSArray *)cardExts
completion:(void (^ __nullable)(BOOL success))completion {
NSMutableArray *cardItems = [NSMutableArray array]; NSMutableArray *cardItems = [NSMutableArray array];
for (NSString *cardId in cardIds) { for (NSString *cardId in cardIds) {
WXCardItem *item = [[WXCardItem alloc] init]; WXCardItem *item = [[WXCardItem alloc] init];
...@@ -298,84 +310,71 @@ ...@@ -298,84 +310,71 @@
AddCardToWXCardPackageReq *req = [[AddCardToWXCardPackageReq alloc] init]; AddCardToWXCardPackageReq *req = [[AddCardToWXCardPackageReq alloc] init];
req.cardAry = cardItems; req.cardAry = cardItems;
return [WXApi sendReq:req]; [WXApi sendReq:req completion:completion];
} }
+ (BOOL)chooseCard:(NSString *)appid + (void)chooseCard:(NSString *)appid
cardSign:(NSString *)cardSign cardSign:(NSString *)cardSign
nonceStr:(NSString *)nonceStr nonceStr:(NSString *)nonceStr
signType:(NSString *)signType signType:(NSString *)signType
timestamp:(UInt32)timestamp { timestamp:(UInt32)timestamp
completion:(void (^ __nullable)(BOOL success))completion {
WXChooseCardReq *chooseCardReq = [[WXChooseCardReq alloc] init]; WXChooseCardReq *chooseCardReq = [[WXChooseCardReq alloc] init];
chooseCardReq.appID = appid; chooseCardReq.appID = appid;
chooseCardReq.cardSign = cardSign; chooseCardReq.cardSign = cardSign;
chooseCardReq.nonceStr = nonceStr; chooseCardReq.nonceStr = nonceStr;
chooseCardReq.signType = signType; chooseCardReq.signType = signType;
chooseCardReq.timeStamp = timestamp; chooseCardReq.timeStamp = timestamp;
return [WXApi sendReq:chooseCardReq]; [WXApi sendReq:chooseCardReq completion:completion];
} }
+ (BOOL)sendAuthRequestScope:(NSString *)scope + (void)sendAuthRequestScope:(NSString *)scope
State:(NSString *)state State:(NSString *)state
OpenID:(NSString *)openID OpenID:(NSString *)openID
InViewController:(UIViewController *)viewController { InViewController:(UIViewController *)viewController
completion:(void (^ __nullable)(BOOL success))completion {
SendAuthReq *req = [[SendAuthReq alloc] init]; SendAuthReq *req = [[SendAuthReq alloc] init];
req.scope = scope; // @"post_timeline,sns" req.scope = scope; // @"post_timeline,sns"
req.state = state; req.state = state;
req.openID = openID; req.openID = openID;
return [WXApi sendAuthReq:req return [WXApi sendAuthReq:req
viewController:viewController viewController:viewController
delegate:[FluwxResponseHandler defaultManager]]; delegate:[FluwxResponseHandler defaultManager]
completion:completion];
} }
+ (BOOL)sendAuthRequestScope:(NSString *)scope + (void)sendAuthRequestScope:(NSString *)scope
State:(NSString *)state State:(NSString *)state
OpenID:(NSString *)openID { OpenID:(NSString *)openID
completion:(void (^ __nullable)(BOOL success))completion {
SendAuthReq *req = [[SendAuthReq alloc] init]; SendAuthReq *req = [[SendAuthReq alloc] init];
req.scope = scope; // @"post_timeline,sns" req.scope = scope; // @"post_timeline,sns"
req.state = state; req.state = state;
req.openID = openID; req.openID = openID;
return [WXApi sendReq:req]; [WXApi sendReq:req completion:completion];
} }
+ (BOOL)openProfileWithAppID:(NSString *)appID
Description:(NSString *)description
UserName:(NSString *)userName
ExtMsg:(NSString *)extMessage {
[WXApi registerApp:appID];
JumpToBizProfileReq *req = [[JumpToBizProfileReq alloc] init];
req.profileType = WXBizProfileType_Device;
req.username = userName;
req.extMsg = extMessage;
return [WXApi sendReq:req];
}
+ (BOOL)jumpToBizWebviewWithAppID:(NSString *)appID
Description:(NSString *)description
tousrname:(NSString *)tousrname
ExtMsg:(NSString *)extMsg {
[WXApi registerApp:appID];
JumpToBizWebviewReq *req = [[JumpToBizWebviewReq alloc] init];
req.tousrname = tousrname;
req.extMsg = extMsg;
req.webType = WXMPWebviewType_Ad;
return [WXApi sendReq:req];
}
+ (BOOL)openUrl:(NSString *)url {
+ (void)openUrl:(NSString *)url
completion:(void (^ __nullable)(BOOL success))completion {
OpenWebviewReq *req = [[OpenWebviewReq alloc] init]; OpenWebviewReq *req = [[OpenWebviewReq alloc] init];
req.url = url; req.url = url;
return [WXApi sendReq:req]; [WXApi sendReq:req completion:completion];
} }
+ (BOOL)chooseInvoice:(NSString *)appid + (void)chooseInvoice:(NSString *)appid
cardSign:(NSString *)cardSign cardSign:(NSString *)cardSign
nonceStr:(NSString *)nonceStr nonceStr:(NSString *)nonceStr
signType:(NSString *)signType signType:(NSString *)signType
timestamp:(UInt32)timestamp { timestamp:(UInt32)timestamp
completion:(void (^ __nullable)(BOOL success))completion {
WXChooseInvoiceReq *chooseInvoiceReq = [[WXChooseInvoiceReq alloc] init]; WXChooseInvoiceReq *chooseInvoiceReq = [[WXChooseInvoiceReq alloc] init];
chooseInvoiceReq.appID = appid; chooseInvoiceReq.appID = appid;
chooseInvoiceReq.cardSign = cardSign; chooseInvoiceReq.cardSign = cardSign;
...@@ -384,11 +383,12 @@ ...@@ -384,11 +383,12 @@
// chooseCardReq.cardType = @"INVOICE"; // chooseCardReq.cardType = @"INVOICE";
chooseInvoiceReq.timeStamp = timestamp; chooseInvoiceReq.timeStamp = timestamp;
// chooseCardReq.canMultiSelect = 1; // chooseCardReq.canMultiSelect = 1;
return [WXApi sendReq:chooseInvoiceReq]; [WXApi sendReq:chooseInvoiceReq completion:completion];
} }
+ (BOOL)sendPayment:(NSString *)appId PartnerId:(NSString *)partnerId PrepayId:(NSString *)prepayId NonceStr:(NSString *)nonceStr Timestamp:(UInt32)timestamp Package:(NSString *)package Sign:(NSString *)sign { + (void)sendPayment:(NSString *)appId PartnerId:(NSString *)partnerId PrepayId:(NSString *)prepayId NonceStr:(NSString *)nonceStr Timestamp:(UInt32)timestamp Package:(NSString *)package Sign:(NSString *)sign
completion:(void (^ __nullable)(BOOL success))completion {
PayReq *req = [[PayReq alloc] init]; PayReq *req = [[PayReq alloc] init];
req.openID = (appId == (id) [NSNull null]) ? nil : appId; req.openID = (appId == (id) [NSNull null]) ? nil : appId;
...@@ -400,7 +400,7 @@ ...@@ -400,7 +400,7 @@
req.sign = sign; req.sign = sign;
return [WXApi sendReq:req]; [WXApi sendReq:req completion:completion];
} }
@end @end
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论