更新微信sdk

Demo/Demo.xcodeproj/project.pbxproj

@@ -29,6 +29,7 @@
 		816ACAD31BFF019300F4EC4F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 816ACAD21BFF019300F4EC4F /* Security.framework */; };
 		816ACAD71BFF024E00F4EC4F /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 816ACAD61BFF024E00F4EC4F /* libsqlite3.tbd */; };
 		816ACAD91BFF025B00F4EC4F /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 816ACAD81BFF025B00F4EC4F /* libc++.tbd */; };
+		817D550C21B7B7AC0065F816 /* libWXModule.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 817D550B21B7B7AC0065F816 /* libWXModule.a */; };
 		818408831DE7EE2800DB194B /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81B2095A1CE481F6007E3534 /* CoreTelephony.framework */; };
 		8196CBAF1DFE8B48002D7454 /* libAllPaySDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8196CBA11DFE8B48002D7454 /* libAllPaySDK.a */; };
 		8196CBCD1DFE92C3002D7454 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8196CBCC1DFE92C3002D7454 /* CoreMotion.framework */; };
@@ -105,6 +106,7 @@
 		816ACAD41BFF023200F4EC4F /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		816ACAD61BFF024E00F4EC4F /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
 		816ACAD81BFF025B00F4EC4F /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
+		817D550B21B7B7AC0065F816 /* libWXModule.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWXModule.a; sourceTree = "<group>"; };
 		8196CB9C1DFE8B48002D7454 /* AllPaySDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AllPaySDK.h; sourceTree = "<group>"; };
 		8196CBA11DFE8B48002D7454 /* libAllPaySDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libAllPaySDK.a; sourceTree = "<group>"; };
 		8196CBCC1DFE92C3002D7454 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; };
@@ -125,6 +127,7 @@
 				81D9AFAC20747223000B51A7 /* SystemConfiguration.framework in Frameworks */,
 				81D9AFAB20747216000B51A7 /* CFNetwork.framework in Frameworks */,
 				8196CBCD1DFE92C3002D7454 /* CoreMotion.framework in Frameworks */,
+				817D550C21B7B7AC0065F816 /* libWXModule.a in Frameworks */,
 				818408831DE7EE2800DB194B /* CoreTelephony.framework in Frameworks */,
 				8199773F1D34D3C400266819 /* JavaScriptCore.framework in Frameworks */,
 				81232DC420DCD83500B78E71 /* libAppleModule.a in Frameworks */,
@@ -262,9 +265,18 @@
 			name = Util;
 			sourceTree = "<group>";
 		};
+		817D550A21B7B7AC0065F816 /* WXModule */ = {
+			isa = PBXGroup;
+			children = (
+				817D550B21B7B7AC0065F816 /* libWXModule.a */,
+			);
+			path = WXModule;
+			sourceTree = "<group>";
+		};
 		8196CB971DFE8B48002D7454 /* allpaysdk */ = {
 			isa = PBXGroup;
 			children = (
+				817D550A21B7B7AC0065F816 /* WXModule */,
 				81232DC720DCDC5100B78E71 /* AliModule */,
 				81232DC220DCD83500B78E71 /* AppleModule */,
 				81232DBF20DCD5C200B78E71 /* UPModule */,
@@ -611,7 +623,6 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Demo/allpaysdk",
 					"$(PROJECT_DIR)/Demo/allpaysdk/AliModule",
-					"$(PROJECT_DIR)/Demo/allpaysdk/EBModule",
 				);
 				INFOPLIST_FILE = Demo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
@@ -624,7 +635,6 @@
 					"$(PROJECT_DIR)/Demo/allpaysdk/AppleModule",
 					"$(PROJECT_DIR)/Demo/allpaysdk/AliModule",
 					"$(PROJECT_DIR)/Demo/allpaysdk/WXModule",
-					"$(PROJECT_DIR)/Demo/allpaysdk/EBModule",
 				);
 				MACH_O_TYPE = mh_execute;
 				OTHER_LDFLAGS = "-ObjC";
@@ -652,7 +662,6 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Demo/allpaysdk",
 					"$(PROJECT_DIR)/Demo/allpaysdk/AliModule",
-					"$(PROJECT_DIR)/Demo/allpaysdk/EBModule",
 				);
 				INFOPLIST_FILE = Demo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
@@ -665,7 +674,6 @@
 					"$(PROJECT_DIR)/Demo/allpaysdk/AppleModule",
 					"$(PROJECT_DIR)/Demo/allpaysdk/AliModule",
 					"$(PROJECT_DIR)/Demo/allpaysdk/WXModule",
-					"$(PROJECT_DIR)/Demo/allpaysdk/EBModule",
 				);
 				MACH_O_TYPE = mh_execute;
 				OTHER_LDFLAGS = "-ObjC";

