lizhihui

更新190320版本

Showing 61 changed files with 229 additions and 225 deletions
No preview for this file type
......@@ -7,7 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
2606300D2240A07C00019981 /* Ragdolls.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2606300C2240A07C00019981 /* Ragdolls.framework */; };
2606305B224247FF00019981 /* Sisley.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2606305A224247FF00019981 /* Sisley.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 */
2606300C2240A07C00019981 /* Ragdolls.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Ragdolls.framework; sourceTree = "<group>"; };
2606305A224247FF00019981 /* Sisley.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sisley.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>"; };
......@@ -105,11 +105,11 @@
8484E5161EE7E36800B402D1 /* SystemConfiguration.framework in Frameworks */,
269F653821B6613F006AEC88 /* HaiBaoJuheSDK.framework in Frameworks */,
8484E4FC1EE7E1D800B402D1 /* libsqlite3.dylib in Frameworks */,
2606305B224247FF00019981 /* Sisley.framework in Frameworks */,
8484E5121EE7E2B800B402D1 /* libz.1.dylib in Frameworks */,
8484E5101EE7E29A00B402D1 /* libc++.1.dylib in Frameworks */,
8484E5001EE7E20C00B402D1 /* CFNetwork.framework in Frameworks */,
8484E5061EE7E24A00B402D1 /* CoreMotion.framework in Frameworks */,
2606300D2240A07C00019981 /* Ragdolls.framework in Frameworks */,
8484E5021EE7E21F00B402D1 /* UIKit.framework in Frameworks */,
8484E50C1EE7E27100B402D1 /* CoreGraphics.framework in Frameworks */,
8484E5081EE7E25600B402D1 /* CoreText.framework in Frameworks */,
......@@ -143,7 +143,7 @@
8476DF641C4DD71D00EC42BA /* poolsdk */ = {
isa = PBXGroup;
children = (
2606300C2240A07C00019981 /* Ragdolls.framework */,
2606305A224247FF00019981 /* Sisley.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) RagdollsHaiBaoJuhereportOpen;
- (void) RagdollsHaiBaoJuhereportSDKOpen;
- (void)RagdollsHaiBaoJuhehandleFirstOpenApp:(NSString*) path;
- (void) SisleyHaiBaoJuhereportOpen;
- (void) SisleyHaiBaoJuhereportSDKOpen;
- (void)SisleyHaiBaoJuhehandleFirstOpenApp:(NSString*) path;
- (void) reportEnter:(HaiBaoJuheReportInfo *)reInfo;
- (void) RagdollsHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo;
- (void) SisleyHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo;
- (void)sendNotice:(HaiBaoJuheSDKNotificationType)notiType
notiName:(NSString *)notiName
statusCode:(int)nCode
......@@ -28,7 +28,7 @@
- (void)startCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo;
- (void)RagdollsHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type;
- (void)SisleyHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type;
/*
*初始化时调用
......
#import "HaiBaoJuheSDK/RagdollsHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheCreateOrderInfo : RagdollsHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/SisleyHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheCreateOrderInfo : SisleyHaiBaoJuheBaseModel
@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 *) RagdollsHaiBaoJuheGetTsign ;
- (NSString *) RagdollsHaiBaoJuheGetTimestamp ;
- (NSString *) SisleyHaiBaoJuheGetTsign ;
- (NSString *) SisleyHaiBaoJuheGetTimestamp ;
@end
......
#import "HaiBaoJuheSDK/RagdollsHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheGzyazfInfo : RagdollsHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/SisleyHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheGzyazfInfo : SisleyHaiBaoJuheBaseModel
@property(nonatomic, strong)NSString *serverId;
@property(nonatomic, strong)NSString *queryId;
......
#import "HaiBaoJuheSDK/RagdollsHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheLoginInfo : RagdollsHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/SisleyHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheLoginInfo : SisleyHaiBaoJuheBaseModel
@property(nonatomic,strong)NSString *timestamp;
@property(nonatomic, strong)NSString *sign;
......
//
// RagdollsHaiBaoJuheReportInfo.h
// SisleyHaiBaoJuheReportInfo.h
// HaiBaoJuheSDK
//
// Created by winFan on 12/21/15.
// Copyright (c) 2015 winFan. All rights reserved.
//
#import "HaiBaoJuheSDK/RagdollsHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheReportInfo : RagdollsHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/SisleyHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheReportInfo : SisleyHaiBaoJuheBaseModel
@property(nonatomic, strong)NSString *reportType;//类型
@property(nonatomic, strong)NSString *playerId;//玩家ID
......
......@@ -10,6 +10,8 @@
@property(nonatomic, strong)NSString *urlSchemes;
@property(strong) NSMutableArray* SisleyList;
@property BOOL isAppleGzyazfing;
+ (HaiBaoJuheSDK *)shareSDK;
......
......@@ -4,7 +4,7 @@
@interface HaiBaoJuheUtils : NSObject
+(NSString *)md5:(NSString *)str;
+ (NSDictionary *)RagdollsHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString;
+ (NSDictionary *)SisleyHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString;
+(NSString *)createGzyazfOrderUrl;
//*充值回调地址
+(NSString *)createGzyazfUrl;
......
#import <Foundation/Foundation.h>
#import "OtherSetting.h"
@interface RagdollsHaiBaoJuheBaseModel : NSObject
@interface SisleyHaiBaoJuheBaseModel : NSObject
- (NSString *)RagdollsHaiBaoJuheObjectToJsonString;
- (NSString *)SisleyHaiBaoJuheObjectToJsonString;
- (NSMutableString *)paramAddToString;
- (id)initWithDiction:(NSDictionary *)diction;
......
......@@ -11,7 +11,7 @@ typedef NS_ENUM(NSInteger, DGLoggerLevel)
ELogError
};
@interface RagdollsHaiBaoJuheDGLogger : NSObject
@interface SisleyHaiBaoJuheDGLogger : NSObject
+ (void)showLog:(NSString *)fmt,...;
......
#import <UIKit/UIKit.h>
#import "StoreKit/StoreKit.h"
@interface RagdollsAllManager : NSObject
{
NSString* RagdollsAPPID_;
NSString* RagdollsAPPKEY_;
NSString* RagdollsInviterCode_;
}
@property bool RagdollsGeiWoHuaQianBa;
+ (RagdollsAllManager *)RagdollsInstance;
- (void)RagdollsChuShiHua;
- (void)RagdollsDengLu:(NSString *)RagdollsAPPID : (NSString *)RagdollsAPPKEY : (UIViewController *)controller;
- (void)RagdollsYangShi:(NSString*)RagdollsLeiXing;
- (void)RagdollsQuery: (NSString *)RagdollsFuWuQiID : (NSString *)RagdollsNickName : (NSNumber *)RagdollsAmount : (NSString *)RagdollsCallBack : (UIViewController *)controller : (NSString *)RagdollsServerName;
- (void)RagdollsQueryOperation:(UIViewController*)controll RagdollsHuoWuID:(NSString*)products RagdollsJiaGe:(NSString*)amount RagdollsHuoWuMing:(NSString*)productName RagdollsDingDanHao:(NSString*) DingDanHao;
@end
#import <Foundation/Foundation.h>
extern NSString * const RagdollsExitNotification;
extern NSString * const RagdollsLoginNotification;
extern NSString * const RagdollsErrorNotification;
@interface RagdollsHuiTiaoNotification : NSObject
@end
#import <UIKit/UIKit.h>
@interface RagdollsIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
@property(nonatomic,strong) NSString* RagdollsDingDanHao;
@property(nonatomic,strong) NSDictionary* RagdollsHuoWuLieBiao;
@property(nonatomic,strong) NSMutableArray* RagdollsHuoWuIDLieBiao;
@property(nonatomic, strong) UITableView *RagdollsHuoWuLieBiaoView;
- (void)RagdollsHuaQianView:(UIViewController*)controller RagdollsHuoWuD:(NSString*)products RagdollsQian:(NSString*)amount RagdollsHuoWuMing:(NSString*)productName RagdollsDingDanHao:(NSString*)DingDanHao;
@end
#import <UIKit/UIKit.h>
#import "StoreKit/StoreKit.h"
@interface SisleyAllManager : NSObject
{
NSString* SisleyAPPID_;
NSString* SisleyAPPKEY_;
NSString* SisleyInviterCode_;
}
@property bool SisleyGeiWoHuaQianBa;
+ (SisleyAllManager *)SisleyInstance;
- (void)SisleyChuShiHua;
- (void)SisleyDengLu:(NSString *)SisleyAPPID : (NSString *)SisleyAPPKEY : (UIViewController *)controller;
- (void)SisleyYangShi:(NSString*)SisleyLeiXing;
- (void)SisleyQuery: (NSString *)SisleyFuWuQiID : (NSString *)SisleyNickName : (NSNumber *)SisleyAmount : (NSString *)SisleyCallBack : (UIViewController *)controller : (NSString *)SisleyServerName;
- (void)SisleyQueryOperation:(UIViewController*)controll SisleyHuoWuID:(NSString*)products SisleyJiaGe:(NSString*)amount SisleyHuoWuMing:(NSString*)productName SisleyDingDanHao:(NSString*) DingDanHao;
@end
#import <Foundation/Foundation.h>
extern NSString * const SisleyExitNotification;
extern NSString * const SisleyLoginNotification;
extern NSString * const SisleyErrorNotification;
@interface SisleyHuiTiaoNotification : NSObject
@end
#import <UIKit/UIKit.h>
@interface SisleyIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
@property(nonatomic,strong) NSString* SisleyDingDanHao;
@property(nonatomic,strong) NSDictionary* SisleyHuoWuLieBiao;
@property(nonatomic,strong) NSMutableArray* SisleyHuoWuIDLieBiao;
@property(nonatomic, strong) UITableView *SisleyHuoWuLieBiaoView;
- (void)SisleyHuaQianView:(UIViewController*)controller SisleyHuoWuD:(NSString*)products SisleyQian:(NSString*)amount SisleyHuoWuMing:(NSString*)productName SisleyDingDanHao:(NSString*)DingDanHao;
@end
#import <Foundation/Foundation.h>
@interface RagdollsInformation : NSObject
@interface SisleyInformation : NSObject
{
//
NSString *openId;
......@@ -12,5 +12,5 @@ NSString *timestamp;
@property(retain,nonatomic) NSString *openId;
@property(retain,nonatomic) NSString *token;
@property(retain,nonatomic) NSString *timestamp;
+ (RagdollsInformation *)getInstance;
+ (SisleyInformation *)getInstance;
@end
......
#import <Foundation/Foundation.h>
@interface RagdollsInformationJM : NSObject
@interface SisleyInformationJM : NSObject
+(NSString *)RagdollsJM:(NSString *)jm;
+(NSString *)SisleyJM:(NSString *)jm;
@end
......
#import <UIKit/UIKit.h>
@interface RagdollsLocation : NSObject
@interface SisleyLocation : NSObject
+ (NSString *)RagdollsSKCloudServiceSetupOptionsKey;
+ (NSString *)SisleySKCloudServiceSetupOptionsKey;
@end
......
#import <UIKit/UIKit.h>
#import "RagdollsInformation.h"
#import "SisleyInformation.h"
#import <JavaScriptCore/JavaScriptCore.h>
@interface RagdollsMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
@interface SisleyMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
{
UIWebView *webRagdollsView_;
UIWebView *webSisleyView_;
UIActivityIndicatorView *activityIndicator;
}
@property(assign) BOOL RagdollsYouYuanJiao;
@property(assign) BOOL SisleyYouYuanJiao;
- (void)RagdollsSettingRagdollsView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
- (void)RagdollsInitWebView;
- (void)SisleySettingSisleyView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
- (void)SisleyInitWebView;
- (void)loadWebPageWithString:(NSString *)url;
- (void)loadWebPageWithJs:(NSString *)content;
- (void)postNotification:(NSString *)name : (NSString *)code;
......
......@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.0</string>
<string>1.0.0.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
......
#include "SDKInterface.h"
#import <UIKit/UIKit.h>
#import "Ragdolls/RagdollsAllManager.h"
#import "Ragdolls/RagdollsHuiTiaoNotification.h"
#import "Ragdolls/RagdollsInformation.h"
#import "Sisley/SisleyAllManager.h"
#import "Sisley/SisleyHuiTiaoNotification.h"
#import "Sisley/SisleyInformation.h"
#import "TrackingIO.h"
@implementation SDKInterface : Interface
int mExchange;
NSString *RagdollsAppId;
NSString *RagdollsAppKey;
NSString *RagdollsLeakOrderUrl;
NSString *SisleyAppId;
NSString *SisleyAppKey;
NSString *SisleyLeakOrderUrl;
- (void)SDKinit:(UIViewController *) control
{
......@@ -20,10 +20,10 @@ NSString *RagdollsLeakOrderUrl;
[super SDKinit:control];
[HaiBaoJuheConfig getInstance];
[[RagdollsAllManager RagdollsInstance]RagdollsChuShiHua];
[[RagdollsAllManager RagdollsInstance]RagdollsYangShi:@"sdk"];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:RagdollsLoginNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"RagdollsToolCallBack" object:nil];
[[SisleyAllManager SisleyInstance]SisleyChuShiHua];
[[SisleyAllManager SisleyInstance]SisleyYangShi:@"sdk"];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:SisleyLoginNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"SisleyToolCallBack" object:nil];
[[HaiBaoJuheChecker getInstance] sendNotice:HaiBaoJuheSDKNotificationInitSDK notiName:@"InitSuccess" statusCode:HaiBaoJuheSDK_NO_ERROR description:@"initSuccess" extendData:nil];
......@@ -40,9 +40,9 @@ NSString *RagdollsLeakOrderUrl;
- (void)SDKloginSDK
{
//APPID APPKEY
RagdollsAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"];
RagdollsAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"];
[[RagdollsAllManager RagdollsInstance]RagdollsDengLu:RagdollsAppId :RagdollsAppKey :self.controller];
SisleyAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"];
SisleyAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"];
[[SisleyAllManager SisleyInstance]SisleyDengLu:SisleyAppId :SisleyAppKey :self.controller];
}
......@@ -53,9 +53,9 @@ NSString *RagdollsLeakOrderUrl;
{
NSLog(@"loginchek");
HaiBaoJuheLoginInfo *loginInfo = [HaiBaoJuheLoginInfo alloc];
loginInfo.openId = [[RagdollsInformation getInstance]openId];
loginInfo.sign = [[RagdollsInformation getInstance] token];
loginInfo.timestamp = [[RagdollsInformation getInstance] timestamp];
loginInfo.openId = [[SisleyInformation getInstance]openId];
loginInfo.sign = [[SisleyInformation getInstance] token];
loginInfo.timestamp = [[SisleyInformation getInstance] timestamp];
dispatch_async(dispatch_get_global_queue(0, 0), ^{
[[HaiBaoJuheChecker getInstance] startCheck:loginInfo];
......@@ -82,7 +82,7 @@ NSString *RagdollsLeakOrderUrl;
- (void)HCKAssetsToolCallBack:(NSNotification *)notification
{
NSDictionary* payResultDic = notification.object;
NSString* receiptStr = [payResultDic objectForKey:@"RagdollsToolResult"];
NSString* receiptStr = [payResultDic objectForKey:@"SisleyToolResult"];
NSString* queryId = [payResultDic objectForKey:@"query_id"];
//收到回调,保存queryid和data
......@@ -101,7 +101,7 @@ NSString *RagdollsLeakOrderUrl;
[userDefaults setObject:receiptStr forKey:queryId];
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
NSString* result = [[NetCenter getInstance] httpPostSyn:RagdollsLeakOrderUrl :receiptDic];
NSString* result = [[NetCenter getInstance] httpPostSyn:SisleyLeakOrderUrl :receiptDic];
if([@"success" isEqualToString:result]){//确认订单成功
//删除已保存的
......@@ -121,11 +121,11 @@ NSString *RagdollsLeakOrderUrl;
NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
NSString* lastqueryid = [userDefaults objectForKey:@"lastqueryid"];
RagdollsLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
SisleyLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
[HaiBaoJuheUtils createGzyazfUrl],
[payInfo userId],
[payInfo playerId]];
[userDefaults setObject:RagdollsLeakOrderUrl forKey:@"lastRagdollsLeakOrderUrl"];
[userDefaults setObject:SisleyLeakOrderUrl forKey:@"lastSisleyLeakOrderUrl"];
if (lastqueryid!=nil) {
//创建订单前进行补单
......@@ -135,7 +135,7 @@ NSString *RagdollsLeakOrderUrl;
receiptStr = [receiptStr stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
//如果不为空,进行最后一次补单
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",lastqueryid,@"query_id", nil];
NSString* result = [[NetCenter getInstance] httpPostSyn:RagdollsLeakOrderUrl :receiptDic];
NSString* result = [[NetCenter getInstance] httpPostSyn:SisleyLeakOrderUrl :receiptDic];
if([@"success" isEqualToString:result]){//确认订单成功
//删除已保存的
[userDefaults removeObjectForKey:@"lastqueryid"];
......@@ -145,7 +145,7 @@ NSString *RagdollsLeakOrderUrl;
mExchange = [payInfo exchange].intValue;
[super SDKgzyazfWithGzyazfmentInfo:payInfo];
RagdollsLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
SisleyLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
[HaiBaoJuheUtils createGzyazfUrl],
[payInfo userId],
[payInfo playerId]];
......@@ -212,10 +212,10 @@ NSString *RagdollsLeakOrderUrl;
for (NSString* queryId in queryIdArray) {
NSString* receiptStr = [userDefaults valueForKey:queryId];
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
NSString* lastRagdollsLeakOrderUrl = [userDefaults objectForKey:@"lastRagdollsLeakOrderUrl"];
NSString* lastSisleyLeakOrderUrl = [userDefaults objectForKey:@"lastSisleyLeakOrderUrl"];
NSString* result;
if (lastRagdollsLeakOrderUrl!=nil) {
result = [[NetCenter getInstance] httpPostSyn:lastRagdollsLeakOrderUrl :receiptDic];
if (lastSisleyLeakOrderUrl!=nil) {
result = [[NetCenter getInstance] httpPostSyn:lastSisleyLeakOrderUrl :receiptDic];
}else{
result = [[NetCenter getInstance] httpPostSyn:[HaiBaoJuheUtils createGzyazfUrl] :receiptDic];
}
......@@ -253,14 +253,14 @@ NSString *RagdollsLeakOrderUrl;
NSString *other = [payInfo other];
if (other && [other length] > 0) {
[[RagdollsAllManager RagdollsInstance] RagdollsQuery:serverId :roleName :amount :[payInfo queryId] :self.controller :[payInfo serverName]];
[[SisleyAllManager SisleyInstance] SisleyQuery: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];
[[RagdollsAllManager RagdollsInstance] RagdollsQueryOperation:self.controller RagdollsHuoWuID:products RagdollsJiaGe:[payInfo postAmount] RagdollsHuoWuMing:[payInfo productName] RagdollsDingDanHao:queryId];
[[SisleyAllManager SisleyInstance] SisleyQueryOperation:self.controller SisleyHuoWuID:products SisleyJiaGe:[payInfo postAmount] SisleyHuoWuMing:[payInfo productName] SisleyDingDanHao:queryId];
}
}
......
......@@ -10,9 +10,9 @@
7、``` 所有接口PoolSdk 替换成 HaiBaoJuheSDK(如不理解可以参考demo或者详细文档) ``` <br>
已更新 海豹聚合SDK 2018年12月05日版本 快速更新到 2019年03月19日版本2方法<br>
已更新 海豹聚合SDK 2018年12月05日版本 快速更新到 2019年03月20日版本<br>
1、``` 删除poolsdk_file文件夹中原来framework ``` <br>
2、``` 引入poolsdk_file文件夹中Ragdolls.framework ``` <br>
2、``` 引入poolsdk_file文件夹中Sisley.framework ``` <br>
3、``` 替换SDKInterface.m文件 ``` <br>
4、``` 替换HaiBaoJuheSDK.framework ``` <br>
5、``` 原 URL Schemes 中的 i9133public 改为 sdk.uuufish.com (可参考demo中info设置) ``` <br>
\ No newline at end of file
......
......@@ -15,11 +15,11 @@
- (void)initChecker;
- (void)startCheck:(HaiBaoJuheLoginInfo *)loginInfo;
- (void) createOrder:(HaiBaoJuheCreateOrderInfo *)gzyazfInfo;
- (void) RagdollsHaiBaoJuhereportOpen;
- (void) RagdollsHaiBaoJuhereportSDKOpen;
- (void)RagdollsHaiBaoJuhehandleFirstOpenApp:(NSString*) path;
- (void) SisleyHaiBaoJuhereportOpen;
- (void) SisleyHaiBaoJuhereportSDKOpen;
- (void)SisleyHaiBaoJuhehandleFirstOpenApp:(NSString*) path;
- (void) reportEnter:(HaiBaoJuheReportInfo *)reInfo;
- (void) RagdollsHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo;
- (void) SisleyHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo;
- (void)sendNotice:(HaiBaoJuheSDKNotificationType)notiType
notiName:(NSString *)notiName
statusCode:(int)nCode
......@@ -28,7 +28,7 @@
- (void)startCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo;
- (void)RagdollsHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type;
- (void)SisleyHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type;
/*
*初始化时调用
......
#import "HaiBaoJuheSDK/RagdollsHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheCreateOrderInfo : RagdollsHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/SisleyHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheCreateOrderInfo : SisleyHaiBaoJuheBaseModel
@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 *) RagdollsHaiBaoJuheGetTsign ;
- (NSString *) RagdollsHaiBaoJuheGetTimestamp ;
- (NSString *) SisleyHaiBaoJuheGetTsign ;
- (NSString *) SisleyHaiBaoJuheGetTimestamp ;
@end
......
#import "HaiBaoJuheSDK/RagdollsHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheGzyazfInfo : RagdollsHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/SisleyHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheGzyazfInfo : SisleyHaiBaoJuheBaseModel
@property(nonatomic, strong)NSString *serverId;
@property(nonatomic, strong)NSString *queryId;
......
#import "HaiBaoJuheSDK/RagdollsHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheLoginInfo : RagdollsHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/SisleyHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheLoginInfo : SisleyHaiBaoJuheBaseModel
@property(nonatomic,strong)NSString *timestamp;
@property(nonatomic, strong)NSString *sign;
......
//
// RagdollsHaiBaoJuheReportInfo.h
// SisleyHaiBaoJuheReportInfo.h
// HaiBaoJuheSDK
//
// Created by winFan on 12/21/15.
// Copyright (c) 2015 winFan. All rights reserved.
//
#import "HaiBaoJuheSDK/RagdollsHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheReportInfo : RagdollsHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/SisleyHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheReportInfo : SisleyHaiBaoJuheBaseModel
@property(nonatomic, strong)NSString *reportType;//类型
@property(nonatomic, strong)NSString *playerId;//玩家ID
......
......@@ -10,6 +10,8 @@
@property(nonatomic, strong)NSString *urlSchemes;
@property(strong) NSMutableArray* SisleyList;
@property BOOL isAppleGzyazfing;
+ (HaiBaoJuheSDK *)shareSDK;
......
......@@ -4,7 +4,7 @@
@interface HaiBaoJuheUtils : NSObject
+(NSString *)md5:(NSString *)str;
+ (NSDictionary *)RagdollsHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString;
+ (NSDictionary *)SisleyHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString;
+(NSString *)createGzyazfOrderUrl;
//*充值回调地址
+(NSString *)createGzyazfUrl;
......
#import <Foundation/Foundation.h>
#import "OtherSetting.h"
@interface RagdollsHaiBaoJuheBaseModel : NSObject
@interface SisleyHaiBaoJuheBaseModel : NSObject
- (NSString *)RagdollsHaiBaoJuheObjectToJsonString;
- (NSString *)SisleyHaiBaoJuheObjectToJsonString;
- (NSMutableString *)paramAddToString;
- (id)initWithDiction:(NSDictionary *)diction;
......
......@@ -11,7 +11,7 @@ typedef NS_ENUM(NSInteger, DGLoggerLevel)
ELogError
};
@interface RagdollsHaiBaoJuheDGLogger : NSObject
@interface SisleyHaiBaoJuheDGLogger : NSObject
+ (void)showLog:(NSString *)fmt,...;
......
#import <UIKit/UIKit.h>
#import "StoreKit/StoreKit.h"
@interface RagdollsAllManager : NSObject
{
NSString* RagdollsAPPID_;
NSString* RagdollsAPPKEY_;
NSString* RagdollsInviterCode_;
}
@property bool RagdollsGeiWoHuaQianBa;
+ (RagdollsAllManager *)RagdollsInstance;
- (void)RagdollsChuShiHua;
- (void)RagdollsDengLu:(NSString *)RagdollsAPPID : (NSString *)RagdollsAPPKEY : (UIViewController *)controller;
- (void)RagdollsYangShi:(NSString*)RagdollsLeiXing;
- (void)RagdollsQuery: (NSString *)RagdollsFuWuQiID : (NSString *)RagdollsNickName : (NSNumber *)RagdollsAmount : (NSString *)RagdollsCallBack : (UIViewController *)controller : (NSString *)RagdollsServerName;
- (void)RagdollsQueryOperation:(UIViewController*)controll RagdollsHuoWuID:(NSString*)products RagdollsJiaGe:(NSString*)amount RagdollsHuoWuMing:(NSString*)productName RagdollsDingDanHao:(NSString*) DingDanHao;
@end
#import <Foundation/Foundation.h>
extern NSString * const RagdollsExitNotification;
extern NSString * const RagdollsLoginNotification;
extern NSString * const RagdollsErrorNotification;
@interface RagdollsHuiTiaoNotification : NSObject
@end
#import <UIKit/UIKit.h>
@interface RagdollsIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
@property(nonatomic,strong) NSString* RagdollsDingDanHao;
@property(nonatomic,strong) NSDictionary* RagdollsHuoWuLieBiao;
@property(nonatomic,strong) NSMutableArray* RagdollsHuoWuIDLieBiao;
@property(nonatomic, strong) UITableView *RagdollsHuoWuLieBiaoView;
- (void)RagdollsHuaQianView:(UIViewController*)controller RagdollsHuoWuD:(NSString*)products RagdollsQian:(NSString*)amount RagdollsHuoWuMing:(NSString*)productName RagdollsDingDanHao:(NSString*)DingDanHao;
@end
#include "SDKInterface.h"
#import <UIKit/UIKit.h>
#import "Ragdolls/RagdollsAllManager.h"
#import "Ragdolls/RagdollsHuiTiaoNotification.h"
#import "Ragdolls/RagdollsInformation.h"
#import "Sisley/SisleyAllManager.h"
#import "Sisley/SisleyHuiTiaoNotification.h"
#import "Sisley/SisleyInformation.h"
#import "TrackingIO.h"
@implementation SDKInterface : Interface
int mExchange;
NSString *RagdollsAppId;
NSString *RagdollsAppKey;
NSString *RagdollsLeakOrderUrl;
NSString *SisleyAppId;
NSString *SisleyAppKey;
NSString *SisleyLeakOrderUrl;
- (void)SDKinit:(UIViewController *) control
{
......@@ -20,10 +20,10 @@ NSString *RagdollsLeakOrderUrl;
[super SDKinit:control];
[HaiBaoJuheConfig getInstance];
[[RagdollsAllManager RagdollsInstance]RagdollsChuShiHua];
[[RagdollsAllManager RagdollsInstance]RagdollsYangShi:@"sdk"];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:RagdollsLoginNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"RagdollsToolCallBack" object:nil];
[[SisleyAllManager SisleyInstance]SisleyChuShiHua];
[[SisleyAllManager SisleyInstance]SisleyYangShi:@"sdk"];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:SisleyLoginNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"SisleyToolCallBack" object:nil];
[[HaiBaoJuheChecker getInstance] sendNotice:HaiBaoJuheSDKNotificationInitSDK notiName:@"InitSuccess" statusCode:HaiBaoJuheSDK_NO_ERROR description:@"initSuccess" extendData:nil];
......@@ -40,9 +40,9 @@ NSString *RagdollsLeakOrderUrl;
- (void)SDKloginSDK
{
//APPID APPKEY
RagdollsAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"];
RagdollsAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"];
[[RagdollsAllManager RagdollsInstance]RagdollsDengLu:RagdollsAppId :RagdollsAppKey :self.controller];
SisleyAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"];
SisleyAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"];
[[SisleyAllManager SisleyInstance]SisleyDengLu:SisleyAppId :SisleyAppKey :self.controller];
}
......@@ -53,9 +53,9 @@ NSString *RagdollsLeakOrderUrl;
{
NSLog(@"loginchek");
HaiBaoJuheLoginInfo *loginInfo = [HaiBaoJuheLoginInfo alloc];
loginInfo.openId = [[RagdollsInformation getInstance]openId];
loginInfo.sign = [[RagdollsInformation getInstance] token];
loginInfo.timestamp = [[RagdollsInformation getInstance] timestamp];
loginInfo.openId = [[SisleyInformation getInstance]openId];
loginInfo.sign = [[SisleyInformation getInstance] token];
loginInfo.timestamp = [[SisleyInformation getInstance] timestamp];
dispatch_async(dispatch_get_global_queue(0, 0), ^{
[[HaiBaoJuheChecker getInstance] startCheck:loginInfo];
......@@ -82,7 +82,7 @@ NSString *RagdollsLeakOrderUrl;
- (void)HCKAssetsToolCallBack:(NSNotification *)notification
{
NSDictionary* payResultDic = notification.object;
NSString* receiptStr = [payResultDic objectForKey:@"RagdollsToolResult"];
NSString* receiptStr = [payResultDic objectForKey:@"SisleyToolResult"];
NSString* queryId = [payResultDic objectForKey:@"query_id"];
//收到回调,保存queryid和data
......@@ -101,7 +101,7 @@ NSString *RagdollsLeakOrderUrl;
[userDefaults setObject:receiptStr forKey:queryId];
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
NSString* result = [[NetCenter getInstance] httpPostSyn:RagdollsLeakOrderUrl :receiptDic];
NSString* result = [[NetCenter getInstance] httpPostSyn:SisleyLeakOrderUrl :receiptDic];
if([@"success" isEqualToString:result]){//确认订单成功
//删除已保存的
......@@ -121,11 +121,11 @@ NSString *RagdollsLeakOrderUrl;
NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
NSString* lastqueryid = [userDefaults objectForKey:@"lastqueryid"];
RagdollsLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
SisleyLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
[HaiBaoJuheUtils createGzyazfUrl],
[payInfo userId],
[payInfo playerId]];
[userDefaults setObject:RagdollsLeakOrderUrl forKey:@"lastRagdollsLeakOrderUrl"];
[userDefaults setObject:SisleyLeakOrderUrl forKey:@"lastSisleyLeakOrderUrl"];
if (lastqueryid!=nil) {
//创建订单前进行补单
......@@ -135,7 +135,7 @@ NSString *RagdollsLeakOrderUrl;
receiptStr = [receiptStr stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
//如果不为空,进行最后一次补单
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",lastqueryid,@"query_id", nil];
NSString* result = [[NetCenter getInstance] httpPostSyn:RagdollsLeakOrderUrl :receiptDic];
NSString* result = [[NetCenter getInstance] httpPostSyn:SisleyLeakOrderUrl :receiptDic];
if([@"success" isEqualToString:result]){//确认订单成功
//删除已保存的
[userDefaults removeObjectForKey:@"lastqueryid"];
......@@ -145,7 +145,7 @@ NSString *RagdollsLeakOrderUrl;
mExchange = [payInfo exchange].intValue;
[super SDKgzyazfWithGzyazfmentInfo:payInfo];
RagdollsLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
SisleyLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
[HaiBaoJuheUtils createGzyazfUrl],
[payInfo userId],
[payInfo playerId]];
......@@ -212,10 +212,10 @@ NSString *RagdollsLeakOrderUrl;
for (NSString* queryId in queryIdArray) {
NSString* receiptStr = [userDefaults valueForKey:queryId];
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
NSString* lastRagdollsLeakOrderUrl = [userDefaults objectForKey:@"lastRagdollsLeakOrderUrl"];
NSString* lastSisleyLeakOrderUrl = [userDefaults objectForKey:@"lastSisleyLeakOrderUrl"];
NSString* result;
if (lastRagdollsLeakOrderUrl!=nil) {
result = [[NetCenter getInstance] httpPostSyn:lastRagdollsLeakOrderUrl :receiptDic];
if (lastSisleyLeakOrderUrl!=nil) {
result = [[NetCenter getInstance] httpPostSyn:lastSisleyLeakOrderUrl :receiptDic];
}else{
result = [[NetCenter getInstance] httpPostSyn:[HaiBaoJuheUtils createGzyazfUrl] :receiptDic];
}
......@@ -253,14 +253,14 @@ NSString *RagdollsLeakOrderUrl;
NSString *other = [payInfo other];
if (other && [other length] > 0) {
[[RagdollsAllManager RagdollsInstance] RagdollsQuery:serverId :roleName :amount :[payInfo queryId] :self.controller :[payInfo serverName]];
[[SisleyAllManager SisleyInstance] SisleyQuery: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];
[[RagdollsAllManager RagdollsInstance] RagdollsQueryOperation:self.controller RagdollsHuoWuID:products RagdollsJiaGe:[payInfo postAmount] RagdollsHuoWuMing:[payInfo productName] RagdollsDingDanHao:queryId];
[[SisleyAllManager SisleyInstance] SisleyQueryOperation:self.controller SisleyHuoWuID:products SisleyJiaGe:[payInfo postAmount] SisleyHuoWuMing:[payInfo productName] SisleyDingDanHao:queryId];
}
}
......
#import <UIKit/UIKit.h>
#import "StoreKit/StoreKit.h"
@interface SisleyAllManager : NSObject
{
NSString* SisleyAPPID_;
NSString* SisleyAPPKEY_;
NSString* SisleyInviterCode_;
}
@property bool SisleyGeiWoHuaQianBa;
+ (SisleyAllManager *)SisleyInstance;
- (void)SisleyChuShiHua;
- (void)SisleyDengLu:(NSString *)SisleyAPPID : (NSString *)SisleyAPPKEY : (UIViewController *)controller;
- (void)SisleyYangShi:(NSString*)SisleyLeiXing;
- (void)SisleyQuery: (NSString *)SisleyFuWuQiID : (NSString *)SisleyNickName : (NSNumber *)SisleyAmount : (NSString *)SisleyCallBack : (UIViewController *)controller : (NSString *)SisleyServerName;
- (void)SisleyQueryOperation:(UIViewController*)controll SisleyHuoWuID:(NSString*)products SisleyJiaGe:(NSString*)amount SisleyHuoWuMing:(NSString*)productName SisleyDingDanHao:(NSString*) DingDanHao;
@end
#import <Foundation/Foundation.h>
extern NSString * const SisleyExitNotification;
extern NSString * const SisleyLoginNotification;
extern NSString * const SisleyErrorNotification;
@interface SisleyHuiTiaoNotification : NSObject
@end
#import <UIKit/UIKit.h>
@interface SisleyIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
@property(nonatomic,strong) NSString* SisleyDingDanHao;
@property(nonatomic,strong) NSDictionary* SisleyHuoWuLieBiao;
@property(nonatomic,strong) NSMutableArray* SisleyHuoWuIDLieBiao;
@property(nonatomic, strong) UITableView *SisleyHuoWuLieBiaoView;
- (void)SisleyHuaQianView:(UIViewController*)controller SisleyHuoWuD:(NSString*)products SisleyQian:(NSString*)amount SisleyHuoWuMing:(NSString*)productName SisleyDingDanHao:(NSString*)DingDanHao;
@end
#import <Foundation/Foundation.h>
@interface RagdollsInformation : NSObject
@interface SisleyInformation : NSObject
{
//
NSString *openId;
......@@ -12,5 +12,5 @@ NSString *timestamp;
@property(retain,nonatomic) NSString *openId;
@property(retain,nonatomic) NSString *token;
@property(retain,nonatomic) NSString *timestamp;
+ (RagdollsInformation *)getInstance;
+ (SisleyInformation *)getInstance;
@end
......
#import <Foundation/Foundation.h>
@interface RagdollsInformationJM : NSObject
@interface SisleyInformationJM : NSObject
+(NSString *)RagdollsJM:(NSString *)jm;
+(NSString *)SisleyJM:(NSString *)jm;
@end
......
#import <UIKit/UIKit.h>
@interface RagdollsLocation : NSObject
@interface SisleyLocation : NSObject
+ (NSString *)RagdollsSKCloudServiceSetupOptionsKey;
+ (NSString *)SisleySKCloudServiceSetupOptionsKey;
@end
......
#import <UIKit/UIKit.h>
#import "RagdollsInformation.h"
#import "SisleyInformation.h"
#import <JavaScriptCore/JavaScriptCore.h>
@interface RagdollsMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
@interface SisleyMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
{
UIWebView *webRagdollsView_;
UIWebView *webSisleyView_;
UIActivityIndicatorView *activityIndicator;
}
@property(assign) BOOL RagdollsYouYuanJiao;
@property(assign) BOOL SisleyYouYuanJiao;
- (void)RagdollsSettingRagdollsView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
- (void)RagdollsInitWebView;
- (void)SisleySettingSisleyView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
- (void)SisleyInitWebView;
- (void)loadWebPageWithString:(NSString *)url;
- (void)loadWebPageWithJs:(NSString *)content;
- (void)postNotification:(NSString *)name : (NSString *)code;
......