lizhihui

更新190516版本3

Showing 72 changed files with 256 additions and 256 deletions
No preview for this file type
......@@ -7,7 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
261A1D4E228D3C06008025AB /* Remaster.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 261A1D4D228D3C06008025AB /* Remaster.framework */; };
261A1D88228D54DE008025AB /* Odyssey.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 261A1D87228D54DE008025AB /* Odyssey.framework */; };
269F653821B6613F006AEC88 /* HaiBaoJuheSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 269F653721B6613F006AEC88 /* HaiBaoJuheSDK.framework */; };
845D18221C8D778400F27EB9 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 845D181B1C8D778400F27EB9 /* Images.xcassets */; };
846BD2241EE9342700E89A1D /* haibaoyouxi_config in Resources */ = {isa = PBXBuildFile; fileRef = 846BD21F1EE9342700E89A1D /* haibaoyouxi_config */; };
......@@ -59,7 +59,7 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
261A1D4D228D3C06008025AB /* Remaster.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Remaster.framework; sourceTree = "<group>"; };
261A1D87228D54DE008025AB /* Odyssey.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Odyssey.framework; sourceTree = "<group>"; };
269F653721B6613F006AEC88 /* HaiBaoJuheSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = HaiBaoJuheSDK.framework; sourceTree = "<group>"; };
845D181B1C8D778400F27EB9 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = poolsdk_file/poolsdk/Images.xcassets; sourceTree = "<group>"; };
845D181C1C8D778400F27EB9 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = poolsdk_file/poolsdk/Info.plist; sourceTree = "<group>"; };
......@@ -109,6 +109,7 @@
8484E5101EE7E29A00B402D1 /* libc++.1.dylib in Frameworks */,
8484E5001EE7E20C00B402D1 /* CFNetwork.framework in Frameworks */,
8484E5061EE7E24A00B402D1 /* CoreMotion.framework in Frameworks */,
261A1D88228D54DE008025AB /* Odyssey.framework in Frameworks */,
8484E5021EE7E21F00B402D1 /* UIKit.framework in Frameworks */,
8484E50C1EE7E27100B402D1 /* CoreGraphics.framework in Frameworks */,
8484E5081EE7E25600B402D1 /* CoreText.framework in Frameworks */,
......@@ -116,7 +117,6 @@
8484E5141EE7E2DE00B402D1 /* Foundation.framework in Frameworks */,
8484E50A1EE7E26200B402D1 /* Security.framework in Frameworks */,
8484E5041EE7E24400B402D1 /* StoreKit.framework in Frameworks */,
261A1D4E228D3C06008025AB /* Remaster.framework in Frameworks */,
8484E4FE1EE7E1F700B402D1 /* CoreTelephony.framework in Frameworks */,
84A090AB1F160A69003D23FB /* TrackingIO.a in Frameworks */,
);
......@@ -143,7 +143,7 @@
8476DF641C4DD71D00EC42BA /* poolsdk */ = {
isa = PBXGroup;
children = (
261A1D4D228D3C06008025AB /* Remaster.framework */,
261A1D87228D54DE008025AB /* Odyssey.framework */,
84A090AC1F174E21003D23FB /* TrackingIO.h */,
84A090AA1F160A69003D23FB /* TrackingIO.a */,
846BD21F1EE9342700E89A1D /* haibaoyouxi_config */,
......
......@@ -15,11 +15,11 @@
- (void)initChecker;
- (void)startCheck:(HaiBaoJuheLoginInfo *)loginInfo;
- (void) createOrder:(HaiBaoJuheCreateOrderInfo *)gzyazfInfo;
- (void) RemasterHaiBaoJuhereportOpen;
- (void) RemasterHaiBaoJuhereportSDKOpen;
- (void)RemasterHaiBaoJuhehandleFirstOpenApp:(NSString*) path;
- (void) OdysseyHaiBaoJuhereportOpen;
- (void) OdysseyHaiBaoJuhereportSDKOpen;
- (void)OdysseyHaiBaoJuhehandleFirstOpenApp:(NSString*) path;
- (void) reportEnter:(HaiBaoJuheReportInfo *)reInfo;
- (void) RemasterHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo;
- (void) OdysseyHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo;
- (void)sendNotice:(HaiBaoJuheSDKNotificationType)notiType
notiName:(NSString *)notiName
statusCode:(int)nCode
......@@ -28,7 +28,7 @@
- (void)startCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo;
- (void)RemasterHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type;
- (void)OdysseyHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type;
/*
*初始化时调用
......
#import "HaiBaoJuheSDK/RemasterHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheCreateOrderInfo : RemasterHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/OdysseyHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheCreateOrderInfo : OdysseyHaiBaoJuheBaseModel
@property(nonatomic,strong)NSString *serverId;//服务器ID
@property(nonatomic, strong)NSString *serverName;//服务器名称
......@@ -16,7 +16,7 @@
@property(nonatomic, strong)NSString *userId;//用户ID
@property(nonatomic, strong)NSString *timestamp;//时间戳
- (NSString *) RemasterHaiBaoJuheGetTsign ;
- (NSString *) RemasterHaiBaoJuheGetTimestamp ;
- (NSString *) OdysseyHaiBaoJuheGetTsign ;
- (NSString *) OdysseyHaiBaoJuheGetTimestamp ;
@end
......
#import "HaiBaoJuheSDK/RemasterHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheGzyazfInfo : RemasterHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/OdysseyHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheGzyazfInfo : OdysseyHaiBaoJuheBaseModel
@property(nonatomic, strong)NSString *serverId;
@property(nonatomic, strong)NSString *queryId;
......
#import "HaiBaoJuheSDK/RemasterHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheLoginInfo : RemasterHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/OdysseyHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheLoginInfo : OdysseyHaiBaoJuheBaseModel
@property(nonatomic,strong)NSString *timestamp;
@property(nonatomic, strong)NSString *sign;
......
//
// RemasterHaiBaoJuheReportInfo.h
// OdysseyHaiBaoJuheReportInfo.h
// HaiBaoJuheSDK
//
// Created by winFan on 12/21/15.
// Copyright (c) 2015 winFan. All rights reserved.
//
#import "HaiBaoJuheSDK/RemasterHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheReportInfo : RemasterHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/OdysseyHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheReportInfo : OdysseyHaiBaoJuheBaseModel
@property(nonatomic, strong)NSString *reportType;//类型
@property(nonatomic, strong)NSString *playerId;//玩家ID
......
......@@ -10,7 +10,7 @@
@property(nonatomic, strong)NSString *urlSchemes;
@property(strong) NSMutableArray* RemasterList;
@property(strong) NSMutableArray* OdysseyList;
@property BOOL isAppleGzyazfing;
......
......@@ -4,7 +4,7 @@
@interface HaiBaoJuheUtils : NSObject
+(NSString *)md5:(NSString *)str;
+ (NSDictionary *)RemasterHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString;
+ (NSDictionary *)OdysseyHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString;
+(NSString *)createGzyazfOrderUrl;
//*充值回调地址
+(NSString *)createGzyazfUrl;
......
#import <Foundation/Foundation.h>
@interface RemasterControl : NSObject
@interface OdysseyControl : NSObject
- (void)initRemasterInstance;
- (void)initOdysseyInstance;
- (void)RemasterStartGo;
- (void)OdysseyStartGo;
@property(strong) NSMutableArray* myarray;
......
#import <Foundation/Foundation.h>
@interface RemasterControl1 : NSObject
@interface OdysseyControl1 : NSObject
- (void)initRemasterInstance;
- (void)initOdysseyInstance;
- (void)RemasterStartGo;
- (void)OdysseyStartGo;
@property(strong) NSMutableArray* myarray;
......
#import <Foundation/Foundation.h>
@interface RemasterControl2 : NSObject
@interface OdysseyControl2 : NSObject
- (void)initRemasterInstance;
- (void)initOdysseyInstance;
- (void)RemasterStartGo;
- (void)OdysseyStartGo;
@property(strong) NSMutableArray* myarray;
......
#import <Foundation/Foundation.h>
@interface RemasterControl3 : NSObject
@interface OdysseyControl3 : NSObject
- (void)initRemasterInstance;
- (void)initOdysseyInstance;
- (void)RemasterStartGo;
- (void)OdysseyStartGo;
@property(strong) NSMutableArray* myarray;
......
#import <Foundation/Foundation.h>
@interface RemasterControl4 : NSObject
@interface OdysseyControl4 : NSObject
- (void)initRemasterInstance;
- (void)initOdysseyInstance;
- (void)RemasterStartGo;
- (void)OdysseyStartGo;
@property(strong) NSMutableArray* myarray;
......
#import <Foundation/Foundation.h>
#import "OtherSetting.h"
@interface RemasterHaiBaoJuheBaseModel : NSObject
@interface OdysseyHaiBaoJuheBaseModel : NSObject
- (NSString *)RemasterHaiBaoJuheObjectToJsonString;
- (NSString *)OdysseyHaiBaoJuheObjectToJsonString;
- (NSMutableString *)paramAddToString;
- (id)initWithDiction:(NSDictionary *)diction;
......
......@@ -11,7 +11,7 @@ typedef NS_ENUM(NSInteger, DGLoggerLevel)
ELogError
};
@interface RemasterHaiBaoJuheDGLogger : NSObject
@interface OdysseyHaiBaoJuheDGLogger : NSObject
+ (void)showLog:(NSString *)fmt,...;
......
#import <UIKit/UIKit.h>
#import "StoreKit/StoreKit.h"
@interface OdysseyAllManager : NSObject
{
NSString* OdysseyAPPID_;
NSString* OdysseyAPPKEY_;
NSString* OdysseyInviterCode_;
}
@property bool OdysseyGeiWoHuaQianBa;
+ (OdysseyAllManager *)OdysseyInstance;
- (void)OdysseyChuShiHua;
- (void)OdysseyDengLu:(NSString *)OdysseyAPPID : (NSString *)OdysseyAPPKEY : (UIViewController *)controller;
- (void)OdysseyYangShi:(NSString*)OdysseyLeiXing;
- (void)OdysseyQuery: (NSString *)OdysseyFuWuQiID : (NSString *)OdysseyNickName : (NSNumber *)OdysseyAmount : (NSString *)OdysseyCallBack : (UIViewController *)controller : (NSString *)OdysseyServerName;
- (void)OdysseyQueryOperation:(UIViewController*)controll OdysseyHuoWuID:(NSString*)products OdysseyJiaGe:(NSString*)amount OdysseyHuoWuMing:(NSString*)productName OdysseyDingDanHao:(NSString*) DingDanHao;
@end
#import <Foundation/Foundation.h>
extern NSString * const OdysseyExitNotification;
extern NSString * const OdysseyLoginNotification;
extern NSString * const OdysseyErrorNotification;
@interface OdysseyHuiTiaoNotification : NSObject
@end
#import <UIKit/UIKit.h>
@interface OdysseyIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
@property(nonatomic,strong) NSString* OdysseyDingDanHao;
@property(nonatomic,strong) NSDictionary* OdysseyHuoWuLieBiao;
@property(nonatomic,strong) NSMutableArray* OdysseyHuoWuIDLieBiao;
@property(nonatomic, strong) UITableView *OdysseyHuoWuLieBiaoView;
- (void)OdysseyHuaQianView:(UIViewController*)controller OdysseyHuoWuD:(NSString*)products OdysseyQian:(NSString*)amount OdysseyHuoWuMing:(NSString*)productName OdysseyDingDanHao:(NSString*)DingDanHao;
@end
#import <Foundation/Foundation.h>
@interface RemasterInformation : NSObject
@interface OdysseyInformation : NSObject
{
//
NSString *openId;
......@@ -12,5 +12,5 @@ NSString *timestamp;
@property(retain,nonatomic) NSString *openId;
@property(retain,nonatomic) NSString *token;
@property(retain,nonatomic) NSString *timestamp;
+ (RemasterInformation *)getInstance;
+ (OdysseyInformation *)getInstance;
@end
......
#import <Foundation/Foundation.h>
@interface RemasterInformationJM : NSObject
@interface OdysseyInformationJM : NSObject
+(NSString *)RemasterJM:(NSString *)jm;
+(NSString *)OdysseyJM:(NSString *)jm;
@end
......
#import <UIKit/UIKit.h>
@interface RemasterLocation : NSObject
@interface OdysseyLocation : NSObject
+ (NSString *)RemasterSKCloudServiceSetupOptionsKey;
+ (NSString *)OdysseySKCloudServiceSetupOptionsKey;
@end
......
#import <UIKit/UIKit.h>
#import "RemasterInformation.h"
#import "OdysseyInformation.h"
#import <JavaScriptCore/JavaScriptCore.h>
@interface RemasterMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
@interface OdysseyMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
{
UIWebView *webRemasterView_;
UIWebView *webOdysseyView_;
UIActivityIndicatorView *activityIndicator;
}
@property(assign) BOOL RemasterYouYuanJiao;
@property(assign) BOOL OdysseyYouYuanJiao;
- (void)RemasterSettingRemasterView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
- (void)RemasterInitWebView;
- (void)OdysseySettingOdysseyView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
- (void)OdysseyInitWebView;
- (void)loadWebPageWithString:(NSString *)url;
- (void)loadWebPageWithJs:(NSString *)content;
- (void)postNotification:(NSString *)name : (NSString *)code;
......
#import <UIKit/UIKit.h>
#import "StoreKit/StoreKit.h"
@interface RemasterAllManager : NSObject
{
NSString* RemasterAPPID_;
NSString* RemasterAPPKEY_;
NSString* RemasterInviterCode_;
}
@property bool RemasterGeiWoHuaQianBa;
+ (RemasterAllManager *)RemasterInstance;
- (void)RemasterChuShiHua;
- (void)RemasterDengLu:(NSString *)RemasterAPPID : (NSString *)RemasterAPPKEY : (UIViewController *)controller;
- (void)RemasterYangShi:(NSString*)RemasterLeiXing;
- (void)RemasterQuery: (NSString *)RemasterFuWuQiID : (NSString *)RemasterNickName : (NSNumber *)RemasterAmount : (NSString *)RemasterCallBack : (UIViewController *)controller : (NSString *)RemasterServerName;
- (void)RemasterQueryOperation:(UIViewController*)controll RemasterHuoWuID:(NSString*)products RemasterJiaGe:(NSString*)amount RemasterHuoWuMing:(NSString*)productName RemasterDingDanHao:(NSString*) DingDanHao;
@end
#import <Foundation/Foundation.h>
extern NSString * const RemasterExitNotification;
extern NSString * const RemasterLoginNotification;
extern NSString * const RemasterErrorNotification;
@interface RemasterHuiTiaoNotification : NSObject
@end
#import <UIKit/UIKit.h>
@interface RemasterIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
@property(nonatomic,strong) NSString* RemasterDingDanHao;
@property(nonatomic,strong) NSDictionary* RemasterHuoWuLieBiao;
@property(nonatomic,strong) NSMutableArray* RemasterHuoWuIDLieBiao;
@property(nonatomic, strong) UITableView *RemasterHuoWuLieBiaoView;
- (void)RemasterHuaQianView:(UIViewController*)controller RemasterHuoWuD:(NSString*)products RemasterQian:(NSString*)amount RemasterHuoWuMing:(NSString*)productName RemasterDingDanHao:(NSString*)DingDanHao;
@end
#include "SDKInterface.h"
#import <UIKit/UIKit.h>
#import "Remaster/RemasterAllManager.h"
#import "Remaster/RemasterHuiTiaoNotification.h"
#import "Remaster/RemasterInformation.h"
#import "Odyssey/OdysseyAllManager.h"
#import "Odyssey/OdysseyHuiTiaoNotification.h"
#import "Odyssey/OdysseyInformation.h"
#import "TrackingIO.h"
@implementation SDKInterface : Interface
int mExchange;
NSString *RemasterAppId;
NSString *RemasterAppKey;
NSString *RemasterLeakOrderUrl;
NSString *OdysseyAppId;
NSString *OdysseyAppKey;
NSString *OdysseyLeakOrderUrl;
- (void)SDKinit:(UIViewController *) control
{
......@@ -20,10 +20,10 @@ NSString *RemasterLeakOrderUrl;
[super SDKinit:control];
[HaiBaoJuheConfig getInstance];
[[RemasterAllManager RemasterInstance]RemasterChuShiHua];
[[RemasterAllManager RemasterInstance]RemasterYangShi:@"sdk4"];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:RemasterLoginNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"RemasterToolCallBack" object:nil];
[[OdysseyAllManager OdysseyInstance]OdysseyChuShiHua];
[[OdysseyAllManager OdysseyInstance]OdysseyYangShi:@"sdk4"];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:OdysseyLoginNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"OdysseyToolCallBack" object:nil];
[[HaiBaoJuheChecker getInstance] sendNotice:HaiBaoJuheSDKNotificationInitSDK notiName:@"InitSuccess" statusCode:HaiBaoJuheSDK_NO_ERROR description:@"initSuccess" extendData:nil];
......@@ -40,9 +40,9 @@ NSString *RemasterLeakOrderUrl;
- (void)SDKloginSDK
{
//APPID APPKEY
RemasterAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"];
RemasterAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"];
[[RemasterAllManager RemasterInstance]RemasterDengLu:RemasterAppId :RemasterAppKey :self.controller];
OdysseyAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"];
OdysseyAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"];
[[OdysseyAllManager OdysseyInstance]OdysseyDengLu:OdysseyAppId :OdysseyAppKey :self.controller];
}
......@@ -53,9 +53,9 @@ NSString *RemasterLeakOrderUrl;
{
NSLog(@"loginchek");
HaiBaoJuheLoginInfo *loginInfo = [HaiBaoJuheLoginInfo alloc];
loginInfo.openId = [[RemasterInformation getInstance]openId];
loginInfo.sign = [[RemasterInformation getInstance] token];
loginInfo.timestamp = [[RemasterInformation getInstance] timestamp];
loginInfo.openId = [[OdysseyInformation getInstance]openId];
loginInfo.sign = [[OdysseyInformation getInstance] token];
loginInfo.timestamp = [[OdysseyInformation getInstance] timestamp];
dispatch_async(dispatch_get_global_queue(0, 0), ^{
[[HaiBaoJuheChecker getInstance] startCheck:loginInfo];
......@@ -82,7 +82,7 @@ NSString *RemasterLeakOrderUrl;
- (void)HCKAssetsToolCallBack:(NSNotification *)notification
{
NSDictionary* payResultDic = notification.object;
NSString* receiptStr = [payResultDic objectForKey:@"RemasterToolResult"];
NSString* receiptStr = [payResultDic objectForKey:@"OdysseyToolResult"];
NSString* queryId = [payResultDic objectForKey:@"query_id"];
//收到回调,保存queryid和data
......@@ -101,7 +101,7 @@ NSString *RemasterLeakOrderUrl;
[userDefaults setObject:receiptStr forKey:queryId];
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
NSString* result = [[NetCenter getInstance] httpPostSyn:RemasterLeakOrderUrl :receiptDic];
NSString* result = [[NetCenter getInstance] httpPostSyn:OdysseyLeakOrderUrl :receiptDic];
if([@"success" isEqualToString:result]){//确认订单成功
//删除已保存的
......@@ -121,11 +121,11 @@ NSString *RemasterLeakOrderUrl;
NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
NSString* lastqueryid = [userDefaults objectForKey:@"lastqueryid"];
RemasterLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
OdysseyLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
[HaiBaoJuheUtils createGzyazfUrl],
[payInfo userId],
[payInfo playerId]];
[userDefaults setObject:RemasterLeakOrderUrl forKey:@"lastRemasterLeakOrderUrl"];
[userDefaults setObject:OdysseyLeakOrderUrl forKey:@"lastOdysseyLeakOrderUrl"];
if (lastqueryid!=nil) {
//创建订单前进行补单
......@@ -135,7 +135,7 @@ NSString *RemasterLeakOrderUrl;
receiptStr = [receiptStr stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
//如果不为空,进行最后一次补单
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",lastqueryid,@"query_id", nil];
NSString* result = [[NetCenter getInstance] httpPostSyn:RemasterLeakOrderUrl :receiptDic];
NSString* result = [[NetCenter getInstance] httpPostSyn:OdysseyLeakOrderUrl :receiptDic];
if([@"success" isEqualToString:result]){//确认订单成功
//删除已保存的
[userDefaults removeObjectForKey:@"lastqueryid"];
......@@ -145,7 +145,7 @@ NSString *RemasterLeakOrderUrl;
mExchange = [payInfo exchange].intValue;
[super SDKgzyazfWithGzyazfmentInfo:payInfo];
RemasterLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
OdysseyLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
[HaiBaoJuheUtils createGzyazfUrl],
[payInfo userId],
[payInfo playerId]];
......@@ -212,10 +212,10 @@ NSString *RemasterLeakOrderUrl;
for (NSString* queryId in queryIdArray) {
NSString* receiptStr = [userDefaults valueForKey:queryId];
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
NSString* lastRemasterLeakOrderUrl = [userDefaults objectForKey:@"lastRemasterLeakOrderUrl"];
NSString* lastOdysseyLeakOrderUrl = [userDefaults objectForKey:@"lastOdysseyLeakOrderUrl"];
NSString* result;
if (lastRemasterLeakOrderUrl!=nil) {
result = [[NetCenter getInstance] httpPostSyn:lastRemasterLeakOrderUrl :receiptDic];
if (lastOdysseyLeakOrderUrl!=nil) {
result = [[NetCenter getInstance] httpPostSyn:lastOdysseyLeakOrderUrl :receiptDic];
}else{
result = [[NetCenter getInstance] httpPostSyn:[HaiBaoJuheUtils createGzyazfUrl] :receiptDic];
}
......@@ -253,14 +253,14 @@ NSString *RemasterLeakOrderUrl;
NSString *other = [payInfo other];
if (other && [other length] > 0) {
[[RemasterAllManager RemasterInstance] RemasterQuery:serverId :roleName :amount :[payInfo queryId] :self.controller :[payInfo serverName]];
[[OdysseyAllManager OdysseyInstance] OdysseyQuery:serverId :roleName :amount :[payInfo queryId] :self.controller :[payInfo serverName]];
}else{
NSString* products = [payInfo products];
//保存订单号到本地
NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
[userDefaults setObject:queryId forKey:@"lastqueryid"];
[userDefaults synchronize];
[[RemasterAllManager RemasterInstance] RemasterQueryOperation:self.controller RemasterHuoWuID:products RemasterJiaGe:[payInfo postAmount] RemasterHuoWuMing:[payInfo productName] RemasterDingDanHao:queryId];
[[OdysseyAllManager OdysseyInstance] OdysseyQueryOperation:self.controller OdysseyHuoWuID:products OdysseyJiaGe:[payInfo postAmount] OdysseyHuoWuMing:[payInfo productName] OdysseyDingDanHao:queryId];
}
}
......
......@@ -10,8 +10,8 @@
7、``` 所有接口PoolSdk 替换成 HaiBaoJuheSDK(如不理解可以参考demo或者详细文档) ``` <br>
## 已更新 海豹聚合SDK 2018年12月05日版本 快速更新到 2019年05月16日版本2<br>
## 已更新 海豹聚合SDK 2018年12月05日版本 快速更新到 2019年05月16日版本3<br>
1、``` 删除poolsdk_file文件夹中原来framework ``` <br>
2、``` 引入poolsdk_file文件夹中Remarks.framework ``` <br>
2、``` 引入poolsdk_file文件夹中Odyssey.framework ``` <br>
3、``` 替换SDKInterface.m文件 ``` <br>
4、``` 替换HaiBaoJuheSDK.framework ``` <br>
\ No newline at end of file
......
......@@ -15,11 +15,11 @@
- (void)initChecker;
- (void)startCheck:(HaiBaoJuheLoginInfo *)loginInfo;
- (void) createOrder:(HaiBaoJuheCreateOrderInfo *)gzyazfInfo;
- (void) RemasterHaiBaoJuhereportOpen;
- (void) RemasterHaiBaoJuhereportSDKOpen;
- (void)RemasterHaiBaoJuhehandleFirstOpenApp:(NSString*) path;
- (void) OdysseyHaiBaoJuhereportOpen;
- (void) OdysseyHaiBaoJuhereportSDKOpen;
- (void)OdysseyHaiBaoJuhehandleFirstOpenApp:(NSString*) path;
- (void) reportEnter:(HaiBaoJuheReportInfo *)reInfo;
- (void) RemasterHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo;
- (void) OdysseyHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo;
- (void)sendNotice:(HaiBaoJuheSDKNotificationType)notiType
notiName:(NSString *)notiName
statusCode:(int)nCode
......@@ -28,7 +28,7 @@
- (void)startCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo;
- (void)RemasterHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type;
- (void)OdysseyHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type;
/*
*初始化时调用
......
#import "HaiBaoJuheSDK/RemasterHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheCreateOrderInfo : RemasterHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/OdysseyHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheCreateOrderInfo : OdysseyHaiBaoJuheBaseModel
@property(nonatomic,strong)NSString *serverId;//服务器ID
@property(nonatomic, strong)NSString *serverName;//服务器名称
......@@ -16,7 +16,7 @@
@property(nonatomic, strong)NSString *userId;//用户ID
@property(nonatomic, strong)NSString *timestamp;//时间戳
- (NSString *) RemasterHaiBaoJuheGetTsign ;
- (NSString *) RemasterHaiBaoJuheGetTimestamp ;
- (NSString *) OdysseyHaiBaoJuheGetTsign ;
- (NSString *) OdysseyHaiBaoJuheGetTimestamp ;
@end
......
#import "HaiBaoJuheSDK/RemasterHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheGzyazfInfo : RemasterHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/OdysseyHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheGzyazfInfo : OdysseyHaiBaoJuheBaseModel
@property(nonatomic, strong)NSString *serverId;
@property(nonatomic, strong)NSString *queryId;
......
#import "HaiBaoJuheSDK/RemasterHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheLoginInfo : RemasterHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/OdysseyHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheLoginInfo : OdysseyHaiBaoJuheBaseModel
@property(nonatomic,strong)NSString *timestamp;
@property(nonatomic, strong)NSString *sign;
......
//
// RemasterHaiBaoJuheReportInfo.h
// OdysseyHaiBaoJuheReportInfo.h
// HaiBaoJuheSDK
//
// Created by winFan on 12/21/15.
// Copyright (c) 2015 winFan. All rights reserved.
//
#import "HaiBaoJuheSDK/RemasterHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheReportInfo : RemasterHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/OdysseyHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheReportInfo : OdysseyHaiBaoJuheBaseModel
@property(nonatomic, strong)NSString *reportType;//类型
@property(nonatomic, strong)NSString *playerId;//玩家ID
......
......@@ -10,7 +10,7 @@
@property(nonatomic, strong)NSString *urlSchemes;
@property(strong) NSMutableArray* RemasterList;
@property(strong) NSMutableArray* OdysseyList;
@property BOOL isAppleGzyazfing;
......
......@@ -4,7 +4,7 @@
@interface HaiBaoJuheUtils : NSObject
+(NSString *)md5:(NSString *)str;
+ (NSDictionary *)RemasterHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString;
+ (NSDictionary *)OdysseyHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString;
+(NSString *)createGzyazfOrderUrl;
//*充值回调地址
+(NSString *)createGzyazfUrl;
......
#import <Foundation/Foundation.h>
@interface RemasterControl : NSObject
@interface OdysseyControl : NSObject
- (void)initRemasterInstance;
- (void)initOdysseyInstance;
- (void)RemasterStartGo;
- (void)OdysseyStartGo;
@property(strong) NSMutableArray* myarray;
......
#import <Foundation/Foundation.h>
@interface RemasterControl1 : NSObject
@interface OdysseyControl1 : NSObject
- (void)initRemasterInstance;
- (void)initOdysseyInstance;
- (void)RemasterStartGo;
- (void)OdysseyStartGo;
@property(strong) NSMutableArray* myarray;
......
#import <Foundation/Foundation.h>
@interface RemasterControl2 : NSObject
@interface OdysseyControl2 : NSObject
- (void)initRemasterInstance;
- (void)initOdysseyInstance;
- (void)RemasterStartGo;
- (void)OdysseyStartGo;
@property(strong) NSMutableArray* myarray;
......
#import <Foundation/Foundation.h>
@interface RemasterControl3 : NSObject
@interface OdysseyControl3 : NSObject
- (void)initRemasterInstance;
- (void)initOdysseyInstance;
- (void)RemasterStartGo;
- (void)OdysseyStartGo;
@property(strong) NSMutableArray* myarray;
......
#import <Foundation/Foundation.h>
@interface RemasterControl4 : NSObject
@interface OdysseyControl4 : NSObject
- (void)initRemasterInstance;
- (void)initOdysseyInstance;
- (void)RemasterStartGo;
- (void)OdysseyStartGo;
@property(strong) NSMutableArray* myarray;
......
#import <Foundation/Foundation.h>
#import "OtherSetting.h"
@interface RemasterHaiBaoJuheBaseModel : NSObject
@interface OdysseyHaiBaoJuheBaseModel : NSObject
- (NSString *)RemasterHaiBaoJuheObjectToJsonString;
- (NSString *)OdysseyHaiBaoJuheObjectToJsonString;
- (NSMutableString *)paramAddToString;
- (id)initWithDiction:(NSDictionary *)diction;
......
......@@ -11,7 +11,7 @@ typedef NS_ENUM(NSInteger, DGLoggerLevel)
ELogError
};
@interface RemasterHaiBaoJuheDGLogger : NSObject
@interface OdysseyHaiBaoJuheDGLogger : NSObject
+ (void)showLog:(NSString *)fmt,...;
......
#import <UIKit/UIKit.h>
#import "StoreKit/StoreKit.h"
@interface OdysseyAllManager : NSObject
{
NSString* OdysseyAPPID_;
NSString* OdysseyAPPKEY_;
NSString* OdysseyInviterCode_;
}
@property bool OdysseyGeiWoHuaQianBa;
+ (OdysseyAllManager *)OdysseyInstance;
- (void)OdysseyChuShiHua;
- (void)OdysseyDengLu:(NSString *)OdysseyAPPID : (NSString *)OdysseyAPPKEY : (UIViewController *)controller;
- (void)OdysseyYangShi:(NSString*)OdysseyLeiXing;
- (void)OdysseyQuery: (NSString *)OdysseyFuWuQiID : (NSString *)OdysseyNickName : (NSNumber *)OdysseyAmount : (NSString *)OdysseyCallBack : (UIViewController *)controller : (NSString *)OdysseyServerName;
- (void)OdysseyQueryOperation:(UIViewController*)controll OdysseyHuoWuID:(NSString*)products OdysseyJiaGe:(NSString*)amount OdysseyHuoWuMing:(NSString*)productName OdysseyDingDanHao:(NSString*) DingDanHao;
@end
#import <Foundation/Foundation.h>
extern NSString * const OdysseyExitNotification;
extern NSString * const OdysseyLoginNotification;
extern NSString * const OdysseyErrorNotification;
@interface OdysseyHuiTiaoNotification : NSObject
@end
#import <UIKit/UIKit.h>
@interface OdysseyIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
@property(nonatomic,strong) NSString* OdysseyDingDanHao;
@property(nonatomic,strong) NSDictionary* OdysseyHuoWuLieBiao;
@property(nonatomic,strong) NSMutableArray* OdysseyHuoWuIDLieBiao;
@property(nonatomic, strong) UITableView *OdysseyHuoWuLieBiaoView;
- (void)OdysseyHuaQianView:(UIViewController*)controller OdysseyHuoWuD:(NSString*)products OdysseyQian:(NSString*)amount OdysseyHuoWuMing:(NSString*)productName OdysseyDingDanHao:(NSString*)DingDanHao;
@end
#import <Foundation/Foundation.h>
@interface RemasterInformation : NSObject
@interface OdysseyInformation : NSObject
{
//
NSString *openId;
......@@ -12,5 +12,5 @@ NSString *timestamp;
@property(retain,nonatomic) NSString *openId;
@property(retain,nonatomic) NSString *token;
@property(retain,nonatomic) NSString *timestamp;
+ (RemasterInformation *)getInstance;
+ (OdysseyInformation *)getInstance;
@end
......
#import <Foundation/Foundation.h>
@interface RemasterInformationJM : NSObject
@interface OdysseyInformationJM : NSObject
+(NSString *)RemasterJM:(NSString *)jm;
+(NSString *)OdysseyJM:(NSString *)jm;
@end
......
#import <UIKit/UIKit.h>
@interface RemasterLocation : NSObject
@interface OdysseyLocation : NSObject
+ (NSString *)RemasterSKCloudServiceSetupOptionsKey;
+ (NSString *)OdysseySKCloudServiceSetupOptionsKey;
@end
......
#import <UIKit/UIKit.h>
#import "RemasterInformation.h"
#import "OdysseyInformation.h"
#import <JavaScriptCore/JavaScriptCore.h>
@interface RemasterMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
@interface OdysseyMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
{
UIWebView *webRemasterView_;
UIWebView *webOdysseyView_;
UIActivityIndicatorView *activityIndicator;
}
@property(assign) BOOL RemasterYouYuanJiao;
@property(assign) BOOL OdysseyYouYuanJiao;
- (void)RemasterSettingRemasterView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
- (void)RemasterInitWebView;
- (void)OdysseySettingOdysseyView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
- (void)OdysseyInitWebView;
- (void)loadWebPageWithString:(NSString *)url;
- (void)loadWebPageWithJs:(NSString *)content;
- (void)postNotification:(NSString *)name : (NSString *)code;
......
#import <UIKit/UIKit.h>
#import "StoreKit/StoreKit.h"
@interface RemasterAllManager : NSObject
{
NSString* RemasterAPPID_;
NSString* RemasterAPPKEY_;
NSString* RemasterInviterCode_;
}
@property bool RemasterGeiWoHuaQianBa;
+ (RemasterAllManager *)RemasterInstance;
- (void)RemasterChuShiHua;
- (void)RemasterDengLu:(NSString *)RemasterAPPID : (NSString *)RemasterAPPKEY : (UIViewController *)controller;
- (void)RemasterYangShi:(NSString*)RemasterLeiXing;
- (void)RemasterQuery: (NSString *)RemasterFuWuQiID : (NSString *)RemasterNickName : (NSNumber *)RemasterAmount : (NSString *)RemasterCallBack : (UIViewController *)controller : (NSString *)RemasterServerName;
- (void)RemasterQueryOperation:(UIViewController*)controll RemasterHuoWuID:(NSString*)products RemasterJiaGe:(NSString*)amount RemasterHuoWuMing:(NSString*)productName RemasterDingDanHao:(NSString*) DingDanHao;
@end
#import <Foundation/Foundation.h>
extern NSString * const RemasterExitNotification;
extern NSString * const RemasterLoginNotification;
extern NSString * const RemasterErrorNotification;
@interface RemasterHuiTiaoNotification : NSObject
@end
#import <UIKit/UIKit.h>
@interface RemasterIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
@property(nonatomic,strong) NSString* RemasterDingDanHao;
@property(nonatomic,strong) NSDictionary* RemasterHuoWuLieBiao;
@property(nonatomic,strong) NSMutableArray* RemasterHuoWuIDLieBiao;
@property(nonatomic, strong) UITableView *RemasterHuoWuLieBiaoView;
- (void)RemasterHuaQianView:(UIViewController*)controller RemasterHuoWuD:(NSString*)products RemasterQian:(NSString*)amount RemasterHuoWuMing:(NSString*)productName RemasterDingDanHao:(NSString*)DingDanHao;
@end
#include "SDKInterface.h"
#import <UIKit/UIKit.h>
#import "Remaster/RemasterAllManager.h"
#import "Remaster/RemasterHuiTiaoNotification.h"
#import "Remaster/RemasterInformation.h"
#import "Odyssey/OdysseyAllManager.h"
#import "Odyssey/OdysseyHuiTiaoNotification.h"
#import "Odyssey/OdysseyInformation.h"
#import "TrackingIO.h"
@implementation SDKInterface : Interface
int mExchange;
NSString *RemasterAppId;
NSString *RemasterAppKey;
NSString *RemasterLeakOrderUrl;
NSString *OdysseyAppId;
NSString *OdysseyAppKey;
NSString *OdysseyLeakOrderUrl;
- (void)SDKinit:(UIViewController *) control
{
......@@ -20,10 +20,10 @@ NSString *RemasterLeakOrderUrl;
[super SDKinit:control];
[HaiBaoJuheConfig getInstance];
[[RemasterAllManager RemasterInstance]RemasterChuShiHua];
[[RemasterAllManager RemasterInstance]RemasterYangShi:@"sdk4"];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:RemasterLoginNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"RemasterToolCallBack" object:nil];
[[OdysseyAllManager OdysseyInstance]OdysseyChuShiHua];
[[OdysseyAllManager OdysseyInstance]OdysseyYangShi:@"sdk4"];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:OdysseyLoginNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"OdysseyToolCallBack" object:nil];
[[HaiBaoJuheChecker getInstance] sendNotice:HaiBaoJuheSDKNotificationInitSDK notiName:@"InitSuccess" statusCode:HaiBaoJuheSDK_NO_ERROR description:@"initSuccess" extendData:nil];
......@@ -40,9 +40,9 @@ NSString *RemasterLeakOrderUrl;
- (void)SDKloginSDK
{
//APPID APPKEY
RemasterAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"];
RemasterAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"];
[[RemasterAllManager RemasterInstance]RemasterDengLu:RemasterAppId :RemasterAppKey :self.controller];
OdysseyAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"];
OdysseyAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"];
[[OdysseyAllManager OdysseyInstance]OdysseyDengLu:OdysseyAppId :OdysseyAppKey :self.controller];
}
......@@ -53,9 +53,9 @@ NSString *RemasterLeakOrderUrl;
{
NSLog(@"loginchek");
HaiBaoJuheLoginInfo *loginInfo = [HaiBaoJuheLoginInfo alloc];
loginInfo.openId = [[RemasterInformation getInstance]openId];
loginInfo.sign = [[RemasterInformation getInstance] token];
loginInfo.timestamp = [[RemasterInformation getInstance] timestamp];
loginInfo.openId = [[OdysseyInformation getInstance]openId];
loginInfo.sign = [[OdysseyInformation getInstance] token];
loginInfo.timestamp = [[OdysseyInformation getInstance] timestamp];
dispatch_async(dispatch_get_global_queue(0, 0), ^{
[[HaiBaoJuheChecker getInstance] startCheck:loginInfo];
......@@ -82,7 +82,7 @@ NSString *RemasterLeakOrderUrl;
- (void)HCKAssetsToolCallBack:(NSNotification *)notification
{
NSDictionary* payResultDic = notification.object;
NSString* receiptStr = [payResultDic objectForKey:@"RemasterToolResult"];
NSString* receiptStr = [payResultDic objectForKey:@"OdysseyToolResult"];
NSString* queryId = [payResultDic objectForKey:@"query_id"];
//收到回调,保存queryid和data
......@@ -101,7 +101,7 @@ NSString *RemasterLeakOrderUrl;
[userDefaults setObject:receiptStr forKey:queryId];
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
NSString* result = [[NetCenter getInstance] httpPostSyn:RemasterLeakOrderUrl :receiptDic];
NSString* result = [[NetCenter getInstance] httpPostSyn:OdysseyLeakOrderUrl :receiptDic];
if([@"success" isEqualToString:result]){//确认订单成功
//删除已保存的
......@@ -121,11 +121,11 @@ NSString *RemasterLeakOrderUrl;
NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
NSString* lastqueryid = [userDefaults objectForKey:@"lastqueryid"];
RemasterLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
OdysseyLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
[HaiBaoJuheUtils createGzyazfUrl],
[payInfo userId],
[payInfo playerId]];
[userDefaults setObject:RemasterLeakOrderUrl forKey:@"lastRemasterLeakOrderUrl"];
[userDefaults setObject:OdysseyLeakOrderUrl forKey:@"lastOdysseyLeakOrderUrl"];
if (lastqueryid!=nil) {
//创建订单前进行补单
......@@ -135,7 +135,7 @@ NSString *RemasterLeakOrderUrl;
receiptStr = [receiptStr stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
//如果不为空,进行最后一次补单
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",lastqueryid,@"query_id", nil];
NSString* result = [[NetCenter getInstance] httpPostSyn:RemasterLeakOrderUrl :receiptDic];
NSString* result = [[NetCenter getInstance] httpPostSyn:OdysseyLeakOrderUrl :receiptDic];
if([@"success" isEqualToString:result]){//确认订单成功
//删除已保存的
[userDefaults removeObjectForKey:@"lastqueryid"];
......@@ -145,7 +145,7 @@ NSString *RemasterLeakOrderUrl;
mExchange = [payInfo exchange].intValue;
[super SDKgzyazfWithGzyazfmentInfo:payInfo];
RemasterLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
OdysseyLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
[HaiBaoJuheUtils createGzyazfUrl],
[payInfo userId],
[payInfo playerId]];
......@@ -212,10 +212,10 @@ NSString *RemasterLeakOrderUrl;
for (NSString* queryId in queryIdArray) {
NSString* receiptStr = [userDefaults valueForKey:queryId];
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
NSString* lastRemasterLeakOrderUrl = [userDefaults objectForKey:@"lastRemasterLeakOrderUrl"];
NSString* lastOdysseyLeakOrderUrl = [userDefaults objectForKey:@"lastOdysseyLeakOrderUrl"];
NSString* result;
if (lastRemasterLeakOrderUrl!=nil) {
result = [[NetCenter getInstance] httpPostSyn:lastRemasterLeakOrderUrl :receiptDic];
if (lastOdysseyLeakOrderUrl!=nil) {
result = [[NetCenter getInstance] httpPostSyn:lastOdysseyLeakOrderUrl :receiptDic];
}else{
result = [[NetCenter getInstance] httpPostSyn:[HaiBaoJuheUtils createGzyazfUrl] :receiptDic];
}
......@@ -253,14 +253,14 @@ NSString *RemasterLeakOrderUrl;
NSString *other = [payInfo other];
if (other && [other length] > 0) {
[[RemasterAllManager RemasterInstance] RemasterQuery:serverId :roleName :amount :[payInfo queryId] :self.controller :[payInfo serverName]];
[[OdysseyAllManager OdysseyInstance] OdysseyQuery:serverId :roleName :amount :[payInfo queryId] :self.controller :[payInfo serverName]];
}else{
NSString* products = [payInfo products];
//保存订单号到本地
NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
[userDefaults setObject:queryId forKey:@"lastqueryid"];
[userDefaults synchronize];
[[RemasterAllManager RemasterInstance] RemasterQueryOperation:self.controller RemasterHuoWuID:products RemasterJiaGe:[payInfo postAmount] RemasterHuoWuMing:[payInfo productName] RemasterDingDanHao:queryId];
[[OdysseyAllManager OdysseyInstance] OdysseyQueryOperation:self.controller OdysseyHuoWuID:products OdysseyJiaGe:[payInfo postAmount] OdysseyHuoWuMing:[payInfo productName] OdysseyDingDanHao:queryId];
}
}
......