0.0.3

liushiyu
1 parent 8cfe57b8
Showing 23 changed files with 763 additions and 168 deletions
CNLivePayCostModule.podspec
CNLivePayCostModule/Assets/CNLivePayCostModule.bundle/ye_zfcg@2x.png
CNLivePayCostModule/Assets/CNLivePayCostModule.bundle/ye_zfcg@3x.png
CNLivePayCostModule/Classes/Core/CNLivePayCostHeader.h
CNLivePayCostModule/Classes/Core/CNLivePayCostModel.h
CNLivePayCostModule/Classes/Core/CNLivePayCostModel.m
CNLivePayCostModule/Classes/Core/CNLivePayCostModule.h
CNLivePayCostModule/Classes/Core/CNLivePayCostModule.m
CNLivePayCostModule/Classes/Core/CNLivePayCostNetwork.h
CNLivePayCostModule/Classes/Core/CNLivePayCostNetwork.m
CNLivePayCostModule/Classes/Core/CNLivePayCostProtocol.h
CNLivePayCostModule/Classes/View/CNLivePayCostContentView.h
CNLivePayCostModule/Classes/View/CNLivePayCostContentView.m
CNLivePayCostModule/Classes/View/CNLivePayCostPasswordView.m
CNLivePayCostModule/Classes/View/CNLivePayCostResultViewController.m
CNLivePayCostModule/Classes/View/CNLivePayCostScanResultViewController.m
Example/CNLivePayCostModule.xcodeproj/project.pbxproj
Example/CNLivePayCostModule/CNLIVEAppDelegate.m
Example/CNLivePayCostModule/CNLIVEViewController.m
Example/CNLivePayCostModule/CNLivePayCostModule-Info.plist
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLivePayCostModule'
-  s.version          = '0.0.2'
+  s.version          = '0.0.3'
   s.summary          = 'A short description of CNLivePayCostModule.'
 # This description is used to generate tags and improve search results.
@@ -30,7 +30,8 @@ TODO: Add long description of the pod here.
   s.ios.deployment_target = '10.0'
-  s.source_files = 'CNLivePayCostModule/Classes/**/*'
+#  s.source_files = 'CNLivePayCostModule/Classes/**/*'  s.public_header_files
+  s.source_files  = "CNLivePayCostModule/Classes/Core/*.{h,m}","CNLivePayCostModule/Classes/View/*.{h,m}","CNLivePayCostModule/Classes/UMSPosPayOnly/include/*.h","CNLivePayCostModule/Classes/UPPaymentControl/*.h"
   s.static_framework = true
@@ -39,6 +40,8 @@ TODO: Add long description of the pod here.
    }
   # s.public_header_files = 'Pod/Classes/**/*.h'
+  s.vendored_libraries = 'CNLivePayCostModule/Classes/UMSPosPayOnly/*.a',"CNLivePayCostModule/Classes/UPPaymentControl/*.a"
+  
   #基础库导入
    s.frameworks = 'UIKit', 'MapKit'
@@ -17,8 +17,8 @@ typedef enum : NSUInteger {
     CNLivePayCostTypeSweep,//扫码支付
     CNLivePayCostTypeTicke,//门票支付
     CNLivePayCostTypeSHShop,//上海电商支付
-    CNLivePayCostTypeMall,//商城支付
-    CNLivePayCostTypeBDMini,//百度小程序支付
+    CNLivePayCostTypeMall,//商城支付 未用
+    CNLivePayCostTypeBDMini,//百度小程序支付 未用
     CNLivePayCostTypeCommunt,//社区支付
     CNLivePayCostTypeHtml,//网页拉起支付
 } CNLivePayCostType;
@@ -37,7 +37,7 @@ typedef enum {
 } CNLivePayCostPayType;
 typedef enum {
-    CNLivePayCostThreePayTypePayment = 1,//群收款
+    CNLivePayCostThreePayTypePayment  = 1,//群收款
     CNLivePayCostThreePayTypeOrder    = 3, //订单支付
     CNLivePayCostThreePayTypeScren    = 2, //扫码支付
     CNLivePayCostThreePayTypeTicke    = 4, //门票支付
@@ -96,4 +96,7 @@ typedef enum {
 #import "UMSPPPayUnifyPayPlugin.h"
 //商务全名付 银联
 #import "UPPaymentControl.h"
+//商务全民付 设置
+#import "UMSPPPayPluginSettings.h"
+
 #endif /* CNLivePayCostHeader_h */
@@ -11,7 +11,7 @@
 #import "CNLivePayCostContentView.h"
 NS_ASSUME_NONNULL_BEGIN
-@interface CNLivePayCostModel : NSObject
+@interface CNLivePayCostModel : NSObject<WXApiDelegate>
 +(instancetype)sharePayCostModel;
@@ -32,6 +32,16 @@
     return self;
 }
+
+- (void)onResp:(BaseResp*)resp {
+    //处理微信分享等功能
+    if ([resp isKindOfClass:[WXLaunchMiniProgramResp class]]) {
+        NSDictionary * exDict = [((WXLaunchMiniProgramResp *)resp).extMsg mj_JSONObject];
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"kCNLiveLaunchMiniResultNotification" object:nil userInfo:exDict];
+    }
+    
+}
+
 + (NSString *)payCost_getRandomOrderId {
     // appId+渠道+年月日+毫秒数后10位+2位数的随机数
     NSString *randomOrderId = @"";
@@ -12,6 +12,8 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLivePayCostModule : NSObject
+/// 启动设置
++(void)finishLaunchingWithPayPluginSettings;
 /// 拉起网家家支付功能
 /// @param paramDict 参数 (详细见.m中参数解释)
@@ -31,6 +33,14 @@ NS_ASSUME_NONNULL_BEGIN
                              FromVC:(UIViewController *)formVC
                         ResultBlock:(void(^)(CNLivePayCostTypeResult resultType))resultBlock;
+/// 拉起电商支付功能
+/// @param paramDict 参数
+/// @param payType 支付界面控制器
+/// @param resultBlock 支付结果
++(void)showShopPayViwWithParamDict:(NSDictionary *)paramDict
+                           PayType:(CNLivePayCostPayType)payType
+                       ResultBlock:(void(^)(CNLivePayCostTypeResult resultType))resultBlock;
+
 @end
 NS_ASSUME_NONNULL_END
@@ -8,13 +8,23 @@
 #import "CNLivePayCostModule.h"
 #import "CNLivePayCostContentView.h"
 #import "CNLivePayCostModel.h"
+
+
+
 @interface CNLivePayCostModule ()
 @end
 @implementation CNLivePayCostModule
-
+/// 启动设置
++(void)finishLaunchingWithPayPluginSettings
+{
+    [UMSPPPayPluginSettings sharedInstance].umspEnviroment = UMSP_PROD;
+    
+    //注册微信支付
+    [UMSPPPayUnifyPayPlugin registerApp:WeiChatAppId_Share universalLink:[NSString stringWithFormat:@"%@/",API_Host]];
+}
 /// 拉起网家家支付功能
 /// @param paramDict 参数 (详细见.m中参数解释)
@@ -61,7 +71,8 @@
         payModel.orderId = [paramDict stringValueForKey:@"orderId" default:@""];
         payModel.userId = [paramDict stringValueForKey:@"userId" default:@""];
         payModel.expand = [@{@"fromType":@"1",@"toType":@"3",@"sourceType":@"order"} mj_JSONString];
-        payModel.descStr = [paramDict stringValueForKey:@"userId" default:@""];
+        payModel.descStr = [paramDict stringValueForKey:@"descStr" default:@""];
+        payModel.notifyUrl = [paramDict stringValueForKey:@"notifyUrl" default:@""];
         payModel.price = [paramDict floatValueForKey:@"price" default:0.00];
         if ([[paramDict stringValueForKey:@"orderType" default:@""] isEqualToString:@"3"]) payModel.isHiddenWjjpay =YES;
         payModel.payType = payCostType;
@@ -89,14 +100,13 @@
         payModel.payType = payCostType;
     }
     //社区支付
-    if (payCostType == CNLivePayCostTypeSHShop) {
+    if (payCostType == CNLivePayCostTypeCommunt) {
         payModel.orderId = [paramDict stringValueForKey:@"orderId" default:@""];
         payModel.isHiddenWjjpay = YES;
         payModel.price = [paramDict floatValueForKey:@"price" default:1];
         payModel.descStr = [paramDict stringValueForKey:@"body" default:@"网家家"];
         payModel.attach = @{@"plat":@"i"};
         payModel.notifyUrl = [paramDict stringValueForKey:@"notifyUrl" default:@""];
-
     }
     //网页支付
     if (payCostType == CNLivePayCostTypeHtml) {
@@ -126,14 +136,23 @@
     if ([[CNUserInfoManager manager].userInfoModel.unionUserStatus isEqualToString:@"3"]) payModel.isHiddenWjjpay = YES;
-    CNLivePayCostContentView * payCostView = [[CNLivePayCostContentView alloc] initWithFrame:AppKeyWindow.bounds PayModel:payModel FromVC:formVC CompleterBlock:^(CNLivePayCostType resultType) {
-        if (resultBlock && resultType == CNLivePayCostTypeResultSucc) resultBlock(CNLivePayCostTypeResultSucc);
+    CNLivePayCostContentView * payCostView = [[CNLivePayCostContentView alloc] initWithFrame:AppKeyWindow.bounds PayModel:payModel FromVC:formVC CompleterBlock:^(CNLivePayCostTypeResult resultType) {
+        if (resultBlock) resultBlock(resultType);
     }];
     [AppKeyWindow addSubview:payCostView];
     [payCostView show];
-    //支付成功通知回调
-    [[NSNotificationCenter defaultCenter] addObserver:payCostView selector:@selector(resultPayAction:) name:@"kIMAMSG_ScanPaySuccessNotification" object:nil];
+    if (payCostType == CNLivePayCostTypeCommunt) {
+        //社区支付结果回调
+        [[NSNotificationCenter defaultCenter] addObserver:payCostView selector:@selector(resultPayAction:) name:@"kIMAMSG_CommunityPaySuccessNotification" object:nil];
+    }else if (payCostType == CNLivePayCostTypeSweep) {
+        //二维码识别结果回调
+        [[NSNotificationCenter defaultCenter] addObserver:payCostView selector:@selector(resultPayAction:) name:@"CNLiveContentSweepPaymentNotification" object:nil];
+    }else{
+        //支付成功通知回调
+        [[NSNotificationCenter defaultCenter] addObserver:payCostView selector:@selector(resultPayAction:) name:@"kIMAMSG_ScanPaySuccessNotification" object:nil];
+    }
+
 }
 /// 拉起苹果支付功能
@@ -182,4 +201,29 @@
         });
     }];
 }
