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

fix compile issue

上级 3cc92419
...@@ -67,16 +67,24 @@ BOOL handleOpenURLByFluwx = YES; ...@@ -67,16 +67,24 @@ BOOL handleOpenURLByFluwx = YES;
NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
- (instancetype)initWithRegistrar:(NSObject <FlutterPluginRegistrar> *)registrar methodChannel:(FlutterMethodChannel *)flutterMethodChannel { + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
FlutterMethodChannel *channel =
[FlutterMethodChannel methodChannelWithName:@"com.jarvanmo/fluwx"
binaryMessenger:[registrar messenger]];
FluwxPlugin *instance = [[FluwxPlugin alloc] initWithChannel:channel];
[registrar addApplicationDelegate:instance];
[registrar addMethodCallDelegate:instance channel:channel];
}
- (instancetype)initWithChannel:(FlutterMethodChannel *)channel {
self = [super init]; self = [super init];
if (self) { if (self) {
_fluwxRegistrar = registrar; _channel = channel;
_isRunning = NO;
_qrauth = [[WechatAuthSDK alloc] init]; _qrauth = [[WechatAuthSDK alloc] init];
_qrauth.delegate = self; _qrauth.delegate = self;
_isRunning = NO;
thumbnailWidth = 150; thumbnailWidth = 150;
_channel = flutterMethodChannel; _attemptToResumeMsgFromWxFlag = NO;
_attemptToResumeMsgFromWxFlag = false;
#if WECHAT_LOGGING #if WECHAT_LOGGING
[WXApi startLogByLevel:WXLogLevelDetail logBlock:^(NSString *log) { [WXApi startLogByLevel:WXLogLevelDetail logBlock:^(NSString *log) {
[self logToFlutterWithDetail:log]; [self logToFlutterWithDetail:log];
...@@ -88,7 +96,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; ...@@ -88,7 +96,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
- (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result { - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
_isRunning = YES; _isRunning = YES;
if ([@"registerApp" isEqualToString:call.method]) { if ([@"registerApp" isEqualToString:call.method]) {
[self registerApp:call result:result]; [self registerApp:call result:result];
} else if ([@"isWeChatInstalled" isEqualToString:call.method]) { } else if ([@"isWeChatInstalled" isEqualToString:call.method]) {
...@@ -157,16 +165,6 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; ...@@ -157,16 +165,6 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
} }
} }
+ (void)registerWithRegistrar:(nonnull NSObject<FlutterPluginRegistrar> *)registrar {
<#code#>
}
+ (void)registerWithRegistrar:(nonnull NSObject<FlutterPluginRegistrar> *)registrar {
<#code#>
}
- (void)openWeChatInvoice:(FlutterMethodCall *)call result:(FlutterResult)result { - (void)openWeChatInvoice:(FlutterMethodCall *)call result:(FlutterResult)result {
NSString *appId = call.arguments[@"appId"]; NSString *appId = call.arguments[@"appId"];
...@@ -209,7 +207,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; ...@@ -209,7 +207,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
} }
BOOL isWeChatRegistered = [WXApi registerApp:appId universalLink:universalLink]; BOOL isWeChatRegistered = [WXApi registerApp:appId universalLink:universalLink];
#if WECHAT_LOGGING #if WECHAT_LOGGING
if(isWeChatRegistered) { if(isWeChatRegistered) {
[WXApi checkUniversalLinkReady:^(WXULCheckStep step, WXCheckULStepResult* result) { [WXApi checkUniversalLinkReady:^(WXULCheckStep step, WXCheckULStepResult* result) {
...@@ -219,7 +217,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; ...@@ -219,7 +217,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
} }
#endif #endif
result(@(isWeChatRegistered)); result(@(isWeChatRegistered));
} }
...@@ -230,8 +228,8 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; ...@@ -230,8 +228,8 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
- (void)openWeChatCustomerServiceChat:(FlutterMethodCall *)call result:(FlutterResult)result { - (void)openWeChatCustomerServiceChat:(FlutterMethodCall *)call result:(FlutterResult)result {
NSString *url = call.arguments[@"url"]; NSString *url = call.arguments[@"url"];
NSString *corpId = call.arguments[@"corpId"]; NSString *corpId = call.arguments[@"corpId"];
WXOpenCustomerServiceReq *req = [[WXOpenCustomerServiceReq alloc] init]; WXOpenCustomerServiceReq *req = [[WXOpenCustomerServiceReq alloc] init];
req.corpid = corpId; //企业ID req.corpid = corpId; //企业ID
req.url = url; //客服URL req.url = url; //客服URL
...@@ -271,7 +269,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; ...@@ -271,7 +269,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
req.timeStamp = timeStamp; req.timeStamp = timeStamp;
req.package = packageValue; req.package = packageValue;
req.sign = sign; req.sign = sign;
[WXApi sendReq:req completion:^(BOOL done) { [WXApi sendReq:req completion:^(BOOL done) {
result(@(done)); result(@(done));
}]; }];
...@@ -305,7 +303,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; ...@@ -305,7 +303,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
miniProgramType = WXMiniProgramTypePreview; miniProgramType = WXMiniProgramTypePreview;
} }
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;
...@@ -834,7 +832,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; ...@@ -834,7 +832,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
@"state": [FluwxStringUtil nilToEmpty:authResp.state] @"state": [FluwxStringUtil nilToEmpty:authResp.state]
}; };
if(_channel != nil){ if(_channel != nil){
[_channel invokeMethod:@"onAuthResponse" arguments:result]; [_channel invokeMethod:@"onAuthResponse" arguments:result];
} }
...@@ -845,29 +843,29 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; ...@@ -845,29 +843,29 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
} else if ([resp isKindOfClass:[WXChooseInvoiceResp class]]) { } else if ([resp isKindOfClass:[WXChooseInvoiceResp class]]) {
//TODO 处理发票返回,并回调Dart //TODO 处理发票返回,并回调Dart
WXChooseInvoiceResp *chooseInvoiceResp = (WXChooseInvoiceResp *) resp; WXChooseInvoiceResp *chooseInvoiceResp = (WXChooseInvoiceResp *) resp;
NSArray *array = chooseInvoiceResp.cardAry; NSArray *array = chooseInvoiceResp.cardAry;
NSMutableArray *mutableArray = [NSMutableArray arrayWithCapacity:array.count]; NSMutableArray *mutableArray = [NSMutableArray arrayWithCapacity:array.count];
for (int i = 0; i< array.count; i++) { for (int i = 0; i< array.count; i++) {
WXInvoiceItem *item = array[i]; WXInvoiceItem *item = array[i];
NSDictionary *dict = @{@"app_id":item.appID, @"encrypt_code":item.encryptCode, @"card_id":item.cardId}; NSDictionary *dict = @{@"app_id":item.appID, @"encrypt_code":item.encryptCode, @"card_id":item.cardId};
[mutableArray addObject:dict]; [mutableArray addObject:dict];
} }
NSError *error = nil; NSError *error = nil;
NSData *jsonData = [NSJSONSerialization dataWithJSONObject:mutableArray options:NSJSONWritingPrettyPrinted error: &error]; NSData *jsonData = [NSJSONSerialization dataWithJSONObject:mutableArray options:NSJSONWritingPrettyPrinted error: &error];
NSString *cardItemList = @""; NSString *cardItemList = @"";
if ([jsonData length] && error == nil) { if ([jsonData length] && error == nil) {
cardItemList = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; cardItemList = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
} }
...@@ -879,11 +877,11 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; ...@@ -879,11 +877,11 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
type: @(chooseInvoiceResp.type), type: @(chooseInvoiceResp.type),
@"cardItemList":cardItemList @"cardItemList":cardItemList
}; };
if(_channel != nil){ if(_channel != nil){
[_channel invokeMethod:@"onOpenWechatInvoiceResponse" arguments:result]; [_channel invokeMethod:@"onOpenWechatInvoiceResponse" arguments:result];
} }
} else if ([resp isKindOfClass:[WXSubscribeMsgResp class]]) { } else if ([resp isKindOfClass:[WXSubscribeMsgResp class]]) {
...@@ -893,22 +891,22 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; ...@@ -893,22 +891,22 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
if(openid != nil && openid != NULL && ![openid isKindOfClass:[NSNull class]]){ if(openid != nil && openid != NULL && ![openid isKindOfClass:[NSNull class]]){
result[@"openid"] = openid; result[@"openid"] = openid;
} }
NSString *templateId = subscribeMsgResp.templateId; NSString *templateId = subscribeMsgResp.templateId;
if(templateId != nil && templateId != NULL && ![templateId isKindOfClass:[NSNull class]]){ if(templateId != nil && templateId != NULL && ![templateId isKindOfClass:[NSNull class]]){
result[@"templateId"] = templateId; result[@"templateId"] = templateId;
} }
NSString *action = subscribeMsgResp.action; NSString *action = subscribeMsgResp.action;
if(action != nil && action != NULL && ![action isKindOfClass:[NSNull class]]){ if(action != nil && action != NULL && ![action isKindOfClass:[NSNull class]]){
result[@"action"] = action; result[@"action"] = action;
} }
NSString *reserved = subscribeMsgResp.action; NSString *reserved = subscribeMsgResp.action;
if(reserved != nil && reserved != NULL && ![reserved isKindOfClass:[NSNull class]]){ if(reserved != nil && reserved != NULL && ![reserved isKindOfClass:[NSNull class]]){
result[@"reserved"] = reserved; result[@"reserved"] = reserved;
} }
UInt32 scene = subscribeMsgResp.scene; UInt32 scene = subscribeMsgResp.scene;
result[@"scene"] = @(scene); result[@"scene"] = @(scene);
if(_channel != nil){ if(_channel != nil){
...@@ -934,7 +932,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; ...@@ -934,7 +932,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
// @"extMsg":miniProgramResp.extMsg == nil?@"":miniProgramResp.extMsg // @"extMsg":miniProgramResp.extMsg == nil?@"":miniProgramResp.extMsg
if(_channel != nil){ if(_channel != nil){
[_channel invokeMethod:@"onLaunchMiniProgramResponse" arguments:result]; [_channel invokeMethod:@"onLaunchMiniProgramResponse" arguments:result];
...@@ -959,7 +957,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; ...@@ -959,7 +957,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
} else if ([resp isKindOfClass:[WXOpenCustomerServiceResp class]]) } else if ([resp isKindOfClass:[WXOpenCustomerServiceResp class]])
{ {
WXOpenCustomerServiceResp *customerResp = (WXOpenCustomerServiceResp *) resp; WXOpenCustomerServiceResp *customerResp = (WXOpenCustomerServiceResp *) resp;
NSDictionary *result = @{ NSDictionary *result = @{
description: [FluwxStringUtil nilToEmpty:customerResp.description], description: [FluwxStringUtil nilToEmpty:customerResp.description],
...@@ -975,7 +973,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; ...@@ -975,7 +973,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
// 相关错误信息 // 相关错误信息
}else if ([resp isKindOfClass:[WXOpenBusinessViewResp class]]) }else if ([resp isKindOfClass:[WXOpenBusinessViewResp class]])
{ {
WXOpenBusinessViewResp *openBusinessViewResp = (WXOpenBusinessViewResp *) resp; WXOpenBusinessViewResp *openBusinessViewResp = (WXOpenBusinessViewResp *) resp;
NSDictionary *result = @{ NSDictionary *result = @{
description: [FluwxStringUtil nilToEmpty:openBusinessViewResp.description], description: [FluwxStringUtil nilToEmpty:openBusinessViewResp.description],
...@@ -1011,7 +1009,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; ...@@ -1011,7 +1009,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
[_channel invokeMethod:@"onPayResponse" arguments:result]; [_channel invokeMethod:@"onPayResponse" arguments:result];
} }
} else if ([resp isKindOfClass:[WXNontaxPayResp class]]) { } else if ([resp isKindOfClass:[WXNontaxPayResp class]]) {
} }
#endif #endif
} }
...@@ -1023,7 +1021,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; ...@@ -1023,7 +1021,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
//onWXLaunchFromWX //onWXLaunchFromWX
ShowMessageFromWXReq *showMessageFromWXReq = (ShowMessageFromWXReq *) req; ShowMessageFromWXReq *showMessageFromWXReq = (ShowMessageFromWXReq *) req;
WXMediaMessage *wmm = showMessageFromWXReq.message; WXMediaMessage *wmm = showMessageFromWXReq.message;
NSDictionary *result = @{ NSDictionary *result = @{
@"extMsg": wmm.messageExt, @"extMsg": wmm.messageExt,
...@@ -1033,7 +1031,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; ...@@ -1033,7 +1031,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
}; };
[FluwxDelegate defaultManager].extMsg= wmm.messageExt; [FluwxDelegate defaultManager].extMsg= wmm.messageExt;
if (_isRunning) { if (_isRunning) {
[_channel invokeMethod:@"onWXShowMessageFromWX" arguments:result]; [_channel invokeMethod:@"onWXShowMessageFromWX" arguments:result];
} else { } else {
...@@ -1047,7 +1045,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; ...@@ -1047,7 +1045,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
} else if ([req isKindOfClass:[LaunchFromWXReq class]]) { } else if ([req isKindOfClass:[LaunchFromWXReq class]]) {
LaunchFromWXReq *launchFromWXReq = (LaunchFromWXReq *) req; LaunchFromWXReq *launchFromWXReq = (LaunchFromWXReq *) req;
WXMediaMessage *wmm = launchFromWXReq.message; WXMediaMessage *wmm = launchFromWXReq.message;
NSDictionary *result = @{ NSDictionary *result = @{
@"extMsg": wmm.messageExt, @"extMsg": wmm.messageExt,
...@@ -1057,7 +1055,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; ...@@ -1057,7 +1055,7 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
}; };
[FluwxDelegate defaultManager].extMsg= wmm.messageExt; [FluwxDelegate defaultManager].extMsg= wmm.messageExt;
if (_isRunning) { if (_isRunning) {
[_channel invokeMethod:@"onWXLaunchFromWX" arguments:result]; [_channel invokeMethod:@"onWXLaunchFromWX" arguments:result];
} else { } else {
...@@ -1068,8 +1066,8 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar; ...@@ -1068,8 +1066,8 @@ NSObject <FlutterPluginRegistrar> *_fluwxRegistrar;
}; };
} }
if(channel != nil){ if(_channel != nil){
[channel invokeMethod:@"onWXShowMessageFromWX" arguments:result]; [_channel invokeMethod:@"onWXShowMessageFromWX" arguments:result];
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论