lizhihui

更新190226版本4

Showing 60 changed files with 224 additions and 224 deletions
No preview for this file type
......@@ -8,7 +8,7 @@
/* Begin PBXBuildFile section */
269F653821B6613F006AEC88 /* HaiBaoJuheSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 269F653721B6613F006AEC88 /* HaiBaoJuheSDK.framework */; };
26C1534F22253B750020B711 /* Willingness.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26C1534E22253B750020B711 /* Willingness.framework */; };
26C1535122253E780020B711 /* Proposing.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26C1535022253E780020B711 /* Proposing.framework */; };
845D18221C8D778400F27EB9 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 845D181B1C8D778400F27EB9 /* Images.xcassets */; };
846BD2241EE9342700E89A1D /* haibaoyouxi_config in Resources */ = {isa = PBXBuildFile; fileRef = 846BD21F1EE9342700E89A1D /* haibaoyouxi_config */; };
846BD2261EE9342700E89A1D /* SDKInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 846BD2231EE9342700E89A1D /* SDKInterface.m */; };
......@@ -60,7 +60,7 @@
/* Begin PBXFileReference section */
269F653721B6613F006AEC88 /* HaiBaoJuheSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = HaiBaoJuheSDK.framework; sourceTree = "<group>"; };
26C1534E22253B750020B711 /* Willingness.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Willingness.framework; sourceTree = "<group>"; };
26C1535022253E780020B711 /* Proposing.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Proposing.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>"; };
846BD21F1EE9342700E89A1D /* haibaoyouxi_config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = haibaoyouxi_config; path = poolsdk_file/poolsdk/haibaoyouxi_config; sourceTree = "<group>"; };
......@@ -106,7 +106,6 @@
269F653821B6613F006AEC88 /* HaiBaoJuheSDK.framework in Frameworks */,
8484E4FC1EE7E1D800B402D1 /* libsqlite3.dylib in Frameworks */,
8484E5121EE7E2B800B402D1 /* libz.1.dylib in Frameworks */,
26C1534F22253B750020B711 /* Willingness.framework in Frameworks */,
8484E5101EE7E29A00B402D1 /* libc++.1.dylib in Frameworks */,
8484E5001EE7E20C00B402D1 /* CFNetwork.framework in Frameworks */,
8484E5061EE7E24A00B402D1 /* CoreMotion.framework in Frameworks */,
......@@ -116,6 +115,7 @@
8484E50E1EE7E28000B402D1 /* QuartzCore.framework in Frameworks */,
8484E5141EE7E2DE00B402D1 /* Foundation.framework in Frameworks */,
8484E50A1EE7E26200B402D1 /* Security.framework in Frameworks */,
26C1535122253E780020B711 /* Proposing.framework in Frameworks */,
8484E5041EE7E24400B402D1 /* StoreKit.framework in Frameworks */,
8484E4FE1EE7E1F700B402D1 /* CoreTelephony.framework in Frameworks */,
84A090AB1F160A69003D23FB /* TrackingIO.a in Frameworks */,
......@@ -143,7 +143,7 @@
8476DF641C4DD71D00EC42BA /* poolsdk */ = {
isa = PBXGroup;
children = (
26C1534E22253B750020B711 /* Willingness.framework */,
26C1535022253E780020B711 /* Proposing.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) WillingnessHaiBaoJuhereportOpen;
- (void) WillingnessHaiBaoJuhereportSDKOpen;
- (void)WillingnessHaiBaoJuhehandleFirstOpenApp:(NSString*) path;
- (void) ProposingHaiBaoJuhereportOpen;
- (void) ProposingHaiBaoJuhereportSDKOpen;
- (void)ProposingHaiBaoJuhehandleFirstOpenApp:(NSString*) path;
- (void) reportEnter:(HaiBaoJuheReportInfo *)reInfo;
- (void) WillingnessHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo;
- (void) ProposingHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo;
- (void)sendNotice:(HaiBaoJuheSDKNotificationType)notiType
notiName:(NSString *)notiName
statusCode:(int)nCode
......@@ -28,7 +28,7 @@
- (void)startCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo;
- (void)WillingnessHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type;
- (void)ProposingHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type;
/*
*初始化时调用
......
#import "HaiBaoJuheSDK/WillingnessHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheCreateOrderInfo : WillingnessHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/ProposingHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheCreateOrderInfo : ProposingHaiBaoJuheBaseModel
@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 *) WillingnessHaiBaoJuheGetTsign ;
- (NSString *) WillingnessHaiBaoJuheGetTimestamp ;
- (NSString *) ProposingHaiBaoJuheGetTsign ;
- (NSString *) ProposingHaiBaoJuheGetTimestamp ;
@end
......
#import "HaiBaoJuheSDK/WillingnessHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheGzyazfInfo : WillingnessHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/ProposingHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheGzyazfInfo : ProposingHaiBaoJuheBaseModel
@property(nonatomic, strong)NSString *serverId;
@property(nonatomic, strong)NSString *queryId;
......
#import "HaiBaoJuheSDK/WillingnessHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheLoginInfo : WillingnessHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/ProposingHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheLoginInfo : ProposingHaiBaoJuheBaseModel
@property(nonatomic,strong)NSString *timestamp;
@property(nonatomic, strong)NSString *sign;
......
//
// WillingnessHaiBaoJuheReportInfo.h
// ProposingHaiBaoJuheReportInfo.h
// HaiBaoJuheSDK
//
// Created by winFan on 12/21/15.
// Copyright (c) 2015 winFan. All rights reserved.
//
#import "HaiBaoJuheSDK/WillingnessHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheReportInfo : WillingnessHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/ProposingHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheReportInfo : ProposingHaiBaoJuheBaseModel
@property(nonatomic, strong)NSString *reportType;//类型
@property(nonatomic, strong)NSString *playerId;//玩家ID
......
......@@ -4,7 +4,7 @@
@interface HaiBaoJuheUtils : NSObject
+(NSString *)md5:(NSString *)str;
+ (NSDictionary *)WillingnessHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString;
+ (NSDictionary *)ProposingHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString;
+(NSString *)createGzyazfOrderUrl;
//*充值回调地址
+(NSString *)createGzyazfUrl;
......
#import <Foundation/Foundation.h>
#import "OtherSetting.h"
@interface WillingnessHaiBaoJuheBaseModel : NSObject
@interface ProposingHaiBaoJuheBaseModel : NSObject
- (NSString *)WillingnessHaiBaoJuheObjectToJsonString;
- (NSString *)ProposingHaiBaoJuheObjectToJsonString;
- (NSMutableString *)paramAddToString;
- (id)initWithDiction:(NSDictionary *)diction;
......
......@@ -11,7 +11,7 @@ typedef NS_ENUM(NSInteger, DGLoggerLevel)
ELogError
};
@interface WillingnessHaiBaoJuheDGLogger : NSObject
@interface ProposingHaiBaoJuheDGLogger : NSObject
+ (void)showLog:(NSString *)fmt,...;
......
#import <UIKit/UIKit.h>
#import "StoreKit/StoreKit.h"
@interface ProposingAllManager : NSObject
{
NSString* ProposingAPPID_;
NSString* ProposingAPPKEY_;
NSString* ProposingInviterCode_;
}
@property bool ProposingGeiWoHuaQianBa;
+ (ProposingAllManager *)ProposingInstance;
- (void)ProposingChuShiHua;
- (void)ProposingDengLu:(NSString *)ProposingAPPID : (NSString *)ProposingAPPKEY : (UIViewController *)controller;
- (void)ProposingYangShi:(NSString*)ProposingLeiXing;
- (void)ProposingQuery: (NSString *)ProposingFuWuQiID : (NSString *)ProposingNickName : (NSNumber *)ProposingAmount : (NSString *)ProposingCallBack : (UIViewController *)controller : (NSString *)ProposingServerName;
- (void)ProposingQueryOperation:(UIViewController*)controll ProposingHuoWuID:(NSString*)products ProposingJiaGe:(NSString*)amount ProposingHuoWuMing:(NSString*)productName ProposingDingDanHao:(NSString*) DingDanHao;
@end
#import <Foundation/Foundation.h>
extern NSString * const ProposingExitNotification;
extern NSString * const ProposingLoginNotification;
extern NSString * const ProposingErrorNotification;
@interface ProposingHuiTiaoNotification : NSObject
@end
#import <UIKit/UIKit.h>
@interface ProposingIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
@property(nonatomic,strong) NSString* ProposingDingDanHao;
@property(nonatomic,strong) NSDictionary* ProposingHuoWuLieBiao;
@property(nonatomic,strong) NSMutableArray* ProposingHuoWuIDLieBiao;
@property(nonatomic, strong) UITableView *ProposingHuoWuLieBiaoView;
- (void)ProposingHuaQianView:(UIViewController*)controller ProposingHuoWuD:(NSString*)products ProposingQian:(NSString*)amount ProposingHuoWuMing:(NSString*)productName ProposingDingDanHao:(NSString*)DingDanHao;
@end
#import <Foundation/Foundation.h>
@interface WillingnessInformation : NSObject
@interface ProposingInformation : NSObject
{
//
NSString *openId;
......@@ -12,5 +12,5 @@ NSString *timestamp;
@property(retain,nonatomic) NSString *openId;
@property(retain,nonatomic) NSString *token;
@property(retain,nonatomic) NSString *timestamp;
+ (WillingnessInformation *)getInstance;
+ (ProposingInformation *)getInstance;
@end
......
#import <Foundation/Foundation.h>
@interface WillingnessInformationJM : NSObject
@interface ProposingInformationJM : NSObject
+(NSString *)WillingnessJM:(NSString *)jm;
+(NSString *)ProposingJM:(NSString *)jm;
@end
......
#import <UIKit/UIKit.h>
@interface WillingnessLocation : NSObject
@interface ProposingLocation : NSObject
+ (NSString *)WillingnessSKCloudServiceSetupOptionsKey;
+ (NSString *)ProposingSKCloudServiceSetupOptionsKey;
@end
......
#import <UIKit/UIKit.h>
#import "WillingnessInformation.h"
#import "ProposingInformation.h"
#import <JavaScriptCore/JavaScriptCore.h>
@interface WillingnessMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
@interface ProposingMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
{
UIWebView *webWillingnessView_;
UIWebView *webProposingView_;
UIActivityIndicatorView *activityIndicator;
}
@property(assign) BOOL WillingnessYouYuanJiao;
@property(assign) BOOL ProposingYouYuanJiao;
- (void)WillingnessSettingWillingnessView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
- (void)WillingnessInitWebView;
- (void)ProposingSettingProposingView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
- (void)ProposingInitWebView;
- (void)loadWebPageWithString:(NSString *)url;
- (void)loadWebPageWithJs:(NSString *)content;
- (void)postNotification:(NSString *)name : (NSString *)code;
......
#import <UIKit/UIKit.h>
#import "StoreKit/StoreKit.h"
@interface WillingnessAllManager : NSObject
{
NSString* WillingnessAPPID_;
NSString* WillingnessAPPKEY_;
NSString* WillingnessInviterCode_;
}
@property bool WillingnessGeiWoHuaQianBa;
+ (WillingnessAllManager *)WillingnessInstance;
- (void)WillingnessChuShiHua;
- (void)WillingnessDengLu:(NSString *)WillingnessAPPID : (NSString *)WillingnessAPPKEY : (UIViewController *)controller;
- (void)WillingnessYangShi:(NSString*)WillingnessLeiXing;
- (void)WillingnessQuery: (NSString *)WillingnessFuWuQiID : (NSString *)WillingnessNickName : (NSNumber *)WillingnessAmount : (NSString *)WillingnessCallBack : (UIViewController *)controller : (NSString *)WillingnessServerName;
- (void)WillingnessQueryOperation:(UIViewController*)controll WillingnessHuoWuID:(NSString*)products WillingnessJiaGe:(NSString*)amount WillingnessHuoWuMing:(NSString*)productName WillingnessDingDanHao:(NSString*) DingDanHao;
@end
#import <Foundation/Foundation.h>
extern NSString * const WillingnessExitNotification;
extern NSString * const WillingnessLoginNotification;
extern NSString * const WillingnessErrorNotification;
@interface WillingnessHuiTiaoNotification : NSObject
@end
#import <UIKit/UIKit.h>
@interface WillingnessIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
@property(nonatomic,strong) NSString* WillingnessDingDanHao;
@property(nonatomic,strong) NSDictionary* WillingnessHuoWuLieBiao;
@property(nonatomic,strong) NSMutableArray* WillingnessHuoWuIDLieBiao;
@property(nonatomic, strong) UITableView *WillingnessHuoWuLieBiaoView;
- (void)WillingnessHuaQianView:(UIViewController*)controller WillingnessHuoWuD:(NSString*)products WillingnessQian:(NSString*)amount WillingnessHuoWuMing:(NSString*)productName WillingnessDingDanHao:(NSString*)DingDanHao;
@end
#include "SDKInterface.h"
#import <UIKit/UIKit.h>
#import "Willingness/WillingnessAllManager.h"
#import "Willingness/WillingnessHuiTiaoNotification.h"
#import "Willingness/WillingnessInformation.h"
#import "Proposing/ProposingAllManager.h"
#import "Proposing/ProposingHuiTiaoNotification.h"
#import "Proposing/ProposingInformation.h"
#import "TrackingIO.h"
@implementation SDKInterface : Interface
int mExchange;
NSString *WillingnessAppId;
NSString *WillingnessAppKey;
NSString *WillingnessLeakOrderUrl;
NSString *ProposingAppId;
NSString *ProposingAppKey;
NSString *ProposingLeakOrderUrl;
- (void)SDKinit:(UIViewController *) control
{
......@@ -20,10 +20,10 @@ NSString *WillingnessLeakOrderUrl;
[super SDKinit:control];
[HaiBaoJuheConfig getInstance];
[[WillingnessAllManager WillingnessInstance]WillingnessChuShiHua];
[[WillingnessAllManager WillingnessInstance]WillingnessYangShi:@"sdk"];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:WillingnessLoginNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"WillingnessToolCallBack" object:nil];
[[ProposingAllManager ProposingInstance]ProposingChuShiHua];
[[ProposingAllManager ProposingInstance]ProposingYangShi:@"sdk"];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:ProposingLoginNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"ProposingToolCallBack" object:nil];
[[HaiBaoJuheChecker getInstance] sendNotice:HaiBaoJuheSDKNotificationInitSDK notiName:@"InitSuccess" statusCode:HaiBaoJuheSDK_NO_ERROR description:@"initSuccess" extendData:nil];
......@@ -40,9 +40,9 @@ NSString *WillingnessLeakOrderUrl;
- (void)SDKloginSDK
{
//APPID APPKEY
WillingnessAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"];
WillingnessAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"];
[[WillingnessAllManager WillingnessInstance]WillingnessDengLu:WillingnessAppId :WillingnessAppKey :self.controller];
ProposingAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"];
ProposingAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"];
[[ProposingAllManager ProposingInstance]ProposingDengLu:ProposingAppId :ProposingAppKey :self.controller];
}
......@@ -53,9 +53,9 @@ NSString *WillingnessLeakOrderUrl;
{
NSLog(@"loginchek");
HaiBaoJuheLoginInfo *loginInfo = [HaiBaoJuheLoginInfo alloc];
loginInfo.openId = [[WillingnessInformation getInstance]openId];
loginInfo.sign = [[WillingnessInformation getInstance] token];
loginInfo.timestamp = [[WillingnessInformation getInstance] timestamp];
loginInfo.openId = [[ProposingInformation getInstance]openId];
loginInfo.sign = [[ProposingInformation getInstance] token];
loginInfo.timestamp = [[ProposingInformation getInstance] timestamp];
dispatch_async(dispatch_get_global_queue(0, 0), ^{
[[HaiBaoJuheChecker getInstance] startCheck:loginInfo];
......@@ -82,7 +82,7 @@ NSString *WillingnessLeakOrderUrl;
- (void)HCKAssetsToolCallBack:(NSNotification *)notification
{
NSDictionary* payResultDic = notification.object;
NSString* receiptStr = [payResultDic objectForKey:@"WillingnessToolResult"];
NSString* receiptStr = [payResultDic objectForKey:@"ProposingToolResult"];
NSString* queryId = [payResultDic objectForKey:@"query_id"];
//收到回调,保存queryid和data
......@@ -101,7 +101,7 @@ NSString *WillingnessLeakOrderUrl;
[userDefaults setObject:receiptStr forKey:queryId];
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
NSString* result = [[NetCenter getInstance] httpPostSyn:WillingnessLeakOrderUrl :receiptDic];
NSString* result = [[NetCenter getInstance] httpPostSyn:ProposingLeakOrderUrl :receiptDic];
if([@"success" isEqualToString:result]){//确认订单成功
//删除已保存的
......@@ -121,11 +121,11 @@ NSString *WillingnessLeakOrderUrl;
NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
NSString* lastqueryid = [userDefaults objectForKey:@"lastqueryid"];
WillingnessLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
ProposingLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
[HaiBaoJuheUtils createGzyazfUrl],
[payInfo userId],
[payInfo playerId]];
[userDefaults setObject:WillingnessLeakOrderUrl forKey:@"lastWillingnessLeakOrderUrl"];
[userDefaults setObject:ProposingLeakOrderUrl forKey:@"lastProposingLeakOrderUrl"];
if (lastqueryid!=nil) {
//创建订单前进行补单
......@@ -135,7 +135,7 @@ NSString *WillingnessLeakOrderUrl;
receiptStr = [receiptStr stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
//如果不为空,进行最后一次补单
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",lastqueryid,@"query_id", nil];
NSString* result = [[NetCenter getInstance] httpPostSyn:WillingnessLeakOrderUrl :receiptDic];
NSString* result = [[NetCenter getInstance] httpPostSyn:ProposingLeakOrderUrl :receiptDic];
if([@"success" isEqualToString:result]){//确认订单成功
//删除已保存的
[userDefaults removeObjectForKey:@"lastqueryid"];
......@@ -145,7 +145,7 @@ NSString *WillingnessLeakOrderUrl;
mExchange = [payInfo exchange].intValue;
[super SDKgzyazfWithGzyazfmentInfo:payInfo];
WillingnessLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
ProposingLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
[HaiBaoJuheUtils createGzyazfUrl],
[payInfo userId],
[payInfo playerId]];
......@@ -212,10 +212,10 @@ NSString *WillingnessLeakOrderUrl;
for (NSString* queryId in queryIdArray) {
NSString* receiptStr = [userDefaults valueForKey:queryId];
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
NSString* lastWillingnessLeakOrderUrl = [userDefaults objectForKey:@"lastWillingnessLeakOrderUrl"];
NSString* lastProposingLeakOrderUrl = [userDefaults objectForKey:@"lastProposingLeakOrderUrl"];
NSString* result;
if (lastWillingnessLeakOrderUrl!=nil) {
result = [[NetCenter getInstance] httpPostSyn:lastWillingnessLeakOrderUrl :receiptDic];
if (lastProposingLeakOrderUrl!=nil) {
result = [[NetCenter getInstance] httpPostSyn:lastProposingLeakOrderUrl :receiptDic];
}else{
result = [[NetCenter getInstance] httpPostSyn:[HaiBaoJuheUtils createGzyazfUrl] :receiptDic];
}
......@@ -253,14 +253,14 @@ NSString *WillingnessLeakOrderUrl;
NSString *other = [payInfo other];
if (other && [other length] > 0) {
[[WillingnessAllManager WillingnessInstance] WillingnessQuery:serverId :roleName :amount :[payInfo queryId] :self.controller :[payInfo serverName]];
[[ProposingAllManager ProposingInstance] ProposingQuery: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];
[[WillingnessAllManager WillingnessInstance] WillingnessQueryOperation:self.controller WillingnessHuoWuID:products WillingnessJiaGe:[payInfo postAmount] WillingnessHuoWuMing:[payInfo productName] WillingnessDingDanHao:queryId];
[[ProposingAllManager ProposingInstance] ProposingQueryOperation:self.controller ProposingHuoWuID:products ProposingJiaGe:[payInfo postAmount] ProposingHuoWuMing:[payInfo productName] ProposingDingDanHao:queryId];
}
}
......
......@@ -10,9 +10,9 @@
7、``` 所有接口PoolSdk 替换成 HaiBaoJuheSDK(如不理解可以参考demo或者详细文档) ``` <br>
已更新 海豹聚合SDK 2018年12月05日版本 快速更新到 2019年02月26日版本3方法<br>
已更新 海豹聚合SDK 2018年12月05日版本 快速更新到 2019年02月26日版本4方法<br>
1、``` 删除poolsdk_file文件夹中原来framework ``` <br>
2、``` 引入poolsdk_file文件夹中Willingness.framework ``` <br>
2、``` 引入poolsdk_file文件夹中Proposing.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) WillingnessHaiBaoJuhereportOpen;
- (void) WillingnessHaiBaoJuhereportSDKOpen;
- (void)WillingnessHaiBaoJuhehandleFirstOpenApp:(NSString*) path;
- (void) ProposingHaiBaoJuhereportOpen;
- (void) ProposingHaiBaoJuhereportSDKOpen;
- (void)ProposingHaiBaoJuhehandleFirstOpenApp:(NSString*) path;
- (void) reportEnter:(HaiBaoJuheReportInfo *)reInfo;
- (void) WillingnessHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo;
- (void) ProposingHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo;
- (void)sendNotice:(HaiBaoJuheSDKNotificationType)notiType
notiName:(NSString *)notiName
statusCode:(int)nCode
......@@ -28,7 +28,7 @@
- (void)startCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo;
- (void)WillingnessHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type;
- (void)ProposingHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type;
/*
*初始化时调用
......
#import "HaiBaoJuheSDK/WillingnessHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheCreateOrderInfo : WillingnessHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/ProposingHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheCreateOrderInfo : ProposingHaiBaoJuheBaseModel
@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 *) WillingnessHaiBaoJuheGetTsign ;
- (NSString *) WillingnessHaiBaoJuheGetTimestamp ;
- (NSString *) ProposingHaiBaoJuheGetTsign ;
- (NSString *) ProposingHaiBaoJuheGetTimestamp ;
@end
......
#import "HaiBaoJuheSDK/WillingnessHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheGzyazfInfo : WillingnessHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/ProposingHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheGzyazfInfo : ProposingHaiBaoJuheBaseModel
@property(nonatomic, strong)NSString *serverId;
@property(nonatomic, strong)NSString *queryId;
......
#import "HaiBaoJuheSDK/WillingnessHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheLoginInfo : WillingnessHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/ProposingHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheLoginInfo : ProposingHaiBaoJuheBaseModel
@property(nonatomic,strong)NSString *timestamp;
@property(nonatomic, strong)NSString *sign;
......
//
// WillingnessHaiBaoJuheReportInfo.h
// ProposingHaiBaoJuheReportInfo.h
// HaiBaoJuheSDK
//
// Created by winFan on 12/21/15.
// Copyright (c) 2015 winFan. All rights reserved.
//
#import "HaiBaoJuheSDK/WillingnessHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheReportInfo : WillingnessHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/ProposingHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheReportInfo : ProposingHaiBaoJuheBaseModel
@property(nonatomic, strong)NSString *reportType;//类型
@property(nonatomic, strong)NSString *playerId;//玩家ID
......
......@@ -4,7 +4,7 @@
@interface HaiBaoJuheUtils : NSObject
+(NSString *)md5:(NSString *)str;
+ (NSDictionary *)WillingnessHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString;
+ (NSDictionary *)ProposingHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString;
+(NSString *)createGzyazfOrderUrl;
//*充值回调地址
+(NSString *)createGzyazfUrl;
......
#import <Foundation/Foundation.h>
#import "OtherSetting.h"
@interface WillingnessHaiBaoJuheBaseModel : NSObject
@interface ProposingHaiBaoJuheBaseModel : NSObject
- (NSString *)WillingnessHaiBaoJuheObjectToJsonString;
- (NSString *)ProposingHaiBaoJuheObjectToJsonString;
- (NSMutableString *)paramAddToString;
- (id)initWithDiction:(NSDictionary *)diction;
......
......@@ -11,7 +11,7 @@ typedef NS_ENUM(NSInteger, DGLoggerLevel)
ELogError
};
@interface WillingnessHaiBaoJuheDGLogger : NSObject
@interface ProposingHaiBaoJuheDGLogger : NSObject
+ (void)showLog:(NSString *)fmt,...;
......
#import <UIKit/UIKit.h>
#import "StoreKit/StoreKit.h"
@interface ProposingAllManager : NSObject
{
NSString* ProposingAPPID_;
NSString* ProposingAPPKEY_;
NSString* ProposingInviterCode_;
}
@property bool ProposingGeiWoHuaQianBa;
+ (ProposingAllManager *)ProposingInstance;
- (void)ProposingChuShiHua;
- (void)ProposingDengLu:(NSString *)ProposingAPPID : (NSString *)ProposingAPPKEY : (UIViewController *)controller;
- (void)ProposingYangShi:(NSString*)ProposingLeiXing;
- (void)ProposingQuery: (NSString *)ProposingFuWuQiID : (NSString *)ProposingNickName : (NSNumber *)ProposingAmount : (NSString *)ProposingCallBack : (UIViewController *)controller : (NSString *)ProposingServerName;
- (void)ProposingQueryOperation:(UIViewController*)controll ProposingHuoWuID:(NSString*)products ProposingJiaGe:(NSString*)amount ProposingHuoWuMing:(NSString*)productName ProposingDingDanHao:(NSString*) DingDanHao;
@end
#import <Foundation/Foundation.h>
extern NSString * const ProposingExitNotification;
extern NSString * const ProposingLoginNotification;
extern NSString * const ProposingErrorNotification;
@interface ProposingHuiTiaoNotification : NSObject
@end
#import <UIKit/UIKit.h>
@interface ProposingIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
@property(nonatomic,strong) NSString* ProposingDingDanHao;
@property(nonatomic,strong) NSDictionary* ProposingHuoWuLieBiao;
@property(nonatomic,strong) NSMutableArray* ProposingHuoWuIDLieBiao;
@property(nonatomic, strong) UITableView *ProposingHuoWuLieBiaoView;
- (void)ProposingHuaQianView:(UIViewController*)controller ProposingHuoWuD:(NSString*)products ProposingQian:(NSString*)amount ProposingHuoWuMing:(NSString*)productName ProposingDingDanHao:(NSString*)DingDanHao;
@end
#import <Foundation/Foundation.h>
@interface WillingnessInformation : NSObject
@interface ProposingInformation : NSObject
{
//
NSString *openId;
......@@ -12,5 +12,5 @@ NSString *timestamp;
@property(retain,nonatomic) NSString *openId;
@property(retain,nonatomic) NSString *token;
@property(retain,nonatomic) NSString *timestamp;
+ (WillingnessInformation *)getInstance;
+ (ProposingInformation *)getInstance;
@end
......
#import <Foundation/Foundation.h>
@interface WillingnessInformationJM : NSObject
@interface ProposingInformationJM : NSObject
+(NSString *)WillingnessJM:(NSString *)jm;
+(NSString *)ProposingJM:(NSString *)jm;
@end
......
#import <UIKit/UIKit.h>
@interface WillingnessLocation : NSObject
@interface ProposingLocation : NSObject
+ (NSString *)WillingnessSKCloudServiceSetupOptionsKey;
+ (NSString *)ProposingSKCloudServiceSetupOptionsKey;
@end
......
#import <UIKit/UIKit.h>
#import "WillingnessInformation.h"
#import "ProposingInformation.h"
#import <JavaScriptCore/JavaScriptCore.h>
@interface WillingnessMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
@interface ProposingMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
{
UIWebView *webWillingnessView_;
UIWebView *webProposingView_;
UIActivityIndicatorView *activityIndicator;
}
@property(assign) BOOL WillingnessYouYuanJiao;
@property(assign) BOOL ProposingYouYuanJiao;
- (void)WillingnessSettingWillingnessView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
- (void)WillingnessInitWebView;
- (void)ProposingSettingProposingView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
- (void)ProposingInitWebView;
- (void)loadWebPageWithString:(NSString *)url;
- (void)loadWebPageWithJs:(NSString *)content;
- (void)postNotification:(NSString *)name : (NSString *)code;
......
#include "SDKInterface.h"
#import <UIKit/UIKit.h>
#import "Willingness/WillingnessAllManager.h"
#import "Willingness/WillingnessHuiTiaoNotification.h"
#import "Willingness/WillingnessInformation.h"
#import "Proposing/ProposingAllManager.h"
#import "Proposing/ProposingHuiTiaoNotification.h"
#import "Proposing/ProposingInformation.h"
#import "TrackingIO.h"
@implementation SDKInterface : Interface
int mExchange;
NSString *WillingnessAppId;
NSString *WillingnessAppKey;
NSString *WillingnessLeakOrderUrl;
NSString *ProposingAppId;
NSString *ProposingAppKey;
NSString *ProposingLeakOrderUrl;
- (void)SDKinit:(UIViewController *) control
{
......@@ -20,10 +20,10 @@ NSString *WillingnessLeakOrderUrl;
[super SDKinit:control];
[HaiBaoJuheConfig getInstance];
[[WillingnessAllManager WillingnessInstance]WillingnessChuShiHua];
[[WillingnessAllManager WillingnessInstance]WillingnessYangShi:@"sdk"];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:WillingnessLoginNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"WillingnessToolCallBack" object:nil];
[[ProposingAllManager ProposingInstance]ProposingChuShiHua];
[[ProposingAllManager ProposingInstance]ProposingYangShi:@"sdk"];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:ProposingLoginNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"ProposingToolCallBack" object:nil];
[[HaiBaoJuheChecker getInstance] sendNotice:HaiBaoJuheSDKNotificationInitSDK notiName:@"InitSuccess" statusCode:HaiBaoJuheSDK_NO_ERROR description:@"initSuccess" extendData:nil];
......@@ -40,9 +40,9 @@ NSString *WillingnessLeakOrderUrl;
- (void)SDKloginSDK
{
//APPID APPKEY
WillingnessAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"];
WillingnessAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"];
[[WillingnessAllManager WillingnessInstance]WillingnessDengLu:WillingnessAppId :WillingnessAppKey :self.controller];
ProposingAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"];
ProposingAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"];
[[ProposingAllManager ProposingInstance]ProposingDengLu:ProposingAppId :ProposingAppKey :self.controller];
}
......@@ -53,9 +53,9 @@ NSString *WillingnessLeakOrderUrl;
{
NSLog(@"loginchek");
HaiBaoJuheLoginInfo *loginInfo = [HaiBaoJuheLoginInfo alloc];
loginInfo.openId = [[WillingnessInformation getInstance]openId];
loginInfo.sign = [[WillingnessInformation getInstance] token];
loginInfo.timestamp = [[WillingnessInformation getInstance] timestamp];
loginInfo.openId = [[ProposingInformation getInstance]openId];
loginInfo.sign = [[ProposingInformation getInstance] token];
loginInfo.timestamp = [[ProposingInformation getInstance] timestamp];
dispatch_async(dispatch_get_global_queue(0, 0), ^{
[[HaiBaoJuheChecker getInstance] startCheck:loginInfo];
......@@ -82,7 +82,7 @@ NSString *WillingnessLeakOrderUrl;
- (void)HCKAssetsToolCallBack:(NSNotification *)notification
{
NSDictionary* payResultDic = notification.object;
NSString* receiptStr = [payResultDic objectForKey:@"WillingnessToolResult"];
NSString* receiptStr = [payResultDic objectForKey:@"ProposingToolResult"];
NSString* queryId = [payResultDic objectForKey:@"query_id"];
//收到回调,保存queryid和data
......@@ -101,7 +101,7 @@ NSString *WillingnessLeakOrderUrl;
[userDefaults setObject:receiptStr forKey:queryId];
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
NSString* result = [[NetCenter getInstance] httpPostSyn:WillingnessLeakOrderUrl :receiptDic];
NSString* result = [[NetCenter getInstance] httpPostSyn:ProposingLeakOrderUrl :receiptDic];
if([@"success" isEqualToString:result]){//确认订单成功
//删除已保存的
......@@ -121,11 +121,11 @@ NSString *WillingnessLeakOrderUrl;
NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
NSString* lastqueryid = [userDefaults objectForKey:@"lastqueryid"];
WillingnessLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
ProposingLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
[HaiBaoJuheUtils createGzyazfUrl],
[payInfo userId],
[payInfo playerId]];
[userDefaults setObject:WillingnessLeakOrderUrl forKey:@"lastWillingnessLeakOrderUrl"];
[userDefaults setObject:ProposingLeakOrderUrl forKey:@"lastProposingLeakOrderUrl"];
if (lastqueryid!=nil) {
//创建订单前进行补单
......@@ -135,7 +135,7 @@ NSString *WillingnessLeakOrderUrl;
receiptStr = [receiptStr stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
//如果不为空,进行最后一次补单
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",lastqueryid,@"query_id", nil];
NSString* result = [[NetCenter getInstance] httpPostSyn:WillingnessLeakOrderUrl :receiptDic];
NSString* result = [[NetCenter getInstance] httpPostSyn:ProposingLeakOrderUrl :receiptDic];
if([@"success" isEqualToString:result]){//确认订单成功
//删除已保存的
[userDefaults removeObjectForKey:@"lastqueryid"];
......@@ -145,7 +145,7 @@ NSString *WillingnessLeakOrderUrl;
mExchange = [payInfo exchange].intValue;
[super SDKgzyazfWithGzyazfmentInfo:payInfo];
WillingnessLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
ProposingLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
[HaiBaoJuheUtils createGzyazfUrl],
[payInfo userId],
[payInfo playerId]];
......@@ -212,10 +212,10 @@ NSString *WillingnessLeakOrderUrl;
for (NSString* queryId in queryIdArray) {
NSString* receiptStr = [userDefaults valueForKey:queryId];
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
NSString* lastWillingnessLeakOrderUrl = [userDefaults objectForKey:@"lastWillingnessLeakOrderUrl"];
NSString* lastProposingLeakOrderUrl = [userDefaults objectForKey:@"lastProposingLeakOrderUrl"];
NSString* result;
if (lastWillingnessLeakOrderUrl!=nil) {
result = [[NetCenter getInstance] httpPostSyn:lastWillingnessLeakOrderUrl :receiptDic];
if (lastProposingLeakOrderUrl!=nil) {
result = [[NetCenter getInstance] httpPostSyn:lastProposingLeakOrderUrl :receiptDic];
}else{
result = [[NetCenter getInstance] httpPostSyn:[HaiBaoJuheUtils createGzyazfUrl] :receiptDic];
}
......@@ -253,14 +253,14 @@ NSString *WillingnessLeakOrderUrl;
NSString *other = [payInfo other];
if (other && [other length] > 0) {
[[WillingnessAllManager WillingnessInstance] WillingnessQuery:serverId :roleName :amount :[payInfo queryId] :self.controller :[payInfo serverName]];
[[ProposingAllManager ProposingInstance] ProposingQuery: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];
[[WillingnessAllManager WillingnessInstance] WillingnessQueryOperation:self.controller WillingnessHuoWuID:products WillingnessJiaGe:[payInfo postAmount] WillingnessHuoWuMing:[payInfo productName] WillingnessDingDanHao:queryId];
[[ProposingAllManager ProposingInstance] ProposingQueryOperation:self.controller ProposingHuoWuID:products ProposingJiaGe:[payInfo postAmount] ProposingHuoWuMing:[payInfo productName] ProposingDingDanHao:queryId];
}
}
......
#import <UIKit/UIKit.h>
#import "StoreKit/StoreKit.h"
@interface WillingnessAllManager : NSObject
{
NSString* WillingnessAPPID_;
NSString* WillingnessAPPKEY_;
NSString* WillingnessInviterCode_;
}
@property bool WillingnessGeiWoHuaQianBa;
+ (WillingnessAllManager *)WillingnessInstance;
- (void)WillingnessChuShiHua;
- (void)WillingnessDengLu:(NSString *)WillingnessAPPID : (NSString *)WillingnessAPPKEY : (UIViewController *)controller;
- (void)WillingnessYangShi:(NSString*)WillingnessLeiXing;
- (void)WillingnessQuery: (NSString *)WillingnessFuWuQiID : (NSString *)WillingnessNickName : (NSNumber *)WillingnessAmount : (NSString *)WillingnessCallBack : (UIViewController *)controller : (NSString *)WillingnessServerName;
- (void)WillingnessQueryOperation:(UIViewController*)controll WillingnessHuoWuID:(NSString*)products WillingnessJiaGe:(NSString*)amount WillingnessHuoWuMing:(NSString*)productName WillingnessDingDanHao:(NSString*) DingDanHao;
@end
#import <Foundation/Foundation.h>
extern NSString * const WillingnessExitNotification;
extern NSString * const WillingnessLoginNotification;
extern NSString * const WillingnessErrorNotification;
@interface WillingnessHuiTiaoNotification : NSObject
@end
#import <UIKit/UIKit.h>
@interface WillingnessIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
@property(nonatomic,strong) NSString* WillingnessDingDanHao;
@property(nonatomic,strong) NSDictionary* WillingnessHuoWuLieBiao;
@property(nonatomic,strong) NSMutableArray* WillingnessHuoWuIDLieBiao;
@property(nonatomic, strong) UITableView *WillingnessHuoWuLieBiaoView;
- (void)WillingnessHuaQianView:(UIViewController*)controller WillingnessHuoWuD:(NSString*)products WillingnessQian:(NSString*)amount WillingnessHuoWuMing:(NSString*)productName WillingnessDingDanHao:(NSString*)DingDanHao;
@end