+
+/// 拉起电商支付功能
+/// @param paramDict 参数
+/// @param payType 支付界面控制器
+/// @param resultBlock 支付结果
++(void)showShopPayViwWithParamDict:(NSDictionary *)paramDict
+                           PayType:(CNLivePayCostPayType)payType
+                       ResultBlock:(void(^)(CNLivePayCostTypeResult resultType))resultBlock
+{
+    NSString * orderId = [paramDict stringValueForKey:@"orderId" default:@""];
+    NSString * body = [paramDict stringValueForKey:@"body" default:@""];
+    NSString * price = [paramDict stringValueForKey:@"price" default:@"0.00"];
+    NSString * couponFee = [paramDict stringValueForKey:@"coupon_fee" default:@"0.00"];
+    NSString * balanceFee = [paramDict stringValueForKey:@"balance_fee" default:@"0.00"];
+    NSString * notifyUrl = [paramDict stringValueForKey:@"notifyUrl" default:@""];
+    NSString * password = [paramDict stringValueForKey:@"password" default:@""];
+    
+    NSString * p = [NSString stringWithFormat:@"%d",(NSInteger)([price floatValue]*100)];
+    
+    [CNLivePayCostNetwork requestWithUMSPayForPrePayWithOrderId:orderId Body:body Price:p CouponFee:couponFee BalanceFee:balanceFee NotifyUrl:notifyUrl Type:payType FrmId:@"debug" PassWord:password CompleterBlcok:^(NSInteger statue) {
+        if (resultBlock) {
+            if (statue == 0) resultBlock(statue == 0?CNLivePayCostTypeResultSucc:CNLivePayCostTypeResultFail);
+        }
+    }];
+}
 @end
@@ -22,6 +22,27 @@ NS_ASSUME_NONNULL_BEGIN
 /// 支付id
 @property (nonatomic, copy) NSString * payId;
+/// 调用维金支付之前的预支付订单
+/// @param orderId 订单id
+/// @param body 订单信息
+/// @param price 价格
+/// @param coupon_fee 优惠券金额
+/// @param balance_fee 余额金额
+/// @param notify_url 服务端回调地址
+/// @param type 支付方式 3：支付宝，4:余额，9：云闪付
+/// @param frmId 渠道id
+/// param completerBlock  返回
++(void)requestWithUMSPayForPrePayWithOrderId:(NSString *)orderId
+                                        Body:(NSString *)body
+                                       Price:(NSString *)price
+                                   CouponFee:(NSString *)coupon_fee
+                                  BalanceFee:(NSString *)balance_fee
+                                   NotifyUrl:(NSString *)notify_url
+                                        Type:(CNLivePayCostPayType)type
+                                       FrmId:(NSString *)frmId
+                                    PassWord:(NSString *)password
+                              CompleterBlcok:(void(^)(NSInteger statue))completerBlock;
+
 /**
  拉起支付接口,调起支付动作
@@ -53,6 +74,8 @@ NS_ASSUME_NONNULL_BEGIN
  @param expand 扩展字段
  @param sourceId 资源 ID
  @param payId 支付 ID
+ @param desc 描述
+ @param notifyUrl 回调地址
  @param password 支付密码
  @param completerBlock 支付结果返回
  */
@@ -62,6 +85,8 @@ NS_ASSUME_NONNULL_BEGIN
                                        Expand:(NSString *)expand
                                      SourceId:(NSString *)sourceId
                                         PayId:(NSString *)payId
+                                         Desc:(NSString *)desc
+                                    NotifyUrl:(NSString *)notifyUrl
                                      PassWord:(NSString *)password
                                CompleterBlock:(void (^)(NSInteger))completerBlock;
@@ -71,6 +96,9 @@ NS_ASSUME_NONNULL_BEGIN
 -(void)requestActiveForPasswordWithLocalAmount:(float)amount
                                 CompleterBlock:(void(^)(NSInteger isPassword))completerBlock;
+// 获取当前活动的navigationcontroller
++ (UINavigationController *)paycost_navigationViewController;
+
 /// 获取图片
 /// @param imageName 图片名称
 +(UIImage *)payCost_setImageWithName:(NSString *)imageName;
@@ -7,7 +7,7 @@
 #import "CNLivePayCostNetwork.h"
 #import <CNLiveBaseTools/CNLiveTimeTools.h>
-
+#import "CNLivePayCostModel.h"
 static NSString *const CNLiveWillBecomeActivePaycostForOrderNotification = @"CNLiveWillBecomeActivePaycostForOrderNotification";
 static NSString *const CNLiveWillBecomeActivePaycostForGroupNotification = @"CNLiveWillBecomeActivePaycostForGroupNotification";
@@ -15,6 +15,9 @@ static NSString *const CNLiveWillBecomeActivePaycostForTickeNotification = @&quot;CNL
 static NSString *const CNLiveWillBecomeActivePaycostForScanNotification = @"CNLiveWillBecomeActivePaycostForScanNotification";
 static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @"CNLiveWillBecomeActivePaycostForSHShopNotification";
+#define CNUMSPayWithPrePayApiContentURL   (@"https://apiumspay.cnlive.com/app/prePay")
+#define CNUMSPayWithBalancePayApiContentURL   (@"https://apiumspay.cnlive.com/app/balancePay")
+
 @implementation CNLivePayCostNetwork
 +(instancetype)sharePayCostNetWork
@@ -27,6 +30,112 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @&quot;CN
     return payCostNetWork;
 }
