提交 756c9dc2 authored 作者: nelson1110's avatar nelson1110

Merge branch 'master' of https://github.com/JarvanMo/fluwx

//
// Created by mo on 2018/8/24.
//
#import <Foundation/Foundation.h>
#import "CallResults.h"
#import "WXApiRequestHandler.h"
#import "FluwxKeys.h"
#import "StringToWeChatScene.h"
#import "WXApi.h"
#import "FluwxMethods.h"
#import <Flutter/Flutter.h>
#import "FluwxPlugin.h"
#import "ThumbnailHelper.h"
#import "NSStringWrapper.h"
@class StringUtil;
@interface FluwxPaymentHandler : NSObject
-(instancetype) initWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar;
- (void)handlePayment:(FlutterMethodCall *)call result:(FlutterResult)result;
@end
\ No newline at end of file
//
// Created by mo on 2018/8/24.
//
#import "FluwxPaymentHandler.h"
@implementation FluwxPaymentHandler
- (instancetype)initWithRegistrar {
self = [super init];
return self;
}
- (void)handlePayment:(FlutterMethodCall *)call result:(FlutterResult)result {
}
@end
\ No newline at end of file
......@@ -40,6 +40,8 @@
- (void)managerDidRecvNonTaxpayResponse:(WXNontaxPayResp *)response;
- (void)managerDidRecvPayInsuranceResponse:(WXPayInsuranceResp *)response;
- (void)managerDidRecvPaymentResponse:(PayResp *)response;
@end
@interface FluwxResponseHandler : NSObject<WXApiDelegate>
......
......@@ -82,6 +82,7 @@ FlutterMethodChannel *methodChannel = nil;
};
[methodChannel invokeMethod:@"onAuthResponse" arguments:result];
} else if ([resp isKindOfClass:[AddCardToWXCardPackageResp class]]) {
if (_delegate
&& [_delegate respondsToSelector:@selector(managerDidRecvAddCardResponse:)]) {
......@@ -120,6 +121,23 @@ FlutterMethodChannel *methodChannel = nil;
if ([_delegate respondsToSelector:@selector(managerDidRecvPayInsuranceResponse:)]) {
[_delegate managerDidRecvPayInsuranceResponse:(WXPayInsuranceResp *) resp];
}
}else if ([resp isKindOfClass:[PayResp class]]) {
if ([_delegate respondsToSelector:@selector(managerDidRecvPaymentResponse)]) {
[_delegate managerDidRecvPaymentResponse:(PayResp *) resp];
}
PayResp *payResp = (PayResp *) resp;
NSDictionary *result = @{
description: payResp.description,
errStr: payResp.errStr,
errCode: @(payResp.errCode),
type: @(payResp.type),
fluwxKeyPlatform: fluwxKeyIOS,
};
[methodChannel invokeMethod:@"onAuthResponse" arguments:result];
}
}
......
......@@ -130,4 +130,15 @@
nonceStr:(NSString *)nonceStr
signType:(NSString *)signType
timestamp:(UInt32)timestamp;
+ (BOOL) sendPayment:(NSString *)appId
PartnerId:(NSString *)partnerId
PrepayId:(NSString *)prepayId
NonceStr:(NSString *)nonceStr
Timestamp:(UInt32)timestamp
Package:(NSString *)package
Sign:(NSString *)sign
Description:(NSString *)description
;
@end
......@@ -37,14 +37,13 @@
ext.imageData = imageData;
WXMediaMessage *message = [WXMediaMessage messageWithTitle:(title == (id) [NSNull null]) ?nil:title
Description:(description == (id) [NSNull null]) ?nil:description
WXMediaMessage *message = [WXMediaMessage messageWithTitle:(title == (id) [NSNull null]) ? nil : title
Description:(description == (id) [NSNull null]) ? nil : description
Object:ext
MessageExt:(messageExt == (id) [NSNull null]) ? nil:messageExt
MessageAction:(action == (id) [NSNull null])?nil:action
MessageExt:(messageExt == (id) [NSNull null]) ? nil : messageExt
MessageAction:(action == (id) [NSNull null]) ? nil : action
ThumbImage:thumbImage
MediaTag:(tagName == (id) [NSNull null])? nil:tagName];
MediaTag:(tagName == (id) [NSNull null]) ? nil : tagName];
SendMessageToWXReq *req = [SendMessageToWXReq requestWithText:nil
OrMediaMessage:message
......@@ -65,13 +64,13 @@
WXWebpageObject *ext = [WXWebpageObject object];
ext.webpageUrl = urlString;
WXMediaMessage *message = [WXMediaMessage messageWithTitle:(title == (id) [NSNull null]) ?nil:title
Description:(description == (id) [NSNull null]) ?nil:description
WXMediaMessage *message = [WXMediaMessage messageWithTitle:(title == (id) [NSNull null]) ? nil : title
Description:(description == (id) [NSNull null]) ? nil : description
Object:ext
MessageExt:(messageExt == (id) [NSNull null]) ?nil:messageExt
MessageAction:(messageAction == (id) [NSNull null]) ?nil:messageAction
MessageExt:(messageExt == (id) [NSNull null]) ? nil : messageExt
MessageAction:(messageAction == (id) [NSNull null]) ? nil : messageAction
ThumbImage:thumbImage
MediaTag:(tagName == (id) [NSNull null]) ?nil:tagName];
MediaTag:(tagName == (id) [NSNull null]) ? nil : tagName];
SendMessageToWXReq *req = [SendMessageToWXReq requestWithText:nil
OrMediaMessage:message
......@@ -102,13 +101,13 @@
}
WXMediaMessage *message = [WXMediaMessage messageWithTitle:(title == (id) [NSNull null]) ?nil:title
WXMediaMessage *message = [WXMediaMessage messageWithTitle:(title == (id) [NSNull null]) ? nil : title
Description:description
Object:ext
MessageExt:(messageExt == (id) [NSNull null]) ?nil:messageExt
MessageAction:(messageAction == (id) [NSNull null]) ?nil:messageAction
MessageExt:(messageExt == (id) [NSNull null]) ? nil : messageExt
MessageAction:(messageAction == (id) [NSNull null]) ? nil : messageAction
ThumbImage:thumbImage
MediaTag:(tagName == (id) [NSNull null]) ?nil:tagName];
MediaTag:(tagName == (id) [NSNull null]) ? nil : tagName];
SendMessageToWXReq *req = [SendMessageToWXReq requestWithText:nil
OrMediaMessage:message
......@@ -128,11 +127,11 @@
TagName:(NSString *)tagName
InScene:(enum WXScene)scene {
WXMediaMessage *message = [WXMediaMessage message];
message.title = (title == (id) [NSNull null]) ?nil:title;
message.description = (description == (id) [NSNull null]) ?nil:description;
message.messageExt = (messageExt == (id) [NSNull null]) ?nil:messageExt;
message.messageAction = (messageAction == (id) [NSNull null]) ?nil:messageAction;
message.mediaTagName = (tagName == (id) [NSNull null]) ?nil:tagName;
message.title = (title == (id) [NSNull null]) ? nil : title;
message.description = (description == (id) [NSNull null]) ? nil : description;
message.messageExt = (messageExt == (id) [NSNull null]) ? nil : messageExt;
message.messageAction = (messageAction == (id) [NSNull null]) ? nil : messageAction;
message.mediaTagName = (tagName == (id) [NSNull null]) ? nil : tagName;
[message setThumbImage:thumbImage];
WXVideoObject *ext = [WXVideoObject object];
......@@ -214,13 +213,13 @@
ext.miniProgramType = programType;
WXMediaMessage *message = [WXMediaMessage messageWithTitle:(title == (id) [NSNull null]) ?nil:title
Description:(description == (id) [NSNull null]) ?nil:description
WXMediaMessage *message = [WXMediaMessage messageWithTitle:(title == (id) [NSNull null]) ? nil : title
Description:(description == (id) [NSNull null]) ? nil : description
Object:ext
MessageExt:(messageExt == (id) [NSNull null]) ?nil:messageExt
MessageAction:(messageAction == (id) [NSNull null]) ?nil:messageAction
MessageExt:(messageExt == (id) [NSNull null]) ? nil : messageExt
MessageAction:(messageAction == (id) [NSNull null]) ? nil : messageAction
ThumbImage:thumbImage
MediaTag:(tagName == (id) [NSNull null]) ?nil:tagName];
MediaTag:(tagName == (id) [NSNull null]) ? nil : tagName];
SendMessageToWXReq *req = [SendMessageToWXReq requestWithText:nil
OrMediaMessage:message
......@@ -323,8 +322,7 @@
+ (BOOL)sendAuthRequestScope:(NSString *)scope
State:(NSString *)state
OpenID:(NSString *)openID
{
OpenID:(NSString *)openID {
SendAuthReq *req = [[SendAuthReq alloc] init];
req.scope = scope; // @"post_timeline,sns"
req.state = state;
......@@ -379,4 +377,25 @@
return [WXApi sendReq:chooseInvoiceReq];
}
- (BOOL)sendPayment:(NSString *)appId
PartnerId:(NSString *)partnerId
PrepayId:(NSString *)prepayId
NonceStr:(NSString *)nonceStr
Timestamp:(UInt32)timestamp
Package:(NSString *)package
Sign:(NSString *)sign
Description:(NSString *)description
{
PayReq *req = [[PayReq alloc] init];
req.partnerId = partnerId;
req.prepayId = prepayId;
req.nonceStr = nonceStr;
req.timeStamp = timestamp;
req.package = package;
req.sign = sign;
return [WXApi sendReq:req];
}
@end
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论