Demo/Demo/ViewController.m

@@ -42,20 +42,15 @@
     [btn3 addTarget:self action:@selector(btnClick:) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:btn3];
     
+
+    
     UIButton * btn4 = [UIButton buttonWithType:UIButtonTypeRoundedRect];
     btn4.tag = 5;
     btn4.frame = CGRectMake(80, 210, 200, 50);
-    [btn4 setTitle:@"EB支付" forState:UIControlStateNormal];
+    [btn4 setTitle:@"Apple Pay" forState:UIControlStateNormal];
     [btn4 addTarget:self action:@selector(btnClick:) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:btn4];
     
-    UIButton * btn5 = [UIButton buttonWithType:UIButtonTypeRoundedRect];
-    btn5.tag = 6;
-    btn5.frame = CGRectMake(80, 260, 200, 50);
-    [btn5 setTitle:@"Apple Pay" forState:UIControlStateNormal];
-    [btn5 addTarget:self action:@selector(btnClick:) forControlEvents:UIControlEventTouchUpInside];
-    [self.view addSubview:btn5];
-    
     
     
   
@@ -92,15 +87,7 @@
     }else if (btn.tag == 4)//银联UP
     {
       [paramDic setObject:@"UP" forKey:@"paymentSchema"];
-    }else if (btn.tag == 5)//EB
-    {   [paramDic setObject:@"INR" forKey:@"orderCurrency"];
-        [paramDic setObject:@"EB" forKey:@"paymentSchema"];
-        [paramDic setObject:@"benson zhang" forKey:@"trxn_firstname"];
-        [paramDic setObject:@"benson.zhang@allpayx.com" forKey:@"trxn_email_id"];
-        [paramDic setObject:@"15026528888" forKey:@"trxn_phone"];
-        [paramDic setObject:@"1" forKey:@"trxn_is_coupon_enabled"];
-         [paramDic setObject:@"123456789" forKey:@"unique_id"];//不多于10位
-    }else if (btn.tag == 6)//APP
+    }else if (btn.tag == 5)//APP
     {
         [paramDic setObject:@"APP" forKey:@"paymentSchema"];
     }

allpaysdk/AliModule/AlipaySDK.framework/Headers/APayAuthInfo.h

@@ -1,33 +0,0 @@
-//
-//  APAuthInfo.h
-//  AliSDKDemo
-//
-//  Created by 方彬 on 14-7-18.
-//  Copyright (c) 2014年 Alipay.com. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface APayAuthInfo : NSObject
-
-@property(nonatomic, copy)NSString *appID;
-@property(nonatomic, copy)NSString *pid;
-@property(nonatomic, copy)NSString *redirectUri;
-
-/**
- *  初始化AuthInfo
- *
- *  @param appIDStr     应用ID
- *  @param productIDStr 产品码 该商户在aboss签约的产品,用户获取pid获取的参数
- *  @param pidStr       商户ID   可不填
- *  @param uriStr       授权的应用回调地址  比如：alidemo://auth
- *
- *  @return authinfo实例
- */
-- (id)initWithAppID:(NSString *)appIDStr
-                pid:(NSString *)pidStr
-        redirectUri:(NSString *)uriStr;
-
-- (NSString *)description;
-- (NSString *)wapDescription;
-@end

allpaysdk/AliModule/AlipaySDK.framework/Headers/AlipaySDK.h