+#pragma mark = 生成预支付订单
+
+/// 调用维金支付之前的预支付订单
+/// @param orderId 订单id
+/// @param body 订单信息
+/// @param price 价格
+/// @param coupon_fee 优惠券金额
+/// @param balance_fee 余额金额
+/// @param notify_url 服务端回调地址
+/// @param type 支付方式 3：支付宝，4:余额，9：云闪付
+/// @param frmId 渠道id
+/// @param completerBlock 返回
++(void)requestWithUMSPayForPrePayWithOrderId:(NSString *)orderId
+                                        Body:(NSString *)body
+                                       Price:(NSString *)price
+                                   CouponFee:(NSString *)coupon_fee
+                                  BalanceFee:(NSString *)balance_fee
+                                   NotifyUrl:(NSString *)notify_url
+                                        Type:(CNLivePayCostPayType)type
+                                       FrmId:(NSString *)frmId
+                                    PassWord:(NSString *)password
+                              CompleterBlcok:(void(^)(NSInteger statue))completerBlock
+{
+    if (type == CNLivePayCostPayTypeWeChatPay) {
+        NSString * path = [NSString stringWithFormat:@"pages/pays/pay/pay?appId=%@&body=%@&out_trade_no=%@&user_id=%@&total_fee=%@&notify_url=%@&type=1&&frmId=ios&&page_url=%@&&coupon_fee=0&&balance_fee=0",AppId,body,orderId,CNUserShareModel.uid?CNUserShareModel.uid:@"",price,notify_url,notify_url];
+        NSLog(@"===>%@",path);
+        WXLaunchMiniProgramReq *launchMiniProgramReq = [WXLaunchMiniProgramReq object];
+        launchMiniProgramReq.userName = @"gh_061b347b32c1";  //拉起的小程序的username
+        launchMiniProgramReq.path = path;
+        launchMiniProgramReq.miniProgramType = WXMiniProgramTypePreview;
+        [WXApi sendReq:launchMiniProgramReq completion:^(BOOL success) {
+            
+        }];
+    }else if (type == CNLivePayCostPayTypeWjjPay) {
+        
+        NSDictionary * paramDict = @{
+            @"appId":AppId,
+            @"user_id":CNUserShareModel.uid?CNUserShareModel.uid:@"",
+            @"out_trade_no":orderId,
+            @"body":body,
+            @"coupon_fee":@"0",
+            @"balance_fee":price,
+            @"notify_url":notify_url,
+            @"page_url":@"",
+            @"type":@"4",
+            @"password":[NSString md5String:password],
+            @"frmId":@"ios"
+        };
+        [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+        [CNLiveNetworking setupShowDataResult:YES];
+        [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNUMSPayWithBalancePayApiContentURL Param:paramDict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+            [QMUITips hideAllToastInView:AppKeyWindow animated:YES];
+            long errorCode = [responseObject longValueForKey:@"errorCode" default:100];
+            NSString * errorMessage = [responseObject stringValueForKey:@"errorMessage" default:@""];
+            if (errorCode == 0) {
+                if (completerBlock) completerBlock(0);
+            }else{
+                [QMUITips showError:[errorMessage isNotBlank]?errorMessage:@"支付失败" inView:AppKeyWindow hideAfterDelay:1.5];
+                if (completerBlock) {
+                    if (errorCode == 100011) completerBlock(2);
+                    if (errorCode != 100011) completerBlock(3);
+                }
+            }
+        }];
+        
+    }else{
+        NSString * index = @"";
+        if (type == CNLivePayCostPayTypeAliPay) index = @"3";
+        if (type == CNLivePayCostPayTypeUnionPay) index = @"9";
+        if (type == CNLivePayCostPayTypeWjjPay) index = @"4";
+        NSDictionary * paramDict = @{
+                                     @"appId":AppId,
+                                     @"user_id":CNUserShareModel.uid?CNUserShareModel.uid:@"",
+                                     @"out_trade_no":orderId,
+                                     @"body":body,
+                                     @"total_fee":price,
+                                     @"coupon_fee":coupon_fee,
+                                     @"balance_fee":balance_fee,
+                                     @"notify_url":notify_url,
+                                     @"page_url":@"",
+                                     @"type":index,
+                                     @"frmId":frmId
+                                     };
+        [CNLiveNetworking setupShowResult:YES];
+        [CNLiveNetworking setupShowDataResult:NO];
+        [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+        [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNUMSPayWithPrePayApiContentURL Param:paramDict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+            [CNLivePayCostNetwork payCost_chooseRequestWithResponseObject:responseObject Error:error isData:YES CompleterBlock:^(id responseObject, NSInteger errorCode) {
+                if (responseObject) {
+                    NSString *payDataJsonStr = [[NSString alloc] initWithData:[NSJSONSerialization dataWithJSONObject:responseObject options:NSJSONWritingPrettyPrinted error:nil] encoding:NSUTF8StringEncoding];
+                    [UMSPPPayUnifyPayPlugin payWithPayChannel:CHANNEL_ALIMINIPAY payData:payDataJsonStr callbackBlock:^(NSString *resultCode, NSString *resultInfo) {
+                        if (completerBlock) {
+                            if ([resultCode isEqualToString:@"0000"]) completerBlock(0);
+                            if ([resultCode isEqualToString:@"1000"]) completerBlock(3);//余额支付取消支付 code1000
+                        }
+                        
+                    }];
+                }
+            }];
+        }];
+    }
+}
+
+
+#pragma mark = 以下为老接口
+
 /**
  拉起支付接口,调起支付动作
@@ -49,6 +158,9 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @&quot;CN
                                      FormVC:(UIViewController *)formVC
                              CompleterBlcok:(void(^)(NSInteger statue))completerBlock
 {
+    
+
+    
     if ((threeType == CNLivePayCostThreePayTypeTicke //门票
          || threeType == CNLivePayCostThreePayTypeScren
          || threeType == CNLivePayCostThreePayTypeOrder
@@ -59,70 +171,111 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @&quot;CN
         CNLivePayType type = payType == CNLivePayCostPayTypeWeChatPay ? CNLivePayCostPayTypeWeChatPay : payType == CNLivePayCostPayTypeAliPay ? CNLivePayCostPayTypeAliPay : CNLivePayCostPayTypeUnionPay;
         NSString * accountString = payType == CNLivePayCostPayTypeWeChatPay ? WXAccount : payType == CNLivePayCostPayTypeAliPay ? @"ztsx" : @"ztyl";
+    
-        float pri = [price floatValue]*100;
-        
-        NSString * notifyUrls = jsfy==YES ? CNJSFYNotifyUrl: (payType == CNLivePayCostPayTypeWeChatPay ? CNWeChatPayUrl : payType == CNLivePayCostPayTypeAliPay ? CNAliPayUrl : CNUnionPayUrl);
-        
-        //上海电商需要特殊的回调地址
-        if (!CNLiveStringIsEmpty(notifyUrl)
-            && threeType == CNLivePayCostThreePayTypeSHSop) notifyUrls = notifyUrl;
-        
-        [self requestPayFromWXAndAliPay:type OrderId:groupId Account:accountString PriceId:pri Desc:desc Attach:attach CNLiveActiveGroupThreePayType:threeType NotifyUrl:notifyUrls NetAddUrlSchems:payType == CNLivePayCostPayTypeWeChatPay ? nil : payType == CNLivePayCostPayTypeAliPay ? CNLiveNetAddUrlSchems : CNLiveNetAddUnionPaySchems FormVC:formVC CompleterBlock:^{
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                if (completerBlock) completerBlock(0);
-            });
-        }];
-        
+        if ([[CNLivePayCostModel sharePayCostModel].protocol pushActivePaymentNewPaycostWayWithModthod]) {
+            
+            NSString * p = [NSString stringWithFormat:@"%d",(NSInteger)([price floatValue]*100)];
+            
+            [CNLivePayCostNetwork requestWithUMSPayForPrePayWithOrderId:groupId Body:desc Price:p CouponFee:@"0" BalanceFee:@"0" NotifyUrl:notifyUrl Type:payType FrmId:@"ios" PassWord:@"" CompleterBlcok:^(NSInteger statue) {
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    if (completerBlock) completerBlock(statue);
+                });
+            }];
+        }else{
+            float pri = [price floatValue]*100;
+            
+            NSString * notifyUrls = jsfy==YES ? CNJSFYNotifyUrl: (payType == CNLivePayCostPayTypeWeChatPay ? CNWeChatPayUrl : payType == CNLivePayCostPayTypeAliPay ? CNAliPayUrl : CNUnionPayUrl);
+    
+            //上海电商需要特殊的回调地址
+            if (!CNLiveStringIsEmpty(notifyUrl)
+                && threeType == CNLivePayCostThreePayTypeSHSop) notifyUrls = notifyUrl;
+            
+            [self requestPayFromWXAndAliPay:type OrderId:groupId Account:accountString PriceId:pri Desc:desc Attach:attach CNLiveActiveGroupThreePayType:threeType NotifyUrl:notifyUrls NetAddUrlSchems:payType == CNLivePayCostPayTypeWeChatPay ? nil : payType == CNLivePayCostPayTypeAliPay ? CNLiveNetAddUrlSchems : CNLiveNetAddUnionPaySchems FormVC:formVC CompleterBlock:^{
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    if (completerBlock) completerBlock(0);
+                });
+            }];
+        }
     }else{
-        __weak typeof(self) weakSelf = self;
-        NSDictionary * paramDict = @{
-                                     @"groupId":groupId,
-                                     @"sid":CNUserShareModel.uid,
-                                     @"price":price,
-                                     @"fundsId":fundsId
-                                     };
-        [CNLiveNetworking setAllowRequestDefaultArgument:YES];
-        [CNLiveNetworking setupShowDataResult:YES];
-        [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNPayByGroupMembersUrl Param:paramDict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
-        
+        if ([[CNLivePayCostModel sharePayCostModel].protocol pushActivePaymentNewPaycostWayWithModthod]) {
+            
+            NSString * p = [NSString stringWithFormat:@"%d",(NSInteger)([price floatValue]*100)];
+            
+            NSDictionary * paramDict = @{
+                                         @"appId":AppId,
+                                         @"user_id":CNUserShareModel.uid?CNUserShareModel.uid:@"",
+                                         @"out_trade_no":groupId,
+                                         @"body":desc,
+                                         @"coupon_fee":@"0",
+                                         @"balance_fee":p,
+                                         @"notify_url":notifyUrl,
+                                         @"page_url":@"",
+                                         @"type":@"4",
+                                         @"password":password,
+                                         @"frmId":@"ios"
+                                         };
+            [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+            [CNLiveNetworking setupShowDataResult:YES];
+            [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNUMSPayWithBalancePayApiContentURL Param:paramDict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+                [CNLivePayCostNetwork payCost_chooseRequestWithResponseObject:responseObject Error:error isData:YES CompleterBlock:^(id responseObject, NSInteger errorCode) {
+                    if (responseObject) {
+                        if (completerBlock) completerBlock(0);
+                    }else{
+                        if (completerBlock) completerBlock(1);
+                    }
+                }];
+            }];
+            
+        } else {
+            __weak typeof(self) weakSelf = self;
+            NSDictionary * paramDict = @{
+                                         @"groupId":groupId,
+                                         @"sid":CNUserShareModel.uid,
+                                         @"price":price,
+                                         @"fundsId":fundsId
+                                         };
+            [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+            [CNLiveNetworking setupShowDataResult:YES];
+            [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNPayByGroupMembersUrl Param:paramDict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
-            if (error == nil && [[responseObject allKeys] containsObject:@"payId"] && responseObject[@"payId"] != nil && ![responseObject[@"payId"] isKindOfClass:[NSNull class]]) {
-                
-                if (payType == CNLivePayCostPayTypeWjjPay) {
+                if (error == nil && [[responseObject allKeys] containsObject:@"payId"] && responseObject[@"payId"] != nil && ![responseObject[@"payId"] isKindOfClass:[NSNull class]]) {
-                    NSString * toid = threeType == CNLivePayCostTypeOrder ? fundsId : groupId;
-                    [self requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:toid Price:[price floatValue] Expand:expand SourceId:[responseObject objectForKey:@"payId"] PayId:responseObject[@"payId"] PassWord:password CompleterBlock:^(NSInteger statue) {
-                        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                            if (completerBlock) completerBlock(statue);
-                        });
-                    }];
+                    if (payType == CNLivePayCostPayTypeWjjPay) {
+                        
+                        NSString * toid = threeType == CNLivePayCostTypeOrder ? fundsId : groupId;
+                        [self requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:toid Price:[price floatValue] Expand:expand SourceId:[responseObject objectForKey:@"payId"] PayId:responseObject[@"payId"] Desc:desc NotifyUrl:notifyUrl PassWord:password CompleterBlock:^(NSInteger statue) {
+                            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                                if (completerBlock) completerBlock(statue);
+                            });
+                        }];
+                    }else{
+                        CNLivePayType type = payType == CNLivePayCostPayTypeWeChatPay ? CNLivePayTypeWeChatPay : payType == CNLivePayCostPayTypeAliPay ? CNLivePayTypeAliPay : CNLivePayTypeUnionpay;
+                        
+                        NSString * accountString = payType == CNLivePayCostPayTypeWeChatPay ? WXAccount : payType == CNLivePayCostPayTypeAliPay ? @"ztsx" : @"ztyl";
+                        
+                        float price = [responseObject[@"price"] floatValue]*100;
+                        NSString * notifyUrls = jsfy == YES ? CNJSFYNotifyUrl : (payType == CNLivePayCostPayTypeWeChatPay ? CNWeChatPayUrl : payType == CNLivePayCostPayTypeAliPay ? CNAliPayUrl : CNUnionPayUrl);
+                        
+                        if (!CNLiveStringIsEmpty(notifyUrl)) notifyUrls = notifyUrl;
+                        
+                        weakSelf.payId = responseObject[@"payId"];
+                        
+                        [weakSelf requestPayFromWXAndAliPay:type OrderId:responseObject[@"payId"] Account:accountString PriceId:price Desc:desc Attach:@{} CNLiveActiveGroupThreePayType:threeType NotifyUrl:notifyUrls NetAddUrlSchems:payType == CNLivePayCostPayTypeWeChatPay ? nil : payType == CNLivePayCostPayTypeAliPay ? CNLiveNetAddUrlSchems : CNLiveNetAddUnionPaySchems FormVC:formVC CompleterBlock:^{
+                            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                                if (completerBlock) completerBlock(0);
+                            });
+                        }];
+                    }
                 }else{
-                    CNLivePayType type = payType == CNLivePayCostPayTypeWeChatPay ? CNLivePayTypeWeChatPay : payType == CNLivePayCostPayTypeAliPay ? CNLivePayTypeAliPay : CNLivePayTypeUnionpay;
-                    
-                    NSString * accountString = payType == CNLivePayCostPayTypeWeChatPay ? WXAccount : payType == CNLivePayCostPayTypeAliPay ? @"ztsx" : @"ztyl";
-                    
-                    float price = [responseObject[@"price"] floatValue]*100;
-                    NSString * notifyUrls = jsfy == YES ? CNJSFYNotifyUrl : (payType == CNLivePayCostPayTypeWeChatPay ? CNWeChatPayUrl : payType == CNLivePayCostPayTypeAliPay ? CNAliPayUrl : CNUnionPayUrl);
-                    
-                    if (!CNLiveStringIsEmpty(notifyUrl)) notifyUrls = notifyUrl;
-                    
-                    weakSelf.payId = responseObject[@"payId"];
-                    
-                    [weakSelf requestPayFromWXAndAliPay:type OrderId:responseObject[@"payId"] Account:accountString PriceId:price Desc:desc Attach:@{} CNLiveActiveGroupThreePayType:threeType NotifyUrl:notifyUrls NetAddUrlSchems:payType == CNLivePayCostPayTypeWeChatPay ? nil : payType == CNLivePayCostPayTypeAliPay ? CNLiveNetAddUrlSchems : CNLiveNetAddUnionPaySchems FormVC:formVC CompleterBlock:^{
-                        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                            if (completerBlock) completerBlock(0);
-                        });
-                    }];
+                    [QMUITips hideAllToastInView:AppKeyWindow animated:YES];
+                    [QMUITips showError:@"预支付失败" inView:AppKeyWindow hideAfterDelay:1.5];
                 }
-            }else{
-                [QMUITips hideAllToastInView:AppKeyWindow animated:YES];
-                [QMUITips showError:@"预支付失败" inView:AppKeyWindow hideAfterDelay:1.5];
-            }
-            
-            if (error) [QMUITips showError:[error.userInfo objectForKey:NSLocalizedDescriptionKey] inView:AppKeyWindow hideAfterDelay:1.5];
-        }];
+                
+                if (error) [QMUITips showError:[error.userInfo objectForKey:NSLocalizedDescriptionKey] inView:AppKeyWindow hideAfterDelay:1.5];
+            }];
+        }
     }
 }
 #pragma mark - 网加加余额支付&连带生成预订单
@@ -145,72 +298,88 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @&quot;CN
                                        Expand:(NSString *)expand
                                      SourceId:(NSString *)sourceId
                                         PayId:(NSString *)payId
+                                         Desc:(NSString *)desc
+                                    NotifyUrl:(NSString *)notifyUrl
                                      PassWord:(NSString *)password
                                CompleterBlock:(void (^)(NSInteger))completerBlock
 {
-    [self requestActiveForPrivateKeyWithCompleterBlock:^(NSDictionary * dict) {
-        NSDictionary * signDict = @{
-                                    @"userId":CNUserShareModel.uid,
-                                    @"platFormId":[[NSBundle mainBundle] bundleIdentifier],
-                                    @"timestamp":[NSString stringWithFormat:@"%ld",(long)[CNLiveTimeTools getNow10NumTimestamp]],
-                                    @"fromId":fromId,
-                                    @"toId":toId,
-                                    @"price":[NSString stringWithFormat:@"%.2f",price],
-                                    @"expand":expand,
-                                    @"sourceId":sourceId
-                                    };
+    if ([[CNLivePayCostModel sharePayCostModel].protocol pushActivePaymentNewPaycostWayWithModthod]) {
-        NSMutableDictionary * param =  [[CNLiveEncryptManager manager] validationEncryptWithParams:signDict preValiDic:dict].mutableCopy;
+        NSString * p = [NSString stringWithFormat:@"%d",(NSInteger)(price*100)];
-        [param addEntriesFromDictionary:@{@"appId":AppId}];
+        [CNLivePayCostNetwork requestWithUMSPayForPrePayWithOrderId:payId Body:desc Price:p CouponFee:@"0" BalanceFee:@"0" NotifyUrl:notifyUrl Type:CNLivePayCostPayTypeWjjPay FrmId:@"ios" PassWord:password CompleterBlcok:^(NSInteger statue) {
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                if (completerBlock) completerBlock(statue);
+            });
+        }];
-        [CNLiveNetworking setupShowDataResult:NO];
-        [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNGroupWjjPayWjjPrePaySourceUrl Param:param CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+    } else {
+        
+        [self requestActiveForPrivateKeyWithCompleterBlock:^(NSDictionary * dict) {
-            if (error) {
-                [QMUITips hideAllToastInView:AppKeyWindow animated:YES];
-                if(error.code != 406) [QMUITips showError:[error.userInfo objectForKey:NSLocalizedDescriptionKey] inView:AppKeyWindow hideAfterDelay:2];
-                if (error.code == 406) completerBlock(1);
-                return;;
-            }
-
-            [CNLivePayCostNetwork payCost_chooseRequestWithResponseObject:responseObject Error:error isData:YES CompleterBlock:^(id responseObject, NSInteger errorCode) {
+            NSDictionary * signDict = @{
+                @"userId":CNUserShareModel.uid,
+                @"platFormId":[[NSBundle mainBundle] bundleIdentifier],
+                @"timestamp":[NSString stringWithFormat:@"%ld",(long)[CNLiveTimeTools getNow10NumTimestamp]],
+                @"fromId":fromId,
+                @"toId":toId,
+                @"price":[NSString stringWithFormat:@"%.2f",price],
+                @"expand":expand,
+                @"sourceId":sourceId
+            };
+            
+            NSMutableDictionary * param =  [[CNLiveEncryptManager manager] validationEncryptWithParams:signDict preValiDic:dict].mutableCopy;
+            
+            [param addEntriesFromDictionary:@{@"appId":AppId}];
+            
+            [CNLiveNetworking setupShowDataResult:NO];
+            [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNGroupWjjPayWjjPrePaySourceUrl Param:param CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
-                if (responseObject) {
-                    NSDictionary * subParamDic = @{
-                                                   @"userId":CNUserShareModel.uid,
-                                                   @"platFormId":[[NSBundle mainBundle] bundleIdentifier],
-                                                   @"timestamp":[NSString stringWithFormat:@"%ld",(long)[CNLiveTimeTools getNow10NumTimestamp]],
-                                                   @"preId":[responseObject objectForKey:@"preId"],
-                                                   @"password":[NSString md5String:password],
-                                                   };
-                    
-                    NSMutableDictionary * subParam =  [[CNLiveEncryptManager manager] validationEncryptWithParams:subParamDic preValiDic:dict].mutableCopy;
-                    
-                    [subParam addEntriesFromDictionary:@{@"appId":AppId}];
+                if (error) {
+                    [QMUITips hideAllToastInView:AppKeyWindow animated:YES];
+                    if(error.code != 406) [QMUITips showError:[error.userInfo objectForKey:NSLocalizedDescriptionKey] inView:AppKeyWindow hideAfterDelay:2];
+                    if (error.code == 406) completerBlock(1);
+                    return;;
+                }
+                
+                [CNLivePayCostNetwork payCost_chooseRequestWithResponseObject:responseObject Error:error isData:YES CompleterBlock:^(id responseObject, NSInteger errorCode) {
-                    [CNLiveNetworking setupShowResult:YES];
-                    [CNLiveNetworking setupShowDataResult:YES];
-                    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNGroupWjjPayWjjSourceUrl Param:subParam CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+                    if (responseObject) {
+                        NSDictionary * subParamDic = @{
+                            @"userId":CNUserShareModel.uid,
+                            @"platFormId":[[NSBundle mainBundle] bundleIdentifier],
+                            @"timestamp":[NSString stringWithFormat:@"%ld",(long)[CNLiveTimeTools getNow10NumTimestamp]],
+                            @"preId":[responseObject objectForKey:@"preId"],
+                            @"password":[NSString md5String:password],
+                        };
+                        
+                        NSMutableDictionary * subParam =  [[CNLiveEncryptManager manager] validationEncryptWithParams:subParamDic preValiDic:dict].mutableCopy;
-                        [QMUITips hideAllToastInView:AppKeyWindow animated:YES];
+                        [subParam addEntriesFromDictionary:@{@"appId":AppId}];
-                        if (error == nil) {
+                        [CNLiveNetworking setupShowResult:YES];
+                        [CNLiveNetworking setupShowDataResult:YES];
+                        [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNGroupWjjPayWjjSourceUrl Param:subParam CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
-                            completerBlock(0);
+                            [QMUITips hideAllToastInView:AppKeyWindow animated:YES];
-                        }else{
-                            if (error.code != 414) [QMUITips showError:[error.userInfo objectForKey:NSLocalizedDescriptionKey] inView:AppKeyWindow hideAfterDelay:1.5];
-                            if (error.code == 414) completerBlock(2);
-                        }
-                    }];
-                }else{
-                    [QMUITips hideAllTipsInView:AppKeyWindow];
-                }
+                            if (error == nil) {
+                                
+                                completerBlock(0);
+                                
+                            }else{
+                                if (error.code != 414) [QMUITips showError:[error.userInfo objectForKey:NSLocalizedDescriptionKey] inView:AppKeyWindow hideAfterDelay:1.5];
+                                if (error.code == 414) completerBlock(2);
+                            }
+                        }];
+                    }else{
+                        [QMUITips hideAllTipsInView:AppKeyWindow];
+                    }
+                }];
             }];
         }];
-    }];
+    }
 }
 #pragma mark - 获取相关的公钥及随机秘钥
@@ -466,10 +635,18 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @&quot;CN
                     && ((NSDictionary *)responseObject[@"data"]).allValues.count > 0) {
                     if (completerBlock) completerBlock(responseObject[@"data"],0);
                 }else{
-                    [QMUITips showError:@"请求失败" inView:AppKeyWindow hideAfterDelay:1.5];
-                    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                        if (completerBlock) completerBlock(nil,-500);
-                    });
+                    NSString * errorMessage = [responseObject stringValueForKey:@"errorMessage" default:@""];
+                    if ([errorMessage length] > 0) {
+                        [QMUITips showError:errorMessage inView:AppKeyWindow hideAfterDelay:1.5];
+                        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                            if (completerBlock) completerBlock(nil,-500);
+                        });
+                    }else{
+                        [QMUITips showError:@"请求失败" inView:AppKeyWindow hideAfterDelay:1.5];
+                        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                            if (completerBlock) completerBlock(nil,-500);
+                        });
+                    }
                 }
             }else{
                 if (completerBlock) completerBlock(responseObject,0);
@@ -15,6 +15,10 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param isChangePassword 是否是设置密码界面
 -(void)pushActivePaymentResultViewModthodChangePassword:(BOOL)isChangePassword;
+
+/// 改变支付调用方法
+-(BOOL)pushActivePaymentNewPaycostWayWithModthod;
+
 @end
 NS_ASSUME_NONNULL_END
@@ -12,7 +12,7 @@
 NS_ASSUME_NONNULL_BEGIN
-typedef void(^CompleterBlock)(CNLivePayCostType resultType);
+typedef void(^CompleterBlock)(CNLivePayCostTypeResult resultType);
 @interface CNLivePayCostContentView : UIView
@@ -62,6 +62,8 @@ static NSString *const CNActiveContentPayViewIdentifier = @&quot;CNActiveContentPayVi
         //进入app的成功回调
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(standardBecomeActive) name:UIApplicationWillEnterForegroundNotification object:nil];
+        
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(launchMiniResultAction:) name:@"kCNLiveLaunchMiniResultNotification" object:nil];
 //        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateGroupNoticeSuccess:) name:kIMAMSG_UpdateGroupInfoNotification object:nil];
     }
     return self;
@@ -70,6 +72,18 @@ static NSString *const CNActiveContentPayViewIdentifier = @&quot;CNActiveContentPayVi
 {
     if (self) [self dismissAction:NULL];
 }
+-(void)launchMiniResultAction:(NSNotification *)note
+{
+    NSDictionary * paramDict = (NSDictionary *)note.userInfo;
+    NSString * code = [paramDict stringValueForKey:@"code" default:@""];
+    NSString * message = [paramDict stringValueForKey:@"message" default:@""];
+    NSString * orderId = [paramDict stringValueForKey:@"out_trade_no" default:@""];
+    if ([orderId isEqualToString:self.payModel.orderId]) {
+        if ([code isEqualToString:@"0"] && self.completerBlock)self.completerBlock(CNLivePayCostTypeResultSucc);
+        if ([code isEqualToString:@"1"] && self.completerBlock)self.completerBlock(CNLivePayCostTypeResultUnknow);
+        if ([code isEqualToString:@"2"] && self.completerBlock)self.completerBlock(CNLivePayCostTypeResultFail);
+    }
+}
 -(void)resultPayAction:(NSNotification *)note
 {
     __weak typeof(self) weakSelf = self;
@@ -79,6 +93,11 @@ static NSString *const CNActiveContentPayViewIdentifier = @&quot;CNActiveContentPayVi
             NSDictionary * systemPayData = [paramDict dictionaryForKey:@"systemPayData"];
             NSString * type = [systemPayData stringValueForKey:@"text" default:@"0"];
             if (weakSelf.completerBlock) weakSelf.completerBlock([type isEqualToString:@"2"]?CNLivePayCostTypeResultSucc:CNLivePayCostTypeResultFail);
+        }else if ([note.name isEqualToString:@"CNLiveContentSweepPaymentNotification"]) {
+            NSDictionary * paramDict = (NSDictionary *)note.object;
+            if ([[paramDict stringValueForKey:@"payType" default:@""] isEqualToString:@"0"]) {
+                if (weakSelf.completerBlock) weakSelf.completerBlock(CNLivePayCostTypeResultSucc);
+            }
         }else{
             if (weakSelf.completerBlock) weakSelf.completerBlock(CNLivePayCostTypeResultSucc);
         }
@@ -170,6 +189,7 @@ static NSString *const CNActiveContentPayViewIdentifier = @&quot;CNActiveContentPayVi
     if (indexPath.row == 0) cell.textLabel.textAlignment = NSTextAlignmentCenter;
     NSDictionary * dict = [self.dataArray objectAtIndex:indexPath.row];
     cell.textLabel.text = [dict objectForKey:@"text"];
+    cell.textLabel.textColor = [UIColor blackColor];
     UIImage * image = [CNLivePayCostNetwork payCost_setImageWithName:[dict objectForKey:@"image"]];
     cell.imageView.image = image;
     cell.accessoryView = [self setSelectView];
@@ -232,13 +252,13 @@ static NSString *const CNActiveContentPayViewIdentifier = @&quot;CNActiveContentPayVi
         [button startButtonActivityIndicatorView:UIActivityIndicatorViewStyleWhite];
         if (self.payModel.payType == CNLivePayCostTypeGroup) {
-            
+
             [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupPayInfoWithGroupId:self.payModel.orderId CNLiveActiveGroupPayType:type CNLiveActiveGroupThreePayType:CNLivePayCostThreePayTypePayment PriceId:[NSString stringWithFormat:@"%.2f",self.payModel.price] Desc:self.payModel.descStr Expand:@"" NotifyUrl:self.payModel.notifyUrl jsfy:NO PassWord:_headerView.passwordView.textField.text FundsId:self.payModel.fundsId Attach:nil FormVC:self.fromVC CompleterBlcok:^(NSInteger statue) {
                 [weakSelf showPayStatue:statue];
             }];
         }
         if (self.payModel.payType == CNLivePayCostTypeOrder || self.payModel.payType == CNLivePayCostTypeSHShop || self.payModel.payType == CNLivePayCostTypeCommunt || self.payModel.payType == CNLivePayCostTypeHtml) {
-            
+
             NSString * priceString = [NSString stringWithFormat:@"%.2f",self.payModel.price];
             CNLivePayCostThreePayType payType = self.payModel.payType == CNLivePayCostTypeOrder?CNLivePayCostThreePayTypeOrder:CNLivePayCostThreePayTypeSHSop;
             [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupPayInfoWithGroupId:self.payModel.orderId CNLiveActiveGroupPayType:type CNLiveActiveGroupThreePayType:payType PriceId:priceString Desc:self.payModel.descStr Expand:@"" NotifyUrl:self.payModel.notifyUrl jsfy:NO PassWord:_headerView.passwordView.textField.text FundsId:nil Attach:self.payModel.payType == CNLivePayCostTypeSHShop || self.payModel.payType == CNLivePayCostTypeHtml ?self.payModel.attach:nil FormVC:self.fromVC CompleterBlcok:^(NSInteger statue) {
@@ -247,15 +267,13 @@ static NSString *const CNActiveContentPayViewIdentifier = @&quot;CNActiveContentPayVi
         }
         if (self.payModel.payType == CNLivePayCostTypeSweep
             || self.payModel.payType == CNLivePayCostTypeTicke) {
-            
+
             [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupPayInfoWithGroupId:self.payModel.orderId CNLiveActiveGroupPayType:type CNLiveActiveGroupThreePayType:self.payModel.payType == CNLivePayCostTypeTicke ? CNLivePayCostThreePayTypeTicke : CNLivePayCostThreePayTypeScren PriceId:[NSString stringWithFormat:@"%.2f",self.payModel.price] Desc:self.payModel.payType == CNLivePayCostTypeSweep?@"扫码支付":self.payModel.descStr Expand:@"" NotifyUrl:self.payModel.notifyUrl jsfy:self.payModel.payType == CNLivePayCostTypeTicke PassWord:_headerView.passwordView.textField.text FundsId:@"" Attach:nil FormVC:self.fromVC CompleterBlcok:^(NSInteger statue) {
                 [weakSelf showPayStatue:statue];
             }];
         }
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [weakSelf dismissAction:NULL];
-        });
+//        [self dismissAction:NULL];
     }
 }
 -(void)payAction:(NSString *)password
@@ -270,27 +288,27 @@ static NSString *const CNActiveContentPayViewIdentifier = @&quot;CNActiveContentPayVi
     }
     if (self.payModel.payType == CNLivePayCostTypeOrder) {
-        [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:self.payModel.userId Price:self.payModel.price Expand:self.payModel.expand SourceId:self.payModel.orderId PayId:self.payModel.orderId PassWord:password CompleterBlock:^(NSInteger statue) {
+        [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:self.payModel.userId Price:self.payModel.price Expand:self.payModel.expand SourceId:self.payModel.orderId PayId:self.payModel.orderId Desc:self.payModel.descStr NotifyUrl:self.payModel.notifyUrl PassWord:password CompleterBlock:^(NSInteger statue) {
             [weakSelf showPayStatue:statue];
         }];
     }
     if (self.payModel.payType == CNLivePayCostTypeSweep) {
-        [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:self.payModel.toId Price:self.payModel.price Expand:self.payModel.expand SourceId:self.payModel.orderId PayId:self.payModel.orderId PassWord:password CompleterBlock:^(NSInteger statue) {
+        [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:self.payModel.toId Price:self.payModel.price Expand:self.payModel.expand SourceId:self.payModel.orderId PayId:self.payModel.orderId Desc:self.payModel.descStr NotifyUrl:self.payModel.notifyUrl PassWord:password CompleterBlock:^(NSInteger statue) {
             [weakSelf showPayStatue:statue];
         }];
     }
     if (self.payModel.payType == CNLivePayCostTypeTicke) {
-        [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:self.payModel.toId Price:self.payModel.price Expand:self.payModel.expand SourceId:self.payModel.orderId PayId:self.payModel.orderId PassWord:password CompleterBlock:^(NSInteger statue) {
+        [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:self.payModel.toId Price:self.payModel.price Expand:self.payModel.expand SourceId:self.payModel.orderId PayId:self.payModel.orderId Desc:self.payModel.descStr NotifyUrl:self.payModel.notifyUrl PassWord:password CompleterBlock:^(NSInteger statue) {
             [weakSelf showPayStatue:statue];
         }];
     }
     if (self.payModel.payType == CNLivePayCostTypeSHShop) {
-        [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:self.payModel.toId Price:self.payModel.price Expand:self.payModel.expand SourceId:self.payModel.orderId PayId:self.payModel.orderId PassWord:password CompleterBlock:^(NSInteger statue) {
+        [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:self.payModel.toId Price:self.payModel.price Expand:self.payModel.expand SourceId:self.payModel.orderId PayId:self.payModel.orderId Desc:self.payModel.descStr NotifyUrl:self.payModel.notifyUrl PassWord:password CompleterBlock:^(NSInteger statue) {
             [weakSelf showPayStatue:statue];
         }];
     }
     if (self.payModel.payType == CNLivePayCostTypeHtml) {
-        [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:self.payModel.toId Price:self.payModel.price Expand:self.payModel.expand SourceId:self.payModel.orderId PayId:self.payModel.orderId PassWord:password CompleterBlock:^(NSInteger statue) {
+        [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:self.payModel.toId Price:self.payModel.price Expand:self.payModel.expand SourceId:self.payModel.orderId PayId:self.payModel.orderId Desc:self.payModel.descStr NotifyUrl:self.payModel.notifyUrl PassWord:password CompleterBlock:^(NSInteger statue) {
             [weakSelf showPayStatue:statue];
         }];
     }
@@ -310,12 +328,12 @@ static NSString *const CNActiveContentPayViewIdentifier = @&quot;CNActiveContentPayVi
                 resultView.moneryString = [NSString stringWithFormat:@"%.2f",weakSelf.payModel.price];
                 resultView.fromVC = weakSelf.fromVC;
                 resultView.remark = weakSelf.payModel.remark;
-                [weakSelf.viewController.navigationController pushViewController:resultView animated:YES];
+                [[CNLivePayCostNetwork paycost_navigationViewController] pushViewController:resultView animated:YES];
             }else if (weakSelf.payModel.payType == CNLivePayCostTypeGroup
                       || weakSelf.payModel.payType == CNLivePayCostTypeOrder) {
                 CNLivePayCostResultViewController * payResultVC = [[CNLivePayCostResultViewController alloc] init];
                 payResultVC.fromVC = weakSelf.fromVC;
-                [weakSelf.viewController.navigationController pushViewController:payResultVC animated:YES];
+                [[CNLivePayCostNetwork paycost_navigationViewController] pushViewController:payResultVC animated:YES];
             }else{
                 if (weakSelf.completerBlock) weakSelf.completerBlock(CNLivePayCostTypeResultSucc);
             }
@@ -352,6 +370,10 @@ static NSString *const CNActiveContentPayViewIdentifier = @&quot;CNActiveContentPayVi
         [alertController addAction:actionSetting];
         [alertController showWithAnimated:YES];
         if (self.completerBlock) self.completerBlock(CNLivePayCostTypeResultFail);
+    }else if (statue == 3) {
+        [self dismiss:^{
+            if (weakSelf.completerBlock) weakSelf.completerBlock(CNLivePayCostTypeResultFail);
+        }];
     }
 }
 -(void)checkWjjPayPasswordWithCompleterBlock:(void(^)(void))completerBlock
@@ -438,6 +460,13 @@ static NSString *const CNActiveContentPayViewIdentifier = @&quot;CNActiveContentPayVi
     }
     return NO;
 }
+-(void)closeBtnAction
+{
+    self.indexPath = [NSIndexPath indexPathForRow:2 inSection:0];
+    [self.headerView.passwordView clearUpPassword];
+    [self.headerView.passwordView.textField resignFirstResponder];
+    [self.mainView setContentOffset:CGPointMake(0, 0) animated:YES];
+}
 #pragma mark - Lazy
 -(NSMutableArray *)dataArray
 {
@@ -535,6 +564,7 @@ static NSString *const CNActiveContentPayViewIdentifier = @&quot;CNActiveContentPayVi
                 [weakSelf payAction:password];
             }
         };
+        [_headerView.closeBtn addTarget:self action:@selector(closeBtnAction) forControlEvents:UIControlEventTouchUpInside];
     }
     return _headerView;
 }
@@ -118,8 +118,8 @@
 {
     if (!_closeBtn) {
         _closeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_closeBtn setImage:[UIImage imageNamed:@"tsq_guanbi"] forState:UIControlStateNormal];
-        [_closeBtn setImage:[UIImage imageNamed:@"tsq_guanbi"] forState:UIControlStateHighlighted];
+        [_closeBtn setImage:[CNLivePayCostNetwork payCost_setImageWithName:@"gz_shanchu"] forState:UIControlStateNormal];
+        [_closeBtn setImage:[CNLivePayCostNetwork payCost_setImageWithName:@"gz_shanchu"] forState:UIControlStateHighlighted];
     }
     return _closeBtn;
 }
@@ -130,6 +130,7 @@
         _nameLabel.font = [UIFont systemFontOfSize:16];
         _nameLabel.textAlignment = NSTextAlignmentCenter;
         _nameLabel.text = @"请输入支付密码";
+        _nameLabel.textColor = [UIColor blackColor];
     }
     return _nameLabel;
 }
@@ -60,14 +60,15 @@
 -(void)backRootView
 {
     self.navigationController.navigationBarHidden = NO;
-    for (UIViewController * vc in self.navigationController.viewControllers) {
-
-        if ([vc isKindOfClass:[_fromVC class]]) {
-            [self.navigationController pushViewController:vc animated:YES];
-            return;
-        }
-    }
-    [self.navigationController popToRootViewControllerAnimated:YES];
+//    for (UIViewController * vc in self.navigationController.viewControllers) {
+//
+//        if ([vc isKindOfClass:[_fromVC class]]) {
+//            [[CNLivePayCostNetwork paycost_navigationViewController] pushViewController:vc animated:YES];
+//            return;
+//        }
+//    }
+//    [[CNLivePayCostNetwork paycost_navigationViewController] popToRootViewControllerAnimated:YES];
+    [[CNLivePayCostNetwork paycost_navigationViewController] popViewControllerAnimated:YES];
 }
 -(void)setFromVC:(UIViewController *)fromVC
 {
@@ -89,8 +90,8 @@
         _stutaButton.titleLabel.font = [UIFont fontWithName:@"PingFangSC-Regular" size:20.0f];
         [_stutaButton setTitle:@"支付成功!" forState:UIControlStateNormal];
         [_stutaButton setTitle:@"支付成功!" forState: UIControlStateHighlighted];
-        [_stutaButton setImage:UIImageMake(@"ye_zfcg") forState:UIControlStateNormal];
-        [_stutaButton setImage:UIImageMake(@"ye_zfcg") forState:UIControlStateHighlighted];
+        [_stutaButton setImage:[CNLivePayCostNetwork payCost_setImageWithName:@"ye_zfcg"] forState:UIControlStateNormal];
+         [_stutaButton setImage:[CNLivePayCostNetwork payCost_setImageWithName:@"ye_zfcg"] forState:UIControlStateHighlighted];
     }
     return _stutaButton;
 }
@@ -90,13 +90,14 @@
 -(void)backAction:(UIButton *)backBtn
 {
     self.navigationController.navigationBarHidden = NO;
-    for (UIViewController * vc in self.navigationController.viewControllers) {
-        if ([vc isKindOfClass:[_fromVC class]]) {
-            [self.navigationController popToViewController:vc animated:YES];
-            return;
-        }
-    }
-    [self.navigationController popToRootViewControllerAnimated:YES];
+//    for (UIViewController * vc in self.navigationController.viewControllers) {
+//        if ([vc isKindOfClass:[_fromVC class]]) {
+//            [[CNLivePayCostNetwork paycost_navigationViewController] popToViewController:vc animated:YES];
+//            return;
+//        }
+//    }
+//    [[CNLivePayCostNetwork paycost_navigationViewController] popToRootViewControllerAnimated:YES];
+    [[CNLivePayCostNetwork paycost_navigationViewController] popViewControllerAnimated:YES];
 }
 - (void)setFromVC:(UIViewController *)fromVC
 {
@@ -118,8 +119,8 @@
         [_successButton setTitleColor:CNLiveColorWithHexString(@"#333333") forState:UIControlStateNormal];
         [_successButton setTitleColor:CNLiveColorWithHexString(@"#333333") forState:UIControlStateHighlighted];
         [_successButton setTitle:@"支付成功!" forState: UIControlStateNormal];
-        [_successButton setImage:UIImageMake(@"ye_zfcg") forState:UIControlStateNormal];
-        [_successButton setImage:UIImageMake(@"ye_zfcg") forState:UIControlStateHighlighted];
+        [_successButton setImage:[CNLivePayCostNetwork payCost_setImageWithName:@"ye_zfcg"] forState:UIControlStateNormal];
+        [_successButton setImage:[CNLivePayCostNetwork payCost_setImageWithName:@"ye_zfcg"] forState:UIControlStateHighlighted];
     }
     return _successButton;
 }
@@ -23,6 +23,13 @@
 		6003F5BC195388D20070C39A /* Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F5BB195388D20070C39A /* Tests.m */; };
 		71719F9F1E33DC2100824A3D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 71719F9D1E33DC2100824A3D /* LaunchScreen.storyboard */; };
 		7938ECBD2846EE480008FB99 /* CNLivePayCostProtocolImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 7938ECBC2846EE480008FB99 /* CNLivePayCostProtocolImpl.m */; };
