public_service / public_sdk_ios

Go to a project
Toggle navigation Toggle navigation pinning
lizhihui
40a5620e 1 parent 2ca9ed61

2018年05月23日更新

Inline Side-by-side
Showing 54 changed files with 232 additions and 208 deletions
No preview for this file type
...@@ -7,8 +7,7 @@ ...@@ -7,8 +7,7 @@
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
10 - 267CB82A20650B8C00194124 /* HaibaoSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 267CB82920650B8C00194124 /* HaibaoSDK.framework */; }; 10 + 26B975C020AD7A66001E5EF9 /* XiongDiSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26B975BF20AD7A66001E5EF9 /* XiongDiSDK.framework */; };
11 - 267CB82B20650B8C00194124 /* HaibaoSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 267CB82920650B8C00194124 /* HaibaoSDK.framework */; };
12 8425EC1A1F0E3CBD00B0D868 /* PoolSdk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8425EC191F0E3CBD00B0D868 /* PoolSdk.framework */; }; 11 8425EC1A1F0E3CBD00B0D868 /* PoolSdk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8425EC191F0E3CBD00B0D868 /* PoolSdk.framework */; };
13 845D18221C8D778400F27EB9 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 845D181B1C8D778400F27EB9 /* Images.xcassets */; }; 12 845D18221C8D778400F27EB9 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 845D181B1C8D778400F27EB9 /* Images.xcassets */; };
14 846BD2241EE9342700E89A1D /* pool_setting in Resources */ = {isa = PBXBuildFile; fileRef = 846BD21F1EE9342700E89A1D /* pool_setting */; }; 13 846BD2241EE9342700E89A1D /* pool_setting in Resources */ = {isa = PBXBuildFile; fileRef = 846BD21F1EE9342700E89A1D /* pool_setting */; };
...@@ -61,7 +60,7 @@ ...@@ -61,7 +60,7 @@
61 /* End PBXCopyFilesBuildPhase section */ 60 /* End PBXCopyFilesBuildPhase section */
62 61
63 /* Begin PBXFileReference section */ 62 /* Begin PBXFileReference section */
64 - 267CB82920650B8C00194124 /* HaibaoSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = HaibaoSDK.framework; sourceTree = "<group>"; }; 63 + 26B975BF20AD7A66001E5EF9 /* XiongDiSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = XiongDiSDK.framework; sourceTree = "<group>"; };
65 8425EC191F0E3CBD00B0D868 /* PoolSdk.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = PoolSdk.framework; sourceTree = "<group>"; }; 64 8425EC191F0E3CBD00B0D868 /* PoolSdk.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = PoolSdk.framework; sourceTree = "<group>"; };
66 845D181B1C8D778400F27EB9 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = poolsdk_file/poolsdk/Images.xcassets; sourceTree = "<group>"; }; 65 845D181B1C8D778400F27EB9 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = poolsdk_file/poolsdk/Images.xcassets; sourceTree = "<group>"; };
67 845D181C1C8D778400F27EB9 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = poolsdk_file/poolsdk/Info.plist; sourceTree = "<group>"; }; 66 845D181C1C8D778400F27EB9 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = poolsdk_file/poolsdk/Info.plist; sourceTree = "<group>"; };
...@@ -107,6 +106,7 @@ ...@@ -107,6 +106,7 @@
107 8484E5161EE7E36800B402D1 /* SystemConfiguration.framework in Frameworks */, 106 8484E5161EE7E36800B402D1 /* SystemConfiguration.framework in Frameworks */,
108 8484E4FC1EE7E1D800B402D1 /* libsqlite3.dylib in Frameworks */, 107 8484E4FC1EE7E1D800B402D1 /* libsqlite3.dylib in Frameworks */,
109 8484E5121EE7E2B800B402D1 /* libz.1.dylib in Frameworks */, 108 8484E5121EE7E2B800B402D1 /* libz.1.dylib in Frameworks */,
109 + 26B975C020AD7A66001E5EF9 /* XiongDiSDK.framework in Frameworks */,
110 8484E5101EE7E29A00B402D1 /* libc++.1.dylib in Frameworks */, 110 8484E5101EE7E29A00B402D1 /* libc++.1.dylib in Frameworks */,
111 8484E5001EE7E20C00B402D1 /* CFNetwork.framework in Frameworks */, 111 8484E5001EE7E20C00B402D1 /* CFNetwork.framework in Frameworks */,
112 8484E5061EE7E24A00B402D1 /* CoreMotion.framework in Frameworks */, 112 8484E5061EE7E24A00B402D1 /* CoreMotion.framework in Frameworks */,
...@@ -115,7 +115,6 @@ ...@@ -115,7 +115,6 @@
115 8484E5081EE7E25600B402D1 /* CoreText.framework in Frameworks */, 115 8484E5081EE7E25600B402D1 /* CoreText.framework in Frameworks */,
116 8484E50E1EE7E28000B402D1 /* QuartzCore.framework in Frameworks */, 116 8484E50E1EE7E28000B402D1 /* QuartzCore.framework in Frameworks */,
117 8484E5141EE7E2DE00B402D1 /* Foundation.framework in Frameworks */, 117 8484E5141EE7E2DE00B402D1 /* Foundation.framework in Frameworks */,
118 - 267CB82A20650B8C00194124 /* HaibaoSDK.framework in Frameworks */,
119 8484E50A1EE7E26200B402D1 /* Security.framework in Frameworks */, 118 8484E50A1EE7E26200B402D1 /* Security.framework in Frameworks */,
120 8484E5041EE7E24400B402D1 /* StoreKit.framework in Frameworks */, 119 8484E5041EE7E24400B402D1 /* StoreKit.framework in Frameworks */,
121 8425EC1A1F0E3CBD00B0D868 /* PoolSdk.framework in Frameworks */, 120 8425EC1A1F0E3CBD00B0D868 /* PoolSdk.framework in Frameworks */,
...@@ -128,7 +127,6 @@ ...@@ -128,7 +127,6 @@
128 isa = PBXFrameworksBuildPhase; 127 isa = PBXFrameworksBuildPhase;
129 buildActionMask = 2147483647; 128 buildActionMask = 2147483647;
130 files = ( 129 files = (
131 - 267CB82B20650B8C00194124 /* HaibaoSDK.framework in Frameworks */,
132 ); 130 );
133 runOnlyForDeploymentPostprocessing = 0; 131 runOnlyForDeploymentPostprocessing = 0;
134 }; 132 };
...@@ -146,7 +144,7 @@ ...@@ -146,7 +144,7 @@
146 8476DF641C4DD71D00EC42BA /* poolsdk */ = { 144 8476DF641C4DD71D00EC42BA /* poolsdk */ = {
147 isa = PBXGroup; 145 isa = PBXGroup;
148 children = ( 146 children = (
149 - 267CB82920650B8C00194124 /* HaibaoSDK.framework */, 147 + 26B975BF20AD7A66001E5EF9 /* XiongDiSDK.framework */,
150 84A090AC1F174E21003D23FB /* TrackingIO.h */, 148 84A090AC1F174E21003D23FB /* TrackingIO.h */,
151 84A090AA1F160A69003D23FB /* TrackingIO.a */, 149 84A090AA1F160A69003D23FB /* TrackingIO.a */,
152 846BD21F1EE9342700E89A1D /* pool_setting */, 150 846BD21F1EE9342700E89A1D /* pool_setting */,
...@@ -283,7 +281,7 @@ ...@@ -283,7 +281,7 @@
283 TargetAttributes = { 281 TargetAttributes = {
284 BB5F3C871C1811BC00DA339D = { 282 BB5F3C871C1811BC00DA339D = {
285 CreatedOnToolsVersion = 6.4; 283 CreatedOnToolsVersion = 6.4;
286 - DevelopmentTeam = A3DGN26BA8; 284 + DevelopmentTeam = H39BDLKKPT;
287 ProvisioningStyle = Manual; 285 ProvisioningStyle = Manual;
288 }; 286 };
289 BB5F3CA01C1811BC00DA339D = { 287 BB5F3CA01C1811BC00DA339D = {
...@@ -474,7 +472,7 @@ ...@@ -474,7 +472,7 @@
474 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 472 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
475 CODE_SIGN_STYLE = Manual; 473 CODE_SIGN_STYLE = Manual;
476 DEAD_CODE_STRIPPING = NO; 474 DEAD_CODE_STRIPPING = NO;
477 - DEVELOPMENT_TEAM = A3DGN26BA8; 475 + DEVELOPMENT_TEAM = H39BDLKKPT;
478 ENABLE_BITCODE = NO; 476 ENABLE_BITCODE = NO;
479 FRAMEWORK_SEARCH_PATHS = ( 477 FRAMEWORK_SEARCH_PATHS = (
480 "$(inherited)", 478 "$(inherited)",
...@@ -492,10 +490,10 @@ ...@@ -492,10 +490,10 @@
492 ); 490 );
493 ONLY_ACTIVE_ARCH = NO; 491 ONLY_ACTIVE_ARCH = NO;
494 OTHER_LDFLAGS = ""; 492 OTHER_LDFLAGS = "";
495 - PRODUCT_BUNDLE_IDENTIFIER = com.mihuyo.beta; 493 + PRODUCT_BUNDLE_IDENTIFIER = com.jghb.xinqinji;
496 PRODUCT_NAME = "$(TARGET_NAME)"; 494 PRODUCT_NAME = "$(TARGET_NAME)";
497 - PROVISIONING_PROFILE = "2a789cc1-1875-4a1e-ba74-85264c56ed4d"; 495 + PROVISIONING_PROFILE = "4e01f69a-1613-4ff8-a1c2-9b7edf29535a";
498 - PROVISIONING_PROFILE_SPECIFIER = dev_provision; 496 + PROVISIONING_PROFILE_SPECIFIER = dev_xqj;
499 TARGETED_DEVICE_FAMILY = "1,2"; 497 TARGETED_DEVICE_FAMILY = "1,2";
500 VALID_ARCHS = "arm64 armv7s"; 498 VALID_ARCHS = "arm64 armv7s";
501 }; 499 };
...@@ -509,7 +507,7 @@ ...@@ -509,7 +507,7 @@
509 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; 507 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
510 CODE_SIGN_STYLE = Manual; 508 CODE_SIGN_STYLE = Manual;
511 DEAD_CODE_STRIPPING = NO; 509 DEAD_CODE_STRIPPING = NO;
512 - DEVELOPMENT_TEAM = A3DGN26BA8; 510 + DEVELOPMENT_TEAM = H39BDLKKPT;
513 ENABLE_BITCODE = NO; 511 ENABLE_BITCODE = NO;
514 FRAMEWORK_SEARCH_PATHS = ( 512 FRAMEWORK_SEARCH_PATHS = (
515 "$(inherited)", 513 "$(inherited)",
...@@ -527,10 +525,10 @@ ...@@ -527,10 +525,10 @@
527 ); 525 );
528 ONLY_ACTIVE_ARCH = NO; 526 ONLY_ACTIVE_ARCH = NO;
529 OTHER_LDFLAGS = ""; 527 OTHER_LDFLAGS = "";
530 - PRODUCT_BUNDLE_IDENTIFIER = com.mihuyo.beta; 528 + PRODUCT_BUNDLE_IDENTIFIER = com.jghb.xinqinji;
531 PRODUCT_NAME = "$(TARGET_NAME)"; 529 PRODUCT_NAME = "$(TARGET_NAME)";
532 - PROVISIONING_PROFILE = "efde732c-987c-4f2a-bc64-c11762722e03"; 530 + PROVISIONING_PROFILE = "4729f9e7-5f04-4bf0-a201-82ce5fe6ec5d";
533 - PROVISIONING_PROFILE_SPECIFIER = dis_provision; 531 + PROVISIONING_PROFILE_SPECIFIER = dis_xqj;
534 TARGETED_DEVICE_FAMILY = "1,2"; 532 TARGETED_DEVICE_FAMILY = "1,2";
535 VALID_ARCHS = "arm64 armv7s"; 533 VALID_ARCHS = "arm64 armv7s";
536 }; 534 };
......
...@@ -100,14 +100,14 @@ ...@@ -100,14 +100,14 @@
100 [payInfo setPlayerLevel:@"10"]; 100 [payInfo setPlayerLevel:@"10"];
101 [payInfo setUserId:@"123456"]; 101 [payInfo setUserId:@"123456"];
102 [payInfo setPostAmount:@"6"]; 102 [payInfo setPostAmount:@"6"];
103 - [payInfo setProductId:@"6"]; 103 + [payInfo setProductId:@"com.xiongdi.xunqinji.6"];
104 [payInfo setPlayerId:@"1231241234"]; 104 [payInfo setPlayerId:@"1231241234"];
105 - [payInfo setProductName:@"60元宝"]; 105 + [payInfo setProductName:@"com.xiongdi.xunqinji.6"];
106 [payInfo setProductDesc:@"productDes"]; 106 [payInfo setProductDesc:@"productDes"];
107 [payInfo setTimestamp:@"1232134"]; 107 [payInfo setTimestamp:@"1232134"];
108 [payInfo setExchange:@"10"]; 108 [payInfo setExchange:@"10"];
109 [payInfo setCustom:@"custom"]; 109 [payInfo setCustom:@"custom"];
110 - [[PoolSdk shareSDK] payWithPaymentInfo:payInfo]; 110 + [[PoolSdk shareSDK] gzyazfWithGzyazfmentInfo:payInfo];
111 } 111 }
112 112
113 -(NSString*)getCurrentTimestamp{ 113 -(NSString*)getCurrentTimestamp{
......
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
17 @property(nonatomic, strong)NSString *userId; 17 @property(nonatomic, strong)NSString *userId;
18 @property(nonatomic, strong)id<PoolSdkDelegate> mPoolSdkDelegate; 18 @property(nonatomic, strong)id<PoolSdkDelegate> mPoolSdkDelegate;
19 19
20 -@property bool onlyOneTimePay; 20 +@property bool onlyOneTimeGzyazf;
21 + (PoolChecker *)getInstance; 21 + (PoolChecker *)getInstance;
22 - (void)initChecker; 22 - (void)initChecker;
23 - (void)startCheck:(PoolLoginInfo *)loginInfo; 23 - (void)startCheck:(PoolLoginInfo *)loginInfo;
24 -- (void) createOrder:(PoolCreateOrderInfo *)payInfo; 24 +- (void) createOrder:(PoolCreateOrderInfo *)gzyazfInfo;
25 - (void) reportOpen; 25 - (void) reportOpen;
26 - (void) reportSDKOpen; 26 - (void) reportSDKOpen;
27 - (void)handleFirstOpenApp:(NSString*) path; 27 - (void)handleFirstOpenApp:(NSString*) path;
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
14 @property(nonatomic, strong)NSString *sdkSimpleName; 14 @property(nonatomic, strong)NSString *sdkSimpleName;
15 @property(nonatomic, strong)NSString *sdkVersionCode; 15 @property(nonatomic, strong)NSString *sdkVersionCode;
16 @property(nonatomic, strong)NSString *loginCheckUrl; 16 @property(nonatomic, strong)NSString *loginCheckUrl;
17 -@property(nonatomic, strong)NSString *payOrderUrl; 17 +@property(nonatomic, strong)NSString *gzyazfOrderUrl;
18 -@property(nonatomic, strong)NSString *payCheckUrl; 18 +@property(nonatomic, strong)NSString *gzyazfCheckUrl;
19 @property(nonatomic, strong)NSString *c1; 19 @property(nonatomic, strong)NSString *c1;
20 @property(nonatomic, strong)NSString *c2; 20 @property(nonatomic, strong)NSString *c2;
21 @property(nonatomic, strong)NSString *custom; 21 @property(nonatomic, strong)NSString *custom;
...@@ -28,4 +28,4 @@ ...@@ -28,4 +28,4 @@
28 28
29 - (void) updateC1C2Value:(NSString *)c1 c2:(NSString *)c2; 29 - (void) updateC1C2Value:(NSString *)c1 c2:(NSString *)c2;
30 30
31 -@end
...\ No newline at end of file ...\ No newline at end of file
31 +@end
......
1 // 1 //
2 -// PayInfo.h 2 +// GzyazfInfo.h
3 // public_i9133 3 // public_i9133
4 // 4 //
5 // Created by winFan on 12/3/15. 5 // Created by winFan on 12/3/15.
...@@ -28,4 +28,4 @@ ...@@ -28,4 +28,4 @@
28 - (NSString *) getTsign ; 28 - (NSString *) getTsign ;
29 - (NSString *) getTimestamp ; 29 - (NSString *) getTimestamp ;
30 30
31 -@end
...\ No newline at end of file ...\ No newline at end of file
31 +@end
......
...@@ -18,7 +18,7 @@ extern NSString * const _create_order_notification; /**< */ ...@@ -18,7 +18,7 @@ extern NSString * const _create_order_notification; /**< */
18 typedef NS_ENUM(int, PoolSDKNotificationType) { 18 typedef NS_ENUM(int, PoolSDKNotificationType) {
19 PoolSDKNotificationLogin = 1,//登录 19 PoolSDKNotificationLogin = 1,//登录
20 PoolSDKNotificationLogout,//注销 20 PoolSDKNotificationLogout,//注销
21 - PoolSDKNotificationPay,//支付完成 21 + PoolSDKNotificationGzyazf,//支付完成
22 PoolSDKNotificationPause,//暂停退出 22 PoolSDKNotificationPause,//暂停退出
23 PoolSDKNotificationRole,//创建角色 23 PoolSDKNotificationRole,//创建角色
24 PoolSDKNotificationInitSDK,//初始化SDK 24 PoolSDKNotificationInitSDK,//初始化SDK
......
1 // 1 //
2 -// PoolPayInfo.h 2 +// PoolGzyazfInfo.h
3 // public_i9133 3 // public_i9133
4 // 4 //
5 // Created by winFan on 12/3/15. 5 // Created by winFan on 12/3/15.
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 8
9 9
10 #import "PoolSdk/PoolBaseModel.h" 10 #import "PoolSdk/PoolBaseModel.h"
11 -@interface PoolPayInfo : PoolBaseModel 11 +@interface PoolGzyazfInfo : PoolBaseModel
12 12
13 @property(nonatomic, strong)NSString *serverId; 13 @property(nonatomic, strong)NSString *serverId;
14 @property(nonatomic, strong)NSString *queryId; 14 @property(nonatomic, strong)NSString *queryId;
...@@ -28,4 +28,4 @@ ...@@ -28,4 +28,4 @@
28 @property(nonatomic, strong)NSString *productDesc;//产品描述 28 @property(nonatomic, strong)NSString *productDesc;//产品描述
29 @property(nonatomic, strong)NSString *exchange;//兑换比例 29 @property(nonatomic, strong)NSString *exchange;//兑换比例
30 30
31 -@end
...\ No newline at end of file ...\ No newline at end of file
31 +@end
......
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
21 */ 21 */
22 @property(nonatomic, strong)NSString *urlSchemes; 22 @property(nonatomic, strong)NSString *urlSchemes;
23 23
24 - 24 +@property BOOL isAppleGzyazfing;
25 -
26 /** 25 /**
27 获取SDK实例对象 26 获取SDK实例对象
28 */ 27 */
...@@ -48,7 +47,7 @@ ...@@ -48,7 +47,7 @@
48 /** 47 /**
49 进行支付 48 进行支付
50 */ 49 */
51 -- (void)payWithPaymentInfo:(PoolCreateOrderInfo *)payInfo; 50 +- (void)gzyazfWithGzyazfmentInfo:(PoolCreateOrderInfo *)gzyazfInfo;
52 51
53 52
54 /** 53 /**
...@@ -159,10 +158,10 @@ ...@@ -159,10 +158,10 @@
159 *orderId 订单Id，必填项，请保证该值的全局唯一，系统会使用订单Id进行付费订单排重。 158 *orderId 订单Id，必填项，请保证该值的全局唯一，系统会使用订单Id进行付费订单排重。
160 *currencyAmount 货币金额，单位为元，支持小数 159 *currencyAmount 货币金额，单位为元，支持小数
161 *currencyType 货币类型 160 *currencyType 货币类型
162 - *payType 支付类型(渠道) 161 + *gzyazfType 支付类型(渠道)
163 *custom 自定义扩展参数 162 *custom 自定义扩展参数
164 */ 163 */
165 --(void)paymentSuccess:(NSString*)accountId orderId:(NSString*)orderId currencyAmount:(double)amount currencyType:(NSString*)currencyType payType:(NSString*)payType custom:(NSArray*)customArray; 164 +-(void)gzyazfmentSuccess:(NSString*)accountId orderId:(NSString*)orderId currencyAmount:(double)amount currencyType:(NSString*)currencyType gzyazfType:(NSString*)gzyazfType custom:(NSArray*)customArray;
166 165
167 166
168 - (void)handleOpenurl:(NSURL *)url; 167 - (void)handleOpenurl:(NSURL *)url;
......
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
14 14
15 +(NSString *)md5:(NSString *)str; 15 +(NSString *)md5:(NSString *)str;
16 + (NSDictionary *)dictionaryWithJsonString:(NSString *)jsonString; 16 + (NSDictionary *)dictionaryWithJsonString:(NSString *)jsonString;
17 -+(NSString *)createPayOrderUrl; 17 ++(NSString *)createGzyazfOrderUrl;
18 //*充值回调地址 18 //*充值回调地址
19 -+(NSString *)createPayUrl; 19 ++(NSString *)createGzyazfUrl;
20 20
21 +(UIActivityIndicatorView *)showLoadingDialog:(UIView*)parentView; 21 +(UIActivityIndicatorView *)showLoadingDialog:(UIView*)parentView;
22 +(void)dismissLoadingDialog:(UIActivityIndicatorView*)indicatorView; 22 +(void)dismissLoadingDialog:(UIActivityIndicatorView*)indicatorView;
23 23
24 -@end
...\ No newline at end of file ...\ No newline at end of file
24 +@end
......
...@@ -25,9 +25,9 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -25,9 +25,9 @@ NS_ASSUME_NONNULL_BEGIN
25 //登陆成功后调用 25 //登陆成功后调用
26 + (void)setLoginWithAccountID:(NSString *)account; 26 + (void)setLoginWithAccountID:(NSString *)account;
27 //开始付费时 调用（人民币单位是元） 27 //开始付费时 调用（人民币单位是元）
28 -+(void)setPaymentStart:(NSString *)transactionId paymentType:(NSString*)paymentType currentType:(NSString*)currencyType currencyAmount:(float)currencyAmount; 28 ++(void)setGzyazfmentStart:(NSString *)transactionId gzyazfmentType:(NSString*)gzyazfmentType currentType:(NSString*)currencyType currencyAmount:(float)currencyAmount;
29 // 支付完成，付费分析,记录玩家充值的金额（人民币单位是元） 29 // 支付完成，付费分析,记录玩家充值的金额（人民币单位是元）
30 -+(void)setPayment:(NSString *)transactionId paymentType:(NSString*)paymentType currentType:(NSString*)currencyType currencyAmount:(float)currencyAmount; 30 ++(void)setGzyazfment:(NSString *)transactionId gzyazfmentType:(NSString*)gzyazfmentType currentType:(NSString*)currencyType currencyAmount:(float)currencyAmount;
31 //自定义事件 31 //自定义事件
32 +(void)setEvent:(NSString *)eventName andExtra:(nullable NSDictionary *)extra; 32 +(void)setEvent:(NSString *)eventName andExtra:(nullable NSDictionary *)extra;
33 //标准接口 33 //标准接口
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 初始化SDK 15 初始化SDK
16 */ 16 */
17 17
18 -//[[PoolChecker getInstance] sendNotice:PoolSDKNotificationPay notiName:@"" statusCode:POOLSDK_NO_ERROR description:@"" extendData:order_id]; 18 +//[[PoolChecker getInstance] sendNotice:PoolSDKNotificationGzyazf notiName:@"" statusCode:POOLSDK_NO_ERROR description:@"" extendData:order_id];
19 19
20 - (void)SDKinit:(UIViewController *) control; 20 - (void)SDKinit:(UIViewController *) control;
21 21
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
91 进行支付 91 进行支付
92 */ 92 */
93 93
94 -- (void)SDKpayWithPaymentInfo:(PoolCreateOrderInfo *)payInfo; 94 +- (void)SDKgzyazfWithGzyazfmentInfo:(PoolCreateOrderInfo *)gzyazfInfo;
95 - (void)receiveCreateOrder: (NSNotification *)notification; 95 - (void)receiveCreateOrder: (NSNotification *)notification;
96 96
97 /** 97 /**
...@@ -100,9 +100,9 @@ ...@@ -100,9 +100,9 @@
100 *orderId 订单Id，必填项，请保证该值的全局唯一，系统会使用订单Id进行付费订单排重。 100 *orderId 订单Id，必填项，请保证该值的全局唯一，系统会使用订单Id进行付费订单排重。
101 *currencyAmount 货币金额，单位为元，支持小数 101 *currencyAmount 货币金额，单位为元，支持小数
102 *currencyType 货币类型 102 *currencyType 货币类型
103 - *payType 支付类型(渠道) 103 + *gzyazfType 支付类型(渠道)
104 */ 104 */
105 --(void)paymentSuccess:(NSString*)accountId orderId:(NSString*)orderId currencyAmount:(double)amount currencyType:(NSString*)currencyType payType:(NSString*)payType custom:(NSArray *)customArray; 105 +-(void)gzyazfmentSuccess:(NSString*)accountId orderId:(NSString*)orderId currencyAmount:(double)amount currencyType:(NSString*)currencyType gzyazfType:(NSString*)gzyazfType custom:(NSArray *)customArray;
106 106
107 - (void)handleOpenurl:(NSURL *)url; 107 - (void)handleOpenurl:(NSURL *)url;
108 - (NSUInteger) application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(UIWindow *)window; 108 - (NSUInteger) application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(UIWindow *)window;
...@@ -129,4 +129,4 @@ ...@@ -129,4 +129,4 @@
129 -(BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString *,id> *)options; 129 -(BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString *,id> *)options;
130 130
131 - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation; 131 - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation;
132 -@end
...\ No newline at end of file ...\ No newline at end of file
132 +@end
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
79 [payInfo setExchange:@"10"]; 79 [payInfo setExchange:@"10"];
80 [payInfo setCustom:@"custom"]; 80 [payInfo setCustom:@"custom"];
81 NSLog(@"start pay"); 81 NSLog(@"start pay");
82 - [[PoolSdk shareSDK] payWithPaymentInfo:payInfo]; 82 + [[PoolSdk shareSDK] gzyazfWithGzyazfmentInfo:payInfo];
83 } 83 }
84 else if(tag == 6){ 84 else if(tag == 6){
85 PoolSdk *poolSdk = [PoolSdk shareSDK]; 85 PoolSdk *poolSdk = [PoolSdk shareSDK];
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
122 } 122 }
123 } 123 }
124 break; 124 break;
125 - case PoolSDKNotificationPay: 125 + case PoolSDKNotificationGzyazf:
126 { 126 {
127 NSLog(@"收到登陆信息PoolSDKNotificationPay"); 127 NSLog(@"收到登陆信息PoolSDKNotificationPay");
128 } 128 }
......
1 -#import <Foundation/Foundation.h>
2 -
3 -extern NSString * const haibaoExitNotification; /**< 退出 */
4 -extern NSString * const haibaoLoginNotification; /**< 登录完成的通知*/
5 -extern NSString * const haibaoErrorNotification; /**< 出错 */
6 -
7 -
8 -@interface HaibaoNotifications : NSObject
9 -
10 -@end
1 -#import <UIKit/UIKit.h>
2 -#import "StoreKit/StoreKit.h"
3 -
4 -@interface HaibaoSDKMgr : NSObject
5 -{
6 - NSString* appId_;
7 - NSString* appKey_;
8 -
9 - NSString* inviterCode_;
10 -}
11 -
12 -@property bool eatting;
13 -
14 -+ (HaibaoSDKMgr *)getInstance;
15 -- (void)initSDK;
16 -
17 -- (void)startLogin:(NSString *)appId : (NSString *)appKey : (UIViewController *)controller;
18 -
19 -- (void)setStyleName:(NSString*)styleName;
20 -
21 -- (void)startHimiko: (NSString *)serverId : (NSString *)nickName : (NSNumber *)amount : (NSString *)callBack : (UIViewController *)controller;
22 -
23 -- (void)startWithHimiko:(UIViewController*)controll products:(NSString*)products amount:(NSString*)amount productName:(NSString*)productName queryId:(NSString*) queryId;
24 -
25 -
26 -
27 -@end
No preview for this file type
1 #import <UIKit/UIKit.h> 1 #import <UIKit/UIKit.h>
2 2
3 -@interface HaibaoGetWifiMac : NSObject 3 +@interface XiongDiGetWifiMac : NSObject
4 4
5 -+ (NSString *)macaddress; 5 ++ (NSString *)myMacAddress;
6 @end 6 @end
......
1 #import <Foundation/Foundation.h> 1 #import <Foundation/Foundation.h>
2 2
3 -@interface HaibaoLoginInfo : NSObject //用户uid 3 +@interface XiongDiLoginInfo : NSObject //用户uid
4 { 4 {
5 // 5 //
6 NSString *openId; 6 NSString *openId;
...@@ -14,5 +14,5 @@ NSString *timestamp; ...@@ -14,5 +14,5 @@ NSString *timestamp;
14 @property(retain,nonatomic) NSString *openId; 14 @property(retain,nonatomic) NSString *openId;
15 @property(retain,nonatomic) NSString *token; 15 @property(retain,nonatomic) NSString *token;
16 @property(retain,nonatomic) NSString *timestamp; 16 @property(retain,nonatomic) NSString *timestamp;
17 -+ (HaibaoLoginInfo *)getInstance; 17 ++ (XiongDiLoginInfo *)getInstance;
18 @end 18 @end
......
1 +#import <Foundation/Foundation.h>
2 +
3 +extern NSString * const XiongDiExitNotification; /**< 退出 */
4 +extern NSString * const XiongDiLoginNotification; /**< 登录完成的通知*/
5 +extern NSString * const XiongDiErrorNotification; /**< 出错 */
6 +
7 +
8 +@interface XiongDiNotifications : NSObject
9 +
10 +@end
1 +#import <UIKit/UIKit.h>
2 +#import "StoreKit/StoreKit.h"
3 +
4 +@interface XiongDiSDKMgr : NSObject
5 +{
6 + NSString* appId_;
7 + NSString* appKey_;
8 +
9 + NSString* inviterCode_;
10 +}
11 +
12 +@property bool banana;
13 +
14 ++ (XiongDiSDKMgr *)getInstance;
15 +- (void)initXiongDiSDK;
16 +
17 +- (void)startXiongDiLogin:(NSString *)appId : (NSString *)appKey : (UIViewController *)controller;
18 +
19 +- (void)setCoolStyleName:(NSString*)styleName;
20 +
21 +- (void)startXiongDiDelia: (NSString *)serverId : (NSString *)nickName : (NSNumber *)amount : (NSString *)callBack : (UIViewController *)controller;
22 +
23 +- (void)startWithXiongDiDelia:(UIViewController*)controll products:(NSString*)products amount:(NSString*)amount productName:(NSString*)productName queryId:(NSString*) queryId;
24 +
25 +
26 +
27 +@end
1 #import <UIKit/UIKit.h> 1 #import <UIKit/UIKit.h>
2 -#import "HaibaoLoginInfo.h" 2 +#import "XiongDiLoginInfo.h"
3 #import <JavaScriptCore/JavaScriptCore.h> 3 #import <JavaScriptCore/JavaScriptCore.h>
4 4
5 -@interface HaibaoViewController : UIViewController<UIWebViewDelegate,UIAlertViewDelegate> 5 +@interface XiongDiViewController : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
6 { 6 {
7 UIWebView *webView_; 7 UIWebView *webView_;
8 UIActivityIndicatorView *activityIndicator; 8 UIActivityIndicatorView *activityIndicator;
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
16 16
17 @property(assign) BOOL hasCorner; 17 @property(assign) BOOL hasCorner;
18 18
19 --(void)setView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight; 19 +-(void)setXiongDiView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
20 -- (void)initWebView; 20 +- (void)initXiongDiWebView;
21 - (void)loadWebPageWithString:(NSString *)url; 21 - (void)loadWebPageWithString:(NSString *)url;
22 - (void)loadWebPageWithJs:(NSString *)content; 22 - (void)loadWebPageWithJs:(NSString *)content;
23 - (void)postNotification:(NSString *)name : (NSString *)code; 23 - (void)postNotification:(NSString *)name : (NSString *)code;
......
No preview for this file type
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
4 <dict> 4 <dict>
5 <key>CFBundleDevelopmentRegion</key> 5 <key>CFBundleDevelopmentRegion</key>
6 <string>en</string> 6 <string>en</string>
7 + <key>CFBundleDisplayName</key>
8 + <string>大胸弟</string>
7 <key>CFBundleExecutable</key> 9 <key>CFBundleExecutable</key>
8 <string>$(EXECUTABLE_NAME)</string> 10 <string>$(EXECUTABLE_NAME)</string>
9 <key>CFBundleIdentifier</key> 11 <key>CFBundleIdentifier</key>
...@@ -30,7 +32,7 @@ ...@@ -30,7 +32,7 @@
30 </dict> 32 </dict>
31 </array> 33 </array>
32 <key>CFBundleVersion</key> 34 <key>CFBundleVersion</key>
33 - <string>2</string> 35 + <string>1</string>
34 <key>LSRequiresIPhoneOS</key> 36 <key>LSRequiresIPhoneOS</key>
35 <true/> 37 <true/>
36 <key>NSAppTransportSecurity</key> 38 <key>NSAppTransportSecurity</key>
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
8 #include "SDKInterface.h" 8 #include "SDKInterface.h"
9 #import <UIKit/UIKit.h> 9 #import <UIKit/UIKit.h>
10 10
11 -#import "HaibaoSDK/HaibaoSDKMgr.h" 11 +#import "XiongDiSDK/XiongDiSDKMgr.h"
12 -#import "HaibaoSDK/HaibaoNotifications.h" 12 +#import "XiongDiSDK/XiongDiNotifications.h"
13 -#import "HaibaoSDK/HaibaoLoginInfo.h" 13 +#import "XiongDiSDK/XiongDiLoginInfo.h"
14 #import "TrackingIO.h" 14 #import "TrackingIO.h"
15 15
16 //SDK 16 //SDK
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
20 20
21 21
22 int mExchange; 22 int mExchange;
23 +NSString *sdkAppId;
24 +NSString *sdkAppKey;
23 25
24 26
25 /** 27 /**
...@@ -31,10 +33,10 @@ int mExchange; ...@@ -31,10 +33,10 @@ int mExchange;
31 [super SDKinit:control]; 33 [super SDKinit:control];
32 34
33 [PoolConfig getInstance]; 35 [PoolConfig getInstance];
34 - [[HaibaoSDKMgr getInstance]initSDK]; 36 + [[XiongDiSDKMgr getInstance]initXiongDiSDK];
35 - [[HaibaoSDKMgr getInstance]setStyleName:@"sdk"]; 37 + [[XiongDiSDKMgr getInstance]setCoolStyleName:@"sdk"];
36 - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:haibaoLoginNotification object:nil]; 38 + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:XiongDiLoginNotification object:nil];
37 - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HaibaoToolCallBack:) name:@"HaibaoToolCallBack" object:nil]; 39 + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(XiongDiToolCallBack:) name:@"XiongDiToolCallBack" object:nil];
38 40
39 [[PoolChecker getInstance] sendNotice:PoolSDKNotificationInitSDK notiName:@"InitSuccess" statusCode:POOLSDK_NO_ERROR description:@"initSuccess" extendData:nil]; 41 [[PoolChecker getInstance] sendNotice:PoolSDKNotificationInitSDK notiName:@"InitSuccess" statusCode:POOLSDK_NO_ERROR description:@"initSuccess" extendData:nil];
40 42
...@@ -43,6 +45,10 @@ int mExchange; ...@@ -43,6 +45,10 @@ int mExchange;
43 channelId = @"unknown"; 45 channelId = @"unknown";
44 } 46 }
45 [TrackingIO initWithappKey:[[PoolConfig getInstance] getValueByKey:@"renyunAppKey"] withChannelId:channelId]; 47 [TrackingIO initWithappKey:[[PoolConfig getInstance] getValueByKey:@"renyunAppKey"] withChannelId:channelId];
48 +
49 + //APPID APPKEY
50 + sdkAppId = [[PoolConfig getInstance] getValueByKey:@"APP_ID"];
51 + sdkAppKey =[[PoolConfig getInstance] getValueByKey:@"APP_KEY"];
46 } 52 }
47 53
48 /** 54 /**
...@@ -51,9 +57,11 @@ int mExchange; ...@@ -51,9 +57,11 @@ int mExchange;
51 - (void)SDKloginSDK 57 - (void)SDKloginSDK
52 { 58 {
53 NSLog(@"调用了LoginSDK"); 59 NSLog(@"调用了LoginSDK");
54 - NSString *appId = [[PoolConfig getInstance] getValueByKey:@"APP_ID"]; 60 + //NSString *appId = [[PoolConfig getInstance] getValueByKey:@"APP_ID"];
55 - NSString *appKey =[[PoolConfig getInstance] getValueByKey:@"APP_KEY"]; 61 + //NSString *appKey =[[PoolConfig getInstance] getValueByKey:@"APP_KEY"];
56 - [[HaibaoSDKMgr getInstance]startLogin:appId :appKey :self.controller]; 62 + NSLog(@"%@",sdkAppId);
63 + NSLog(@"%@",sdkAppId);
64 + [[XiongDiSDKMgr getInstance]startXiongDiLogin:sdkAppId :sdkAppKey :self.controller];
57 65
58 } 66 }
59 67
...@@ -64,9 +72,9 @@ int mExchange; ...@@ -64,9 +72,9 @@ int mExchange;
64 { 72 {
65 NSLog(@"loginchek"); 73 NSLog(@"loginchek");
66 PoolLoginInfo *loginInfo = [PoolLoginInfo alloc]; 74 PoolLoginInfo *loginInfo = [PoolLoginInfo alloc];
67 - loginInfo.openId = [[HaibaoLoginInfo getInstance]openId]; 75 + loginInfo.openId = [[XiongDiLoginInfo getInstance]openId];
68 - loginInfo.sign = [[HaibaoLoginInfo getInstance] token]; 76 + loginInfo.sign = [[XiongDiLoginInfo getInstance] token];
69 - loginInfo.timestamp = [HaibaoLoginInfo getInstance].timestamp; 77 + loginInfo.timestamp = [XiongDiLoginInfo getInstance].timestamp;
70 78
71 dispatch_async(dispatch_get_global_queue(0, 0), ^{ 79 dispatch_async(dispatch_get_global_queue(0, 0), ^{
72 [[PoolChecker getInstance] startCheck:loginInfo]; 80 [[PoolChecker getInstance] startCheck:loginInfo];
...@@ -90,15 +98,15 @@ int mExchange; ...@@ -90,15 +98,15 @@ int mExchange;
90 苹果支付结果回调 98 苹果支付结果回调
91 */ 99 */
92 100
93 -- (void)HaibaoToolCallBack:(NSNotification *)notification 101 +- (void)XiongDiToolCallBack:(NSNotification *)notification
94 { 102 {
95 NSDictionary* payResultDic = notification.object; 103 NSDictionary* payResultDic = notification.object;
96 104
97 - NSString* receiptStr = [payResultDic objectForKey:@"HaibaoToolResult"]; 105 + NSString* receiptStr = [payResultDic objectForKey:@"XiongDiToolResult"];
98 NSString* queryId = [payResultDic objectForKey:@"query_id"]; 106 NSString* queryId = [payResultDic objectForKey:@"query_id"];
99 107
100 NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil]; 108 NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
101 - NSString* result = [[NetCenter getInstance] httpPostSyn:[PoolUtils createPayUrl] :receiptDic]; 109 + NSString* result = [[NetCenter getInstance] httpPostSyn:[PoolUtils createGzyazfUrl] :receiptDic];
102 110
103 111
104 if([@"success" isEqualToString:result]){//确认订单成功 112 if([@"success" isEqualToString:result]){//确认订单成功
...@@ -127,10 +135,10 @@ int mExchange; ...@@ -127,10 +135,10 @@ int mExchange;
127 /** 135 /**
128 支付 创建订单 136 支付 创建订单
129 */ 137 */
130 -- (void)SDKpayWithPaymentInfo:(PoolCreateOrderInfo *)payInfo 138 +- (void)SDKgzyazfWithGzyazfmentInfo:(PoolCreateOrderInfo *)payInfo
131 { 139 {
132 mExchange = [payInfo exchange].intValue; 140 mExchange = [payInfo exchange].intValue;
133 - [super SDKpayWithPaymentInfo:payInfo]; 141 + [super SDKgzyazfWithGzyazfmentInfo:payInfo];
134 } 142 }
135 143
136 /** 144 /**
...@@ -193,7 +201,7 @@ int mExchange; ...@@ -193,7 +201,7 @@ int mExchange;
193 for (NSString* queryId in queryIdArray) { 201 for (NSString* queryId in queryIdArray) {
194 NSString* receiptStr = [userDefaults valueForKey:queryId]; 202 NSString* receiptStr = [userDefaults valueForKey:queryId];
195 NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil]; 203 NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
196 - NSString* result = [[NetCenter getInstance] httpPostSyn:[PoolUtils createPayUrl] :receiptDic]; 204 + NSString* result = [[NetCenter getInstance] httpPostSyn:[PoolUtils createGzyazfUrl] :receiptDic];
197 if([@"success" isEqualToString:result]){//成功 205 if([@"success" isEqualToString:result]){//成功
198 [userDefaults removeObjectForKey:queryId]; 206 [userDefaults removeObjectForKey:queryId];
199 }else{//补单失败 207 }else{//补单失败
...@@ -214,7 +222,7 @@ int mExchange; ...@@ -214,7 +222,7 @@ int mExchange;
214 - (void)receiveCreateOrder:(NSNotification *)notification 222 - (void)receiveCreateOrder:(NSNotification *)notification
215 { 223 {
216 NSLog(@"创建订单成功"); 224 NSLog(@"创建订单成功");
217 - PoolPayInfo *payInfo = [notification object]; 225 + PoolGzyazfInfo *payInfo = [notification object];
218 226
219 NSNumber *amount = @([[payInfo postAmount] integerValue] * mExchange); 227 NSNumber *amount = @([[payInfo postAmount] integerValue] * mExchange);
220 NSString *serverId = [payInfo serverId]; 228 NSString *serverId = [payInfo serverId];
...@@ -228,10 +236,10 @@ int mExchange; ...@@ -228,10 +236,10 @@ int mExchange;
228 NSString *other = [payInfo other]; 236 NSString *other = [payInfo other];
229 237
230 if (other && [other length] > 0) { 238 if (other && [other length] > 0) {
231 - [[HaibaoSDKMgr getInstance] startHimiko:serverId :roleName :amount :[payInfo queryId] :self.controller]; 239 + [[XiongDiSDKMgr getInstance] startXiongDiDelia:serverId :roleName :amount :[payInfo queryId] :self.controller];
232 }else{ 240 }else{
233 NSString* products = [payInfo products]; 241 NSString* products = [payInfo products];
234 - [[HaibaoSDKMgr getInstance] startWithHimiko:self.controller products:products amount:[payInfo postAmount] productName:[payInfo productName] queryId:queryId]; 242 + [[XiongDiSDKMgr getInstance] startWithXiongDiDelia:self.controller products:products amount:[payInfo postAmount] productName:[payInfo productName] queryId:queryId];
235 } 243 }
236 } 244 }
237 245
......
1 +新接入请参考对接文档和demo<br>
2 +
3 +2018-05-23:<br>
4 +已接入快速更新方法：<br>
5 +1、 删除HaibaoSDK.framework<br>
6 +2、 引入XiongDiSDK.framework<br>
7 +3、 替换SDKInterface.h和SDKInterface.m文件<br>
8 +4、 替换PoolSdk.framework<br>
9 +5、 支付接口[[PoolSdk shareSDK] payWithPaymentInfo:orderInfo];修改为[[PoolSdk shareSDK] gzyazfWithGzyazfmentInfo:orderInfo];<br>
10 +6、 回调PoolSDKNotificationPay 修改为 PoolSDKNotificationGzyazf<br>
11 +
1 2018-04-02:<br> 12 2018-04-02:<br>
2 -更新3.1.1被拒问题<br>
3 已接入更新方法：<br> 13 已接入更新方法：<br>
4 1、删除YouaiSDK.framework<br> 14 1、删除YouaiSDK.framework<br>
5 2、引入HaibaoSDK.framework<br> 15 2、引入HaibaoSDK.framework<br>
......
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
17 @property(nonatomic, strong)NSString *userId; 17 @property(nonatomic, strong)NSString *userId;
18 @property(nonatomic, strong)id<PoolSdkDelegate> mPoolSdkDelegate; 18 @property(nonatomic, strong)id<PoolSdkDelegate> mPoolSdkDelegate;
19 19
20 -@property bool onlyOneTimePay; 20 +@property bool onlyOneTimeGzyazf;
21 + (PoolChecker *)getInstance; 21 + (PoolChecker *)getInstance;
22 - (void)initChecker; 22 - (void)initChecker;
23 - (void)startCheck:(PoolLoginInfo *)loginInfo; 23 - (void)startCheck:(PoolLoginInfo *)loginInfo;
24 -- (void) createOrder:(PoolCreateOrderInfo *)payInfo; 24 +- (void) createOrder:(PoolCreateOrderInfo *)gzyazfInfo;
25 - (void) reportOpen; 25 - (void) reportOpen;
26 - (void) reportSDKOpen; 26 - (void) reportSDKOpen;
27 - (void)handleFirstOpenApp:(NSString*) path; 27 - (void)handleFirstOpenApp:(NSString*) path;
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
14 @property(nonatomic, strong)NSString *sdkSimpleName; 14 @property(nonatomic, strong)NSString *sdkSimpleName;
15 @property(nonatomic, strong)NSString *sdkVersionCode; 15 @property(nonatomic, strong)NSString *sdkVersionCode;
16 @property(nonatomic, strong)NSString *loginCheckUrl; 16 @property(nonatomic, strong)NSString *loginCheckUrl;
17 -@property(nonatomic, strong)NSString *payOrderUrl; 17 +@property(nonatomic, strong)NSString *gzyazfOrderUrl;
18 -@property(nonatomic, strong)NSString *payCheckUrl; 18 +@property(nonatomic, strong)NSString *gzyazfCheckUrl;
19 @property(nonatomic, strong)NSString *c1; 19 @property(nonatomic, strong)NSString *c1;
20 @property(nonatomic, strong)NSString *c2; 20 @property(nonatomic, strong)NSString *c2;
21 @property(nonatomic, strong)NSString *custom; 21 @property(nonatomic, strong)NSString *custom;
...@@ -28,4 +28,4 @@ ...@@ -28,4 +28,4 @@
28 28
29 - (void) updateC1C2Value:(NSString *)c1 c2:(NSString *)c2; 29 - (void) updateC1C2Value:(NSString *)c1 c2:(NSString *)c2;
30 30
31 -@end
...\ No newline at end of file ...\ No newline at end of file
31 +@end
......
1 // 1 //
2 -// PayInfo.h 2 +// GzyazfInfo.h
3 // public_i9133 3 // public_i9133
4 // 4 //
5 // Created by winFan on 12/3/15. 5 // Created by winFan on 12/3/15.
...@@ -28,4 +28,4 @@ ...@@ -28,4 +28,4 @@
28 - (NSString *) getTsign ; 28 - (NSString *) getTsign ;
29 - (NSString *) getTimestamp ; 29 - (NSString *) getTimestamp ;
30 30
31 -@end
...\ No newline at end of file ...\ No newline at end of file
31 +@end
......
...@@ -18,7 +18,7 @@ extern NSString * const _create_order_notification; /**< */ ...@@ -18,7 +18,7 @@ extern NSString * const _create_order_notification; /**< */
18 typedef NS_ENUM(int, PoolSDKNotificationType) { 18 typedef NS_ENUM(int, PoolSDKNotificationType) {
19 PoolSDKNotificationLogin = 1,//登录 19 PoolSDKNotificationLogin = 1,//登录
20 PoolSDKNotificationLogout,//注销 20 PoolSDKNotificationLogout,//注销
21 - PoolSDKNotificationPay,//支付完成 21 + PoolSDKNotificationGzyazf,//支付完成
22 PoolSDKNotificationPause,//暂停退出 22 PoolSDKNotificationPause,//暂停退出
23 PoolSDKNotificationRole,//创建角色 23 PoolSDKNotificationRole,//创建角色
24 PoolSDKNotificationInitSDK,//初始化SDK 24 PoolSDKNotificationInitSDK,//初始化SDK
......
1 // 1 //
2 -// PoolPayInfo.h 2 +// PoolGzyazfInfo.h
3 // public_i9133 3 // public_i9133
4 // 4 //
5 // Created by winFan on 12/3/15. 5 // Created by winFan on 12/3/15.
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 8
9 9
10 #import "PoolSdk/PoolBaseModel.h" 10 #import "PoolSdk/PoolBaseModel.h"
11 -@interface PoolPayInfo : PoolBaseModel 11 +@interface PoolGzyazfInfo : PoolBaseModel
12 12
13 @property(nonatomic, strong)NSString *serverId; 13 @property(nonatomic, strong)NSString *serverId;
14 @property(nonatomic, strong)NSString *queryId; 14 @property(nonatomic, strong)NSString *queryId;
...@@ -28,4 +28,4 @@ ...@@ -28,4 +28,4 @@
28 @property(nonatomic, strong)NSString *productDesc;//产品描述 28 @property(nonatomic, strong)NSString *productDesc;//产品描述
29 @property(nonatomic, strong)NSString *exchange;//兑换比例 29 @property(nonatomic, strong)NSString *exchange;//兑换比例
30 30
31 -@end
...\ No newline at end of file ...\ No newline at end of file
31 +@end
......
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
21 */ 21 */
22 @property(nonatomic, strong)NSString *urlSchemes; 22 @property(nonatomic, strong)NSString *urlSchemes;
23 23
24 - 24 +@property BOOL isAppleGzyazfing;
25 -
26 /** 25 /**
27 获取SDK实例对象 26 获取SDK实例对象
28 */ 27 */
...@@ -48,7 +47,7 @@ ...@@ -48,7 +47,7 @@
48 /** 47 /**
49 进行支付 48 进行支付
50 */ 49 */
51 -- (void)payWithPaymentInfo:(PoolCreateOrderInfo *)payInfo; 50 +- (void)gzyazfWithGzyazfmentInfo:(PoolCreateOrderInfo *)gzyazfInfo;
52 51
53 52
54 /** 53 /**
...@@ -159,10 +158,10 @@ ...@@ -159,10 +158,10 @@
159 *orderId 订单Id，必填项，请保证该值的全局唯一，系统会使用订单Id进行付费订单排重。 158 *orderId 订单Id，必填项，请保证该值的全局唯一，系统会使用订单Id进行付费订单排重。
160 *currencyAmount 货币金额，单位为元，支持小数 159 *currencyAmount 货币金额，单位为元，支持小数
161 *currencyType 货币类型 160 *currencyType 货币类型
162 - *payType 支付类型(渠道) 161 + *gzyazfType 支付类型(渠道)
163 *custom 自定义扩展参数 162 *custom 自定义扩展参数
164 */ 163 */
165 --(void)paymentSuccess:(NSString*)accountId orderId:(NSString*)orderId currencyAmount:(double)amount currencyType:(NSString*)currencyType payType:(NSString*)payType custom:(NSArray*)customArray; 164 +-(void)gzyazfmentSuccess:(NSString*)accountId orderId:(NSString*)orderId currencyAmount:(double)amount currencyType:(NSString*)currencyType gzyazfType:(NSString*)gzyazfType custom:(NSArray*)customArray;
166 165
167 166
168 - (void)handleOpenurl:(NSURL *)url; 167 - (void)handleOpenurl:(NSURL *)url;
......
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
14 14
15 +(NSString *)md5:(NSString *)str; 15 +(NSString *)md5:(NSString *)str;
16 + (NSDictionary *)dictionaryWithJsonString:(NSString *)jsonString; 16 + (NSDictionary *)dictionaryWithJsonString:(NSString *)jsonString;
17 -+(NSString *)createPayOrderUrl; 17 ++(NSString *)createGzyazfOrderUrl;
18 //*充值回调地址 18 //*充值回调地址
19 -+(NSString *)createPayUrl; 19 ++(NSString *)createGzyazfUrl;
20 20
21 +(UIActivityIndicatorView *)showLoadingDialog:(UIView*)parentView; 21 +(UIActivityIndicatorView *)showLoadingDialog:(UIView*)parentView;
22 +(void)dismissLoadingDialog:(UIActivityIndicatorView*)indicatorView; 22 +(void)dismissLoadingDialog:(UIActivityIndicatorView*)indicatorView;
23 23
24 -@end
...\ No newline at end of file ...\ No newline at end of file
24 +@end
......
...@@ -25,9 +25,9 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -25,9 +25,9 @@ NS_ASSUME_NONNULL_BEGIN
25 //登陆成功后调用 25 //登陆成功后调用
26 + (void)setLoginWithAccountID:(NSString *)account; 26 + (void)setLoginWithAccountID:(NSString *)account;
27 //开始付费时 调用（人民币单位是元） 27 //开始付费时 调用（人民币单位是元）
28 -+(void)setPaymentStart:(NSString *)transactionId paymentType:(NSString*)paymentType currentType:(NSString*)currencyType currencyAmount:(float)currencyAmount; 28 ++(void)setGzyazfmentStart:(NSString *)transactionId gzyazfmentType:(NSString*)gzyazfmentType currentType:(NSString*)currencyType currencyAmount:(float)currencyAmount;
29 // 支付完成，付费分析,记录玩家充值的金额（人民币单位是元） 29 // 支付完成，付费分析,记录玩家充值的金额（人民币单位是元）
30 -+(void)setPayment:(NSString *)transactionId paymentType:(NSString*)paymentType currentType:(NSString*)currencyType currencyAmount:(float)currencyAmount; 30 ++(void)setGzyazfment:(NSString *)transactionId gzyazfmentType:(NSString*)gzyazfmentType currentType:(NSString*)currencyType currencyAmount:(float)currencyAmount;
31 //自定义事件 31 //自定义事件
32 +(void)setEvent:(NSString *)eventName andExtra:(nullable NSDictionary *)extra; 32 +(void)setEvent:(NSString *)eventName andExtra:(nullable NSDictionary *)extra;
33 //标准接口 33 //标准接口
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 初始化SDK 15 初始化SDK
16 */ 16 */
17 17
18 -//[[PoolChecker getInstance] sendNotice:PoolSDKNotificationPay notiName:@"" statusCode:POOLSDK_NO_ERROR description:@"" extendData:order_id]; 18 +//[[PoolChecker getInstance] sendNotice:PoolSDKNotificationGzyazf notiName:@"" statusCode:POOLSDK_NO_ERROR description:@"" extendData:order_id];
19 19
20 - (void)SDKinit:(UIViewController *) control; 20 - (void)SDKinit:(UIViewController *) control;
21 21
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
91 进行支付 91 进行支付
92 */ 92 */
93 93
94 -- (void)SDKpayWithPaymentInfo:(PoolCreateOrderInfo *)payInfo; 94 +- (void)SDKgzyazfWithGzyazfmentInfo:(PoolCreateOrderInfo *)gzyazfInfo;
95 - (void)receiveCreateOrder: (NSNotification *)notification; 95 - (void)receiveCreateOrder: (NSNotification *)notification;
96 96
97 /** 97 /**
...@@ -100,9 +100,9 @@ ...@@ -100,9 +100,9 @@
100 *orderId 订单Id，必填项，请保证该值的全局唯一，系统会使用订单Id进行付费订单排重。 100 *orderId 订单Id，必填项，请保证该值的全局唯一，系统会使用订单Id进行付费订单排重。
101 *currencyAmount 货币金额，单位为元，支持小数 101 *currencyAmount 货币金额，单位为元，支持小数
102 *currencyType 货币类型 102 *currencyType 货币类型
103 - *payType 支付类型(渠道) 103 + *gzyazfType 支付类型(渠道)
104 */ 104 */
105 --(void)paymentSuccess:(NSString*)accountId orderId:(NSString*)orderId currencyAmount:(double)amount currencyType:(NSString*)currencyType payType:(NSString*)payType custom:(NSArray *)customArray; 105 +-(void)gzyazfmentSuccess:(NSString*)accountId orderId:(NSString*)orderId currencyAmount:(double)amount currencyType:(NSString*)currencyType gzyazfType:(NSString*)gzyazfType custom:(NSArray *)customArray;
106 106
107 - (void)handleOpenurl:(NSURL *)url; 107 - (void)handleOpenurl:(NSURL *)url;
108 - (NSUInteger) application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(UIWindow *)window; 108 - (NSUInteger) application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(UIWindow *)window;
...@@ -129,4 +129,4 @@ ...@@ -129,4 +129,4 @@
129 -(BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString *,id> *)options; 129 -(BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString *,id> *)options;
130 130
131 - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation; 131 - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation;
132 -@end
...\ No newline at end of file ...\ No newline at end of file
132 +@end
......
1 -#import <Foundation/Foundation.h>
2 -
3 -extern NSString * const haibaoExitNotification; /**< 退出 */
4 -extern NSString * const haibaoLoginNotification; /**< 登录完成的通知*/
5 -extern NSString * const haibaoErrorNotification; /**< 出错 */
6 -
7 -
8 -@interface HaibaoNotifications : NSObject
9 -
10 -@end
1 -#import <UIKit/UIKit.h>
2 -#import "StoreKit/StoreKit.h"
3 -
4 -@interface HaibaoSDKMgr : NSObject
5 -{
6 - NSString* appId_;
7 - NSString* appKey_;
8 -
9 - NSString* inviterCode_;
10 -}
11 -
12 -@property bool eatting;
13 -
14 -+ (HaibaoSDKMgr *)getInstance;
15 -- (void)initSDK;
16 -
17 -- (void)startLogin:(NSString *)appId : (NSString *)appKey : (UIViewController *)controller;
18 -
19 -- (void)setStyleName:(NSString*)styleName;
20 -
21 -- (void)startHimiko: (NSString *)serverId : (NSString *)nickName : (NSNumber *)amount : (NSString *)callBack : (UIViewController *)controller;
22 -
23 -- (void)startWithHimiko:(UIViewController*)controll products:(NSString*)products amount:(NSString*)amount productName:(NSString*)productName queryId:(NSString*) queryId;
24 -
25 -
26 -
27 -@end
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
8 #include "SDKInterface.h" 8 #include "SDKInterface.h"
9 #import <UIKit/UIKit.h> 9 #import <UIKit/UIKit.h>
10 10
11 -#import "HaibaoSDK/HaibaoSDKMgr.h" 11 +#import "XiongDiSDK/XiongDiSDKMgr.h"
12 -#import "HaibaoSDK/HaibaoNotifications.h" 12 +#import "XiongDiSDK/XiongDiNotifications.h"
13 -#import "HaibaoSDK/HaibaoLoginInfo.h" 13 +#import "XiongDiSDK/XiongDiLoginInfo.h"
14 #import "TrackingIO.h" 14 #import "TrackingIO.h"
15 15
16 //SDK 16 //SDK
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
20 20
21 21
22 int mExchange; 22 int mExchange;
23 +NSString *sdkAppId;
24 +NSString *sdkAppKey;
23 25
24 26
25 /** 27 /**
...@@ -31,10 +33,10 @@ int mExchange; ...@@ -31,10 +33,10 @@ int mExchange;
31 [super SDKinit:control]; 33 [super SDKinit:control];
32 34
33 [PoolConfig getInstance]; 35 [PoolConfig getInstance];
34 - [[HaibaoSDKMgr getInstance]initSDK]; 36 + [[XiongDiSDKMgr getInstance]initXiongDiSDK];
35 - [[HaibaoSDKMgr getInstance]setStyleName:@"sdk"]; 37 + [[XiongDiSDKMgr getInstance]setCoolStyleName:@"sdk"];
36 - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:haibaoLoginNotification object:nil]; 38 + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:XiongDiLoginNotification object:nil];
37 - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HaibaoToolCallBack:) name:@"HaibaoToolCallBack" object:nil]; 39 + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(XiongDiToolCallBack:) name:@"XiongDiToolCallBack" object:nil];
38 40
39 [[PoolChecker getInstance] sendNotice:PoolSDKNotificationInitSDK notiName:@"InitSuccess" statusCode:POOLSDK_NO_ERROR description:@"initSuccess" extendData:nil]; 41 [[PoolChecker getInstance] sendNotice:PoolSDKNotificationInitSDK notiName:@"InitSuccess" statusCode:POOLSDK_NO_ERROR description:@"initSuccess" extendData:nil];
40 42
...@@ -43,6 +45,10 @@ int mExchange; ...@@ -43,6 +45,10 @@ int mExchange;
43 channelId = @"unknown"; 45 channelId = @"unknown";
44 } 46 }
45 [TrackingIO initWithappKey:[[PoolConfig getInstance] getValueByKey:@"renyunAppKey"] withChannelId:channelId]; 47 [TrackingIO initWithappKey:[[PoolConfig getInstance] getValueByKey:@"renyunAppKey"] withChannelId:channelId];
48 +
49 + //APPID APPKEY
50 + sdkAppId = [[PoolConfig getInstance] getValueByKey:@"APP_ID"];
51 + sdkAppKey =[[PoolConfig getInstance] getValueByKey:@"APP_KEY"];
46 } 52 }
47 53
48 /** 54 /**
...@@ -51,9 +57,11 @@ int mExchange; ...@@ -51,9 +57,11 @@ int mExchange;
51 - (void)SDKloginSDK 57 - (void)SDKloginSDK
52 { 58 {
53 NSLog(@"调用了LoginSDK"); 59 NSLog(@"调用了LoginSDK");
54 - NSString *appId = [[PoolConfig getInstance] getValueByKey:@"APP_ID"]; 60 + //NSString *appId = [[PoolConfig getInstance] getValueByKey:@"APP_ID"];
55 - NSString *appKey =[[PoolConfig getInstance] getValueByKey:@"APP_KEY"]; 61 + //NSString *appKey =[[PoolConfig getInstance] getValueByKey:@"APP_KEY"];
56 - [[HaibaoSDKMgr getInstance]startLogin:appId :appKey :self.controller]; 62 + NSLog(@"%@",sdkAppId);
63 + NSLog(@"%@",sdkAppId);
64 + [[XiongDiSDKMgr getInstance]startXiongDiLogin:sdkAppId :sdkAppKey :self.controller];
57 65
58 } 66 }
59 67
...@@ -64,9 +72,9 @@ int mExchange; ...@@ -64,9 +72,9 @@ int mExchange;
64 { 72 {
65 NSLog(@"loginchek"); 73 NSLog(@"loginchek");
66 PoolLoginInfo *loginInfo = [PoolLoginInfo alloc]; 74 PoolLoginInfo *loginInfo = [PoolLoginInfo alloc];
67 - loginInfo.openId = [[HaibaoLoginInfo getInstance]openId]; 75 + loginInfo.openId = [[XiongDiLoginInfo getInstance]openId];
68 - loginInfo.sign = [[HaibaoLoginInfo getInstance] token]; 76 + loginInfo.sign = [[XiongDiLoginInfo getInstance] token];
69 - loginInfo.timestamp = [HaibaoLoginInfo getInstance].timestamp; 77 + loginInfo.timestamp = [XiongDiLoginInfo getInstance].timestamp;
70 78
71 dispatch_async(dispatch_get_global_queue(0, 0), ^{ 79 dispatch_async(dispatch_get_global_queue(0, 0), ^{
72 [[PoolChecker getInstance] startCheck:loginInfo]; 80 [[PoolChecker getInstance] startCheck:loginInfo];
...@@ -90,15 +98,15 @@ int mExchange; ...@@ -90,15 +98,15 @@ int mExchange;
90 苹果支付结果回调 98 苹果支付结果回调
91 */ 99 */
92 100
93 -- (void)HaibaoToolCallBack:(NSNotification *)notification 101 +- (void)XiongDiToolCallBack:(NSNotification *)notification
94 { 102 {
95 NSDictionary* payResultDic = notification.object; 103 NSDictionary* payResultDic = notification.object;
96 104
97 - NSString* receiptStr = [payResultDic objectForKey:@"HaibaoToolResult"]; 105 + NSString* receiptStr = [payResultDic objectForKey:@"XiongDiToolResult"];
98 NSString* queryId = [payResultDic objectForKey:@"query_id"]; 106 NSString* queryId = [payResultDic objectForKey:@"query_id"];
99 107
100 NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil]; 108 NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
101 - NSString* result = [[NetCenter getInstance] httpPostSyn:[PoolUtils createPayUrl] :receiptDic]; 109 + NSString* result = [[NetCenter getInstance] httpPostSyn:[PoolUtils createGzyazfUrl] :receiptDic];
102 110
103 111
104 if([@"success" isEqualToString:result]){//确认订单成功 112 if([@"success" isEqualToString:result]){//确认订单成功
...@@ -127,10 +135,10 @@ int mExchange; ...@@ -127,10 +135,10 @@ int mExchange;
127 /** 135 /**
128 支付 创建订单 136 支付 创建订单
129 */ 137 */
130 -- (void)SDKpayWithPaymentInfo:(PoolCreateOrderInfo *)payInfo 138 +- (void)SDKgzyazfWithGzyazfmentInfo:(PoolCreateOrderInfo *)payInfo
131 { 139 {
132 mExchange = [payInfo exchange].intValue; 140 mExchange = [payInfo exchange].intValue;
133 - [super SDKpayWithPaymentInfo:payInfo]; 141 + [super SDKgzyazfWithGzyazfmentInfo:payInfo];
134 } 142 }
135 143
136 /** 144 /**
...@@ -193,7 +201,7 @@ int mExchange; ...@@ -193,7 +201,7 @@ int mExchange;
193 for (NSString* queryId in queryIdArray) { 201 for (NSString* queryId in queryIdArray) {
194 NSString* receiptStr = [userDefaults valueForKey:queryId]; 202 NSString* receiptStr = [userDefaults valueForKey:queryId];
195 NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil]; 203 NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
196 - NSString* result = [[NetCenter getInstance] httpPostSyn:[PoolUtils createPayUrl] :receiptDic]; 204 + NSString* result = [[NetCenter getInstance] httpPostSyn:[PoolUtils createGzyazfUrl] :receiptDic];
197 if([@"success" isEqualToString:result]){//成功 205 if([@"success" isEqualToString:result]){//成功
198 [userDefaults removeObjectForKey:queryId]; 206 [userDefaults removeObjectForKey:queryId];
199 }else{//补单失败 207 }else{//补单失败
...@@ -214,7 +222,7 @@ int mExchange; ...@@ -214,7 +222,7 @@ int mExchange;
214 - (void)receiveCreateOrder:(NSNotification *)notification 222 - (void)receiveCreateOrder:(NSNotification *)notification
215 { 223 {
216 NSLog(@"创建订单成功"); 224 NSLog(@"创建订单成功");
217 - PoolPayInfo *payInfo = [notification object]; 225 + PoolGzyazfInfo *payInfo = [notification object];
218 226
219 NSNumber *amount = @([[payInfo postAmount] integerValue] * mExchange); 227 NSNumber *amount = @([[payInfo postAmount] integerValue] * mExchange);
220 NSString *serverId = [payInfo serverId]; 228 NSString *serverId = [payInfo serverId];
...@@ -228,10 +236,10 @@ int mExchange; ...@@ -228,10 +236,10 @@ int mExchange;
228 NSString *other = [payInfo other]; 236 NSString *other = [payInfo other];
229 237
230 if (other && [other length] > 0) { 238 if (other && [other length] > 0) {
231 - [[HaibaoSDKMgr getInstance] startHimiko:serverId :roleName :amount :[payInfo queryId] :self.controller]; 239 + [[XiongDiSDKMgr getInstance] startXiongDiDelia:serverId :roleName :amount :[payInfo queryId] :self.controller];
232 }else{ 240 }else{
233 NSString* products = [payInfo products]; 241 NSString* products = [payInfo products];
234 - [[HaibaoSDKMgr getInstance] startWithHimiko:self.controller products:products amount:[payInfo postAmount] productName:[payInfo productName] queryId:queryId]; 242 + [[XiongDiSDKMgr getInstance] startWithXiongDiDelia:self.controller products:products amount:[payInfo postAmount] productName:[payInfo productName] queryId:queryId];
235 } 243 }
236 } 244 }
237 245
......
1 #import <UIKit/UIKit.h> 1 #import <UIKit/UIKit.h>
2 2
3 -@interface HaibaoGetWifiMac : NSObject 3 +@interface XiongDiGetWifiMac : NSObject
4 4
5 -+ (NSString *)macaddress; 5 ++ (NSString *)myMacAddress;
6 @end 6 @end
......
1 #import <Foundation/Foundation.h> 1 #import <Foundation/Foundation.h>
2 2
3 -@interface HaibaoLoginInfo : NSObject //用户uid 3 +@interface XiongDiLoginInfo : NSObject //用户uid
4 { 4 {
5 // 5 //
6 NSString *openId; 6 NSString *openId;
...@@ -14,5 +14,5 @@ NSString *timestamp; ...@@ -14,5 +14,5 @@ NSString *timestamp;
14 @property(retain,nonatomic) NSString *openId; 14 @property(retain,nonatomic) NSString *openId;
15 @property(retain,nonatomic) NSString *token; 15 @property(retain,nonatomic) NSString *token;
16 @property(retain,nonatomic) NSString *timestamp; 16 @property(retain,nonatomic) NSString *timestamp;
17 -+ (HaibaoLoginInfo *)getInstance; 17 ++ (XiongDiLoginInfo *)getInstance;
18 @end 18 @end
......
1 +#import <Foundation/Foundation.h>
2 +
3 +extern NSString * const XiongDiExitNotification; /**< 退出 */
4 +extern NSString * const XiongDiLoginNotification; /**< 登录完成的通知*/
5 +extern NSString * const XiongDiErrorNotification; /**< 出错 */
6 +
7 +
8 +@interface XiongDiNotifications : NSObject
9 +
10 +@end
1 +#import <UIKit/UIKit.h>
2 +#import "StoreKit/StoreKit.h"
3 +
4 +@interface XiongDiSDKMgr : NSObject
5 +{
6 + NSString* appId_;
7 + NSString* appKey_;
8 +
9 + NSString* inviterCode_;
10 +}
11 +
12 +@property bool banana;
13 +
14 ++ (XiongDiSDKMgr *)getInstance;
15 +- (void)initXiongDiSDK;
16 +
17 +- (void)startXiongDiLogin:(NSString *)appId : (NSString *)appKey : (UIViewController *)controller;
18 +
19 +- (void)setCoolStyleName:(NSString*)styleName;
20 +
21 +- (void)startXiongDiDelia: (NSString *)serverId : (NSString *)nickName : (NSNumber *)amount : (NSString *)callBack : (UIViewController *)controller;
22 +
23 +- (void)startWithXiongDiDelia:(UIViewController*)controll products:(NSString*)products amount:(NSString*)amount productName:(NSString*)productName queryId:(NSString*) queryId;
24 +
25 +
26 +
27 +@end
1 #import <UIKit/UIKit.h> 1 #import <UIKit/UIKit.h>
2 -#import "HaibaoLoginInfo.h" 2 +#import "XiongDiLoginInfo.h"
3 #import <JavaScriptCore/JavaScriptCore.h> 3 #import <JavaScriptCore/JavaScriptCore.h>
4 4
5 -@interface HaibaoViewController : UIViewController<UIWebViewDelegate,UIAlertViewDelegate> 5 +@interface XiongDiViewController : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
6 { 6 {
7 UIWebView *webView_; 7 UIWebView *webView_;
8 UIActivityIndicatorView *activityIndicator; 8 UIActivityIndicatorView *activityIndicator;
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
16 16
17 @property(assign) BOOL hasCorner; 17 @property(assign) BOOL hasCorner;
18 18
19 --(void)setView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight; 19 +-(void)setXiongDiView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
20 -- (void)initWebView; 20 +- (void)initXiongDiWebView;
21 - (void)loadWebPageWithString:(NSString *)url; 21 - (void)loadWebPageWithString:(NSString *)url;
22 - (void)loadWebPageWithJs:(NSString *)content; 22 - (void)loadWebPageWithJs:(NSString *)content;
23 - (void)postNotification:(NSString *)name : (NSString *)code; 23 - (void)postNotification:(NSString *)name : (NSString *)code;
......