@@ -1,177 +0,0 @@
-//
-//  AlipaySDK.h
-//  AlipaySDK
-//
-//  Created by 方彬 on 14-4-28.
-//  Copyright (c) 2014年 Alipay. All rights reserved.
-//
-
-
-////////////////////////////////////////////////////////
-////////////////version:2.1  motify:2014.12.24//////////
-///////////////////Merry Christmas=。=//////////////////
-////////////////////////////////////////////////////////
-
-
-#import "APayAuthInfo.h"
-typedef enum {
-    ALIPAY_TIDFACTOR_IMEI,
-    ALIPAY_TIDFACTOR_IMSI,
-    ALIPAY_TIDFACTOR_TID,
-    ALIPAY_TIDFACTOR_CLIENTKEY,
-    ALIPAY_TIDFACTOR_VIMEI,
-    ALIPAY_TIDFACTOR_VIMSI,
-    ALIPAY_TIDFACTOR_CLIENTID,
-    ALIPAY_TIDFACTOR_APDID,
-    ALIPAY_TIDFACTOR_MAX
-} AlipayTidFactor;
-
-typedef void(^CompletionBlock)(NSDictionary *resultDic);
-
-@interface AlipaySDK : NSObject
-
-/**
- *  创建支付单例服务
- *
- *  @return 返回单例对象
- */
-+ (AlipaySDK *)defaultService;
-
-/**
- *  用于设置SDK使用的window，如果没有自行创建window无需设置此接口
- */
-@property (nonatomic, weak) UIWindow *targetWindow;
-
-/**
- *  支付接口
- *
- *  @param orderStr       订单信息
- *  @param schemeStr      调用支付的app注册在info.plist中的scheme
- *  @param compltionBlock 支付结果回调Block，用于wap支付结果回调（非跳转钱包支付）
- */
-- (void)payOrder:(NSString *)orderStr
-      fromScheme:(NSString *)schemeStr
-        callback:(CompletionBlock)completionBlock;
-
-/**
- *  处理钱包或者独立快捷app支付跳回商户app携带的支付结果Url
- *
- *  @param resultUrl        支付结果url
- *  @param completionBlock  支付结果回调
- */
-- (void)processOrderWithPaymentResult:(NSURL *)resultUrl
-                      standbyCallback:(CompletionBlock)completionBlock;
-
-
-
-/**
- *  获取交易token。
- *
- *  @return 交易token，若无则为空。
- */
-- (NSString *)fetchTradeToken;
-
-/**
- *  是否已经使用过
- *
- *  @return YES为已经使用过，NO反之
- */
-- (BOOL)isLogined;
-
-/**
- *  当前版本号
- *
- *  @return 当前版本字符串
- */
-- (NSString *)currentVersion;
-
-/**
- *  当前版本号
- *
- *  @return tid相关信息
- */
-- (NSString*)queryTidFactor:(AlipayTidFactor)factor;
-
-/**
- *  測試所用，realse包无效
- *
- *  @param url  测试环境
- */
-- (void)setUrl:(NSString *)url;
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////h5 拦截支付入口///////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////////////////////
-
-/**
- *  url order 获取接口
- *
- *  @param urlStr     拦截的 url string
- *
- *  @return 获取到的url order info
- */
-- (NSString*)fetchOrderInfoFromH5PayUrl:(NSString*)urlStr;
-
-
-/**
- *  url支付接口
- *
- *  @param orderStr       订单信息
- *  @param schemeStr      调用支付的app注册在info.plist中的scheme
- *  @param compltionBlock 支付结果回调Block
- */
-- (void)payUrlOrder:(NSString *)orderStr
-         fromScheme:(NSString *)schemeStr
-           callback:(CompletionBlock)completionBlock;
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////授权1.0//////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////////////////////
-
-/**
- *  快登授权
- *  @param authInfo         需授权信息
- *  @param completionBlock  授权结果回调，若在授权过程中，调用方应用被系统终止，则此block无效，
-                            需要调用方在appDelegate中调用processAuthResult:standbyCallback:方法获取授权结果
- */
-- (void)authWithInfo:(APayAuthInfo *)authInfo
-             callback:(CompletionBlock)completionBlock;
-
-
-/**
- *  处理授权信息Url
- *
- *  @param resultUrl        钱包返回的授权结果url
- *  @param completionBlock  授权结果回调
- */
-- (void)processAuthResult:(NSURL *)resultUrl
-          standbyCallback:(CompletionBlock)completionBlock;
-
-//////////////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////授权2.0//////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////////////////////
-
-/**
- *  快登授权2.0
- *
- *  @param infoStr          授权请求信息字符串
- *  @param schemeStr        调用授权的app注册在info.plist中的scheme
- *  @param completionBlock  授权结果回调，若在授权过程中，调用方应用被系统终止，则此block无效，
-                            需要调用方在appDelegate中调用processAuth_V2Result:standbyCallback:方法获取授权结果
- */
-- (void)auth_V2WithInfo:(NSString *)infoStr
-             fromScheme:(NSString *)schemeStr
-               callback:(CompletionBlock)completionBlock;
-
-/**
- *  处理授权信息Url
- *
- *  @param resultUrl        钱包返回的授权结果url
- *  @param completionBlock  授权结果回调
- */
-- (void)processAuth_V2Result:(NSURL *)resultUrl
-             standbyCallback:(CompletionBlock)completionBlock;
-
-@end

allpaysdk/AllPaySDK.h

@@ -1,18 +0,0 @@
-//
-//  AllPaySDK.h
-//  AllPaySDK
-//
-//  Created by BensonZhang on 15/11/18.
-//  Copyright © 2015年 xunlian. All rights reserved.
-//
-
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-@interface AllPaySDK : NSObject
-
-+(void)pay:(NSString *)tn  mode:(BOOL)mode    scheme:(NSString *)schemeStr   ViewController:(UIViewController *)viewController     onResult:(void(^)(NSDictionary * resultDic))onResult;
-+(void)openURL:(NSURL *)url;
-@end
-