no message

yanglingyu
1 parent 7e9ce9d0
Showing 10 changed files with 3 additions and 465 deletions
CNLiveBBASMModule.podspec
Example/CNLiveBBASMModule/CNLiveBBASMModule/CNLiveBainuoPay/CNBBASMPaymentHander.h
Example/CNLiveBBASMModule/CNLiveBBASMModule/CNLiveBainuoPay/CNBBASMPaymentHander.m
Example/CNLiveBBASMModule/CNLiveBBASMModule/CNLiveBainuoPay/CNBBASMPaymentImpl.h
Example/CNLiveBBASMModule/CNLiveBBASMModule/CNLiveBainuoPay/CNBBASMPaymentImpl.m
Example/CNLiveBBASMModule/CNLiveBBASMModule/CNLiveBainuoPay/CNBainuoPayManagerDelegate.h
Example/CNLiveBBASMModule/CNLiveBBASMModule/CNLiveBainuoPay/CNBainuoPayManagerDelegate.m
Example/CNLiveBBASMModule/CNLiveBBASMModule/CNLiveBainuoPay/CNWalletPaymentDelegate.h
Example/CNLiveBBASMModule/CNLiveBBASMModule/CNLiveBainuoPay/CNWalletPaymentDelegate.m
Example/Podfile.lock
@@ -32,7 +32,8 @@ TODO: Add long description of the pod here.
  
   s.vendored_libraries = ['CNLiveBBASMModule/Classes/CNLibrary/**/libs/*']
   s.source_files = ['CNLiveBBASMModule/Classes/CNLiveBBASMImpl/**/*',
-  'CNLiveBBASMModule/Classes/CNBBASATool/**/*']
+  'CNLiveBBASMModule/Classes/CNBBASATool/**/*',
+  'CNLiveBBASMModule/Classes/CNFrameworks/*.framework/Headers/*']
   s.vendored_frameworks = ['CNLiveBBASMModule/Classes/CNFrameworks/BaiduWallet_Portal.framework',
   'CNLiveBBASMModule/Classes/CNFrameworks/BainuoCashierSDK.framework']
   s.static_framework = true