+		797F2D6328519B4000D5736C /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 797F2D6228519B2F00D5736C /* libc++.tbd */; };
+		797F2D6528519B5400D5736C /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 797F2D6428519B4900D5736C /* libz.tbd */; };
+		797F2D6728519B6000D5736C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 797F2D6628519B6000D5736C /* SystemConfiguration.framework */; };
+		797F2D6828519B6C00D5736C /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; };
+		797F2D6928519B7B00D5736C /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; };
+		797F2D6B28519B8800D5736C /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 797F2D6A28519B8800D5736C /* WebKit.framework */; };
+		797F2D6D28519B9F00D5736C /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 797F2D6C28519B9F00D5736C /* CFNetwork.framework */; };
 		873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */; };
 		F530AB2539E63072C2E93C4E /* Pods_CNLivePayCostModule_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76A434486911C088D57DDC70 /* Pods_CNLivePayCostModule_Tests.framework */; };
 /* End PBXBuildFile section */
@@ -64,6 +71,12 @@
 		76A434486911C088D57DDC70 /* Pods_CNLivePayCostModule_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CNLivePayCostModule_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		7938ECBB2846EE480008FB99 /* CNLivePayCostProtocolImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLivePayCostProtocolImpl.h; sourceTree = "<group>"; };
 		7938ECBC2846EE480008FB99 /* CNLivePayCostProtocolImpl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNLivePayCostProtocolImpl.m; sourceTree = "<group>"; };
+		797F2D6228519B2F00D5736C /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
+		797F2D6428519B4900D5736C /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
+		797F2D6628519B6000D5736C /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
+		797F2D6A28519B8800D5736C /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
+		797F2D6C28519B9F00D5736C /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
+		797F2D6E2851F67400D5736C /* CNLivePayCostModule_Example.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = CNLivePayCostModule_Example.entitlements; sourceTree = "<group>"; };
 		873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main.storyboard; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		8DA7B240CDBA39A46D4DFA95 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
 		A7C061FED03823CC85737DA1 /* Pods-CNLivePayCostModule_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CNLivePayCostModule_Example.debug.xcconfig"; path = "Target Support Files/Pods-CNLivePayCostModule_Example/Pods-CNLivePayCostModule_Example.debug.xcconfig"; sourceTree = "<group>"; };
@@ -77,7 +90,14 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				797F2D6B28519B8800D5736C /* WebKit.framework in Frameworks */,
+				797F2D6D28519B9F00D5736C /* CFNetwork.framework in Frameworks */,
 				6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */,
