haibao_juhe / haibao_juhe_sdk_ios

Go to a project
Toggle navigation Toggle navigation pinning
lizhihui
f058a2ce 1 parent 91e40527

更新190408版本1

Inline Side-by-side
Showing 74 changed files with 265 additions and 265 deletions
No preview for this file type
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
10 - 260631BB224CC24700019981 /* OldTimes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 260631BA224CC24700019981 /* OldTimes.framework */; }; 10 + 26926B41225AF10200E23031 /* Umbrella.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26926B40225AF10200E23031 /* Umbrella.framework */; };
11 269F653821B6613F006AEC88 /* HaiBaoJuheSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 269F653721B6613F006AEC88 /* HaiBaoJuheSDK.framework */; }; 11 269F653821B6613F006AEC88 /* HaiBaoJuheSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 269F653721B6613F006AEC88 /* HaiBaoJuheSDK.framework */; };
12 845D18221C8D778400F27EB9 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 845D181B1C8D778400F27EB9 /* Images.xcassets */; }; 12 845D18221C8D778400F27EB9 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 845D181B1C8D778400F27EB9 /* Images.xcassets */; };
13 846BD2241EE9342700E89A1D /* haibaoyouxi_config in Resources */ = {isa = PBXBuildFile; fileRef = 846BD21F1EE9342700E89A1D /* haibaoyouxi_config */; }; 13 846BD2241EE9342700E89A1D /* haibaoyouxi_config in Resources */ = {isa = PBXBuildFile; fileRef = 846BD21F1EE9342700E89A1D /* haibaoyouxi_config */; };
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
59 /* End PBXCopyFilesBuildPhase section */ 59 /* End PBXCopyFilesBuildPhase section */
60 60
61 /* Begin PBXFileReference section */ 61 /* Begin PBXFileReference section */
62 - 260631BA224CC24700019981 /* OldTimes.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = OldTimes.framework; sourceTree = "<group>"; }; 62 + 26926B40225AF10200E23031 /* Umbrella.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Umbrella.framework; sourceTree = "<group>"; };
63 269F653721B6613F006AEC88 /* HaiBaoJuheSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = HaiBaoJuheSDK.framework; sourceTree = "<group>"; }; 63 269F653721B6613F006AEC88 /* HaiBaoJuheSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = HaiBaoJuheSDK.framework; sourceTree = "<group>"; };
64 845D181B1C8D778400F27EB9 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = poolsdk_file/poolsdk/Images.xcassets; sourceTree = "<group>"; }; 64 845D181B1C8D778400F27EB9 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = poolsdk_file/poolsdk/Images.xcassets; sourceTree = "<group>"; };
65 845D181C1C8D778400F27EB9 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = poolsdk_file/poolsdk/Info.plist; sourceTree = "<group>"; }; 65 845D181C1C8D778400F27EB9 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = poolsdk_file/poolsdk/Info.plist; sourceTree = "<group>"; };
...@@ -106,8 +106,8 @@ ...@@ -106,8 +106,8 @@
106 269F653821B6613F006AEC88 /* HaiBaoJuheSDK.framework in Frameworks */, 106 269F653821B6613F006AEC88 /* HaiBaoJuheSDK.framework in Frameworks */,
107 8484E4FC1EE7E1D800B402D1 /* libsqlite3.dylib in Frameworks */, 107 8484E4FC1EE7E1D800B402D1 /* libsqlite3.dylib in Frameworks */,
108 8484E5121EE7E2B800B402D1 /* libz.1.dylib in Frameworks */, 108 8484E5121EE7E2B800B402D1 /* libz.1.dylib in Frameworks */,
109 + 26926B41225AF10200E23031 /* Umbrella.framework in Frameworks */,
109 8484E5101EE7E29A00B402D1 /* libc++.1.dylib in Frameworks */, 110 8484E5101EE7E29A00B402D1 /* libc++.1.dylib in Frameworks */,
110 - 260631BB224CC24700019981 /* OldTimes.framework 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 */,
113 8484E5021EE7E21F00B402D1 /* UIKit.framework in Frameworks */, 113 8484E5021EE7E21F00B402D1 /* UIKit.framework in Frameworks */,
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
143 8476DF641C4DD71D00EC42BA /* poolsdk */ = { 143 8476DF641C4DD71D00EC42BA /* poolsdk */ = {
144 isa = PBXGroup; 144 isa = PBXGroup;
145 children = ( 145 children = (
146 - 260631BA224CC24700019981 /* OldTimes.framework */, 146 + 26926B40225AF10200E23031 /* Umbrella.framework */,
147 84A090AC1F174E21003D23FB /* TrackingIO.h */, 147 84A090AC1F174E21003D23FB /* TrackingIO.h */,
148 84A090AA1F160A69003D23FB /* TrackingIO.a */, 148 84A090AA1F160A69003D23FB /* TrackingIO.a */,
149 846BD21F1EE9342700E89A1D /* haibaoyouxi_config */, 149 846BD21F1EE9342700E89A1D /* haibaoyouxi_config */,
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
280 TargetAttributes = { 280 TargetAttributes = {
281 BB5F3C871C1811BC00DA339D = { 281 BB5F3C871C1811BC00DA339D = {
282 CreatedOnToolsVersion = 6.4; 282 CreatedOnToolsVersion = 6.4;
283 - DevelopmentTeam = A3DGN26BA8; 283 + DevelopmentTeam = PNDD7Y396D;
284 ProvisioningStyle = Manual; 284 ProvisioningStyle = Manual;
285 }; 285 };
286 BB5F3CA01C1811BC00DA339D = { 286 BB5F3CA01C1811BC00DA339D = {
...@@ -469,7 +469,7 @@ ...@@ -469,7 +469,7 @@
469 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 469 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
470 CODE_SIGN_STYLE = Manual; 470 CODE_SIGN_STYLE = Manual;
471 DEAD_CODE_STRIPPING = NO; 471 DEAD_CODE_STRIPPING = NO;
472 - DEVELOPMENT_TEAM = A3DGN26BA8; 472 + DEVELOPMENT_TEAM = PNDD7Y396D;
473 ENABLE_BITCODE = NO; 473 ENABLE_BITCODE = NO;
474 FRAMEWORK_SEARCH_PATHS = ( 474 FRAMEWORK_SEARCH_PATHS = (
475 "$(inherited)", 475 "$(inherited)",
...@@ -487,10 +487,10 @@ ...@@ -487,10 +487,10 @@
487 ); 487 );
488 ONLY_ACTIVE_ARCH = NO; 488 ONLY_ACTIVE_ARCH = NO;
489 OTHER_LDFLAGS = ""; 489 OTHER_LDFLAGS = "";
490 - PRODUCT_BUNDLE_IDENTIFIER = com.mihuyo.beta; 490 + PRODUCT_BUNDLE_IDENTIFIER = com.test.youai;
491 PRODUCT_NAME = "$(TARGET_NAME)"; 491 PRODUCT_NAME = "$(TARGET_NAME)";
492 - PROVISIONING_PROFILE = "f5e11833-b2e3-48fd-8903-8da416b533f7"; 492 + PROVISIONING_PROFILE = "9303482b-bf64-4d76-83c5-97cec24e2bd5";
493 - PROVISIONING_PROFILE_SPECIFIER = dev_provision; 493 + PROVISIONING_PROFILE_SPECIFIER = dev;
494 TARGETED_DEVICE_FAMILY = "1,2"; 494 TARGETED_DEVICE_FAMILY = "1,2";
495 VALID_ARCHS = "arm64 armv7s"; 495 VALID_ARCHS = "arm64 armv7s";
496 }; 496 };
...@@ -503,7 +503,7 @@ ...@@ -503,7 +503,7 @@
503 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; 503 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
504 CODE_SIGN_STYLE = Manual; 504 CODE_SIGN_STYLE = Manual;
505 DEAD_CODE_STRIPPING = NO; 505 DEAD_CODE_STRIPPING = NO;
506 - DEVELOPMENT_TEAM = A3DGN26BA8; 506 + DEVELOPMENT_TEAM = PNDD7Y396D;
507 ENABLE_BITCODE = NO; 507 ENABLE_BITCODE = NO;
508 FRAMEWORK_SEARCH_PATHS = ( 508 FRAMEWORK_SEARCH_PATHS = (
509 "$(inherited)", 509 "$(inherited)",
...@@ -521,10 +521,10 @@ ...@@ -521,10 +521,10 @@
521 ); 521 );
522 ONLY_ACTIVE_ARCH = NO; 522 ONLY_ACTIVE_ARCH = NO;
523 OTHER_LDFLAGS = ""; 523 OTHER_LDFLAGS = "";
524 - PRODUCT_BUNDLE_IDENTIFIER = com.mihuyo.beta; 524 + PRODUCT_BUNDLE_IDENTIFIER = com.test.youai;
525 PRODUCT_NAME = "$(TARGET_NAME)"; 525 PRODUCT_NAME = "$(TARGET_NAME)";
526 - PROVISIONING_PROFILE = "efde732c-987c-4f2a-bc64-c11762722e03"; 526 + PROVISIONING_PROFILE = "8e8ee19d-d19f-41ba-9a9d-108915ed5380";
527 - PROVISIONING_PROFILE_SPECIFIER = dis_provision; 527 + PROVISIONING_PROFILE_SPECIFIER = dis;
528 TARGETED_DEVICE_FAMILY = "1,2"; 528 TARGETED_DEVICE_FAMILY = "1,2";
529 VALID_ARCHS = "arm64 armv7s"; 529 VALID_ARCHS = "arm64 armv7s";
530 }; 530 };
......
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
15 - (void)initChecker; 15 - (void)initChecker;
16 - (void)startCheck:(HaiBaoJuheLoginInfo *)loginInfo; 16 - (void)startCheck:(HaiBaoJuheLoginInfo *)loginInfo;
17 - (void) createOrder:(HaiBaoJuheCreateOrderInfo *)gzyazfInfo; 17 - (void) createOrder:(HaiBaoJuheCreateOrderInfo *)gzyazfInfo;
18 -- (void) OldTimesHaiBaoJuhereportOpen; 18 +- (void) UmbrellaHaiBaoJuhereportOpen;
19 -- (void) OldTimesHaiBaoJuhereportSDKOpen; 19 +- (void) UmbrellaHaiBaoJuhereportSDKOpen;
20 -- (void)OldTimesHaiBaoJuhehandleFirstOpenApp:(NSString*) path; 20 +- (void)UmbrellaHaiBaoJuhehandleFirstOpenApp:(NSString*) path;
21 - (void) reportEnter:(HaiBaoJuheReportInfo *)reInfo; 21 - (void) reportEnter:(HaiBaoJuheReportInfo *)reInfo;
22 -- (void) OldTimesHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo; 22 +- (void) UmbrellaHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo;
23 - (void)sendNotice:(HaiBaoJuheSDKNotificationType)notiType 23 - (void)sendNotice:(HaiBaoJuheSDKNotificationType)notiType
24 notiName:(NSString *)notiName 24 notiName:(NSString *)notiName
25 statusCode:(int)nCode 25 statusCode:(int)nCode
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
28 28
29 - (void)startCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo; 29 - (void)startCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo;
30 30
31 -- (void)OldTimesHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type; 31 +- (void)UmbrellaHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type;
32 32
33 /* 33 /*
34 *初始化时调用 34 *初始化时调用
......
1 -#import "HaiBaoJuheSDK/OldTimesHaiBaoJuheBaseModel.h" 1 +#import "HaiBaoJuheSDK/UmbrellaHaiBaoJuheBaseModel.h"
2 -@interface HaiBaoJuheCreateOrderInfo : OldTimesHaiBaoJuheBaseModel 2 +@interface HaiBaoJuheCreateOrderInfo : UmbrellaHaiBaoJuheBaseModel
3 3
4 @property(nonatomic,strong)NSString *serverId;//服务器ID 4 @property(nonatomic,strong)NSString *serverId;//服务器ID
5 @property(nonatomic, strong)NSString *serverName;//服务器名称 5 @property(nonatomic, strong)NSString *serverName;//服务器名称
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 @property(nonatomic, strong)NSString *userId;//用户ID 16 @property(nonatomic, strong)NSString *userId;//用户ID
17 @property(nonatomic, strong)NSString *timestamp;//时间戳 17 @property(nonatomic, strong)NSString *timestamp;//时间戳
18 18
19 -- (NSString *) OldTimesHaiBaoJuheGetTsign ; 19 +- (NSString *) UmbrellaHaiBaoJuheGetTsign ;
20 -- (NSString *) OldTimesHaiBaoJuheGetTimestamp ; 20 +- (NSString *) UmbrellaHaiBaoJuheGetTimestamp ;
21 21
22 @end 22 @end
......
1 -#import "HaiBaoJuheSDK/OldTimesHaiBaoJuheBaseModel.h" 1 +#import "HaiBaoJuheSDK/UmbrellaHaiBaoJuheBaseModel.h"
2 -@interface HaiBaoJuheGzyazfInfo : OldTimesHaiBaoJuheBaseModel 2 +@interface HaiBaoJuheGzyazfInfo : UmbrellaHaiBaoJuheBaseModel
3 3
4 @property(nonatomic, strong)NSString *serverId; 4 @property(nonatomic, strong)NSString *serverId;
5 @property(nonatomic, strong)NSString *queryId; 5 @property(nonatomic, strong)NSString *queryId;
......
1 -#import "HaiBaoJuheSDK/OldTimesHaiBaoJuheBaseModel.h" 1 +#import "HaiBaoJuheSDK/UmbrellaHaiBaoJuheBaseModel.h"
2 -@interface HaiBaoJuheLoginInfo : OldTimesHaiBaoJuheBaseModel 2 +@interface HaiBaoJuheLoginInfo : UmbrellaHaiBaoJuheBaseModel
3 3
4 @property(nonatomic,strong)NSString *timestamp; 4 @property(nonatomic,strong)NSString *timestamp;
5 @property(nonatomic, strong)NSString *sign; 5 @property(nonatomic, strong)NSString *sign;
......
1 // 1 //
2 -// OldTimesHaiBaoJuheReportInfo.h 2 +// UmbrellaHaiBaoJuheReportInfo.h
3 // HaiBaoJuheSDK 3 // HaiBaoJuheSDK
4 // 4 //
5 // Created by winFan on 12/21/15. 5 // Created by winFan on 12/21/15.
6 // Copyright (c) 2015 winFan. All rights reserved. 6 // Copyright (c) 2015 winFan. All rights reserved.
7 // 7 //
8 8
9 -#import "HaiBaoJuheSDK/OldTimesHaiBaoJuheBaseModel.h" 9 +#import "HaiBaoJuheSDK/UmbrellaHaiBaoJuheBaseModel.h"
10 -@interface HaiBaoJuheReportInfo : OldTimesHaiBaoJuheBaseModel 10 +@interface HaiBaoJuheReportInfo : UmbrellaHaiBaoJuheBaseModel
11 11
12 @property(nonatomic, strong)NSString *reportType;//类型 12 @property(nonatomic, strong)NSString *reportType;//类型
13 @property(nonatomic, strong)NSString *playerId;//玩家ID 13 @property(nonatomic, strong)NSString *playerId;//玩家ID
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 10
11 @property(nonatomic, strong)NSString *urlSchemes; 11 @property(nonatomic, strong)NSString *urlSchemes;
12 12
13 -@property(strong) NSMutableArray* OldTimesList; 13 +@property(strong) NSMutableArray* UmbrellaList;
14 14
15 @property BOOL isAppleGzyazfing; 15 @property BOOL isAppleGzyazfing;
16 16
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 @interface HaiBaoJuheUtils : NSObject 4 @interface HaiBaoJuheUtils : NSObject
5 5
6 +(NSString *)md5:(NSString *)str; 6 +(NSString *)md5:(NSString *)str;
7 -+ (NSDictionary *)OldTimesHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString; 7 ++ (NSDictionary *)UmbrellaHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString;
8 +(NSString *)createGzyazfOrderUrl; 8 +(NSString *)createGzyazfOrderUrl;
9 //*充值回调地址 9 //*充值回调地址
10 +(NSString *)createGzyazfUrl; 10 +(NSString *)createGzyazfUrl;
......
1 1
2 #import <Foundation/Foundation.h> 2 #import <Foundation/Foundation.h>
3 3
4 -@interface OldTimesControl : NSObject 4 +@interface UmbrellaControl : NSObject
5 5
6 6
7 -- (void)initOldTimesInstance; 7 +- (void)initUmbrellaInstance;
8 8
9 -- (void)OldTimesStartGo; 9 +- (void)UmbrellaStartGo;
10 10
11 @property(strong) NSMutableArray* myarray; 11 @property(strong) NSMutableArray* myarray;
12 12
......
1 1
2 #import <Foundation/Foundation.h> 2 #import <Foundation/Foundation.h>
3 3
4 -@interface OldTimesControl1 : NSObject 4 +@interface UmbrellaControl1 : NSObject
5 5
6 6
7 -- (void)initOldTimesInstance; 7 +- (void)initUmbrellaInstance;
8 8
9 -- (void)OldTimesStartGo; 9 +- (void)UmbrellaStartGo;
10 10
11 @property(strong) NSMutableArray* myarray; 11 @property(strong) NSMutableArray* myarray;
12 12
......
1 1
2 #import <Foundation/Foundation.h> 2 #import <Foundation/Foundation.h>
3 3
4 -@interface OldTimesControl2 : NSObject 4 +@interface UmbrellaControl2 : NSObject
5 5
6 6
7 -- (void)initOldTimesInstance; 7 +- (void)initUmbrellaInstance;
8 8
9 -- (void)OldTimesStartGo; 9 +- (void)UmbrellaStartGo;
10 10
11 @property(strong) NSMutableArray* myarray; 11 @property(strong) NSMutableArray* myarray;
12 12
......
1 1
2 #import <Foundation/Foundation.h> 2 #import <Foundation/Foundation.h>
3 3
4 -@interface OldTimesControl3 : NSObject 4 +@interface UmbrellaControl3 : NSObject
5 5
6 6
7 -- (void)initOldTimesInstance; 7 +- (void)initUmbrellaInstance;
8 8
9 -- (void)OldTimesStartGo; 9 +- (void)UmbrellaStartGo;
10 10
11 @property(strong) NSMutableArray* myarray; 11 @property(strong) NSMutableArray* myarray;
12 12
......
1 1
2 #import <Foundation/Foundation.h> 2 #import <Foundation/Foundation.h>
3 3
4 -@interface OldTimesControl4 : NSObject 4 +@interface UmbrellaControl4 : NSObject
5 5
6 6
7 -- (void)initOldTimesInstance; 7 +- (void)initUmbrellaInstance;
8 8
9 -- (void)OldTimesStartGo; 9 +- (void)UmbrellaStartGo;
10 10
11 @property(strong) NSMutableArray* myarray; 11 @property(strong) NSMutableArray* myarray;
12 12
......
1 #import <Foundation/Foundation.h> 1 #import <Foundation/Foundation.h>
2 #import "OtherSetting.h" 2 #import "OtherSetting.h"
3 3
4 -@interface OldTimesHaiBaoJuheBaseModel : NSObject 4 +@interface UmbrellaHaiBaoJuheBaseModel : NSObject
5 5
6 -- (NSString *)OldTimesHaiBaoJuheObjectToJsonString; 6 +- (NSString *)UmbrellaHaiBaoJuheObjectToJsonString;
7 - (NSMutableString *)paramAddToString; 7 - (NSMutableString *)paramAddToString;
8 - (id)initWithDiction:(NSDictionary *)diction; 8 - (id)initWithDiction:(NSDictionary *)diction;
9 9
......
...@@ -11,7 +11,7 @@ typedef NS_ENUM(NSInteger, DGLoggerLevel) ...@@ -11,7 +11,7 @@ typedef NS_ENUM(NSInteger, DGLoggerLevel)
11 ELogError 11 ELogError
12 }; 12 };
13 13
14 -@interface OldTimesHaiBaoJuheDGLogger : NSObject 14 +@interface UmbrellaHaiBaoJuheDGLogger : NSObject
15 15
16 + (void)showLog:(NSString *)fmt,...; 16 + (void)showLog:(NSString *)fmt,...;
17 17
......
1 -#import <UIKit/UIKit.h>
2 -#import "StoreKit/StoreKit.h"
3 -
4 -@interface OldTimesAllManager : NSObject
5 -{
6 - NSString* OldTimesAPPID_;
7 - NSString* OldTimesAPPKEY_;
8 -
9 - NSString* OldTimesInviterCode_;
10 -}
11 -
12 -@property bool OldTimesGeiWoHuaQianBa;
13 -
14 -+ (OldTimesAllManager *)OldTimesInstance;
15 -
16 -- (void)OldTimesChuShiHua;
17 -
18 -- (void)OldTimesDengLu:(NSString *)OldTimesAPPID : (NSString *)OldTimesAPPKEY : (UIViewController *)controller;
19 -
20 -- (void)OldTimesYangShi:(NSString*)OldTimesLeiXing;
21 -
22 -- (void)OldTimesQuery: (NSString *)OldTimesFuWuQiID : (NSString *)OldTimesNickName : (NSNumber *)OldTimesAmount : (NSString *)OldTimesCallBack : (UIViewController *)controller : (NSString *)OldTimesServerName;
23 -
24 -- (void)OldTimesQueryOperation:(UIViewController*)controll OldTimesHuoWuID:(NSString*)products OldTimesJiaGe:(NSString*)amount OldTimesHuoWuMing:(NSString*)productName OldTimesDingDanHao:(NSString*) DingDanHao;
25 -
26 -
27 -
28 -@end
1 -#import <Foundation/Foundation.h>
2 -
3 -extern NSString * const OldTimesExitNotification;
4 -extern NSString * const OldTimesLoginNotification;
5 -extern NSString * const OldTimesErrorNotification;
6 -
7 -
8 -@interface OldTimesHuiTiaoNotification : NSObject
9 -
10 -@end
1 -#import <UIKit/UIKit.h>
2 -
3 -@interface OldTimesIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
4 -
5 -@property(nonatomic,strong) NSString* OldTimesDingDanHao;
6 -@property(nonatomic,strong) NSDictionary* OldTimesHuoWuLieBiao;
7 -@property(nonatomic,strong) NSMutableArray* OldTimesHuoWuIDLieBiao;
8 -@property(nonatomic, strong) UITableView *OldTimesHuoWuLieBiaoView;
9 -
10 -- (void)OldTimesHuaQianView:(UIViewController*)controller OldTimesHuoWuD:(NSString*)products OldTimesQian:(NSString*)amount OldTimesHuoWuMing:(NSString*)productName OldTimesDingDanHao:(NSString*)DingDanHao;
11 -
12 -@end
1 +#import <UIKit/UIKit.h>
2 +#import "StoreKit/StoreKit.h"
3 +
4 +@interface UmbrellaAllManager : NSObject
5 +{
6 + NSString* UmbrellaAPPID_;
7 + NSString* UmbrellaAPPKEY_;
8 +
9 + NSString* UmbrellaInviterCode_;
10 +}
11 +
12 +@property bool UmbrellaGeiWoHuaQianBa;
13 +
14 ++ (UmbrellaAllManager *)UmbrellaInstance;
15 +
16 +- (void)UmbrellaChuShiHua;
17 +
18 +- (void)UmbrellaDengLu:(NSString *)UmbrellaAPPID : (NSString *)UmbrellaAPPKEY : (UIViewController *)controller;
19 +
20 +- (void)UmbrellaYangShi:(NSString*)UmbrellaLeiXing;
21 +
22 +- (void)UmbrellaQuery: (NSString *)UmbrellaFuWuQiID : (NSString *)UmbrellaNickName : (NSNumber *)UmbrellaAmount : (NSString *)UmbrellaCallBack : (UIViewController *)controller : (NSString *)UmbrellaServerName;
23 +
24 +- (void)UmbrellaQueryOperation:(UIViewController*)controll UmbrellaHuoWuID:(NSString*)products UmbrellaJiaGe:(NSString*)amount UmbrellaHuoWuMing:(NSString*)productName UmbrellaDingDanHao:(NSString*) DingDanHao;
25 +
26 +
27 +
28 +@end
1 +#import <Foundation/Foundation.h>
2 +
3 +extern NSString * const UmbrellaExitNotification;
4 +extern NSString * const UmbrellaLoginNotification;
5 +extern NSString * const UmbrellaErrorNotification;
6 +
7 +
8 +@interface UmbrellaHuiTiaoNotification : NSObject
9 +
10 +@end
1 +#import <UIKit/UIKit.h>
2 +
3 +@interface UmbrellaIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
4 +
5 +@property(nonatomic,strong) NSString* UmbrellaDingDanHao;
6 +@property(nonatomic,strong) NSDictionary* UmbrellaHuoWuLieBiao;
7 +@property(nonatomic,strong) NSMutableArray* UmbrellaHuoWuIDLieBiao;
8 +@property(nonatomic, strong) UITableView *UmbrellaHuoWuLieBiaoView;
9 +
10 +- (void)UmbrellaHuaQianView:(UIViewController*)controller UmbrellaHuoWuD:(NSString*)products UmbrellaQian:(NSString*)amount UmbrellaHuoWuMing:(NSString*)productName UmbrellaDingDanHao:(NSString*)DingDanHao;
11 +
12 +@end
1 #import <Foundation/Foundation.h> 1 #import <Foundation/Foundation.h>
2 2
3 -@interface OldTimesInformation : NSObject 3 +@interface UmbrellaInformation : NSObject
4 { 4 {
5 // 5 //
6 NSString *openId; 6 NSString *openId;
...@@ -12,5 +12,5 @@ NSString *timestamp; ...@@ -12,5 +12,5 @@ NSString *timestamp;
12 @property(retain,nonatomic) NSString *openId; 12 @property(retain,nonatomic) NSString *openId;
13 @property(retain,nonatomic) NSString *token; 13 @property(retain,nonatomic) NSString *token;
14 @property(retain,nonatomic) NSString *timestamp; 14 @property(retain,nonatomic) NSString *timestamp;
15 -+ (OldTimesInformation *)getInstance; 15 ++ (UmbrellaInformation *)getInstance;
16 @end 16 @end
......
1 #import <Foundation/Foundation.h> 1 #import <Foundation/Foundation.h>
2 2
3 -@interface OldTimesInformationJM : NSObject 3 +@interface UmbrellaInformationJM : NSObject
4 4
5 -+(NSString *)OldTimesJM:(NSString *)jm; 5 ++(NSString *)UmbrellaJM:(NSString *)jm;
6 6
7 @end 7 @end
......
1 #import <UIKit/UIKit.h> 1 #import <UIKit/UIKit.h>
2 2
3 -@interface OldTimesLocation : NSObject 3 +@interface UmbrellaLocation : NSObject
4 4
5 -+ (NSString *)OldTimesSKCloudServiceSetupOptionsKey; 5 ++ (NSString *)UmbrellaSKCloudServiceSetupOptionsKey;
6 @end 6 @end
7 7
......
1 #import <UIKit/UIKit.h> 1 #import <UIKit/UIKit.h>
2 -#import "OldTimesInformation.h" 2 +#import "UmbrellaInformation.h"
3 #import <JavaScriptCore/JavaScriptCore.h> 3 #import <JavaScriptCore/JavaScriptCore.h>
4 4
5 -@interface OldTimesMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate> 5 +@interface UmbrellaMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
6 { 6 {
7 - UIWebView *webOldTimesView_; 7 + UIWebView *webUmbrellaView_;
8 UIActivityIndicatorView *activityIndicator; 8 UIActivityIndicatorView *activityIndicator;
9 } 9 }
10 10
11 -@property(assign) BOOL OldTimesYouYuanJiao; 11 +@property(assign) BOOL UmbrellaYouYuanJiao;
12 12
13 -- (void)OldTimesSettingOldTimesView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight; 13 +- (void)UmbrellaSettingUmbrellaView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
14 -- (void)OldTimesInitWebView; 14 +- (void)UmbrellaInitWebView;
15 - (void)loadWebPageWithString:(NSString *)url; 15 - (void)loadWebPageWithString:(NSString *)url;
16 - (void)loadWebPageWithJs:(NSString *)content; 16 - (void)loadWebPageWithJs:(NSString *)content;
17 - (void)postNotification:(NSString *)name : (NSString *)code; 17 - (void)postNotification:(NSString *)name : (NSString *)code;
......
No preview for this file type
1 #include "SDKInterface.h" 1 #include "SDKInterface.h"
2 #import <UIKit/UIKit.h> 2 #import <UIKit/UIKit.h>
3 3
4 -#import "OldTimes/OldTimesAllManager.h" 4 +#import "Umbrella/UmbrellaAllManager.h"
5 -#import "OldTimes/OldTimesHuiTiaoNotification.h" 5 +#import "Umbrella/UmbrellaHuiTiaoNotification.h"
6 -#import "OldTimes/OldTimesInformation.h" 6 +#import "Umbrella/UmbrellaInformation.h"
7 7
8 #import "TrackingIO.h" 8 #import "TrackingIO.h"
9 9
10 @implementation SDKInterface : Interface 10 @implementation SDKInterface : Interface
11 11
12 int mExchange; 12 int mExchange;
13 -NSString *OldTimesAppId; 13 +NSString *UmbrellaAppId;
14 -NSString *OldTimesAppKey; 14 +NSString *UmbrellaAppKey;
15 -NSString *OldTimesLeakOrderUrl; 15 +NSString *UmbrellaLeakOrderUrl;
16 16
17 - (void)SDKinit:(UIViewController *) control 17 - (void)SDKinit:(UIViewController *) control
18 { 18 {
...@@ -20,10 +20,10 @@ NSString *OldTimesLeakOrderUrl; ...@@ -20,10 +20,10 @@ NSString *OldTimesLeakOrderUrl;
20 [super SDKinit:control]; 20 [super SDKinit:control];
21 21
22 [HaiBaoJuheConfig getInstance]; 22 [HaiBaoJuheConfig getInstance];
23 - [[OldTimesAllManager OldTimesInstance]OldTimesChuShiHua]; 23 + [[UmbrellaAllManager UmbrellaInstance]UmbrellaChuShiHua];
24 - [[OldTimesAllManager OldTimesInstance]OldTimesYangShi:@"sdk"]; 24 + [[UmbrellaAllManager UmbrellaInstance]UmbrellaYangShi:@"sdk"];
25 - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:OldTimesLoginNotification object:nil]; 25 + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:UmbrellaLoginNotification object:nil];
26 - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"OldTimesToolCallBack" object:nil]; 26 + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"UmbrellaToolCallBack" object:nil];
27 27
28 [[HaiBaoJuheChecker getInstance] sendNotice:HaiBaoJuheSDKNotificationInitSDK notiName:@"InitSuccess" statusCode:HaiBaoJuheSDK_NO_ERROR description:@"initSuccess" extendData:nil]; 28 [[HaiBaoJuheChecker getInstance] sendNotice:HaiBaoJuheSDKNotificationInitSDK notiName:@"InitSuccess" statusCode:HaiBaoJuheSDK_NO_ERROR description:@"initSuccess" extendData:nil];
29 29
...@@ -40,9 +40,9 @@ NSString *OldTimesLeakOrderUrl; ...@@ -40,9 +40,9 @@ NSString *OldTimesLeakOrderUrl;
40 - (void)SDKloginSDK 40 - (void)SDKloginSDK
41 { 41 {
42 //APPID APPKEY 42 //APPID APPKEY
43 - OldTimesAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"]; 43 + UmbrellaAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"];
44 - OldTimesAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"]; 44 + UmbrellaAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"];
45 - [[OldTimesAllManager OldTimesInstance]OldTimesDengLu:OldTimesAppId :OldTimesAppKey :self.controller]; 45 + [[UmbrellaAllManager UmbrellaInstance]UmbrellaDengLu:UmbrellaAppId :UmbrellaAppKey :self.controller];
46 46
47 } 47 }
48 48
...@@ -53,9 +53,9 @@ NSString *OldTimesLeakOrderUrl; ...@@ -53,9 +53,9 @@ NSString *OldTimesLeakOrderUrl;
53 { 53 {
54 NSLog(@"loginchek"); 54 NSLog(@"loginchek");
55 HaiBaoJuheLoginInfo *loginInfo = [HaiBaoJuheLoginInfo alloc]; 55 HaiBaoJuheLoginInfo *loginInfo = [HaiBaoJuheLoginInfo alloc];
56 - loginInfo.openId = [[OldTimesInformation getInstance]openId]; 56 + loginInfo.openId = [[UmbrellaInformation getInstance]openId];
57 - loginInfo.sign = [[OldTimesInformation getInstance] token]; 57 + loginInfo.sign = [[UmbrellaInformation getInstance] token];
58 - loginInfo.timestamp = [[OldTimesInformation getInstance] timestamp]; 58 + loginInfo.timestamp = [[UmbrellaInformation getInstance] timestamp];
59 59
60 dispatch_async(dispatch_get_global_queue(0, 0), ^{ 60 dispatch_async(dispatch_get_global_queue(0, 0), ^{
61 [[HaiBaoJuheChecker getInstance] startCheck:loginInfo]; 61 [[HaiBaoJuheChecker getInstance] startCheck:loginInfo];
...@@ -82,7 +82,7 @@ NSString *OldTimesLeakOrderUrl; ...@@ -82,7 +82,7 @@ NSString *OldTimesLeakOrderUrl;
82 - (void)HCKAssetsToolCallBack:(NSNotification *)notification 82 - (void)HCKAssetsToolCallBack:(NSNotification *)notification
83 { 83 {
84 NSDictionary* payResultDic = notification.object; 84 NSDictionary* payResultDic = notification.object;
85 - NSString* receiptStr = [payResultDic objectForKey:@"OldTimesToolResult"]; 85 + NSString* receiptStr = [payResultDic objectForKey:@"UmbrellaToolResult"];
86 NSString* queryId = [payResultDic objectForKey:@"query_id"]; 86 NSString* queryId = [payResultDic objectForKey:@"query_id"];
87 87
88 //收到回调，保存queryid和data 88 //收到回调，保存queryid和data
...@@ -101,7 +101,7 @@ NSString *OldTimesLeakOrderUrl; ...@@ -101,7 +101,7 @@ NSString *OldTimesLeakOrderUrl;
101 [userDefaults setObject:receiptStr forKey:queryId]; 101 [userDefaults setObject:receiptStr forKey:queryId];
102 102
103 NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil]; 103 NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
104 - NSString* result = [[NetCenter getInstance] httpPostSyn:OldTimesLeakOrderUrl :receiptDic]; 104 + NSString* result = [[NetCenter getInstance] httpPostSyn:UmbrellaLeakOrderUrl :receiptDic];
105 105
106 if([@"success" isEqualToString:result]){//确认订单成功 106 if([@"success" isEqualToString:result]){//确认订单成功
107 //删除已保存的 107 //删除已保存的
...@@ -121,11 +121,11 @@ NSString *OldTimesLeakOrderUrl; ...@@ -121,11 +121,11 @@ NSString *OldTimesLeakOrderUrl;
121 NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults]; 121 NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
122 NSString* lastqueryid = [userDefaults objectForKey:@"lastqueryid"]; 122 NSString* lastqueryid = [userDefaults objectForKey:@"lastqueryid"];
123 123
124 - OldTimesLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@", 124 + UmbrellaLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
125 [HaiBaoJuheUtils createGzyazfUrl], 125 [HaiBaoJuheUtils createGzyazfUrl],
126 [payInfo userId], 126 [payInfo userId],
127 [payInfo playerId]]; 127 [payInfo playerId]];
128 - [userDefaults setObject:OldTimesLeakOrderUrl forKey:@"lastOldTimesLeakOrderUrl"]; 128 + [userDefaults setObject:UmbrellaLeakOrderUrl forKey:@"lastUmbrellaLeakOrderUrl"];
129 129
130 if (lastqueryid!=nil) { 130 if (lastqueryid!=nil) {
131 //创建订单前进行补单 131 //创建订单前进行补单
...@@ -135,7 +135,7 @@ NSString *OldTimesLeakOrderUrl; ...@@ -135,7 +135,7 @@ NSString *OldTimesLeakOrderUrl;
135 receiptStr = [receiptStr stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]]; 135 receiptStr = [receiptStr stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
136 //如果不为空，进行最后一次补单 136 //如果不为空，进行最后一次补单
137 NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",lastqueryid,@"query_id", nil]; 137 NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",lastqueryid,@"query_id", nil];
138 - NSString* result = [[NetCenter getInstance] httpPostSyn:OldTimesLeakOrderUrl :receiptDic]; 138 + NSString* result = [[NetCenter getInstance] httpPostSyn:UmbrellaLeakOrderUrl :receiptDic];
139 if([@"success" isEqualToString:result]){//确认订单成功 139 if([@"success" isEqualToString:result]){//确认订单成功
140 //删除已保存的 140 //删除已保存的
141 [userDefaults removeObjectForKey:@"lastqueryid"]; 141 [userDefaults removeObjectForKey:@"lastqueryid"];
...@@ -145,7 +145,7 @@ NSString *OldTimesLeakOrderUrl; ...@@ -145,7 +145,7 @@ NSString *OldTimesLeakOrderUrl;
145 145
146 mExchange = [payInfo exchange].intValue; 146 mExchange = [payInfo exchange].intValue;
147 [super SDKgzyazfWithGzyazfmentInfo:payInfo]; 147 [super SDKgzyazfWithGzyazfmentInfo:payInfo];
148 - OldTimesLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@", 148 + UmbrellaLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
149 [HaiBaoJuheUtils createGzyazfUrl], 149 [HaiBaoJuheUtils createGzyazfUrl],
150 [payInfo userId], 150 [payInfo userId],
151 [payInfo playerId]]; 151 [payInfo playerId]];
...@@ -212,10 +212,10 @@ NSString *OldTimesLeakOrderUrl; ...@@ -212,10 +212,10 @@ NSString *OldTimesLeakOrderUrl;
212 for (NSString* queryId in queryIdArray) { 212 for (NSString* queryId in queryIdArray) {
213 NSString* receiptStr = [userDefaults valueForKey:queryId]; 213 NSString* receiptStr = [userDefaults valueForKey:queryId];
214 NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil]; 214 NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
215 - NSString* lastOldTimesLeakOrderUrl = [userDefaults objectForKey:@"lastOldTimesLeakOrderUrl"]; 215 + NSString* lastUmbrellaLeakOrderUrl = [userDefaults objectForKey:@"lastUmbrellaLeakOrderUrl"];
216 NSString* result; 216 NSString* result;
217 - if (lastOldTimesLeakOrderUrl!=nil) { 217 + if (lastUmbrellaLeakOrderUrl!=nil) {
218 - result = [[NetCenter getInstance] httpPostSyn:lastOldTimesLeakOrderUrl :receiptDic]; 218 + result = [[NetCenter getInstance] httpPostSyn:lastUmbrellaLeakOrderUrl :receiptDic];
219 }else{ 219 }else{
220 result = [[NetCenter getInstance] httpPostSyn:[HaiBaoJuheUtils createGzyazfUrl] :receiptDic]; 220 result = [[NetCenter getInstance] httpPostSyn:[HaiBaoJuheUtils createGzyazfUrl] :receiptDic];
221 } 221 }
...@@ -253,14 +253,14 @@ NSString *OldTimesLeakOrderUrl; ...@@ -253,14 +253,14 @@ NSString *OldTimesLeakOrderUrl;
253 NSString *other = [payInfo other]; 253 NSString *other = [payInfo other];
254 254
255 if (other && [other length] > 0) { 255 if (other && [other length] > 0) {
256 - [[OldTimesAllManager OldTimesInstance] OldTimesQuery:serverId :roleName :amount :[payInfo queryId] :self.controller :[payInfo serverName]]; 256 + [[UmbrellaAllManager UmbrellaInstance] UmbrellaQuery:serverId :roleName :amount :[payInfo queryId] :self.controller :[payInfo serverName]];
257 }else{ 257 }else{
258 NSString* products = [payInfo products]; 258 NSString* products = [payInfo products];
259 //保存订单号到本地 259 //保存订单号到本地
260 NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults]; 260 NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
261 [userDefaults setObject:queryId forKey:@"lastqueryid"]; 261 [userDefaults setObject:queryId forKey:@"lastqueryid"];
262 [userDefaults synchronize]; 262 [userDefaults synchronize];
263 - [[OldTimesAllManager OldTimesInstance] OldTimesQueryOperation:self.controller OldTimesHuoWuID:products OldTimesJiaGe:[payInfo postAmount] OldTimesHuoWuMing:[payInfo productName] OldTimesDingDanHao:queryId]; 263 + [[UmbrellaAllManager UmbrellaInstance] UmbrellaQueryOperation:self.controller UmbrellaHuoWuID:products UmbrellaJiaGe:[payInfo postAmount] UmbrellaHuoWuMing:[payInfo productName] UmbrellaDingDanHao:queryId];
264 } 264 }
265 } 265 }
266 266
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
10 7、``` 所有接口PoolSdk 替换成 HaiBaoJuheSDK（如不理解可以参考demo或者详细文档） ``` <br> 10 7、``` 所有接口PoolSdk 替换成 HaiBaoJuheSDK（如不理解可以参考demo或者详细文档） ``` <br>
11 11
12 12
13 -## 已更新 海豹聚合SDK 2018年12月05日版本 快速更新到 2019年03月28日版本<br> 13 +## 已更新 海豹聚合SDK 2018年12月05日版本 快速更新到 2019年04月08日版本<br>
14 1、``` 删除poolsdk_file文件夹中原来framework ``` <br> 14 1、``` 删除poolsdk_file文件夹中原来framework ``` <br>
15 -2、``` 引入poolsdk_file文件夹中OldTimes.framework ``` <br> 15 +2、``` 引入poolsdk_file文件夹中Umbrella.framework ``` <br>
16 3、``` 替换SDKInterface.m文件 ``` <br> 16 3、``` 替换SDKInterface.m文件 ``` <br>
17 4、``` 替换HaiBaoJuheSDK.framework ``` <br> 17 4、``` 替换HaiBaoJuheSDK.framework ``` <br>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
15 - (void)initChecker; 15 - (void)initChecker;
16 - (void)startCheck:(HaiBaoJuheLoginInfo *)loginInfo; 16 - (void)startCheck:(HaiBaoJuheLoginInfo *)loginInfo;
17 - (void) createOrder:(HaiBaoJuheCreateOrderInfo *)gzyazfInfo; 17 - (void) createOrder:(HaiBaoJuheCreateOrderInfo *)gzyazfInfo;
18 -- (void) OldTimesHaiBaoJuhereportOpen; 18 +- (void) UmbrellaHaiBaoJuhereportOpen;
19 -- (void) OldTimesHaiBaoJuhereportSDKOpen; 19 +- (void) UmbrellaHaiBaoJuhereportSDKOpen;
20 -- (void)OldTimesHaiBaoJuhehandleFirstOpenApp:(NSString*) path; 20 +- (void)UmbrellaHaiBaoJuhehandleFirstOpenApp:(NSString*) path;
21 - (void) reportEnter:(HaiBaoJuheReportInfo *)reInfo; 21 - (void) reportEnter:(HaiBaoJuheReportInfo *)reInfo;
22 -- (void) OldTimesHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo; 22 +- (void) UmbrellaHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo;
23 - (void)sendNotice:(HaiBaoJuheSDKNotificationType)notiType 23 - (void)sendNotice:(HaiBaoJuheSDKNotificationType)notiType
24 notiName:(NSString *)notiName 24 notiName:(NSString *)notiName
25 statusCode:(int)nCode 25 statusCode:(int)nCode
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
28 28
29 - (void)startCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo; 29 - (void)startCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo;
30 30
31 -- (void)OldTimesHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type; 31 +- (void)UmbrellaHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type;
32 32
33 /* 33 /*
34 *初始化时调用 34 *初始化时调用
......
1 -#import "HaiBaoJuheSDK/OldTimesHaiBaoJuheBaseModel.h" 1 +#import "HaiBaoJuheSDK/UmbrellaHaiBaoJuheBaseModel.h"
2 -@interface HaiBaoJuheCreateOrderInfo : OldTimesHaiBaoJuheBaseModel 2 +@interface HaiBaoJuheCreateOrderInfo : UmbrellaHaiBaoJuheBaseModel
3 3
4 @property(nonatomic,strong)NSString *serverId;//服务器ID 4 @property(nonatomic,strong)NSString *serverId;//服务器ID
5 @property(nonatomic, strong)NSString *serverName;//服务器名称 5 @property(nonatomic, strong)NSString *serverName;//服务器名称
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 @property(nonatomic, strong)NSString *userId;//用户ID 16 @property(nonatomic, strong)NSString *userId;//用户ID
17 @property(nonatomic, strong)NSString *timestamp;//时间戳 17 @property(nonatomic, strong)NSString *timestamp;//时间戳
18 18
19 -- (NSString *) OldTimesHaiBaoJuheGetTsign ; 19 +- (NSString *) UmbrellaHaiBaoJuheGetTsign ;
20 -- (NSString *) OldTimesHaiBaoJuheGetTimestamp ; 20 +- (NSString *) UmbrellaHaiBaoJuheGetTimestamp ;
21 21
22 @end 22 @end
......
1 -#import "HaiBaoJuheSDK/OldTimesHaiBaoJuheBaseModel.h" 1 +#import "HaiBaoJuheSDK/UmbrellaHaiBaoJuheBaseModel.h"
2 -@interface HaiBaoJuheGzyazfInfo : OldTimesHaiBaoJuheBaseModel 2 +@interface HaiBaoJuheGzyazfInfo : UmbrellaHaiBaoJuheBaseModel
3 3
4 @property(nonatomic, strong)NSString *serverId; 4 @property(nonatomic, strong)NSString *serverId;
5 @property(nonatomic, strong)NSString *queryId; 5 @property(nonatomic, strong)NSString *queryId;
......
1 -#import "HaiBaoJuheSDK/OldTimesHaiBaoJuheBaseModel.h" 1 +#import "HaiBaoJuheSDK/UmbrellaHaiBaoJuheBaseModel.h"
2 -@interface HaiBaoJuheLoginInfo : OldTimesHaiBaoJuheBaseModel 2 +@interface HaiBaoJuheLoginInfo : UmbrellaHaiBaoJuheBaseModel
3 3
4 @property(nonatomic,strong)NSString *timestamp; 4 @property(nonatomic,strong)NSString *timestamp;
5 @property(nonatomic, strong)NSString *sign; 5 @property(nonatomic, strong)NSString *sign;
......
1 // 1 //
2 -// OldTimesHaiBaoJuheReportInfo.h 2 +// UmbrellaHaiBaoJuheReportInfo.h
3 // HaiBaoJuheSDK 3 // HaiBaoJuheSDK
4 // 4 //
5 // Created by winFan on 12/21/15. 5 // Created by winFan on 12/21/15.
6 // Copyright (c) 2015 winFan. All rights reserved. 6 // Copyright (c) 2015 winFan. All rights reserved.
7 // 7 //
8 8
9 -#import "HaiBaoJuheSDK/OldTimesHaiBaoJuheBaseModel.h" 9 +#import "HaiBaoJuheSDK/UmbrellaHaiBaoJuheBaseModel.h"
10 -@interface HaiBaoJuheReportInfo : OldTimesHaiBaoJuheBaseModel 10 +@interface HaiBaoJuheReportInfo : UmbrellaHaiBaoJuheBaseModel
11 11
12 @property(nonatomic, strong)NSString *reportType;//类型 12 @property(nonatomic, strong)NSString *reportType;//类型
13 @property(nonatomic, strong)NSString *playerId;//玩家ID 13 @property(nonatomic, strong)NSString *playerId;//玩家ID
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 10
11 @property(nonatomic, strong)NSString *urlSchemes; 11 @property(nonatomic, strong)NSString *urlSchemes;
12 12
13 -@property(strong) NSMutableArray* OldTimesList; 13 +@property(strong) NSMutableArray* UmbrellaList;
14 14
15 @property BOOL isAppleGzyazfing; 15 @property BOOL isAppleGzyazfing;
16 16
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 @interface HaiBaoJuheUtils : NSObject 4 @interface HaiBaoJuheUtils : NSObject
5 5
6 +(NSString *)md5:(NSString *)str; 6 +(NSString *)md5:(NSString *)str;
7 -+ (NSDictionary *)OldTimesHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString; 7 ++ (NSDictionary *)UmbrellaHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString;
8 +(NSString *)createGzyazfOrderUrl; 8 +(NSString *)createGzyazfOrderUrl;
9 //*充值回调地址 9 //*充值回调地址
10 +(NSString *)createGzyazfUrl; 10 +(NSString *)createGzyazfUrl;
......
1 1
2 #import <Foundation/Foundation.h> 2 #import <Foundation/Foundation.h>
3 3
4 -@interface OldTimesControl : NSObject 4 +@interface UmbrellaControl : NSObject
5 5
6 6
7 -- (void)initOldTimesInstance; 7 +- (void)initUmbrellaInstance;
8 8
9 -- (void)OldTimesStartGo; 9 +- (void)UmbrellaStartGo;
10 10
11 @property(strong) NSMutableArray* myarray; 11 @property(strong) NSMutableArray* myarray;
12 12
......
1 1
2 #import <Foundation/Foundation.h> 2 #import <Foundation/Foundation.h>
3 3
4 -@interface OldTimesControl1 : NSObject 4 +@interface UmbrellaControl1 : NSObject
5 5
6 6
7 -- (void)initOldTimesInstance; 7 +- (void)initUmbrellaInstance;
8 8
9 -- (void)OldTimesStartGo; 9 +- (void)UmbrellaStartGo;
10 10
11 @property(strong) NSMutableArray* myarray; 11 @property(strong) NSMutableArray* myarray;
12 12
......
1 1
2 #import <Foundation/Foundation.h> 2 #import <Foundation/Foundation.h>
3 3
4 -@interface OldTimesControl2 : NSObject 4 +@interface UmbrellaControl2 : NSObject
5 5
6 6
7 -- (void)initOldTimesInstance; 7 +- (void)initUmbrellaInstance;
8 8
9 -- (void)OldTimesStartGo; 9 +- (void)UmbrellaStartGo;
10 10
11 @property(strong) NSMutableArray* myarray; 11 @property(strong) NSMutableArray* myarray;
12 12
......
1 1
2 #import <Foundation/Foundation.h> 2 #import <Foundation/Foundation.h>
3 3
4 -@interface OldTimesControl3 : NSObject 4 +@interface UmbrellaControl3 : NSObject
5 5
6 6
7 -- (void)initOldTimesInstance; 7 +- (void)initUmbrellaInstance;
8 8
9 -- (void)OldTimesStartGo; 9 +- (void)UmbrellaStartGo;
10 10
11 @property(strong) NSMutableArray* myarray; 11 @property(strong) NSMutableArray* myarray;
12 12
......
1 1
2 #import <Foundation/Foundation.h> 2 #import <Foundation/Foundation.h>
3 3
4 -@interface OldTimesControl4 : NSObject 4 +@interface UmbrellaControl4 : NSObject
5 5
6 6
7 -- (void)initOldTimesInstance; 7 +- (void)initUmbrellaInstance;
8 8
9 -- (void)OldTimesStartGo; 9 +- (void)UmbrellaStartGo;
10 10
11 @property(strong) NSMutableArray* myarray; 11 @property(strong) NSMutableArray* myarray;
12 12
......
1 #import <Foundation/Foundation.h> 1 #import <Foundation/Foundation.h>
2 #import "OtherSetting.h" 2 #import "OtherSetting.h"
3 3
4 -@interface OldTimesHaiBaoJuheBaseModel : NSObject 4 +@interface UmbrellaHaiBaoJuheBaseModel : NSObject
5 5
6 -- (NSString *)OldTimesHaiBaoJuheObjectToJsonString; 6 +- (NSString *)UmbrellaHaiBaoJuheObjectToJsonString;
7 - (NSMutableString *)paramAddToString; 7 - (NSMutableString *)paramAddToString;
8 - (id)initWithDiction:(NSDictionary *)diction; 8 - (id)initWithDiction:(NSDictionary *)diction;
9 9
......
...@@ -11,7 +11,7 @@ typedef NS_ENUM(NSInteger, DGLoggerLevel) ...@@ -11,7 +11,7 @@ typedef NS_ENUM(NSInteger, DGLoggerLevel)
11 ELogError 11 ELogError
12 }; 12 };
13 13
14 -@interface OldTimesHaiBaoJuheDGLogger : NSObject 14 +@interface UmbrellaHaiBaoJuheDGLogger : NSObject
15 15
16 + (void)showLog:(NSString *)fmt,...; 16 + (void)showLog:(NSString *)fmt,...;
17 17
......
1 -#import <UIKit/UIKit.h>
2 -#import "StoreKit/StoreKit.h"
3 -
4 -@interface OldTimesAllManager : NSObject
5 -{
6 - NSString* OldTimesAPPID_;
7 - NSString* OldTimesAPPKEY_;
8 -
9 - NSString* OldTimesInviterCode_;
10 -}
11 -
12 -@property bool OldTimesGeiWoHuaQianBa;
13 -
14 -+ (OldTimesAllManager *)OldTimesInstance;
15 -
16 -- (void)OldTimesChuShiHua;
17 -
18 -- (void)OldTimesDengLu:(NSString *)OldTimesAPPID : (NSString *)OldTimesAPPKEY : (UIViewController *)controller;
19 -
20 -- (void)OldTimesYangShi:(NSString*)OldTimesLeiXing;
21 -
22 -- (void)OldTimesQuery: (NSString *)OldTimesFuWuQiID : (NSString *)OldTimesNickName : (NSNumber *)OldTimesAmount : (NSString *)OldTimesCallBack : (UIViewController *)controller : (NSString *)OldTimesServerName;
23 -
24 -- (void)OldTimesQueryOperation:(UIViewController*)controll OldTimesHuoWuID:(NSString*)products OldTimesJiaGe:(NSString*)amount OldTimesHuoWuMing:(NSString*)productName OldTimesDingDanHao:(NSString*) DingDanHao;
25 -
26 -
27 -
28 -@end
1 -#import <Foundation/Foundation.h>
2 -
3 -extern NSString * const OldTimesExitNotification;
4 -extern NSString * const OldTimesLoginNotification;
5 -extern NSString * const OldTimesErrorNotification;
6 -
7 -
8 -@interface OldTimesHuiTiaoNotification : NSObject
9 -
10 -@end
1 -#import <UIKit/UIKit.h>
2 -
3 -@interface OldTimesIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
4 -
5 -@property(nonatomic,strong) NSString* OldTimesDingDanHao;
6 -@property(nonatomic,strong) NSDictionary* OldTimesHuoWuLieBiao;
7 -@property(nonatomic,strong) NSMutableArray* OldTimesHuoWuIDLieBiao;
8 -@property(nonatomic, strong) UITableView *OldTimesHuoWuLieBiaoView;
9 -
10 -- (void)OldTimesHuaQianView:(UIViewController*)controller OldTimesHuoWuD:(NSString*)products OldTimesQian:(NSString*)amount OldTimesHuoWuMing:(NSString*)productName OldTimesDingDanHao:(NSString*)DingDanHao;
11 -
12 -@end
1 #include "SDKInterface.h" 1 #include "SDKInterface.h"
2 #import <UIKit/UIKit.h> 2 #import <UIKit/UIKit.h>
3 3
4 -#import "OldTimes/OldTimesAllManager.h" 4 +#import "Umbrella/UmbrellaAllManager.h"
5 -#import "OldTimes/OldTimesHuiTiaoNotification.h" 5 +#import "Umbrella/UmbrellaHuiTiaoNotification.h"
6 -#import "OldTimes/OldTimesInformation.h" 6 +#import "Umbrella/UmbrellaInformation.h"
7 7
8 #import "TrackingIO.h" 8 #import "TrackingIO.h"
9 9
10 @implementation SDKInterface : Interface 10 @implementation SDKInterface : Interface
11 11
12 int mExchange; 12 int mExchange;
13 -NSString *OldTimesAppId; 13 +NSString *UmbrellaAppId;
14 -NSString *OldTimesAppKey; 14 +NSString *UmbrellaAppKey;
15 -NSString *OldTimesLeakOrderUrl; 15 +NSString *UmbrellaLeakOrderUrl;
16 16
17 - (void)SDKinit:(UIViewController *) control 17 - (void)SDKinit:(UIViewController *) control
18 { 18 {
...@@ -20,10 +20,10 @@ NSString *OldTimesLeakOrderUrl; ...@@ -20,10 +20,10 @@ NSString *OldTimesLeakOrderUrl;
20 [super SDKinit:control]; 20 [super SDKinit:control];
21 21
22 [HaiBaoJuheConfig getInstance]; 22 [HaiBaoJuheConfig getInstance];
23 - [[OldTimesAllManager OldTimesInstance]OldTimesChuShiHua]; 23 + [[UmbrellaAllManager UmbrellaInstance]UmbrellaChuShiHua];
24 - [[OldTimesAllManager OldTimesInstance]OldTimesYangShi:@"sdk"]; 24 + [[UmbrellaAllManager UmbrellaInstance]UmbrellaYangShi:@"sdk"];
25 - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:OldTimesLoginNotification object:nil]; 25 + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:UmbrellaLoginNotification object:nil];
26 - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"OldTimesToolCallBack" object:nil]; 26 + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"UmbrellaToolCallBack" object:nil];
27 27
28 [[HaiBaoJuheChecker getInstance] sendNotice:HaiBaoJuheSDKNotificationInitSDK notiName:@"InitSuccess" statusCode:HaiBaoJuheSDK_NO_ERROR description:@"initSuccess" extendData:nil]; 28 [[HaiBaoJuheChecker getInstance] sendNotice:HaiBaoJuheSDKNotificationInitSDK notiName:@"InitSuccess" statusCode:HaiBaoJuheSDK_NO_ERROR description:@"initSuccess" extendData:nil];
29 29
...@@ -40,9 +40,9 @@ NSString *OldTimesLeakOrderUrl; ...@@ -40,9 +40,9 @@ NSString *OldTimesLeakOrderUrl;
40 - (void)SDKloginSDK 40 - (void)SDKloginSDK
41 { 41 {
42 //APPID APPKEY 42 //APPID APPKEY
43 - OldTimesAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"]; 43 + UmbrellaAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"];
44 - OldTimesAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"]; 44 + UmbrellaAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"];
45 - [[OldTimesAllManager OldTimesInstance]OldTimesDengLu:OldTimesAppId :OldTimesAppKey :self.controller]; 45 + [[UmbrellaAllManager UmbrellaInstance]UmbrellaDengLu:UmbrellaAppId :UmbrellaAppKey :self.controller];
46 46
47 } 47 }
48 48
...@@ -53,9 +53,9 @@ NSString *OldTimesLeakOrderUrl; ...@@ -53,9 +53,9 @@ NSString *OldTimesLeakOrderUrl;
53 { 53 {
54 NSLog(@"loginchek"); 54 NSLog(@"loginchek");
55 HaiBaoJuheLoginInfo *loginInfo = [HaiBaoJuheLoginInfo alloc]; 55 HaiBaoJuheLoginInfo *loginInfo = [HaiBaoJuheLoginInfo alloc];
56 - loginInfo.openId = [[OldTimesInformation getInstance]openId]; 56 + loginInfo.openId = [[UmbrellaInformation getInstance]openId];
57 - loginInfo.sign = [[OldTimesInformation getInstance] token]; 57 + loginInfo.sign = [[UmbrellaInformation getInstance] token];
58 - loginInfo.timestamp = [[OldTimesInformation getInstance] timestamp]; 58 + loginInfo.timestamp = [[UmbrellaInformation getInstance] timestamp];
59 59
60 dispatch_async(dispatch_get_global_queue(0, 0), ^{ 60 dispatch_async(dispatch_get_global_queue(0, 0), ^{
61 [[HaiBaoJuheChecker getInstance] startCheck:loginInfo]; 61 [[HaiBaoJuheChecker getInstance] startCheck:loginInfo];
...@@ -82,7 +82,7 @@ NSString *OldTimesLeakOrderUrl; ...@@ -82,7 +82,7 @@ NSString *OldTimesLeakOrderUrl;
82 - (void)HCKAssetsToolCallBack:(NSNotification *)notification 82 - (void)HCKAssetsToolCallBack:(NSNotification *)notification
83 { 83 {
84 NSDictionary* payResultDic = notification.object; 84 NSDictionary* payResultDic = notification.object;
85 - NSString* receiptStr = [payResultDic objectForKey:@"OldTimesToolResult"]; 85 + NSString* receiptStr = [payResultDic objectForKey:@"UmbrellaToolResult"];
86 NSString* queryId = [payResultDic objectForKey:@"query_id"]; 86 NSString* queryId = [payResultDic objectForKey:@"query_id"];
87 87
88 //收到回调，保存queryid和data 88 //收到回调，保存queryid和data
...@@ -101,7 +101,7 @@ NSString *OldTimesLeakOrderUrl; ...@@ -101,7 +101,7 @@ NSString *OldTimesLeakOrderUrl;
101 [userDefaults setObject:receiptStr forKey:queryId]; 101 [userDefaults setObject:receiptStr forKey:queryId];
102 102
103 NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil]; 103 NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
104 - NSString* result = [[NetCenter getInstance] httpPostSyn:OldTimesLeakOrderUrl :receiptDic]; 104 + NSString* result = [[NetCenter getInstance] httpPostSyn:UmbrellaLeakOrderUrl :receiptDic];
105 105
106 if([@"success" isEqualToString:result]){//确认订单成功 106 if([@"success" isEqualToString:result]){//确认订单成功
107 //删除已保存的 107 //删除已保存的
...@@ -121,11 +121,11 @@ NSString *OldTimesLeakOrderUrl; ...@@ -121,11 +121,11 @@ NSString *OldTimesLeakOrderUrl;
121 NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults]; 121 NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
122 NSString* lastqueryid = [userDefaults objectForKey:@"lastqueryid"]; 122 NSString* lastqueryid = [userDefaults objectForKey:@"lastqueryid"];
123 123
124 - OldTimesLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@", 124 + UmbrellaLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
125 [HaiBaoJuheUtils createGzyazfUrl], 125 [HaiBaoJuheUtils createGzyazfUrl],
126 [payInfo userId], 126 [payInfo userId],
127 [payInfo playerId]]; 127 [payInfo playerId]];
128 - [userDefaults setObject:OldTimesLeakOrderUrl forKey:@"lastOldTimesLeakOrderUrl"]; 128 + [userDefaults setObject:UmbrellaLeakOrderUrl forKey:@"lastUmbrellaLeakOrderUrl"];
129 129
130 if (lastqueryid!=nil) { 130 if (lastqueryid!=nil) {
131 //创建订单前进行补单 131 //创建订单前进行补单
...@@ -135,7 +135,7 @@ NSString *OldTimesLeakOrderUrl; ...@@ -135,7 +135,7 @@ NSString *OldTimesLeakOrderUrl;
135 receiptStr = [receiptStr stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]]; 135 receiptStr = [receiptStr stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
136 //如果不为空，进行最后一次补单 136 //如果不为空，进行最后一次补单
137 NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",lastqueryid,@"query_id", nil]; 137 NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",lastqueryid,@"query_id", nil];
138 - NSString* result = [[NetCenter getInstance] httpPostSyn:OldTimesLeakOrderUrl :receiptDic]; 138 + NSString* result = [[NetCenter getInstance] httpPostSyn:UmbrellaLeakOrderUrl :receiptDic];
139 if([@"success" isEqualToString:result]){//确认订单成功 139 if([@"success" isEqualToString:result]){//确认订单成功
140 //删除已保存的 140 //删除已保存的
141 [userDefaults removeObjectForKey:@"lastqueryid"]; 141 [userDefaults removeObjectForKey:@"lastqueryid"];
...@@ -145,7 +145,7 @@ NSString *OldTimesLeakOrderUrl; ...@@ -145,7 +145,7 @@ NSString *OldTimesLeakOrderUrl;
145 145
146 mExchange = [payInfo exchange].intValue; 146 mExchange = [payInfo exchange].intValue;
147 [super SDKgzyazfWithGzyazfmentInfo:payInfo]; 147 [super SDKgzyazfWithGzyazfmentInfo:payInfo];
148 - OldTimesLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@", 148 + UmbrellaLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
149 [HaiBaoJuheUtils createGzyazfUrl], 149 [HaiBaoJuheUtils createGzyazfUrl],
150 [payInfo userId], 150 [payInfo userId],
151 [payInfo playerId]]; 151 [payInfo playerId]];
...@@ -212,10 +212,10 @@ NSString *OldTimesLeakOrderUrl; ...@@ -212,10 +212,10 @@ NSString *OldTimesLeakOrderUrl;
212 for (NSString* queryId in queryIdArray) { 212 for (NSString* queryId in queryIdArray) {
213 NSString* receiptStr = [userDefaults valueForKey:queryId]; 213 NSString* receiptStr = [userDefaults valueForKey:queryId];
214 NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil]; 214 NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
215 - NSString* lastOldTimesLeakOrderUrl = [userDefaults objectForKey:@"lastOldTimesLeakOrderUrl"]; 215 + NSString* lastUmbrellaLeakOrderUrl = [userDefaults objectForKey:@"lastUmbrellaLeakOrderUrl"];
216 NSString* result; 216 NSString* result;
217 - if (lastOldTimesLeakOrderUrl!=nil) { 217 + if (lastUmbrellaLeakOrderUrl!=nil) {
218 - result = [[NetCenter getInstance] httpPostSyn:lastOldTimesLeakOrderUrl :receiptDic]; 218 + result = [[NetCenter getInstance] httpPostSyn:lastUmbrellaLeakOrderUrl :receiptDic];
219 }else{ 219 }else{
220 result = [[NetCenter getInstance] httpPostSyn:[HaiBaoJuheUtils createGzyazfUrl] :receiptDic]; 220 result = [[NetCenter getInstance] httpPostSyn:[HaiBaoJuheUtils createGzyazfUrl] :receiptDic];
221 } 221 }
...@@ -253,14 +253,14 @@ NSString *OldTimesLeakOrderUrl; ...@@ -253,14 +253,14 @@ NSString *OldTimesLeakOrderUrl;
253 NSString *other = [payInfo other]; 253 NSString *other = [payInfo other];
254 254
255 if (other && [other length] > 0) { 255 if (other && [other length] > 0) {
256 - [[OldTimesAllManager OldTimesInstance] OldTimesQuery:serverId :roleName :amount :[payInfo queryId] :self.controller :[payInfo serverName]]; 256 + [[UmbrellaAllManager UmbrellaInstance] UmbrellaQuery:serverId :roleName :amount :[payInfo queryId] :self.controller :[payInfo serverName]];
257 }else{ 257 }else{
258 NSString* products = [payInfo products]; 258 NSString* products = [payInfo products];
259 //保存订单号到本地 259 //保存订单号到本地
260 NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults]; 260 NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
261 [userDefaults setObject:queryId forKey:@"lastqueryid"]; 261 [userDefaults setObject:queryId forKey:@"lastqueryid"];
262 [userDefaults synchronize]; 262 [userDefaults synchronize];
263 - [[OldTimesAllManager OldTimesInstance] OldTimesQueryOperation:self.controller OldTimesHuoWuID:products OldTimesJiaGe:[payInfo postAmount] OldTimesHuoWuMing:[payInfo productName] OldTimesDingDanHao:queryId]; 263 + [[UmbrellaAllManager UmbrellaInstance] UmbrellaQueryOperation:self.controller UmbrellaHuoWuID:products UmbrellaJiaGe:[payInfo postAmount] UmbrellaHuoWuMing:[payInfo productName] UmbrellaDingDanHao:queryId];
264 } 264 }
265 } 265 }
266 266
......
1 +#import <UIKit/UIKit.h>
2 +#import "StoreKit/StoreKit.h"
3 +
4 +@interface UmbrellaAllManager : NSObject
5 +{
6 + NSString* UmbrellaAPPID_;
7 + NSString* UmbrellaAPPKEY_;
8 +
9 + NSString* UmbrellaInviterCode_;
10 +}
11 +
12 +@property bool UmbrellaGeiWoHuaQianBa;
13 +
14 ++ (UmbrellaAllManager *)UmbrellaInstance;
15 +
16 +- (void)UmbrellaChuShiHua;
17 +
18 +- (void)UmbrellaDengLu:(NSString *)UmbrellaAPPID : (NSString *)UmbrellaAPPKEY : (UIViewController *)controller;
19 +
20 +- (void)UmbrellaYangShi:(NSString*)UmbrellaLeiXing;
21 +
22 +- (void)UmbrellaQuery: (NSString *)UmbrellaFuWuQiID : (NSString *)UmbrellaNickName : (NSNumber *)UmbrellaAmount : (NSString *)UmbrellaCallBack : (UIViewController *)controller : (NSString *)UmbrellaServerName;
23 +
24 +- (void)UmbrellaQueryOperation:(UIViewController*)controll UmbrellaHuoWuID:(NSString*)products UmbrellaJiaGe:(NSString*)amount UmbrellaHuoWuMing:(NSString*)productName UmbrellaDingDanHao:(NSString*) DingDanHao;
25 +
26 +
27 +
28 +@end
1 +#import <Foundation/Foundation.h>
2 +
3 +extern NSString * const UmbrellaExitNotification;
4 +extern NSString * const UmbrellaLoginNotification;
5 +extern NSString * const UmbrellaErrorNotification;
6 +
7 +
8 +@interface UmbrellaHuiTiaoNotification : NSObject
9 +
10 +@end
1 +#import <UIKit/UIKit.h>
2 +
3 +@interface UmbrellaIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
4 +
5 +@property(nonatomic,strong) NSString* UmbrellaDingDanHao;
6 +@property(nonatomic,strong) NSDictionary* UmbrellaHuoWuLieBiao;
7 +@property(nonatomic,strong) NSMutableArray* UmbrellaHuoWuIDLieBiao;
8 +@property(nonatomic, strong) UITableView *UmbrellaHuoWuLieBiaoView;
9 +
10 +- (void)UmbrellaHuaQianView:(UIViewController*)controller UmbrellaHuoWuD:(NSString*)products UmbrellaQian:(NSString*)amount UmbrellaHuoWuMing:(NSString*)productName UmbrellaDingDanHao:(NSString*)DingDanHao;
11 +
12 +@end
1 #import <Foundation/Foundation.h> 1 #import <Foundation/Foundation.h>
2 2
3 -@interface OldTimesInformation : NSObject 3 +@interface UmbrellaInformation : NSObject
4 { 4 {
5 // 5 //
6 NSString *openId; 6 NSString *openId;
...@@ -12,5 +12,5 @@ NSString *timestamp; ...@@ -12,5 +12,5 @@ NSString *timestamp;
12 @property(retain,nonatomic) NSString *openId; 12 @property(retain,nonatomic) NSString *openId;
13 @property(retain,nonatomic) NSString *token; 13 @property(retain,nonatomic) NSString *token;
14 @property(retain,nonatomic) NSString *timestamp; 14 @property(retain,nonatomic) NSString *timestamp;
15 -+ (OldTimesInformation *)getInstance; 15 ++ (UmbrellaInformation *)getInstance;
16 @end 16 @end
......
1 #import <Foundation/Foundation.h> 1 #import <Foundation/Foundation.h>
2 2
3 -@interface OldTimesInformationJM : NSObject 3 +@interface UmbrellaInformationJM : NSObject
4 4
5 -+(NSString *)OldTimesJM:(NSString *)jm; 5 ++(NSString *)UmbrellaJM:(NSString *)jm;
6 6
7 @end 7 @end
......
1 #import <UIKit/UIKit.h> 1 #import <UIKit/UIKit.h>
2 2
3 -@interface OldTimesLocation : NSObject 3 +@interface UmbrellaLocation : NSObject
4 4
5 -+ (NSString *)OldTimesSKCloudServiceSetupOptionsKey; 5 ++ (NSString *)UmbrellaSKCloudServiceSetupOptionsKey;
6 @end 6 @end
7 7
......
1 #import <UIKit/UIKit.h> 1 #import <UIKit/UIKit.h>
2 -#import "OldTimesInformation.h" 2 +#import "UmbrellaInformation.h"
3 #import <JavaScriptCore/JavaScriptCore.h> 3 #import <JavaScriptCore/JavaScriptCore.h>
4 4
5 -@interface OldTimesMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate> 5 +@interface UmbrellaMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
6 { 6 {
7 - UIWebView *webOldTimesView_; 7 + UIWebView *webUmbrellaView_;
8 UIActivityIndicatorView *activityIndicator; 8 UIActivityIndicatorView *activityIndicator;
9 } 9 }
10 10
11 -@property(assign) BOOL OldTimesYouYuanJiao; 11 +@property(assign) BOOL UmbrellaYouYuanJiao;
12 12
13 -- (void)OldTimesSettingOldTimesView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight; 13 +- (void)UmbrellaSettingUmbrellaView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
14 -- (void)OldTimesInitWebView; 14 +- (void)UmbrellaInitWebView;
15 - (void)loadWebPageWithString:(NSString *)url; 15 - (void)loadWebPageWithString:(NSString *)url;
16 - (void)loadWebPageWithJs:(NSString *)content; 16 - (void)loadWebPageWithJs:(NSString *)content;
17 - (void)postNotification:(NSString *)name : (NSString *)code; 17 - (void)postNotification:(NSString *)name : (NSString *)code;
......