-//
-//  CNBBASMPaymentHander.h
-//  BBASMDemo
-//
-//  Created by CNLive on 2021/10/29.
-//
-
-#import <Foundation/Foundation.h>
-#import <AlipaySDK/AlipaySDK.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface CNBBASMPaymentHander : NSObject
-// 新支付回调信息，返回data更多数据
-typedef void(^BBASMCashierPaymentCallBack)(NSString *payDesc, NSDictionary *data);
-
-+ (instancetype)shareInstance;
-
-/**
- * @brief 新版调起糯米聚合支付收银台 API，支持支付数据data回传
- * @param params 订单信息
- * @param bannedChannels    屏蔽的支付渠道
- * @param successCallBack  成功回调，参数为描述信息
- * @param loadingCallBack  支付中回调，参数为描述信息
- * @param errorCallBack    失败回调，参数为描述信息
- * @param cancelCallBack   取消回调，参数为描述信息
- */
-- (void)requestBainuoCashierPayment:(NSDictionary *)params
-                     bannedChannels:(NSArray *)bannedChannels
-                    successCallBack:(BBASMCashierPaymentCallBack)successCallBack
-                    loadingCallBack:(BBASMCashierPaymentCallBack)loadingCallBack
-                      errorCallBack:(BBASMCashierPaymentCallBack)errorCallBack
-                     cancelCallBack:(BBASMCashierPaymentCallBack)cancelCallBack;
-/**
- * @brief 糯米聚合收银台支付渠道信息（含支付渠道列表、优惠券列表）
- *
- * @param params  调起参数
- * @param completionBlock 回调
- */
-- (void)requestBainuoPolymerPaymentChannelInfoWithParams:(NSDictionary *)params
-                                              completion:(void (^)(NSDictionary *_Nullable, NSError *_Nullable))completionBlock;
-
-/**
- * @brief 糯米聚合收银台算价接口
- *
- * @param params  调起参数
- * @param completionBlock 回调
- */
-- (void)calculateBainuoPolymerPaymentPriceWithParams:(NSDictionary *)params
-                                          completion:(void (^)(NSDictionary *_Nullable, NSError *_Nullable))completionBlock;
-
-/**
- * @brief 展示糯米聚合支付收银台优惠券面板
- * @param params 展示所需参数
- * @param fromViewController 承接面板展示的vc
- * @param callback callback
- */
-- (void)showBainuoCashierCouponPannel:(NSDictionary *)params
-                   fromViewController:(UIViewController *)fromViewController
-                             callback:(void (^)(NSDictionary * _Nonnull))callback;
-
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  CNBBASMPaymentHander.m
-//  BBASMDemo
-//
-//  Created by CNLive on 2021/10/29.
-//
-
-#import "CNBBASMPaymentHander.h"
-#import <BainuoCashierSDK/BDNCashierSDK.h>
-#import <BainuoCashierSDK/BDNCashierSDKAlipayService.h>
-#import <BainuoCashierSDK/BDNCashierSDKWechatService.h>
-#import <BainuoCashierSDK/BDNCashierSDKBaifubaoService.h>
-#import <CNLiveEnvironment/CNLiveEnvironment.h>
-#import "CNBainuoPayManagerDelegate.h"
-
-static NSString * const CNPAY_WEICHAT_PAY_SCHEME = @"cnlive.baidu.com://";
-@implementation CNBBASMPaymentHander
-+ (instancetype)shareInstance
-{
-    static dispatch_once_t onceToken;
-    static CNBBASMPaymentHander *hander = nil;
-    dispatch_once(&onceToken, ^{
-        hander = [[self alloc] init];
-        [hander registerPayment];
-    });
-    return hander;
-}
-
-- (void )registerPayment{
-    // 按需实现和注册支付能力（收银台SDK提供了微信、支付宝、百付宝的支付能力的默认实现）
-    [BDNCashierSDK registerPaymentServices:@[[BDNCashierSDKAlipayService defaultService],[BDNCashierSDKWechatService defaultService],[BDNCashierSDKBaifubaoService defaultService]]];
-    // 使用收银台提供的支付宝支付能力时，需要注册对应Scheme
-    [[BDNCashierSDKAlipayService defaultService] registerScheme:@"cnlive"];
-    // 使用收银台提供的微信支付能力时，需要注册对应的宿主App的universalLink
-    [[BDNCashierSDKWechatService defaultService] registerUniversalLink:[NSString stringWithFormat:@"%@/",API_Host]];
-    // 使用收银台提供的百付宝支付能力时，需要注册实现BDNCashierSDKBaifubaoDelegate协议的代理类
-    [[BDNCashierSDKBaifubaoService defaultService] registerDelegate:[CNBainuoPayManagerDelegate shareInstance]];
-}
-
--(void)requestBainuoCashierPayment:(NSDictionary *)params bannedChannels:(NSArray *)bannedChannels successCallBack:(BBASMCashierPaymentCallBack)successCallBack loadingCallBack:(BBASMCashierPaymentCallBack)loadingCallBack errorCallBack:(BBASMCashierPaymentCallBack)errorCallBack cancelCallBack:(BBASMCashierPaymentCallBack)cancelCallBack{
-    [self doBainuoCashierPayment:params bannedChannels:bannedChannels callback:^(NSDictionary *info) {
-        // 支付渠道响应结果
-        NSNumber *resultCode = info[BDNCashierPaymentRespCodeKey];
-        NSString *payDesc = info[BDNCashierPaymentRespMsgKey];
-        NSDictionary *data = info[BDNCashierPaymentRespDataKey];
-        switch (resultCode.integerValue) {
-            case BDNCashierPaymentRespCodeSucceeded:
-            {
-                successCallBack(payDesc, data);
-                break;
-            }
-            case BDNCashierPaymentRespCodeLoading:
-            {
-                loadingCallBack(payDesc, data);
-                break;
-            }
-            case BDNCashierPaymentRespCodeCanceled:{
-                cancelCallBack(payDesc, data);
-                break;
-            }
-            case BDNCashierPaymentRespCodeFailed:{
-                errorCallBack(payDesc, data);
-                break;
-            }
-                
-            default:
-                break;
-        }
-    }];
-}
-- (void)doBainuoCashierPayment:(NSDictionary *)params
-                bannedChannels:(NSArray *)bannedChannels
-                      callback:(void (^)(NSDictionary *info))callback{
-    BDNCashierDealReq *dealReq = [[BDNCashierDealReq alloc] init];
-    dealReq.params = params;
-    dealReq.bannedChannels = bannedChannels;
-    dealReq.schemeForWechatH5Pay = CNPAY_WEICHAT_PAY_SCHEME;
-    dealReq.completion = ^(NSDictionary *info) {
-        callback ? callback(info) : nil;
-    };
-    // 调起收银台
-    [BDNCashierSDK showCashierDesk:dealReq];
-}
-
--(void)requestBainuoPolymerPaymentChannelInfoWithParams:(NSDictionary *)params completion:(void (^)(NSDictionary * _Nullable, NSError * _Nullable))completionBlock
-{
-    [BDNCashierSDK requestChannelInfoWithParams:params responseBlock:^(NSDictionary *response) {
-        completionBlock ? completionBlock(response, nil) : nil;
-    } failedBlock:^(NSError *error) {
-        completionBlock ? completionBlock (nil, error) : nil;
-    }];
-}
-- (void)calculateBainuoPolymerPaymentPriceWithParams:(NSDictionary *)params
-                                          completion:(void (^)(NSDictionary *_Nullable, NSError *_Nullable))completionBlock{
-    [BDNCashierSDK calculatePriceWithParams:params responseBlock:^(NSDictionary *response) {
-        completionBlock ? completionBlock(response, nil) : nil;
-    } failedBlock:^(NSError *error) {
-        completionBlock ? completionBlock(nil, error) : nil;
-    }];
-}
-- (void)showBainuoCashierCouponPannel:(NSDictionary *)params
-                   fromViewController:(UIViewController *)fromViewController
-                             callback:(void (^)(NSDictionary * _Nonnull))callback{
-    BDNCashierCouponReq *req = [BDNCashierCouponReq new];
-    req.params = params;
-    req.fromViewController = fromViewController;
-    req.completion = ^(NSDictionary *info) {
-        callback ? callback(info) : nil;
-    };
-    [BDNCashierSDK showCashierCoupon:req];
-}
-@end
-//
-//  CNBBASMPaymentImpl.h
-//  CNLiveNetAdd
-//
-//  Created by CNLive on 2021/10/16.
-//  Copyright © 2021 cnlive. All rights reserved.
-//
-
-#import <BBAMNP/BBAMNP.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface CNBBASMPaymentImpl : BBASMAdapterBaseImplement<BBASMPaymentAdapterProtocol>
-
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  CNBBASMPaymentImpl.m
-//  CNLiveNetAdd
-//
-//  Created by CNLive on 2021/10/16.
-//  Copyright © 2021 cnlive. All rights reserved.
-//
-
-#import "CNBBASMPaymentImpl.h"
-
-/**
- * 小程序统计支付
- */
-typedef NS_ENUM(NSInteger, BBASMPayStatisticsType) {
-    BBASMPayStatisticsAliPay     = 0,     //支付宝直连
-    BBASMPayStatisticsPolymer    = 1,     //聚合收银台
-    BBASMPayStatisticsBDWallet   = 2,     //百度钱包
-    BBASMPayStatisticsWechat     = 3,     //微信端能力调用
-};
-@implementation CNBBASMPaymentImpl
-RegisterBBASMAdapter()
-
-+ (void)calculateBainuoPolymerPaymentPriceWithParams:(nonnull NSDictionary *)params completion:(nonnull void (^)(NSDictionary * _Nonnull, NSError * _Nonnull))completionBlock {
-    [[CNBBASMPaymentHander shareInstance] calculateBainuoPolymerPaymentPriceWithParams:params completion:completionBlock];
-}
-
-
-+ (void)requestBainuoPolymerPaymentChannelInfoWithParams:(nonnull NSDictionary *)params completion:(nonnull void (^)(NSDictionary * _Nonnull, NSError * _Nonnull))completionBlock {
-    [[CNBBASMPaymentHander shareInstance] requestBainuoPolymerPaymentChannelInfoWithParams:params completion:completionBlock];
-}
-
-
-+ (void)requestBainuoPolymerPaymentWithParams:(nonnull NSDictionary *)params bannedChannels:(nullable NSArray *)bannedChannels detailResultCallback:(nonnull void (^)(BBASMPaymentStatus, NSString * _Nonnull, NSDictionary * _Nonnull))detailResultCallback {
-    [[CNBBASMPaymentHander shareInstance] requestBainuoCashierPayment:[params copy]
-                                                      bannedChannels:bannedChannels
-                                                     successCallBack:^(NSString *payDesc, NSDictionary *data) {
-        detailResultCallback(BBASMPaymentStatusSuccess, payDesc, data);
-        [self cnPaymentUbcPayStatisticstype:BBASMPayStatisticsPolymer
-                                    payInfo:payDesc
-                                    succeed:YES];
-    } loadingCallBack:^(NSString *payDesc, NSDictionary *data) {
-        detailResultCallback(BBASMPaymentStatusLoading, payDesc, data);
-    } errorCallBack:^(NSString *payDesc, NSDictionary *data) {
-        detailResultCallback(BBASMPaymentStatusFailed, payDesc, data);
-        [self cnPaymentUbcPayStatisticstype:BBASMPayStatisticsPolymer
-                                    payInfo:payDesc
-                                    succeed:NO];
-    } cancelCallBack:^(NSString *payDesc, NSDictionary *data) {
-        detailResultCallback(BBASMPaymentStatusCanceled, payDesc, data);
-        [self cnPaymentUbcPayStatisticstype:BBASMPayStatisticsPolymer
-                                    payInfo:payDesc
-                                    succeed:NO];
-    }];
-}
-
-
-+ (void)requestPaymentWithType:(BBASMPaymentType)type orderInfo:(nonnull NSString *)orderInfo completion:(nonnull void (^)(BBASMPaymentStatus, NSDictionary * _Nonnull))completion {
-    
-}
-
-
-+ (void)requestWalletRiskInfo:(nonnull NSString *)parameter source:(nonnull NSString *)source controller:(nonnull UIViewController *)controller completion:(nonnull void (^)(NSInteger, NSString * _Nonnull))completion {
-    
-}
-
-
-+ (void)showBainuoCashierCouponPannel:(nonnull NSDictionary *)params fromViewController:(nonnull UIViewController *)fromViewController callback:(nonnull void (^)(NSDictionary * _Nonnull))callback {
-    [[CNBBASMPaymentHander shareInstance] showBainuoCashierCouponPannel:params fromViewController:fromViewController callback:callback];
-}
-
-+ (void)requestBainuoPolymerPaymentWithParams:(NSDictionary *)params
-                               bannedChannels:(nullable NSArray *)bannedChannels
-                                   completion:(void (^)(BBASMPaymentStatus status, NSString *payResult))completionBlock{
-    [[CNBBASMPaymentHander shareInstance] requestBainuoCashierPayment:[params copy] bannedChannels:bannedChannels successCallBack:^(NSString * _Nonnull payDesc, NSDictionary * _Nonnull data) {
-        completionBlock(BBASMPaymentStatusSuccess, payDesc);
-        [self cnPaymentUbcPayStatisticstype:BBASMPayStatisticsPolymer
-                                      payInfo:payDesc
-                                      succeed:YES];
-    } loadingCallBack:^(NSString * _Nonnull payDesc, NSDictionary * _Nonnull data) {
-        completionBlock(BBASMPaymentStatusLoading, payDesc);
-    } errorCallBack:^(NSString * _Nonnull payDesc, NSDictionary * _Nonnull data) {
-        completionBlock(BBASMPaymentStatusFailed, payDesc);
-        [self cnPaymentUbcPayStatisticstype:BBASMPayStatisticsPolymer
-                                      payInfo:payDesc
-                                      succeed:NO];
-    } cancelCallBack:^(NSString * _Nonnull payDesc, NSDictionary * _Nonnull data) {
-        completionBlock(BBASMPaymentStatusCanceled, payDesc);
-        [self cnPaymentUbcPayStatisticstype:BBASMPayStatisticsPolymer
-                                      payInfo:payDesc
-                                      succeed:NO];
-    }];
-}
-
-
-#pragma mark - Private Method
-
-/**
- * @brief 统计小程序带来的订单量和支付成功的订单金额
- *
- * @param type 区分支付方式：支付宝-直连，聚合收银台，百度钱包
- * @param payInfo 支付结果信息字符串
- * @param succeed 支付成功失败
- */
-+ (void)cnPaymentUbcPayStatisticstype:(BBASMPayStatisticsType)type payInfo:(NSString *)payInfo succeed:(BOOL)succeed {
-    NSString *value = succeed? @"success" : @"fail";
-    Class<BBASMServiceProtocol> serviceClass = [Pyramid createClassService:@protocol(BBASMServiceProtocol)];
-    NSString *appKey = [serviceClass currentBBASMAppId];
-    NSString *moneyInfo = payInfo;
-    if (!CHECK_STRING_VALID(moneyInfo)) {
-        moneyInfo = @"";
-    }
-    if (!CHECK_STRING_VALID(appKey)) {
-        appKey = @"";
-    }
-    //  支付方式
-    NSString *source = @"";
-    switch (type) {
-        case BBASMPayStatisticsBDWallet:{
-            source = @"baiduqianbao";
-            break;
-        }
-        case BBASMPayStatisticsAliPay:{
-            source = @"alipay";
-            break;
-        }
-        case BBASMPayStatisticsPolymer:{
-            source = @"nuomi";
-        }   break;
-        case BBASMPayStatisticsWechat:{
-            source = @"wechatH5Action";
-            break;
-        }
-        default:
-            source = @"baiduqianbao";
-            break;
-    }
-    if (CHECK_STRING_VALID(appKey)) {
-        Class<BBASMServiceProtocol> serviceClass = [Pyramid createClassService:@protocol(BBASMServiceProtocol)];
-        NSString *appTypeString = [serviceClass appTypeString:appKey];
-        if (!appTypeString || [appTypeString isEqualToString:@"unknown"]) {
-            return;
-        }
-        NSDictionary *ubcDict = @{@"type": @"pay",
-                                  @"from": appTypeString,
-                                  @"value": value,
-                                  @"source": source,
-                                  @"ext": @{@"appid": appKey, @"money": moneyInfo,@"source" : BBASM_LOWERCASE_STR}};
-        [serviceClass sendWalletUBCMessage:ubcDict
-                                     appId:appKey];
-    }
-}
-
-
-@end
-//
-//  CNBainuoPayManagerDelegate.h
-//  BBASMDemo_Example
-//
-//  Created by CNLive on 2021/10/29.
-//  Copyright © 2021 杨苓玉. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "BainuoCashierSDK/BDNCashierSDK.h"
-#import <BainuoCashierSDK/BDNCashierSDKBaifubaoService.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface CNBainuoPayManagerDelegate : NSObject<BDNCashierSDKBaifubaoDelegate>
-
-+ (instancetype)shareInstance;
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  CNBainuoPayManagerDelegate.m
-//  BBASMDemo_Example
-//
-//  Created by CNLive on 2021/10/29.
-//  Copyright © 2021 杨苓玉. All rights reserved.
-//
-
-#import "CNBainuoPayManagerDelegate.h"
-#import "CNWalletPaymentDelegate.h"
-
-@implementation CNBainuoPayManagerDelegate
-+ (instancetype)shareInstance
-{
-    static dispatch_once_t onceToken;
-    static CNBainuoPayManagerDelegate *instance = nil;
-    dispatch_once(&onceToken, ^{
-        instance = [[self alloc] init];
-    });
-    return instance;
-}
-#pragma mark - BDNCashierSDKDelegate相关协议
-- (id<BDWalletSDKMainManagerDelegate>)bridgeBDWalletDelegateWithPayCallback:(BDNCashierSDKBaifubaoPaymentCallback)callback {
-    // 宿主App实现的BDWalletSDKMainManagerDelegate代理类
-    CNWalletPaymentDelegate *walletDelegate = [CNWalletPaymentDelegate shareInstance];
-    walletDelegate.callback = callback;
-    return walletDelegate;
-}
-@end
-//
-//  CNWalletPaymentDelegate.h
-//  BBASMDemo_Example
-//
-//  Created by CNLive on 2021/10/29.
-//  Copyright © 2021 杨苓玉. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import <BainuoCashierSDK/BDNCashierSDK.h>
-#import <BainuoCashierSDK/BDNCashierSDKBaifubaoService.h>
-NS_ASSUME_NONNULL_BEGIN
-
-@interface CNWalletPaymentDelegate : UIViewController<BDWalletSDKMainManagerDelegate>
-@property (nonatomic, copy) BDNCashierSDKBaifubaoPaymentCallback callback;
-
-+ (instancetype)shareInstance;
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  CNWalletPaymentDelegate.m
-//  BBASMDemo_Example
-//
-//  Created by CNLive on 2021/10/29.
-//  Copyright © 2021 杨苓玉. All rights reserved.
-//
-
-#import "CNWalletPaymentDelegate.h"
-
-@interface CNWalletPaymentDelegate ()
-
-@end
-
-@implementation CNWalletPaymentDelegate
-
-+ (instancetype)shareInstance
-{
-    static dispatch_once_t onceToken;
-    static CNWalletPaymentDelegate *instance = nil;
-    dispatch_once(&onceToken, ^{
-        instance = [[self alloc] init];
-    });
-    return instance;
-}
-
-
-#pragma mark - BDNCashierSDKBaifubaoDelegate相关协议
-
-// 支付回调接口
-- (void)BDWalletPayResultWithCode:(int)statusCode payDesc:(NSString *)payDescs {
-    if (self.callback) {
-        self.callback(statusCode, payDescs);
-    }
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
-@end
@@ -497,7 +497,7 @@ SPEC CHECKSUMS:
   AlipaySDK-iOS: 8659cdb4403de7e5f26ad8b699864a9cbe53384c
   BaiduBCE: ca933eadbccac8f8254976c9181ca5f45ded948b
   BBAMNPLib: 070a935319cfd816f29d00c88012a496f7448229
-  CNLiveBBASMModule: b9f55bded98f5ab01ab583c4ae5091fb07127238
+  CNLiveBBASMModule: 360d8b0be15993b8576c19f353e81ca5bc2b4845
   CNLiveBeeHive: 1e105b15b6ccaad546258fcf91231563beb853d4
   CNLiveCommonCategory: 11c736c733ab9c3ea27426d2fafff31a92f0286e
   CNLiveEnvironment: 6af0a2f332b704ffdec67106b4ba044c7f8da371