+				797F2D6728519B6000D5736C /* SystemConfiguration.framework in Frameworks */,
+				797F2D6528519B5400D5736C /* libz.tbd in Frameworks */,
+				797F2D6928519B7B00D5736C /* CoreGraphics.framework in Frameworks */,
+				797F2D6328519B4000D5736C /* libc++.tbd in Frameworks */,
+				797F2D6828519B6C00D5736C /* CoreGraphics.framework in Frameworks */,
 				6003F592195388D20070C39A /* UIKit.framework in Frameworks */,
 				6003F58E195388D20070C39A /* Foundation.framework in Frameworks */,
 				01C8E1692AE74160B42E3059 /* Pods_CNLivePayCostModule_Example.framework in Frameworks */,
@@ -112,6 +132,7 @@
 		6003F581195388D10070C39A = {
 			isa = PBXGroup;
 			children = (
+				797F2D6E2851F67400D5736C /* CNLivePayCostModule_Example.entitlements */,
 				60FF7A9C1954A5C5007DD14C /* Podspec Metadata */,
 				6003F593195388D20070C39A /* Example for CNLivePayCostModule */,
 				6003F5B5195388D20070C39A /* Tests */,
@@ -133,6 +154,11 @@
 		6003F58C195388D20070C39A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				797F2D6C28519B9F00D5736C /* CFNetwork.framework */,
+				797F2D6A28519B8800D5736C /* WebKit.framework */,
+				797F2D6628519B6000D5736C /* SystemConfiguration.framework */,
+				797F2D6428519B4900D5736C /* libz.tbd */,
+				797F2D6228519B2F00D5736C /* libc++.tbd */,
 				6003F58D195388D20070C39A /* Foundation.framework */,
 				6003F58F195388D20070C39A /* CoreGraphics.framework */,
 				6003F591195388D20070C39A /* UIKit.framework */,
@@ -574,12 +600,13 @@
 			baseConfigurationReference = A7C061FED03823CC85737DA1 /* Pods-CNLivePayCostModule_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = CNLivePayCostModule_Example.entitlements;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "CNLivePayCostModule/CNLivePayCostModule-Prefix.pch";
 				INFOPLIST_FILE = "CNLivePayCostModule/CNLivePayCostModule-Info.plist";
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAdd.debug;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 4.0;
 				WRAPPER_EXTENSION = app;
@@ -591,12 +618,13 @@
 			baseConfigurationReference = 3F31B47D5821EBC8F4E235F1 /* Pods-CNLivePayCostModule_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = CNLivePayCostModule_Example.entitlements;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "CNLivePayCostModule/CNLivePayCostModule-Prefix.pch";
 				INFOPLIST_FILE = "CNLivePayCostModule/CNLivePayCostModule-Info.plist";
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
+				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAdd.debug;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 4.0;
 				WRAPPER_EXTENSION = app;
@@ -7,14 +7,103 @@
 //
 #import "CNLIVEAppDelegate.h"
-
+#import "CNLIVEViewController.h"
+#import <CNLivePayCostModule/CNLivePayCostHeader.h>
+#import <CNLivePayCostModule/CNLivePayCostModel.h>
 @implementation CNLIVEAppDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     // Override point for customization after application launch.
+    [CNLivePayCostModule finishLaunchingWithPayPluginSettings];
+    
+    [CNUserInfoManager manager].userInfoModel.uid = @"10458139";
+    
+    UINavigationController *navCtrl = [[UINavigationController alloc] initWithRootViewController:[[CNLIVEViewController alloc] init]];
+
+    self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+    self.window.rootViewController = navCtrl;
+    self.window.backgroundColor = [UIColor whiteColor];
+    [self.window makeKeyAndVisible];
+    
+    [self setParamNet];
+    
     return YES;
 }
+-(void)setParamNet
+{
+    NSMutableDictionary * mDict = [[NSMutableDictionary alloc] init];
+    [mDict setValue:[CNUserInfoManager manager].userInfoModel.uid forKey:@"loginSid"];
+    [mDict setValue:@"com.cnlive.CNLiveNetAdd.debug" forKey:@"platform_id"];
+    [mDict setValue:[[[[UIDevice currentDevice] identifierForVendor] UUIDString] stringByReplacingOccurrencesOfString:@"-" withString:@""] forKey:@"uuid"];
+    [mDict setValue:@"i" forKey:@"plat"];
+    [mDict setValue:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"] forKey:@"ver"];
+    [mDict setObject:AppId forKey:@"appId"];
+    [mDict setObject:[CNUserInfoManager manager].userInfoModel.uid forKey:@"sid"];
+    [CNLiveNetworking setupDefaultParam:mDict];
+    [CNLiveNetworking setupShowResult:NO];
+    [CNLiveNetworking setupSignKey:APPKey];
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setResponseSerializerType:CNLiveResponseSerializerJSON];
+}
+
+
+- (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url
+{
+    NSString *string =[url absoluteString];
+    if ([string hasPrefix:@"unifyPayDemo://"])
+    {
+        return [UMSPPPayUnifyPayPlugin cloudPayHandleOpenURL:url];
+    }
+    return  [UMSPPPayUnifyPayPlugin handleOpenURL:url otherDelegate:[CNLivePayCostModel sharePayCostModel]];
+}
+
+- (BOOL)application:(UIApplication *)application
+            openURL:(NSURL *)url
+  sourceApplication:(NSString *)sourceApplication
+         annotation:(id)annotation {
+    
+    NSString *string =[url absoluteString];
+    if ([string hasPrefix:@"unifyPayDemo://"])
+    {
+        return [UMSPPPayUnifyPayPlugin cloudPayHandleOpenURL:url];
+    }
+    
+    return [UMSPPPayUnifyPayPlugin handleOpenURL:url otherDelegate:[CNLivePayCostModel sharePayCostModel]];
+}
+
+
+- (BOOL)application:(UIApplication *)app
+            openURL:(NSURL *)url
+            options:(NSDictionary<NSString *,id> *)options{
+    
+    NSString *string =[url absoluteString];
+    if ([string hasPrefix:@"unifyPayDemo://"])
+    {
+        return [UMSPPPayUnifyPayPlugin cloudPayHandleOpenURL:url];
+    }
+    else if ([string hasPrefix:@"qmfpppay://"])
+    {
+        [UMSPPPayUnifyPayPlugin aliMiniPayHandleOpenURL:url];
+        return YES;
+        
+    }
+    [UMSPPPayUnifyPayPlugin aliMiniPayHandleOpenURL:url];
+    [WXApi handleOpenURL:url delegate:[CNLivePayCostModel sharePayCostModel]];
+    return [UMSPPPayUnifyPayPlugin handleOpenURL:url otherDelegate:[CNLivePayCostModel sharePayCostModel]];
+};
+
+- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler  API_AVAILABLE(ios(8.0)){
+    if (@available(iOS 8.0, *)) {
+        [WXApi handleOpenUniversalLink:userActivity delegate:[CNLivePayCostModel sharePayCostModel]];
+        return [UMSPPPayUnifyPayPlugin handleOpenUniversalLink:userActivity otherDelegate:[CNLivePayCostModel sharePayCostModel]];
+    } else {
+        // Fallback on earlier versions
+        return YES;
+    }
+    
+}
+
 - (void)applicationWillResignActive:(UIApplication *)application
 {
@@ -8,6 +8,8 @@
 #import "CNLIVEViewController.h"
 #import <CNLivePayCostModule/CNLivePayCostModule.h>
+#import "WXApi.h"
+
 @interface CNLIVEViewController ()
 @end
@@ -18,18 +20,111 @@
 {
     [super viewDidLoad];
 	// Do any additional setup after loading the view, typically from a nib.
+    
+    CGFloat kWidth = [UIScreen mainScreen].bounds.size.width;
+
+    UIButton * requestBtn = [UIButton buttonWithType:UIButtonTypeSystem];
+    requestBtn.frame = CGRectMake(0, 100, kWidth, 70);
+    requestBtn.backgroundColor = [UIColor cyanColor];
+    [requestBtn setTitle:@"拉起支付" forState: UIControlStateNormal];
+    [requestBtn setTitle:@"拉起支付" forState: UIControlStateHighlighted];
+    [requestBtn addTarget:self action:@selector(requestAction) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:requestBtn];
+
+    UIButton * batchBtn = [UIButton buttonWithType:UIButtonTypeSystem];
+    batchBtn.frame = CGRectMake(0, CGRectGetMaxY(requestBtn.frame)+5, kWidth, 70);
+    batchBtn.backgroundColor = [UIColor cyanColor];
+    [batchBtn setTitle:@"支付宝支付" forState: UIControlStateNormal];
+    [batchBtn setTitle:@"支付宝支付" forState: UIControlStateHighlighted];
+    [batchBtn addTarget:self action:@selector(batchRequestAction) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:batchBtn];
+}
+-(void)requestAction
+{
+//    [CNLivePayCostNetwork requestWithUMSPayForPrePayWithOrderId:[self generateTradeNO] Body:@"测试" Price:@"1" CouponFee:@"0" BalanceFee:@"0" NotifyUrl:@"http://unifypay.cnlive.com/test/notify_url" Type:CNLivePayCostPayTypeWeChatPay FrmId:@"debug"];
+    NSDictionary * paramDict = @{
+        @"orderId":[self generateTradeNO],
+        @"userId":@"10458139",
+        @"descStr":@"测试",
+        @"price":@0.01,
+        @"orderType":@"1",
+        @"notifyUrl":@"http://unifypay.cnlive.com/test/notify_url"
+    };
+    [CNLivePayCostModule showDefaultPayViwWithParamDict:paramDict PayCostType:CNLivePayCostTypeOrder FromVC:self ResultBlock:^(CNLivePayCostTypeResult resultType) {
+        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:resultType == CNLivePayCostTypeResultSucc?@"支付成功":@"支付失败" message:nil delegate:self cancelButtonTitle:@"确认" otherButtonTitles:nil, nil];
+        [alert show];
+    }];
+    
+}
+-(void)batchRequestAction
+{
+//    [CNLivePayCostNetwork requestWithUMSPayForPrePayWithOrderId:[self generateTradeNO] Body:@"测试" Price:@"1" CouponFee:@"0" BalanceFee:@"0" NotifyUrl:@"http://unifypay.cnlive.com/test/notify_url" Type:CNLivePayCostPayTypeAliPay FrmId:@"debug" PassWord:@"" CompleterBlcok:^(NSInteger statue) {
+//
+//    }];
+    
+    NSDictionary * paramDict = @{
+        @"orderId":[self generateTradeNO],
+        @"userId":@"10458139",
+        @"descStr":@"测试",
+        @"price":@0.01,
+        @"orderType":@"1",
+        @"notifyUrl":@"http://unifypay.cnlive.com/test/notify_url",
+        @"password":@"123456"
+    };
+    [CNLivePayCostModule showShopPayViwWithParamDict:paramDict PayType:CNLivePayCostPayTypeWeChatPay ResultBlock:^(CNLivePayCostTypeResult resultType) {
+        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:resultType == CNLivePayCostTypeResultSucc?@"支付成功":@"支付失败" message:nil delegate:self cancelButtonTitle:@"确认" otherButtonTitles:nil, nil];
+        [alert show];
+    }];
 }
 -(void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
 {
     [super touchesBegan:touches withEvent:event];
-    [CNLivePayCostModule showDefaultPayViwWithParamDict:@{} PayCostType:CNLivePayCostTypeHtml FromVC:self ResultBlock:^(CNLivePayCostTypeResult resultType) {
-        
-    }];
+//    if ([[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:@"alipays://"]]) {
+//        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"alipays://"]];
+//    }
+    
+//    NSDictionary * paramDict = @{
+//        @"miniuser": @"2019010762862511",
+//        @"msgType": @"trade.appPreOrder",
+//        @"package": @"Sign=ALI",
+//        @"minipath": @"pages/appPay/test/test",
+//        @"appScheme": @"iOS:qmfpppay;Android:qmfpppay",
+//        @"sign": @"C8E269942EB13494ED6B9F81956606E7",
+//        @"prepayid": @"ori=101720220609570858884356",
+//        @"noncestr": @"VnwtNeidfwbGmNGlinLLBBSBmDmNxKnf",
+//        @"timestamp": @"20220609144445"
+//    };
+//    NSString *payDataJsonStr = [[NSString alloc] initWithData:[NSJSONSerialization dataWithJSONObject:paramDict options:NSJSONWritingPrettyPrinted error:nil] encoding:NSUTF8StringEncoding];
+//    [UMSPPPayUnifyPayPlugin payWithPayChannel:CHANNEL_ALIPAY payData:payDataJsonStr callbackBlock:^(NSString *resultCode, NSString *resultInfo) {
+//
+//    }];
 }
 - (void)didReceiveMemoryWarning
 {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
 }
+- (NSString *)generateTradeNO
+{
+    static int kNumber = 15;
+
+    NSString *sourceStr = @"0123456789";
+
+    NSMutableString *resultStr = [[NSMutableString alloc] init];
+
+    srand((unsigned)time(0));
+
+    for (int i = 0; i < kNumber; i++)    {
+
+        unsigned index = rand() % [sourceStr length];
+        NSString *oneStr = [sourceStr substringWithRange:NSMakeRange(index, 1)];
+
+        [resultStr appendString:oneStr];
+
+    }
+
+    return resultStr;
+
+}
 @end
@@ -20,8 +20,60 @@
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>微信测试</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>wx9b7f9443a8ccf15a</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>微信正式</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>wxed528fc749b7ee88</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>qmfpppay</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>netpppay</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>weixinULAPI</string>
+		<string>weixin</string>
+		<string>wechat</string>
+		<string>alipays</string>
+		<string>alipay</string>
+		<string>uppaysdk</string>
+		<string>uppaywallet</string>
+		<string>uppayx1</string>
+		<string>uppayx2</string>
+		<string>uppayx3</string>
+	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>
@@ -18,4 +18,10 @@
     //[[AppDelegate sharedAppDelegate] pushViewController:payCenterVC withBackTitle:@" "];
 }
+/// 改变支付调用方法
+-(BOOL)pushActivePaymentNewPaycostWayWithModthod
+{
+    return YES;
+}
+
 @end
@@ -8,10 +8,11 @@
 @import UIKit;
 #import "CNLIVEAppDelegate.h"
-
+#import <CNLiveEnvironment/CNLiveEnvironmentManager.h>
 int main(int argc, char * argv[])
 {
     @autoreleasepool {
+        [CNLiveEnvironmentManager setAppType:CNLiveAppTypeUser environmentType:CNLiveDebugAppStore];//CNLiveProductionAppStore//CNLiveDebugAppStore];
         return UIApplicationMain(argc, argv, nil, NSStringFromClass([CNLIVEAppDelegate class]));
     }
 }
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:apiwjjtest.cnlive.com</string>
+		<string>applinks:applelinkstest.cnlive.com</string>
+		<string>applinks:apiwjj.cnlive.com</string>
+	</array>
+</dict>
+</plist>