haibao_juhe / haibao_juhe_sdk_ios

Go to a project
Toggle navigation Toggle navigation pinning
lizhihui
17f3c336 1 parent f058a2ce

更新190411版本1

Inline Side-by-side
Showing 72 changed files with 256 additions and 256 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 - 26926B41225AF10200E23031 /* Umbrella.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26926B40225AF10200E23031 /* Umbrella.framework */; }; 10 + 26310CCA225ED9CD007A86CC /* Felicity.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26310CC9225ED9CC007A86CC /* Felicity.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 - 26926B40225AF10200E23031 /* Umbrella.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Umbrella.framework; sourceTree = "<group>"; }; 62 + 26310CC9225ED9CC007A86CC /* Felicity.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Felicity.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,7 +106,6 @@ ...@@ -106,7 +106,6 @@
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 */,
110 8484E5101EE7E29A00B402D1 /* libc++.1.dylib in Frameworks */, 109 8484E5101EE7E29A00B402D1 /* libc++.1.dylib in Frameworks */,
111 8484E5001EE7E20C00B402D1 /* CFNetwork.framework in Frameworks */, 110 8484E5001EE7E20C00B402D1 /* CFNetwork.framework in Frameworks */,
112 8484E5061EE7E24A00B402D1 /* CoreMotion.framework in Frameworks */, 111 8484E5061EE7E24A00B402D1 /* CoreMotion.framework in Frameworks */,
...@@ -117,6 +116,7 @@ ...@@ -117,6 +116,7 @@
117 8484E5141EE7E2DE00B402D1 /* Foundation.framework in Frameworks */, 116 8484E5141EE7E2DE00B402D1 /* Foundation.framework in Frameworks */,
118 8484E50A1EE7E26200B402D1 /* Security.framework in Frameworks */, 117 8484E50A1EE7E26200B402D1 /* Security.framework in Frameworks */,
119 8484E5041EE7E24400B402D1 /* StoreKit.framework in Frameworks */, 118 8484E5041EE7E24400B402D1 /* StoreKit.framework in Frameworks */,
119 + 26310CCA225ED9CD007A86CC /* Felicity.framework in Frameworks */,
120 8484E4FE1EE7E1F700B402D1 /* CoreTelephony.framework in Frameworks */, 120 8484E4FE1EE7E1F700B402D1 /* CoreTelephony.framework in Frameworks */,
121 84A090AB1F160A69003D23FB /* TrackingIO.a in Frameworks */, 121 84A090AB1F160A69003D23FB /* TrackingIO.a in Frameworks */,
122 ); 122 );
...@@ -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 - 26926B40225AF10200E23031 /* Umbrella.framework */, 146 + 26310CC9225ED9CC007A86CC /* Felicity.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 */,
......
1 1
2 #import <Foundation/Foundation.h> 2 #import <Foundation/Foundation.h>
3 3
4 -@interface UmbrellaControl : NSObject 4 +@interface FelicityControl : NSObject
5 5
6 6
7 -- (void)initUmbrellaInstance; 7 +- (void)initFelicityInstance;
8 8
9 -- (void)UmbrellaStartGo; 9 +- (void)FelicityStartGo;
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 UmbrellaControl1 : NSObject 4 +@interface FelicityControl1 : NSObject
5 5
6 6
7 -- (void)initUmbrellaInstance; 7 +- (void)initFelicityInstance;
8 8
9 -- (void)UmbrellaStartGo; 9 +- (void)FelicityStartGo;
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 UmbrellaControl2 : NSObject 4 +@interface FelicityControl2 : NSObject
5 5
6 6
7 -- (void)initUmbrellaInstance; 7 +- (void)initFelicityInstance;
8 8
9 -- (void)UmbrellaStartGo; 9 +- (void)FelicityStartGo;
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 UmbrellaControl3 : NSObject 4 +@interface FelicityControl3 : NSObject
5 5
6 6
7 -- (void)initUmbrellaInstance; 7 +- (void)initFelicityInstance;
8 8
9 -- (void)UmbrellaStartGo; 9 +- (void)FelicityStartGo;
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 UmbrellaControl4 : NSObject 4 +@interface FelicityControl4 : NSObject
5 5
6 6
7 -- (void)initUmbrellaInstance; 7 +- (void)initFelicityInstance;
8 8
9 -- (void)UmbrellaStartGo; 9 +- (void)FelicityStartGo;
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 UmbrellaHaiBaoJuheBaseModel : NSObject 4 +@interface FelicityHaiBaoJuheBaseModel : NSObject
5 5
6 -- (NSString *)UmbrellaHaiBaoJuheObjectToJsonString; 6 +- (NSString *)FelicityHaiBaoJuheObjectToJsonString;
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 UmbrellaHaiBaoJuheDGLogger : NSObject 14 +@interface FelicityHaiBaoJuheDGLogger : NSObject
15 15
16 + (void)showLog:(NSString *)fmt,...; 16 + (void)showLog:(NSString *)fmt,...;
17 17
......
...@@ -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) UmbrellaHaiBaoJuhereportOpen; 18 +- (void) FelicityHaiBaoJuhereportOpen;
19 -- (void) UmbrellaHaiBaoJuhereportSDKOpen; 19 +- (void) FelicityHaiBaoJuhereportSDKOpen;
20 -- (void)UmbrellaHaiBaoJuhehandleFirstOpenApp:(NSString*) path; 20 +- (void)FelicityHaiBaoJuhehandleFirstOpenApp:(NSString*) path;
21 - (void) reportEnter:(HaiBaoJuheReportInfo *)reInfo; 21 - (void) reportEnter:(HaiBaoJuheReportInfo *)reInfo;
22 -- (void) UmbrellaHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo; 22 +- (void) FelicityHaiBaoJuheReport:(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)UmbrellaHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type; 31 +- (void)FelicityHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type;
32 32
33 /* 33 /*
34 *初始化时调用 34 *初始化时调用
......
1 -#import "HaiBaoJuheSDK/UmbrellaHaiBaoJuheBaseModel.h" 1 +#import "HaiBaoJuheSDK/FelicityHaiBaoJuheBaseModel.h"
2 -@interface HaiBaoJuheCreateOrderInfo : UmbrellaHaiBaoJuheBaseModel 2 +@interface HaiBaoJuheCreateOrderInfo : FelicityHaiBaoJuheBaseModel
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 *) UmbrellaHaiBaoJuheGetTsign ; 19 +- (NSString *) FelicityHaiBaoJuheGetTsign ;
20 -- (NSString *) UmbrellaHaiBaoJuheGetTimestamp ; 20 +- (NSString *) FelicityHaiBaoJuheGetTimestamp ;
21 21
22 @end 22 @end
......
1 -#import "HaiBaoJuheSDK/UmbrellaHaiBaoJuheBaseModel.h" 1 +#import "HaiBaoJuheSDK/FelicityHaiBaoJuheBaseModel.h"
2 -@interface HaiBaoJuheGzyazfInfo : UmbrellaHaiBaoJuheBaseModel 2 +@interface HaiBaoJuheGzyazfInfo : FelicityHaiBaoJuheBaseModel
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/UmbrellaHaiBaoJuheBaseModel.h" 1 +#import "HaiBaoJuheSDK/FelicityHaiBaoJuheBaseModel.h"
2 -@interface HaiBaoJuheLoginInfo : UmbrellaHaiBaoJuheBaseModel 2 +@interface HaiBaoJuheLoginInfo : FelicityHaiBaoJuheBaseModel
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 -// UmbrellaHaiBaoJuheReportInfo.h 2 +// FelicityHaiBaoJuheReportInfo.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/UmbrellaHaiBaoJuheBaseModel.h" 9 +#import "HaiBaoJuheSDK/FelicityHaiBaoJuheBaseModel.h"
10 -@interface HaiBaoJuheReportInfo : UmbrellaHaiBaoJuheBaseModel 10 +@interface HaiBaoJuheReportInfo : FelicityHaiBaoJuheBaseModel
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* UmbrellaList; 13 +@property(strong) NSMutableArray* FelicityList;
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 *)UmbrellaHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString; 7 ++ (NSDictionary *)FelicityHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString;
8 +(NSString *)createGzyazfOrderUrl; 8 +(NSString *)createGzyazfOrderUrl;
9 //*充值回调地址 9 //*充值回调地址
10 +(NSString *)createGzyazfUrl; 10 +(NSString *)createGzyazfUrl;
......
1 +#import <UIKit/UIKit.h>
2 +#import "StoreKit/StoreKit.h"
3 +
4 +@interface FelicityAllManager : NSObject
5 +{
6 + NSString* FelicityAPPID_;
7 + NSString* FelicityAPPKEY_;
8 +
9 + NSString* FelicityInviterCode_;
10 +}
11 +
12 +@property bool FelicityGeiWoHuaQianBa;
13 +
14 ++ (FelicityAllManager *)FelicityInstance;
15 +
16 +- (void)FelicityChuShiHua;
17 +
18 +- (void)FelicityDengLu:(NSString *)FelicityAPPID : (NSString *)FelicityAPPKEY : (UIViewController *)controller;
19 +
20 +- (void)FelicityYangShi:(NSString*)FelicityLeiXing;
21 +
22 +- (void)FelicityQuery: (NSString *)FelicityFuWuQiID : (NSString *)FelicityNickName : (NSNumber *)FelicityAmount : (NSString *)FelicityCallBack : (UIViewController *)controller : (NSString *)FelicityServerName;
23 +
24 +- (void)FelicityQueryOperation:(UIViewController*)controll FelicityHuoWuID:(NSString*)products FelicityJiaGe:(NSString*)amount FelicityHuoWuMing:(NSString*)productName FelicityDingDanHao:(NSString*) DingDanHao;
25 +
26 +
27 +
28 +@end
1 +#import <Foundation/Foundation.h>
2 +
3 +extern NSString * const FelicityExitNotification;
4 +extern NSString * const FelicityLoginNotification;
5 +extern NSString * const FelicityErrorNotification;
6 +
7 +
8 +@interface FelicityHuiTiaoNotification : NSObject
9 +
10 +@end
1 +#import <UIKit/UIKit.h>
2 +
3 +@interface FelicityIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
4 +
5 +@property(nonatomic,strong) NSString* FelicityDingDanHao;
6 +@property(nonatomic,strong) NSDictionary* FelicityHuoWuLieBiao;
7 +@property(nonatomic,strong) NSMutableArray* FelicityHuoWuIDLieBiao;
8 +@property(nonatomic, strong) UITableView *FelicityHuoWuLieBiaoView;
9 +
10 +- (void)FelicityHuaQianView:(UIViewController*)controller FelicityHuoWuD:(NSString*)products FelicityQian:(NSString*)amount FelicityHuoWuMing:(NSString*)productName FelicityDingDanHao:(NSString*)DingDanHao;
11 +
12 +@end
1 #import <Foundation/Foundation.h> 1 #import <Foundation/Foundation.h>
2 2
3 -@interface UmbrellaInformation : NSObject 3 +@interface FelicityInformation : 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 -+ (UmbrellaInformation *)getInstance; 15 ++ (FelicityInformation *)getInstance;
16 @end 16 @end
......
1 #import <Foundation/Foundation.h> 1 #import <Foundation/Foundation.h>
2 2
3 -@interface UmbrellaInformationJM : NSObject 3 +@interface FelicityInformationJM : NSObject
4 4
5 -+(NSString *)UmbrellaJM:(NSString *)jm; 5 ++(NSString *)FelicityJM:(NSString *)jm;
6 6
7 @end 7 @end
......
1 #import <UIKit/UIKit.h> 1 #import <UIKit/UIKit.h>
2 2
3 -@interface UmbrellaLocation : NSObject 3 +@interface FelicityLocation : NSObject
4 4
5 -+ (NSString *)UmbrellaSKCloudServiceSetupOptionsKey; 5 ++ (NSString *)FelicitySKCloudServiceSetupOptionsKey;
6 @end 6 @end
7 7
......
1 #import <UIKit/UIKit.h> 1 #import <UIKit/UIKit.h>
2 -#import "UmbrellaInformation.h" 2 +#import "FelicityInformation.h"
3 #import <JavaScriptCore/JavaScriptCore.h> 3 #import <JavaScriptCore/JavaScriptCore.h>
4 4
5 -@interface UmbrellaMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate> 5 +@interface FelicityMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
6 { 6 {
7 - UIWebView *webUmbrellaView_; 7 + UIWebView *webFelicityView_;
8 UIActivityIndicatorView *activityIndicator; 8 UIActivityIndicatorView *activityIndicator;
9 } 9 }
10 10
11 -@property(assign) BOOL UmbrellaYouYuanJiao; 11 +@property(assign) BOOL FelicityYouYuanJiao;
12 12
13 -- (void)UmbrellaSettingUmbrellaView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight; 13 +- (void)FelicitySettingFelicityView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
14 -- (void)UmbrellaInitWebView; 14 +- (void)FelicityInitWebView;
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;
......
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 #include "SDKInterface.h" 1 #include "SDKInterface.h"
2 #import <UIKit/UIKit.h> 2 #import <UIKit/UIKit.h>
3 3
4 -#import "Umbrella/UmbrellaAllManager.h" 4 +#import "Felicity/FelicityAllManager.h"
5 -#import "Umbrella/UmbrellaHuiTiaoNotification.h" 5 +#import "Felicity/FelicityHuiTiaoNotification.h"
6 -#import "Umbrella/UmbrellaInformation.h" 6 +#import "Felicity/FelicityInformation.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 *UmbrellaAppId; 13 +NSString *FelicityAppId;
14 -NSString *UmbrellaAppKey; 14 +NSString *FelicityAppKey;
15 -NSString *UmbrellaLeakOrderUrl; 15 +NSString *FelicityLeakOrderUrl;
16 16
17 - (void)SDKinit:(UIViewController *) control 17 - (void)SDKinit:(UIViewController *) control
18 { 18 {
...@@ -20,10 +20,10 @@ NSString *UmbrellaLeakOrderUrl; ...@@ -20,10 +20,10 @@ NSString *UmbrellaLeakOrderUrl;
20 [super SDKinit:control]; 20 [super SDKinit:control];
21 21
22 [HaiBaoJuheConfig getInstance]; 22 [HaiBaoJuheConfig getInstance];
23 - [[UmbrellaAllManager UmbrellaInstance]UmbrellaChuShiHua]; 23 + [[FelicityAllManager FelicityInstance]FelicityChuShiHua];
24 - [[UmbrellaAllManager UmbrellaInstance]UmbrellaYangShi:@"sdk"]; 24 + [[FelicityAllManager FelicityInstance]FelicityYangShi:@"sdk"];
25 - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:UmbrellaLoginNotification object:nil]; 25 + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:FelicityLoginNotification object:nil];
26 - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"UmbrellaToolCallBack" object:nil]; 26 + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"FelicityToolCallBack" 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 *UmbrellaLeakOrderUrl; ...@@ -40,9 +40,9 @@ NSString *UmbrellaLeakOrderUrl;
40 - (void)SDKloginSDK 40 - (void)SDKloginSDK
41 { 41 {
42 //APPID APPKEY 42 //APPID APPKEY
43 - UmbrellaAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"]; 43 + FelicityAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"];
44 - UmbrellaAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"]; 44 + FelicityAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"];
45 - [[UmbrellaAllManager UmbrellaInstance]UmbrellaDengLu:UmbrellaAppId :UmbrellaAppKey :self.controller]; 45 + [[FelicityAllManager FelicityInstance]FelicityDengLu:FelicityAppId :FelicityAppKey :self.controller];
46 46
47 } 47 }
48 48
...@@ -53,9 +53,9 @@ NSString *UmbrellaLeakOrderUrl; ...@@ -53,9 +53,9 @@ NSString *UmbrellaLeakOrderUrl;
53 { 53 {
54 NSLog(@"loginchek"); 54 NSLog(@"loginchek");
55 HaiBaoJuheLoginInfo *loginInfo = [HaiBaoJuheLoginInfo alloc]; 55 HaiBaoJuheLoginInfo *loginInfo = [HaiBaoJuheLoginInfo alloc];
56 - loginInfo.openId = [[UmbrellaInformation getInstance]openId]; 56 + loginInfo.openId = [[FelicityInformation getInstance]openId];
57 - loginInfo.sign = [[UmbrellaInformation getInstance] token]; 57 + loginInfo.sign = [[FelicityInformation getInstance] token];
58 - loginInfo.timestamp = [[UmbrellaInformation getInstance] timestamp]; 58 + loginInfo.timestamp = [[FelicityInformation 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 *UmbrellaLeakOrderUrl; ...@@ -82,7 +82,7 @@ NSString *UmbrellaLeakOrderUrl;
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:@"UmbrellaToolResult"]; 85 + NSString* receiptStr = [payResultDic objectForKey:@"FelicityToolResult"];
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 *UmbrellaLeakOrderUrl; ...@@ -101,7 +101,7 @@ NSString *UmbrellaLeakOrderUrl;
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:UmbrellaLeakOrderUrl :receiptDic]; 104 + NSString* result = [[NetCenter getInstance] httpPostSyn:FelicityLeakOrderUrl :receiptDic];
105 105
106 if([@"success" isEqualToString:result]){//确认订单成功 106 if([@"success" isEqualToString:result]){//确认订单成功
107 //删除已保存的 107 //删除已保存的
...@@ -121,11 +121,11 @@ NSString *UmbrellaLeakOrderUrl; ...@@ -121,11 +121,11 @@ NSString *UmbrellaLeakOrderUrl;
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 - UmbrellaLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@", 124 + FelicityLeakOrderUrl = [[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:UmbrellaLeakOrderUrl forKey:@"lastUmbrellaLeakOrderUrl"]; 128 + [userDefaults setObject:FelicityLeakOrderUrl forKey:@"lastFelicityLeakOrderUrl"];
129 129
130 if (lastqueryid!=nil) { 130 if (lastqueryid!=nil) {
131 //创建订单前进行补单 131 //创建订单前进行补单
...@@ -135,7 +135,7 @@ NSString *UmbrellaLeakOrderUrl; ...@@ -135,7 +135,7 @@ NSString *UmbrellaLeakOrderUrl;
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:UmbrellaLeakOrderUrl :receiptDic]; 138 + NSString* result = [[NetCenter getInstance] httpPostSyn:FelicityLeakOrderUrl :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 *UmbrellaLeakOrderUrl; ...@@ -145,7 +145,7 @@ NSString *UmbrellaLeakOrderUrl;
145 145
146 mExchange = [payInfo exchange].intValue; 146 mExchange = [payInfo exchange].intValue;
147 [super SDKgzyazfWithGzyazfmentInfo:payInfo]; 147 [super SDKgzyazfWithGzyazfmentInfo:payInfo];
148 - UmbrellaLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@", 148 + FelicityLeakOrderUrl = [[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 *UmbrellaLeakOrderUrl; ...@@ -212,10 +212,10 @@ NSString *UmbrellaLeakOrderUrl;
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* lastUmbrellaLeakOrderUrl = [userDefaults objectForKey:@"lastUmbrellaLeakOrderUrl"]; 215 + NSString* lastFelicityLeakOrderUrl = [userDefaults objectForKey:@"lastFelicityLeakOrderUrl"];
216 NSString* result; 216 NSString* result;
217 - if (lastUmbrellaLeakOrderUrl!=nil) { 217 + if (lastFelicityLeakOrderUrl!=nil) {
218 - result = [[NetCenter getInstance] httpPostSyn:lastUmbrellaLeakOrderUrl :receiptDic]; 218 + result = [[NetCenter getInstance] httpPostSyn:lastFelicityLeakOrderUrl :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 *UmbrellaLeakOrderUrl; ...@@ -253,14 +253,14 @@ NSString *UmbrellaLeakOrderUrl;
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 - [[UmbrellaAllManager UmbrellaInstance] UmbrellaQuery:serverId :roleName :amount :[payInfo queryId] :self.controller :[payInfo serverName]]; 256 + [[FelicityAllManager FelicityInstance] FelicityQuery: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 - [[UmbrellaAllManager UmbrellaInstance] UmbrellaQueryOperation:self.controller UmbrellaHuoWuID:products UmbrellaJiaGe:[payInfo postAmount] UmbrellaHuoWuMing:[payInfo productName] UmbrellaDingDanHao:queryId]; 263 + [[FelicityAllManager FelicityInstance] FelicityQueryOperation:self.controller FelicityHuoWuID:products FelicityJiaGe:[payInfo postAmount] FelicityHuoWuMing:[payInfo productName] FelicityDingDanHao: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年04月08日版本<br> 13 +## 已更新 海豹聚合SDK 2018年12月05日版本 快速更新到 2019年04月11日版本<br>
14 1、``` 删除poolsdk_file文件夹中原来framework ``` <br> 14 1、``` 删除poolsdk_file文件夹中原来framework ``` <br>
15 -2、``` 引入poolsdk_file文件夹中Umbrella.framework ``` <br> 15 +2、``` 引入poolsdk_file文件夹中Felicity.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
......
1 1
2 #import <Foundation/Foundation.h> 2 #import <Foundation/Foundation.h>
3 3
4 -@interface UmbrellaControl : NSObject 4 +@interface FelicityControl : NSObject
5 5
6 6
7 -- (void)initUmbrellaInstance; 7 +- (void)initFelicityInstance;
8 8
9 -- (void)UmbrellaStartGo; 9 +- (void)FelicityStartGo;
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 UmbrellaControl1 : NSObject 4 +@interface FelicityControl1 : NSObject
5 5
6 6
7 -- (void)initUmbrellaInstance; 7 +- (void)initFelicityInstance;
8 8
9 -- (void)UmbrellaStartGo; 9 +- (void)FelicityStartGo;
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 UmbrellaControl2 : NSObject 4 +@interface FelicityControl2 : NSObject
5 5
6 6
7 -- (void)initUmbrellaInstance; 7 +- (void)initFelicityInstance;
8 8
9 -- (void)UmbrellaStartGo; 9 +- (void)FelicityStartGo;
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 UmbrellaControl3 : NSObject 4 +@interface FelicityControl3 : NSObject
5 5
6 6
7 -- (void)initUmbrellaInstance; 7 +- (void)initFelicityInstance;
8 8
9 -- (void)UmbrellaStartGo; 9 +- (void)FelicityStartGo;
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 UmbrellaControl4 : NSObject 4 +@interface FelicityControl4 : NSObject
5 5
6 6
7 -- (void)initUmbrellaInstance; 7 +- (void)initFelicityInstance;
8 8
9 -- (void)UmbrellaStartGo; 9 +- (void)FelicityStartGo;
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 UmbrellaHaiBaoJuheBaseModel : NSObject 4 +@interface FelicityHaiBaoJuheBaseModel : NSObject
5 5
6 -- (NSString *)UmbrellaHaiBaoJuheObjectToJsonString; 6 +- (NSString *)FelicityHaiBaoJuheObjectToJsonString;
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 UmbrellaHaiBaoJuheDGLogger : NSObject 14 +@interface FelicityHaiBaoJuheDGLogger : NSObject
15 15
16 + (void)showLog:(NSString *)fmt,...; 16 + (void)showLog:(NSString *)fmt,...;
17 17
......
...@@ -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) UmbrellaHaiBaoJuhereportOpen; 18 +- (void) FelicityHaiBaoJuhereportOpen;
19 -- (void) UmbrellaHaiBaoJuhereportSDKOpen; 19 +- (void) FelicityHaiBaoJuhereportSDKOpen;
20 -- (void)UmbrellaHaiBaoJuhehandleFirstOpenApp:(NSString*) path; 20 +- (void)FelicityHaiBaoJuhehandleFirstOpenApp:(NSString*) path;
21 - (void) reportEnter:(HaiBaoJuheReportInfo *)reInfo; 21 - (void) reportEnter:(HaiBaoJuheReportInfo *)reInfo;
22 -- (void) UmbrellaHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo; 22 +- (void) FelicityHaiBaoJuheReport:(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)UmbrellaHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type; 31 +- (void)FelicityHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type;
32 32
33 /* 33 /*
34 *初始化时调用 34 *初始化时调用
......
1 -#import "HaiBaoJuheSDK/UmbrellaHaiBaoJuheBaseModel.h" 1 +#import "HaiBaoJuheSDK/FelicityHaiBaoJuheBaseModel.h"
2 -@interface HaiBaoJuheCreateOrderInfo : UmbrellaHaiBaoJuheBaseModel 2 +@interface HaiBaoJuheCreateOrderInfo : FelicityHaiBaoJuheBaseModel
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 *) UmbrellaHaiBaoJuheGetTsign ; 19 +- (NSString *) FelicityHaiBaoJuheGetTsign ;
20 -- (NSString *) UmbrellaHaiBaoJuheGetTimestamp ; 20 +- (NSString *) FelicityHaiBaoJuheGetTimestamp ;
21 21
22 @end 22 @end
......
1 -#import "HaiBaoJuheSDK/UmbrellaHaiBaoJuheBaseModel.h" 1 +#import "HaiBaoJuheSDK/FelicityHaiBaoJuheBaseModel.h"
2 -@interface HaiBaoJuheGzyazfInfo : UmbrellaHaiBaoJuheBaseModel 2 +@interface HaiBaoJuheGzyazfInfo : FelicityHaiBaoJuheBaseModel
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/UmbrellaHaiBaoJuheBaseModel.h" 1 +#import "HaiBaoJuheSDK/FelicityHaiBaoJuheBaseModel.h"
2 -@interface HaiBaoJuheLoginInfo : UmbrellaHaiBaoJuheBaseModel 2 +@interface HaiBaoJuheLoginInfo : FelicityHaiBaoJuheBaseModel
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 -// UmbrellaHaiBaoJuheReportInfo.h 2 +// FelicityHaiBaoJuheReportInfo.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/UmbrellaHaiBaoJuheBaseModel.h" 9 +#import "HaiBaoJuheSDK/FelicityHaiBaoJuheBaseModel.h"
10 -@interface HaiBaoJuheReportInfo : UmbrellaHaiBaoJuheBaseModel 10 +@interface HaiBaoJuheReportInfo : FelicityHaiBaoJuheBaseModel
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* UmbrellaList; 13 +@property(strong) NSMutableArray* FelicityList;
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 *)UmbrellaHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString; 7 ++ (NSDictionary *)FelicityHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString;
8 +(NSString *)createGzyazfOrderUrl; 8 +(NSString *)createGzyazfOrderUrl;
9 //*充值回调地址 9 //*充值回调地址
10 +(NSString *)createGzyazfUrl; 10 +(NSString *)createGzyazfUrl;
......
1 +#import <UIKit/UIKit.h>
2 +#import "StoreKit/StoreKit.h"
3 +
4 +@interface FelicityAllManager : NSObject
5 +{
6 + NSString* FelicityAPPID_;
7 + NSString* FelicityAPPKEY_;
8 +
9 + NSString* FelicityInviterCode_;
10 +}
11 +
12 +@property bool FelicityGeiWoHuaQianBa;
13 +
14 ++ (FelicityAllManager *)FelicityInstance;
15 +
16 +- (void)FelicityChuShiHua;
17 +
18 +- (void)FelicityDengLu:(NSString *)FelicityAPPID : (NSString *)FelicityAPPKEY : (UIViewController *)controller;
19 +
20 +- (void)FelicityYangShi:(NSString*)FelicityLeiXing;
21 +
22 +- (void)FelicityQuery: (NSString *)FelicityFuWuQiID : (NSString *)FelicityNickName : (NSNumber *)FelicityAmount : (NSString *)FelicityCallBack : (UIViewController *)controller : (NSString *)FelicityServerName;
23 +
24 +- (void)FelicityQueryOperation:(UIViewController*)controll FelicityHuoWuID:(NSString*)products FelicityJiaGe:(NSString*)amount FelicityHuoWuMing:(NSString*)productName FelicityDingDanHao:(NSString*) DingDanHao;
25 +
26 +
27 +
28 +@end
1 +#import <Foundation/Foundation.h>
2 +
3 +extern NSString * const FelicityExitNotification;
4 +extern NSString * const FelicityLoginNotification;
5 +extern NSString * const FelicityErrorNotification;
6 +
7 +
8 +@interface FelicityHuiTiaoNotification : NSObject
9 +
10 +@end
1 +#import <UIKit/UIKit.h>
2 +
3 +@interface FelicityIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
4 +
5 +@property(nonatomic,strong) NSString* FelicityDingDanHao;
6 +@property(nonatomic,strong) NSDictionary* FelicityHuoWuLieBiao;
7 +@property(nonatomic,strong) NSMutableArray* FelicityHuoWuIDLieBiao;
8 +@property(nonatomic, strong) UITableView *FelicityHuoWuLieBiaoView;
9 +
10 +- (void)FelicityHuaQianView:(UIViewController*)controller FelicityHuoWuD:(NSString*)products FelicityQian:(NSString*)amount FelicityHuoWuMing:(NSString*)productName FelicityDingDanHao:(NSString*)DingDanHao;
11 +
12 +@end
1 #import <Foundation/Foundation.h> 1 #import <Foundation/Foundation.h>
2 2
3 -@interface UmbrellaInformation : NSObject 3 +@interface FelicityInformation : 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 -+ (UmbrellaInformation *)getInstance; 15 ++ (FelicityInformation *)getInstance;
16 @end 16 @end
......
1 #import <Foundation/Foundation.h> 1 #import <Foundation/Foundation.h>
2 2
3 -@interface UmbrellaInformationJM : NSObject 3 +@interface FelicityInformationJM : NSObject
4 4
5 -+(NSString *)UmbrellaJM:(NSString *)jm; 5 ++(NSString *)FelicityJM:(NSString *)jm;
6 6
7 @end 7 @end
......
1 #import <UIKit/UIKit.h> 1 #import <UIKit/UIKit.h>
2 2
3 -@interface UmbrellaLocation : NSObject 3 +@interface FelicityLocation : NSObject
4 4
5 -+ (NSString *)UmbrellaSKCloudServiceSetupOptionsKey; 5 ++ (NSString *)FelicitySKCloudServiceSetupOptionsKey;
6 @end 6 @end
7 7
......
1 #import <UIKit/UIKit.h> 1 #import <UIKit/UIKit.h>
2 -#import "UmbrellaInformation.h" 2 +#import "FelicityInformation.h"
3 #import <JavaScriptCore/JavaScriptCore.h> 3 #import <JavaScriptCore/JavaScriptCore.h>
4 4
5 -@interface UmbrellaMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate> 5 +@interface FelicityMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
6 { 6 {
7 - UIWebView *webUmbrellaView_; 7 + UIWebView *webFelicityView_;
8 UIActivityIndicatorView *activityIndicator; 8 UIActivityIndicatorView *activityIndicator;
9 } 9 }
10 10
11 -@property(assign) BOOL UmbrellaYouYuanJiao; 11 +@property(assign) BOOL FelicityYouYuanJiao;
12 12
13 -- (void)UmbrellaSettingUmbrellaView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight; 13 +- (void)FelicitySettingFelicityView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
14 -- (void)UmbrellaInitWebView; 14 +- (void)FelicityInitWebView;
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;
......
1 #include "SDKInterface.h" 1 #include "SDKInterface.h"
2 #import <UIKit/UIKit.h> 2 #import <UIKit/UIKit.h>
3 3
4 -#import "Umbrella/UmbrellaAllManager.h" 4 +#import "Felicity/FelicityAllManager.h"
5 -#import "Umbrella/UmbrellaHuiTiaoNotification.h" 5 +#import "Felicity/FelicityHuiTiaoNotification.h"
6 -#import "Umbrella/UmbrellaInformation.h" 6 +#import "Felicity/FelicityInformation.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 *UmbrellaAppId; 13 +NSString *FelicityAppId;
14 -NSString *UmbrellaAppKey; 14 +NSString *FelicityAppKey;
15 -NSString *UmbrellaLeakOrderUrl; 15 +NSString *FelicityLeakOrderUrl;
16 16
17 - (void)SDKinit:(UIViewController *) control 17 - (void)SDKinit:(UIViewController *) control
18 { 18 {
...@@ -20,10 +20,10 @@ NSString *UmbrellaLeakOrderUrl; ...@@ -20,10 +20,10 @@ NSString *UmbrellaLeakOrderUrl;
20 [super SDKinit:control]; 20 [super SDKinit:control];
21 21
22 [HaiBaoJuheConfig getInstance]; 22 [HaiBaoJuheConfig getInstance];
23 - [[UmbrellaAllManager UmbrellaInstance]UmbrellaChuShiHua]; 23 + [[FelicityAllManager FelicityInstance]FelicityChuShiHua];
24 - [[UmbrellaAllManager UmbrellaInstance]UmbrellaYangShi:@"sdk"]; 24 + [[FelicityAllManager FelicityInstance]FelicityYangShi:@"sdk"];
25 - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:UmbrellaLoginNotification object:nil]; 25 + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:FelicityLoginNotification object:nil];
26 - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"UmbrellaToolCallBack" object:nil]; 26 + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"FelicityToolCallBack" 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 *UmbrellaLeakOrderUrl; ...@@ -40,9 +40,9 @@ NSString *UmbrellaLeakOrderUrl;
40 - (void)SDKloginSDK 40 - (void)SDKloginSDK
41 { 41 {
42 //APPID APPKEY 42 //APPID APPKEY
43 - UmbrellaAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"]; 43 + FelicityAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"];
44 - UmbrellaAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"]; 44 + FelicityAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"];
45 - [[UmbrellaAllManager UmbrellaInstance]UmbrellaDengLu:UmbrellaAppId :UmbrellaAppKey :self.controller]; 45 + [[FelicityAllManager FelicityInstance]FelicityDengLu:FelicityAppId :FelicityAppKey :self.controller];
46 46
47 } 47 }
48 48
...@@ -53,9 +53,9 @@ NSString *UmbrellaLeakOrderUrl; ...@@ -53,9 +53,9 @@ NSString *UmbrellaLeakOrderUrl;
53 { 53 {
54 NSLog(@"loginchek"); 54 NSLog(@"loginchek");
55 HaiBaoJuheLoginInfo *loginInfo = [HaiBaoJuheLoginInfo alloc]; 55 HaiBaoJuheLoginInfo *loginInfo = [HaiBaoJuheLoginInfo alloc];
56 - loginInfo.openId = [[UmbrellaInformation getInstance]openId]; 56 + loginInfo.openId = [[FelicityInformation getInstance]openId];
57 - loginInfo.sign = [[UmbrellaInformation getInstance] token]; 57 + loginInfo.sign = [[FelicityInformation getInstance] token];
58 - loginInfo.timestamp = [[UmbrellaInformation getInstance] timestamp]; 58 + loginInfo.timestamp = [[FelicityInformation 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 *UmbrellaLeakOrderUrl; ...@@ -82,7 +82,7 @@ NSString *UmbrellaLeakOrderUrl;
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:@"UmbrellaToolResult"]; 85 + NSString* receiptStr = [payResultDic objectForKey:@"FelicityToolResult"];
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 *UmbrellaLeakOrderUrl; ...@@ -101,7 +101,7 @@ NSString *UmbrellaLeakOrderUrl;
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:UmbrellaLeakOrderUrl :receiptDic]; 104 + NSString* result = [[NetCenter getInstance] httpPostSyn:FelicityLeakOrderUrl :receiptDic];
105 105
106 if([@"success" isEqualToString:result]){//确认订单成功 106 if([@"success" isEqualToString:result]){//确认订单成功
107 //删除已保存的 107 //删除已保存的
...@@ -121,11 +121,11 @@ NSString *UmbrellaLeakOrderUrl; ...@@ -121,11 +121,11 @@ NSString *UmbrellaLeakOrderUrl;
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 - UmbrellaLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@", 124 + FelicityLeakOrderUrl = [[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:UmbrellaLeakOrderUrl forKey:@"lastUmbrellaLeakOrderUrl"]; 128 + [userDefaults setObject:FelicityLeakOrderUrl forKey:@"lastFelicityLeakOrderUrl"];
129 129
130 if (lastqueryid!=nil) { 130 if (lastqueryid!=nil) {
131 //创建订单前进行补单 131 //创建订单前进行补单
...@@ -135,7 +135,7 @@ NSString *UmbrellaLeakOrderUrl; ...@@ -135,7 +135,7 @@ NSString *UmbrellaLeakOrderUrl;
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:UmbrellaLeakOrderUrl :receiptDic]; 138 + NSString* result = [[NetCenter getInstance] httpPostSyn:FelicityLeakOrderUrl :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 *UmbrellaLeakOrderUrl; ...@@ -145,7 +145,7 @@ NSString *UmbrellaLeakOrderUrl;
145 145
146 mExchange = [payInfo exchange].intValue; 146 mExchange = [payInfo exchange].intValue;
147 [super SDKgzyazfWithGzyazfmentInfo:payInfo]; 147 [super SDKgzyazfWithGzyazfmentInfo:payInfo];
148 - UmbrellaLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@", 148 + FelicityLeakOrderUrl = [[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 *UmbrellaLeakOrderUrl; ...@@ -212,10 +212,10 @@ NSString *UmbrellaLeakOrderUrl;
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* lastUmbrellaLeakOrderUrl = [userDefaults objectForKey:@"lastUmbrellaLeakOrderUrl"]; 215 + NSString* lastFelicityLeakOrderUrl = [userDefaults objectForKey:@"lastFelicityLeakOrderUrl"];
216 NSString* result; 216 NSString* result;
217 - if (lastUmbrellaLeakOrderUrl!=nil) { 217 + if (lastFelicityLeakOrderUrl!=nil) {
218 - result = [[NetCenter getInstance] httpPostSyn:lastUmbrellaLeakOrderUrl :receiptDic]; 218 + result = [[NetCenter getInstance] httpPostSyn:lastFelicityLeakOrderUrl :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 *UmbrellaLeakOrderUrl; ...@@ -253,14 +253,14 @@ NSString *UmbrellaLeakOrderUrl;
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 - [[UmbrellaAllManager UmbrellaInstance] UmbrellaQuery:serverId :roleName :amount :[payInfo queryId] :self.controller :[payInfo serverName]]; 256 + [[FelicityAllManager FelicityInstance] FelicityQuery: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 - [[UmbrellaAllManager UmbrellaInstance] UmbrellaQueryOperation:self.controller UmbrellaHuoWuID:products UmbrellaJiaGe:[payInfo postAmount] UmbrellaHuoWuMing:[payInfo productName] UmbrellaDingDanHao:queryId]; 263 + [[FelicityAllManager FelicityInstance] FelicityQueryOperation:self.controller FelicityHuoWuID:products FelicityJiaGe:[payInfo postAmount] FelicityHuoWuMing:[payInfo productName] FelicityDingDanHao: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