提交 a2cc1650 authored 作者: JarvanMo's avatar JarvanMo

fix bugs : Lauch mini program

上级 38206605
...@@ -21,6 +21,7 @@ FluwxShareHandler *_fluwxShareHandler; ...@@ -21,6 +21,7 @@ FluwxShareHandler *_fluwxShareHandler;
FluwxAuthHandler *_fluwxAuthHandler; FluwxAuthHandler *_fluwxAuthHandler;
FluwxWXApiHandler *_fluwxWXApiHandler; FluwxWXApiHandler *_fluwxWXApiHandler;
FluwxPaymentHandler *_fluwxPaymentHandler; FluwxPaymentHandler *_fluwxPaymentHandler;
FluwxLaunchMiniProgramHandler *_fluwxLaunchMiniProgramHandler;
- (void)dealloc - (void)dealloc
{ {
...@@ -50,7 +51,7 @@ FluwxPaymentHandler *_fluwxPaymentHandler; ...@@ -50,7 +51,7 @@ FluwxPaymentHandler *_fluwxPaymentHandler;
_fluwxAuthHandler = [[FluwxAuthHandler alloc] initWithRegistrar:registrar]; _fluwxAuthHandler = [[FluwxAuthHandler alloc] initWithRegistrar:registrar];
_fluwxWXApiHandler = [[FluwxWXApiHandler alloc] init]; _fluwxWXApiHandler = [[FluwxWXApiHandler alloc] init];
_fluwxPaymentHandler = [[FluwxPaymentHandler alloc] initWithRegistrar:registrar]; _fluwxPaymentHandler = [[FluwxPaymentHandler alloc] initWithRegistrar:registrar];
_fluwxLaunchMiniProgramHandler = [[FluwxLuanchMiniProgramHandler alloc] initWithRegistrar:registrar]; _fluwxLaunchMiniProgramHandler = [[FluwxLaunchMiniProgramHandler alloc] initWithRegistrar:registrar];
} }
...@@ -91,7 +92,7 @@ FluwxPaymentHandler *_fluwxPaymentHandler; ...@@ -91,7 +92,7 @@ FluwxPaymentHandler *_fluwxPaymentHandler;
result(FlutterMethodNotImplemented); result(FlutterMethodNotImplemented);
} }
if([@"launchMiniProgram" isEqualToString :call.method]){ if([@"launchMiniProgram" isEqualToString :call.method]){
[_fluwxLaunchMiniProgramHandler handlerLaunchMiniProgram:call result:result]; // [_fluwxLaunchMiniProgramHandler handlerLaunchMiniProgram:call result:result];
return; return;
} }
......
#import "FluwxLaunchMiniProgramHandler.h" #import "FluwxLaunchMiniProgramHandler.h"
#import "CallResults.h" #import "WXApiRequestHandler.h"
#import "FluwxKeys.h"
#import "StringToWeChatScene.h"
#import "FluwxMethods.h"
#import "ThumbnailHelper.h"
#import "NSStringWrapper.h"
@implementation FluwxLaunchMiniProgramHandler @implementation FluwxLaunchMiniProgramHandler
...@@ -20,10 +15,18 @@ ...@@ -20,10 +15,18 @@
- (void)handleLaunchMiniProgram:(FlutterMethodCall *)call result:(FlutterResult)result { - (void)handleLaunchMiniProgram:(FlutterMethodCall *)call result:(FlutterResult)result {
NSString *userName = call.arguments[@"userName"]; NSString *userName = call.arguments[@"userName"];
NSString *path = call.arguments[@"path"]; NSString *path = call.arguments[@"path"];
WXMiniProgramType *miniProgramType = (call.arguments[@"miniProgramType"] // WXMiniProgramType *miniProgramType = call.arguments[@"miniProgramType"];
NSNumber *typeInt = call.arguments[@"miniProgramType"];
WXMiniProgramType miniProgramType = WXMiniProgramTypeRelease;
if([typeInt isEqualToNumber:@1]){
miniProgramType =WXMiniProgramTypeTest;
} else if([typeInt isEqualToNumber:@2]){
miniProgramType = WXMiniProgramTypePreview;
}
[WXApiRequestHandler launchMiniProgramWithUserName:userName [WXApiRequestHandler launchMiniProgramWithUserName:userName
path:path path:path
type:miniProgramType; type:miniProgramType];
} }
@end @end
...@@ -339,6 +339,15 @@ NSObject <FlutterPluginRegistrar> *_registrar; ...@@ -339,6 +339,15 @@ 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];
NSNumber *typeInt = call.arguments[@"miniProgramType"];
WXMiniProgramType miniProgramType = WXMiniProgramTypeRelease;
if([typeInt isEqualToNumber:@1]){
miniProgramType =WXMiniProgramTypeTest;
} else if([typeInt isEqualToNumber:@2]){
miniProgramType = WXMiniProgramTypePreview;
}
BOOL done = [WXApiRequestHandler sendMiniProgramWebpageUrl:call.arguments[@"webPageUrl"] BOOL done = [WXApiRequestHandler sendMiniProgramWebpageUrl:call.arguments[@"webPageUrl"]
userName:call.arguments[@"userName"] userName:call.arguments[@"userName"]
path:call.arguments[@"path"] path:call.arguments[@"path"]
...@@ -347,7 +356,7 @@ NSObject <FlutterPluginRegistrar> *_registrar; ...@@ -347,7 +356,7 @@ NSObject <FlutterPluginRegistrar> *_registrar;
ThumbImage:thumbnailImage ThumbImage:thumbnailImage
hdImageData:hdImageData hdImageData:hdImageData
withShareTicket:[call.arguments[@"withShareTicket"] boolValue] withShareTicket:[call.arguments[@"withShareTicket"] boolValue]
miniProgramType:(WXMiniProgramType) call.arguments[@"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]
......
...@@ -115,6 +115,21 @@ FlutterMethodChannel *fluwxMethodChannel = nil; ...@@ -115,6 +115,21 @@ FlutterMethodChannel *fluwxMethodChannel = nil;
if ([_delegate respondsToSelector:@selector(managerDidRecvLaunchMiniProgram:)]) { if ([_delegate respondsToSelector:@selector(managerDidRecvLaunchMiniProgram:)]) {
[_delegate managerDidRecvLaunchMiniProgram:(WXLaunchMiniProgramResp *) resp]; [_delegate managerDidRecvLaunchMiniProgram:(WXLaunchMiniProgramResp *) resp];
} }
WXLaunchMiniProgramResp *miniProgramResp = (WXLaunchMiniProgramResp *) resp;
NSDictionary *result = @{
description: miniProgramResp.description == nil ?@"":miniProgramResp.description,
errStr: miniProgramResp.errStr == nil ?@"":miniProgramResp.errStr,
errCode: @(miniProgramResp.errCode),
type: miniProgramResp.type == nil ?@1:@(miniProgramResp.type),
fluwxKeyPlatform: fluwxKeyIOS,
@"extMsg":miniProgramResp.extMsg
};
[fluwxMethodChannel invokeMethod:@"onLaunchMiniProgramResponse" arguments:result];
} else if ([resp isKindOfClass:[WXInvoiceAuthInsertResp class]]) { } else if ([resp isKindOfClass:[WXInvoiceAuthInsertResp class]]) {
if ([_delegate respondsToSelector:@selector(managerDidRecvInvoiceAuthInsertResponse:)]) { if ([_delegate respondsToSelector:@selector(managerDidRecvInvoiceAuthInsertResponse:)]) {
[_delegate managerDidRecvInvoiceAuthInsertResponse:(WXInvoiceAuthInsertResp *) resp]; [_delegate managerDidRecvInvoiceAuthInsertResponse:(WXInvoiceAuthInsertResp *) resp];
......
...@@ -213,16 +213,16 @@ ...@@ -213,16 +213,16 @@
ext.withShareTicket = withShareTicket; ext.withShareTicket = withShareTicket;
WXMiniProgramType miniProgramType = WXMiniProgramTypeRelease; // WXMiniProgramType miniProgramType = WXMiniProgramTypeRelease;
if(programType == 0){ // if(programType == 0){
miniProgramType = WXMiniProgramTypeRelease; // miniProgramType = WXMiniProgramTypeRelease;
} else if(programType == 1){ // } else if(programType == 1){
miniProgramType =WXMiniProgramTypeTest; // miniProgramType =WXMiniProgramTypeTest;
} else if(programType == 2){ // } else if(programType == 2){
miniProgramType = WXMiniProgramTypePreview; // miniProgramType = WXMiniProgramTypePreview;
} // }
ext.miniProgramType = miniProgramType; ext.miniProgramType = programType;
WXMediaMessage *message = [WXMediaMessage messageWithTitle:(title == (id) [NSNull null]) ? nil : title WXMediaMessage *message = [WXMediaMessage messageWithTitle:(title == (id) [NSNull null]) ? nil : title
Description:(description == (id) [NSNull null]) ? nil : description Description:(description == (id) [NSNull null]) ? nil : description
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
type:(WXMiniProgramType)miniProgramType { type:(WXMiniProgramType)miniProgramType {
WXLaunchMiniProgramReq *launchMiniProgramReq = [WXLaunchMiniProgramReq object]; WXLaunchMiniProgramReq *launchMiniProgramReq = [WXLaunchMiniProgramReq object];
launchMiniProgramReq.userName = userName; launchMiniProgramReq.userName = userName;
launchMiniProgramReq.path = path; launchMiniProgramReq.path = (path == (id) [NSNull null]) ? nil : path;
launchMiniProgramReq.miniProgramType = miniProgramType; launchMiniProgramReq.miniProgramType = miniProgramType;
return [WXApi sendReq:launchMiniProgramReq]; return [WXApi sendReq:launchMiniProgramReq];
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论