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

ios sdk upgrade to 1.8.6.1

上级 fce63253
......@@ -14,8 +14,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/fluwx/ios"
SPEC CHECKSUMS:
Flutter: 58dd7d1b27887414a370fcccb9e645c08ffd7a6a
fluwx: 19524c5e4c9c539a646407259139c9c1e4eaf9e5
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
fluwx: 765c6052398eaf6fe13c73409488b0d0b9d00fd6
PODFILE CHECKSUM: 348e15598a1c6ea25d3ed63919d5ffb9bd1c2ba6
......
......@@ -451,7 +451,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
PRODUCT_BUNDLE_IDENTIFIER = com.jarvanmo.fluwxexample1;
PRODUCT_BUNDLE_IDENTIFIER = com.jarvanmo.fluwxexample2;
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = "\"${PROJECT_DIR}/../..\"/** \"${PROJECT_DIR}/../..\"/**";
......@@ -479,7 +479,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
PRODUCT_BUNDLE_IDENTIFIER = com.jarvanmo.fluwxexample1;
PRODUCT_BUNDLE_IDENTIFIER = com.jarvanmo.fluwxexample2;
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = "\"${PROJECT_DIR}/../..\"/** \"${PROJECT_DIR}/../..\"/**";
......
......@@ -133,6 +133,11 @@ FluwxAutoDeductHandler *_fluwxAutoDeductHandler;
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 {
......
......@@ -25,10 +25,9 @@ FlutterMethodChannel *_fluwxMethodChannel = nil;
- (void)handleAuth:(FlutterMethodCall *)call result:(FlutterResult)result {
NSString *openId = call.arguments[@"openId"];
BOOL done = [WXApiRequestHandler sendAuthRequestScope:call.arguments[@"scope"]
State:(call.arguments[@"state"] == (id) [NSNull null]) ? nil : call.arguments[@"state"]
OpenID:(openId == (id) [NSNull null]) ? nil : openId];
result(@(done));
[WXApiRequestHandler sendAuthRequestScope:call.arguments[@"scope"]
State:(call.arguments[@"state"] == (id) [NSNull null]) ? nil : call.arguments[@"state"]
OpenID:(openId == (id) [NSNull null]) ? nil : openId completion:^(BOOL done) {result(@(done));}];
}
- (void)authByQRCode:(FlutterMethodCall *)call result:(FlutterResult)result {
......
......@@ -27,9 +27,11 @@
NSNumber *businessType = call.arguments[@"businessType"];
req.businessType = [businessType unsignedIntValue];
req.queryInfoDic = paramsFromDart;
BOOL b = [WXApi sendReq:req];
[WXApi sendReq:req completion:^(BOOL done) {
result(@(done));
}];
result(@(b));
}
- (NSString *)convertToJsonData:(NSDictionary *)dict {
......
......@@ -26,9 +26,10 @@
miniProgramType = WXMiniProgramTypePreview;
}
BOOL done = [WXApiRequestHandler launchMiniProgramWithUserName:userName
path:path
type:miniProgramType];
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
[WXApiRequestHandler launchMiniProgramWithUserName:userName
path:path
type:miniProgramType completion:^(BOOL done) {
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
}];
}
@end
......@@ -31,13 +31,14 @@
NSString *nonceStr = call.arguments[@"nonceStr"];
UInt32 timeStamp = [timestamp unsignedIntValue];
NSString *sign = call.arguments[@"sign"];
BOOL done = [WXApiRequestHandler sendPayment:call.arguments[@"appId"]
PartnerId:partnerId
PrepayId:prepayId
NonceStr:nonceStr
Timestamp:timeStamp
Package:packageValue
Sign:sign];
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
[WXApiRequestHandler sendPayment:call.arguments[@"appId"]
PartnerId:partnerId
PrepayId:prepayId
NonceStr:nonceStr
Timestamp:timeStamp
Package:packageValue
Sign:sign completion:^(BOOL done) {
result(@{fluwxKeyPlatform: fluwxKeyIOS, fluwxKeyResult: @(done)});
}];
}
@end
......@@ -32,9 +32,9 @@
req.reserved = reserved;
req.openID = appId;
BOOL b = [WXApi sendReq:req];
[WXApi sendReq:req completion:^(BOOL done) {result(@(done));}];
result(@(b));
}
......
......@@ -28,10 +28,20 @@
return;
}
NSString *universalLink = call.arguments[@"universalLink"];
isWeChatRegistered = [WXApi registerApp:appId enableMTA:[call.arguments[@"enableMTA"] boolValue]];
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];
if ([StringUtil isBlank:universalLink]) {
result([FlutterError errorWithCode:@"invalid universal link" message:@"are you sure your universal link is correct ? " details:universalLink]);
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)});
}
......
......@@ -12,28 +12,31 @@
@interface WXApiRequestHandler : NSObject
+ (BOOL)sendText:(NSString *)text
InScene:(enum WXScene)scene;
+ (void)sendText:(NSString *)text
InScene:(enum WXScene)scene
completion:(void (^ __nullable)(BOOL success))completion;
+ (BOOL)sendImageData:(NSData *)imageData
+ (void)sendImageData:(NSData *)imageData
TagName:(NSString *)tagName
MessageExt:(NSString *)messageExt
Action:(NSString *)action
ThumbImage:(UIImage *)thumbImage
InScene:(enum WXScene)scene
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
Title:(NSString *)title
Description:(NSString *)description
ThumbImage:(UIImage *)thumbImage
MessageExt:(NSString *)messageExt
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
MusicLowBandUrl:(NSString *)musicLowBandUrl
MusicLowBandDataUrl:(NSString *)musicLowBandDataUrl
......@@ -43,9 +46,10 @@
MessageExt:(NSString *)messageExt
MessageAction:(NSString *)messageAction
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
Title:(NSString *)title
Description:(NSString *)description
......@@ -53,20 +57,22 @@
MessageExt:(NSString *)messageExt
MessageAction:(NSString *)messageAction
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
InScene:(enum WXScene)scene;
+ (BOOL)sendFileData:(NSData *)fileData
+ (void)sendFileData:(NSData *)fileData
fileExtension:(NSString *)extension
Title:(NSString *)title
Description:(NSString *)description
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
path:(NSString *)path
title:(NSString *)title
......@@ -78,13 +84,15 @@
MessageExt:(NSString *)messageExt
MessageAction:(NSString *)messageAction
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
type:(WXMiniProgramType)miniProgramType;
type:(WXMiniProgramType)miniProgramType
completion:(void (^ __nullable)(BOOL success))completion;
+ (BOOL)sendAppContentData:(NSData *)data
+ (void)sendAppContentData:(NSData *)data
ExtInfo:(NSString *)info
ExtURL:(NSString *)url
Title:(NSString *)title
......@@ -92,50 +100,49 @@
MessageExt:(NSString *)messageExt
MessageAction:(NSString *)action
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
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
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
nonceStr:(NSString *)nonceStr
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
nonceStr:(NSString *)nonceStr
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
PrepayId:(NSString *)prepayId
NonceStr:(NSString *)nonceStr
Timestamp:(UInt32)timestamp
Package:(NSString *)package
Sign:(NSString *)sign;
Sign:(NSString *)sign
completion:(void (^ __nullable)(BOOL success))completion;
@end
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论