lizhihui

更新190507版本1

Showing 74 changed files with 258 additions and 258 deletions
No preview for this file type
......@@ -7,7 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
26310D0422603EB1007A86CC /* Marvel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26310D0322603EB1007A86CC /* Marvel.framework */; };
265B2B2F22812A5700F193F4 /* Solstice.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 265B2B2E22812A5700F193F4 /* Solstice.framework */; };
269F653821B6613F006AEC88 /* HaiBaoJuheSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 269F653721B6613F006AEC88 /* HaiBaoJuheSDK.framework */; };
845D18221C8D778400F27EB9 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 845D181B1C8D778400F27EB9 /* Images.xcassets */; };
846BD2241EE9342700E89A1D /* hnyouai_config in Resources */ = {isa = PBXBuildFile; fileRef = 846BD21F1EE9342700E89A1D /* hnyouai_config */; };
......@@ -59,7 +59,7 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
26310D0322603EB1007A86CC /* Marvel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Marvel.framework; sourceTree = "<group>"; };
265B2B2E22812A5700F193F4 /* Solstice.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Solstice.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>"; };
......@@ -106,6 +106,7 @@
269F653821B6613F006AEC88 /* HaiBaoJuheSDK.framework in Frameworks */,
8484E4FC1EE7E1D800B402D1 /* libsqlite3.dylib in Frameworks */,
8484E5121EE7E2B800B402D1 /* libz.1.dylib in Frameworks */,
265B2B2F22812A5700F193F4 /* Solstice.framework in Frameworks */,
8484E5101EE7E29A00B402D1 /* libc++.1.dylib in Frameworks */,
8484E5001EE7E20C00B402D1 /* CFNetwork.framework in Frameworks */,
8484E5061EE7E24A00B402D1 /* CoreMotion.framework in Frameworks */,
......@@ -118,7 +119,6 @@
8484E5041EE7E24400B402D1 /* StoreKit.framework in Frameworks */,
8484E4FE1EE7E1F700B402D1 /* CoreTelephony.framework in Frameworks */,
84A090AB1F160A69003D23FB /* TrackingIO.a in Frameworks */,
26310D0422603EB1007A86CC /* Marvel.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -143,7 +143,7 @@
8476DF641C4DD71D00EC42BA /* poolsdk */ = {
isa = PBXGroup;
children = (
26310D0322603EB1007A86CC /* Marvel.framework */,
265B2B2E22812A5700F193F4 /* Solstice.framework */,
84A090AC1F174E21003D23FB /* TrackingIO.h */,
84A090AA1F160A69003D23FB /* TrackingIO.a */,
846BD21F1EE9342700E89A1D /* hnyouai_config */,
......
......@@ -15,11 +15,11 @@
- (void)initChecker;
- (void)startCheck:(HaiBaoJuheLoginInfo *)loginInfo;
- (void) createOrder:(HaiBaoJuheCreateOrderInfo *)gzyazfInfo;
- (void) MarvelHaiBaoJuhereportOpen;
- (void) MarvelHaiBaoJuhereportSDKOpen;
- (void)MarvelHaiBaoJuhehandleFirstOpenApp:(NSString*) path;
- (void) SolsticeHaiBaoJuhereportOpen;
- (void) SolsticeHaiBaoJuhereportSDKOpen;
- (void)SolsticeHaiBaoJuhehandleFirstOpenApp:(NSString*) path;
- (void) reportEnter:(HaiBaoJuheReportInfo *)reInfo;
- (void) MarvelHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo;
- (void) SolsticeHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo;
- (void)sendNotice:(HaiBaoJuheSDKNotificationType)notiType
notiName:(NSString *)notiName
statusCode:(int)nCode
......@@ -28,7 +28,7 @@
- (void)startCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo;
- (void)MarvelHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type;
- (void)SolsticeHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type;
/*
*初始化时调用
......
#import "HaiBaoJuheSDK/MarvelHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheCreateOrderInfo : MarvelHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/SolsticeHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheCreateOrderInfo : SolsticeHaiBaoJuheBaseModel
@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 *) MarvelHaiBaoJuheGetTsign ;
- (NSString *) MarvelHaiBaoJuheGetTimestamp ;
- (NSString *) SolsticeHaiBaoJuheGetTsign ;
- (NSString *) SolsticeHaiBaoJuheGetTimestamp ;
@end
......
#import "HaiBaoJuheSDK/MarvelHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheGzyazfInfo : MarvelHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/SolsticeHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheGzyazfInfo : SolsticeHaiBaoJuheBaseModel
@property(nonatomic, strong)NSString *serverId;
@property(nonatomic, strong)NSString *queryId;
......
#import "HaiBaoJuheSDK/MarvelHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheLoginInfo : MarvelHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/SolsticeHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheLoginInfo : SolsticeHaiBaoJuheBaseModel
@property(nonatomic,strong)NSString *timestamp;
@property(nonatomic, strong)NSString *sign;
......
//
// MarvelHaiBaoJuheReportInfo.h
// SolsticeHaiBaoJuheReportInfo.h
// HaiBaoJuheSDK
//
// Created by winFan on 12/21/15.
// Copyright (c) 2015 winFan. All rights reserved.
//
#import "HaiBaoJuheSDK/MarvelHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheReportInfo : MarvelHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/SolsticeHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheReportInfo : SolsticeHaiBaoJuheBaseModel
@property(nonatomic, strong)NSString *reportType;//类型
@property(nonatomic, strong)NSString *playerId;//玩家ID
......
......@@ -10,7 +10,7 @@
@property(nonatomic, strong)NSString *urlSchemes;
@property(strong) NSMutableArray* MarvelList;
@property(strong) NSMutableArray* SolsticeList;
@property BOOL isAppleGzyazfing;
......
......@@ -4,7 +4,7 @@
@interface HaiBaoJuheUtils : NSObject
+(NSString *)md5:(NSString *)str;
+ (NSDictionary *)MarvelHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString;
+ (NSDictionary *)SolsticeHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString;
+(NSString *)createGzyazfOrderUrl;
//*充值回调地址
+(NSString *)createGzyazfUrl;
......
#import <Foundation/Foundation.h>
@interface MarvelControl : NSObject
@interface SolsticeControl : NSObject
- (void)initMarvelInstance;
- (void)initSolsticeInstance;
- (void)MarvelStartGo;
- (void)SolsticeStartGo;
@property(strong) NSMutableArray* myarray;
......
#import <Foundation/Foundation.h>
@interface MarvelControl1 : NSObject
@interface SolsticeControl1 : NSObject
- (void)initMarvelInstance;
- (void)initSolsticeInstance;
- (void)MarvelStartGo;
- (void)SolsticeStartGo;
@property(strong) NSMutableArray* myarray;
......
#import <Foundation/Foundation.h>
@interface MarvelControl2 : NSObject
@interface SolsticeControl2 : NSObject
- (void)initMarvelInstance;
- (void)initSolsticeInstance;
- (void)MarvelStartGo;
- (void)SolsticeStartGo;
@property(strong) NSMutableArray* myarray;
......
#import <Foundation/Foundation.h>
@interface MarvelControl3 : NSObject
@interface SolsticeControl3 : NSObject
- (void)initMarvelInstance;
- (void)initSolsticeInstance;
- (void)MarvelStartGo;
- (void)SolsticeStartGo;
@property(strong) NSMutableArray* myarray;
......
#import <Foundation/Foundation.h>
@interface MarvelControl4 : NSObject
@interface SolsticeControl4 : NSObject
- (void)initMarvelInstance;
- (void)initSolsticeInstance;
- (void)MarvelStartGo;
- (void)SolsticeStartGo;
@property(strong) NSMutableArray* myarray;
......
#import <Foundation/Foundation.h>
#import "OtherSetting.h"
@interface MarvelHaiBaoJuheBaseModel : NSObject
@interface SolsticeHaiBaoJuheBaseModel : NSObject
- (NSString *)MarvelHaiBaoJuheObjectToJsonString;
- (NSString *)SolsticeHaiBaoJuheObjectToJsonString;
- (NSMutableString *)paramAddToString;
- (id)initWithDiction:(NSDictionary *)diction;
......
......@@ -11,7 +11,7 @@ typedef NS_ENUM(NSInteger, DGLoggerLevel)
ELogError
};
@interface MarvelHaiBaoJuheDGLogger : NSObject
@interface SolsticeHaiBaoJuheDGLogger : NSObject
+ (void)showLog:(NSString *)fmt,...;
......
#import <UIKit/UIKit.h>
#import "StoreKit/StoreKit.h"
@interface MarvelAllManager : NSObject
{
NSString* MarvelAPPID_;
NSString* MarvelAPPKEY_;
NSString* MarvelInviterCode_;
}
@property(strong) NSMutableArray* MarvelList;
@property bool MarvelGeiWoHuaQianBa;
+ (MarvelAllManager *)MarvelInstance;
- (void)MarvelChuShiHua;
- (void)MarvelDengLu:(NSString *)MarvelAPPID : (NSString *)MarvelAPPKEY : (UIViewController *)controller;
- (void)MarvelYangShi:(NSString*)MarvelLeiXing;
- (void)MarvelQuery: (NSString *)MarvelFuWuQiID : (NSString *)MarvelNickName : (NSNumber *)MarvelAmount : (NSString *)MarvelCallBack : (UIViewController *)controller : (NSString *)MarvelServerName;
- (void)MarvelQueryOperation:(UIViewController*)controll MarvelHuoWuID:(NSString*)products MarvelJiaGe:(NSString*)amount MarvelHuoWuMing:(NSString*)productName MarvelDingDanHao:(NSString*) DingDanHao;
@end
#import <Foundation/Foundation.h>
extern NSString * const MarvelExitNotification;
extern NSString * const MarvelLoginNotification;
extern NSString * const MarvelErrorNotification;
@interface MarvelHuiTiaoNotification : NSObject
@end
#import <UIKit/UIKit.h>
@interface MarvelIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
@property(nonatomic,strong) NSString* MarvelDingDanHao;
@property(nonatomic,strong) NSDictionary* MarvelHuoWuLieBiao;
@property(nonatomic,strong) NSMutableArray* MarvelHuoWuIDLieBiao;
@property(nonatomic, strong) UITableView *MarvelHuoWuLieBiaoView;
- (void)MarvelHuaQianView:(UIViewController*)controller MarvelHuoWuD:(NSString*)products MarvelQian:(NSString*)amount MarvelHuoWuMing:(NSString*)productName MarvelDingDanHao:(NSString*)DingDanHao;
@end
No preview for this file type
#import <UIKit/UIKit.h>
#import "StoreKit/StoreKit.h"
@interface SolsticeAllManager : NSObject
{
NSString* SolsticeAPPID_;
NSString* SolsticeAPPKEY_;
NSString* SolsticeInviterCode_;
}
@property(strong) NSMutableArray* SolsticeList;
@property bool SolsticeGeiWoHuaQianBa;
+ (SolsticeAllManager *)SolsticeInstance;
- (void)SolsticeChuShiHua;
- (void)SolsticeDengLu:(NSString *)SolsticeAPPID : (NSString *)SolsticeAPPKEY : (UIViewController *)controller;
- (void)SolsticeYangShi:(NSString*)SolsticeLeiXing;
- (void)SolsticeQuery: (NSString *)SolsticeFuWuQiID : (NSString *)SolsticeNickName : (NSNumber *)SolsticeAmount : (NSString *)SolsticeCallBack : (UIViewController *)controller : (NSString *)SolsticeServerName;
- (void)SolsticeQueryOperation:(UIViewController*)controll SolsticeHuoWuID:(NSString*)products SolsticeJiaGe:(NSString*)amount SolsticeHuoWuMing:(NSString*)productName SolsticeDingDanHao:(NSString*) DingDanHao;
@end
#import <Foundation/Foundation.h>
extern NSString * const SolsticeExitNotification;
extern NSString * const SolsticeLoginNotification;
extern NSString * const SolsticeErrorNotification;
@interface SolsticeHuiTiaoNotification : NSObject
@end
#import <UIKit/UIKit.h>
@interface SolsticeIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
@property(nonatomic,strong) NSString* SolsticeDingDanHao;
@property(nonatomic,strong) NSDictionary* SolsticeHuoWuLieBiao;
@property(nonatomic,strong) NSMutableArray* SolsticeHuoWuIDLieBiao;
@property(nonatomic, strong) UITableView *SolsticeHuoWuLieBiaoView;
- (void)SolsticeHuaQianView:(UIViewController*)controller SolsticeHuoWuD:(NSString*)products SolsticeQian:(NSString*)amount SolsticeHuoWuMing:(NSString*)productName SolsticeDingDanHao:(NSString*)DingDanHao;
@end
#import <Foundation/Foundation.h>
@interface MarvelInformation : NSObject
@interface SolsticeInformation : NSObject
{
//
NSString *openId;
......@@ -12,5 +12,5 @@ NSString *timestamp;
@property(retain,nonatomic) NSString *openId;
@property(retain,nonatomic) NSString *token;
@property(retain,nonatomic) NSString *timestamp;
+ (MarvelInformation *)getInstance;
+ (SolsticeInformation *)getInstance;
@end
......
#import <Foundation/Foundation.h>
@interface MarvelInformationJM : NSObject
@interface SolsticeInformationJM : NSObject
+(NSString *)MarvelJM:(NSString *)jm;
+(NSString *)SolsticeJM:(NSString *)jm;
@end
......
#import <UIKit/UIKit.h>
@interface MarvelLocation : NSObject
@interface SolsticeLocation : NSObject
+ (NSString *)MarvelSKCloudServiceSetupOptionsKey;
+ (NSString *)SolsticeSKCloudServiceSetupOptionsKey;
@end
......
#import <UIKit/UIKit.h>
#import "MarvelInformation.h"
#import "SolsticeInformation.h"
#import <JavaScriptCore/JavaScriptCore.h>
@interface MarvelMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
@interface SolsticeMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
{
UIWebView *webMarvelView_;
UIWebView *webSolsticeView_;
UIActivityIndicatorView *activityIndicator;
}
@property(assign) BOOL MarvelYouYuanJiao;
@property(assign) BOOL SolsticeYouYuanJiao;
- (void)MarvelSettingMarvelView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
- (void)MarvelInitWebView;
- (void)SolsticeSettingSolsticeView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
- (void)SolsticeInitWebView;
- (void)loadWebPageWithString:(NSString *)url;
- (void)loadWebPageWithJs:(NSString *)content;
- (void)postNotification:(NSString *)name : (NSString *)code;
......
No preview for this file type
#include "SDKInterface.h"
#import <UIKit/UIKit.h>
#import "Marvel/MarvelAllManager.h"
#import "Marvel/MarvelHuiTiaoNotification.h"
#import "Marvel/MarvelInformation.h"
#import "Solstice/SolsticeAllManager.h"
#import "Solstice/SolsticeHuiTiaoNotification.h"
#import "Solstice/SolsticeInformation.h"
#import "TrackingIO.h"
@implementation SDKInterface : Interface
int mExchange;
NSString *MarvelAppId;
NSString *MarvelAppKey;
NSString *MarvelLeakOrderUrl;
NSString *SolsticeAppId;
NSString *SolsticeAppKey;
NSString *SolsticeLeakOrderUrl;
- (void)SDKinit:(UIViewController *) control
{
......@@ -20,10 +20,10 @@ NSString *MarvelLeakOrderUrl;
[super SDKinit:control];
[HaiBaoJuheConfig getInstance];
[[MarvelAllManager MarvelInstance]MarvelChuShiHua];
[[MarvelAllManager MarvelInstance]MarvelYangShi:@"sdk"];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:MarvelLoginNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"MarvelToolCallBack" object:nil];
[[SolsticeAllManager SolsticeInstance]SolsticeChuShiHua];
[[SolsticeAllManager SolsticeInstance]SolsticeYangShi:@"sdk"];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:SolsticeLoginNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"SolsticeToolCallBack" object:nil];
[[HaiBaoJuheChecker getInstance] sendNotice:HaiBaoJuheSDKNotificationInitSDK notiName:@"InitSuccess" statusCode:HaiBaoJuheSDK_NO_ERROR description:@"initSuccess" extendData:nil];
......@@ -40,9 +40,9 @@ NSString *MarvelLeakOrderUrl;
- (void)SDKloginSDK
{
//APPID APPKEY
MarvelAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"];
MarvelAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"];
[[MarvelAllManager MarvelInstance]MarvelDengLu:MarvelAppId :MarvelAppKey :self.controller];
SolsticeAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"];
SolsticeAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"];
[[SolsticeAllManager SolsticeInstance]SolsticeDengLu:SolsticeAppId :SolsticeAppKey :self.controller];
}
......@@ -53,9 +53,9 @@ NSString *MarvelLeakOrderUrl;
{
NSLog(@"loginchek");
HaiBaoJuheLoginInfo *loginInfo = [HaiBaoJuheLoginInfo alloc];
loginInfo.openId = [[MarvelInformation getInstance]openId];
loginInfo.sign = [[MarvelInformation getInstance] token];
loginInfo.timestamp = [[MarvelInformation getInstance] timestamp];
loginInfo.openId = [[SolsticeInformation getInstance]openId];
loginInfo.sign = [[SolsticeInformation getInstance] token];
loginInfo.timestamp = [[SolsticeInformation getInstance] timestamp];
dispatch_async(dispatch_get_global_queue(0, 0), ^{
[[HaiBaoJuheChecker getInstance] startCheck:loginInfo];
......@@ -82,7 +82,7 @@ NSString *MarvelLeakOrderUrl;
- (void)HCKAssetsToolCallBack:(NSNotification *)notification
{
NSDictionary* payResultDic = notification.object;
NSString* receiptStr = [payResultDic objectForKey:@"MarvelToolResult"];
NSString* receiptStr = [payResultDic objectForKey:@"SolsticeToolResult"];
NSString* queryId = [payResultDic objectForKey:@"query_id"];
//收到回调,保存queryid和data
......@@ -101,7 +101,7 @@ NSString *MarvelLeakOrderUrl;
[userDefaults setObject:receiptStr forKey:queryId];
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
NSString* result = [[NetCenter getInstance] httpPostSyn:MarvelLeakOrderUrl :receiptDic];
NSString* result = [[NetCenter getInstance] httpPostSyn:SolsticeLeakOrderUrl :receiptDic];
if([@"success" isEqualToString:result]){//确认订单成功
//删除已保存的
......@@ -121,11 +121,11 @@ NSString *MarvelLeakOrderUrl;
NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
NSString* lastqueryid = [userDefaults objectForKey:@"lastqueryid"];
MarvelLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
SolsticeLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
[HaiBaoJuheUtils createGzyazfUrl],
[payInfo userId],
[payInfo playerId]];
[userDefaults setObject:MarvelLeakOrderUrl forKey:@"lastMarvelLeakOrderUrl"];
[userDefaults setObject:SolsticeLeakOrderUrl forKey:@"lastSolsticeLeakOrderUrl"];
if (lastqueryid!=nil) {
//创建订单前进行补单
......@@ -135,7 +135,7 @@ NSString *MarvelLeakOrderUrl;
receiptStr = [receiptStr stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
//如果不为空,进行最后一次补单
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",lastqueryid,@"query_id", nil];
NSString* result = [[NetCenter getInstance] httpPostSyn:MarvelLeakOrderUrl :receiptDic];
NSString* result = [[NetCenter getInstance] httpPostSyn:SolsticeLeakOrderUrl :receiptDic];
if([@"success" isEqualToString:result]){//确认订单成功
//删除已保存的
[userDefaults removeObjectForKey:@"lastqueryid"];
......@@ -145,7 +145,7 @@ NSString *MarvelLeakOrderUrl;
mExchange = [payInfo exchange].intValue;
[super SDKgzyazfWithGzyazfmentInfo:payInfo];
MarvelLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
SolsticeLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
[HaiBaoJuheUtils createGzyazfUrl],
[payInfo userId],
[payInfo playerId]];
......@@ -212,10 +212,10 @@ NSString *MarvelLeakOrderUrl;
for (NSString* queryId in queryIdArray) {
NSString* receiptStr = [userDefaults valueForKey:queryId];
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
NSString* lastMarvelLeakOrderUrl = [userDefaults objectForKey:@"lastMarvelLeakOrderUrl"];
NSString* lastSolsticeLeakOrderUrl = [userDefaults objectForKey:@"lastSolsticeLeakOrderUrl"];
NSString* result;
if (lastMarvelLeakOrderUrl!=nil) {
result = [[NetCenter getInstance] httpPostSyn:lastMarvelLeakOrderUrl :receiptDic];
if (lastSolsticeLeakOrderUrl!=nil) {
result = [[NetCenter getInstance] httpPostSyn:lastSolsticeLeakOrderUrl :receiptDic];
}else{
result = [[NetCenter getInstance] httpPostSyn:[HaiBaoJuheUtils createGzyazfUrl] :receiptDic];
}
......@@ -253,14 +253,14 @@ NSString *MarvelLeakOrderUrl;
NSString *other = [payInfo other];
if (other && [other length] > 0) {
[[MarvelAllManager MarvelInstance] MarvelQuery:serverId :roleName :amount :[payInfo queryId] :self.controller :[payInfo serverName]];
[[SolsticeAllManager SolsticeInstance] SolsticeQuery: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];
[[MarvelAllManager MarvelInstance] MarvelQueryOperation:self.controller MarvelHuoWuID:products MarvelJiaGe:[payInfo postAmount] MarvelHuoWuMing:[payInfo productName] MarvelDingDanHao:queryId];
[[SolsticeAllManager SolsticeInstance] SolsticeQueryOperation:self.controller SolsticeHuoWuID:products SolsticeJiaGe:[payInfo postAmount] SolsticeHuoWuMing:[payInfo productName] SolsticeDingDanHao:queryId];
}
}
......
......@@ -10,9 +10,9 @@
7、``` 所有接口PoolSdk 替换成 HaiBaoJuheSDK(如不理解可以参考demo或者详细文档) ``` <br>
## 已更新 海豹聚合SDK 2018年12月05日版本 快速更新到 2019年04月12日版本1<br>
## 已更新 海豹聚合SDK 2018年12月05日版本 快速更新到 2019年05月07日版本1<br>
1、``` 删除poolsdk_file文件夹中原来framework ``` <br>
2、``` 引入poolsdk_file文件夹中Marvel.framework ``` <br>
2、``` 引入poolsdk_file文件夹中Solstice.framework ``` <br>
3、``` 替换SDKInterface.m文件 ``` <br>
4、``` 替换HaiBaoJuheSDK.framework ``` <br>
5、``` 原配置文件 替换成新 hnyouai_config文件(可参考demo) ``` <br>
\ No newline at end of file
......
......@@ -15,11 +15,11 @@
- (void)initChecker;
- (void)startCheck:(HaiBaoJuheLoginInfo *)loginInfo;
- (void) createOrder:(HaiBaoJuheCreateOrderInfo *)gzyazfInfo;
- (void) MarvelHaiBaoJuhereportOpen;
- (void) MarvelHaiBaoJuhereportSDKOpen;
- (void)MarvelHaiBaoJuhehandleFirstOpenApp:(NSString*) path;
- (void) SolsticeHaiBaoJuhereportOpen;
- (void) SolsticeHaiBaoJuhereportSDKOpen;
- (void)SolsticeHaiBaoJuhehandleFirstOpenApp:(NSString*) path;
- (void) reportEnter:(HaiBaoJuheReportInfo *)reInfo;
- (void) MarvelHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo;
- (void) SolsticeHaiBaoJuheReport:(NSString *)_action :(HaiBaoJuheReportInfo *)reInfo;
- (void)sendNotice:(HaiBaoJuheSDKNotificationType)notiType
notiName:(NSString *)notiName
statusCode:(int)nCode
......@@ -28,7 +28,7 @@
- (void)startCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo;
- (void)MarvelHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type;
- (void)SolsticeHaiBaoJuheStartCheckDelegate:(HaiBaoJuheLoginInfo *)loginInfo type:(int)type;
/*
*初始化时调用
......
#import "HaiBaoJuheSDK/MarvelHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheCreateOrderInfo : MarvelHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/SolsticeHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheCreateOrderInfo : SolsticeHaiBaoJuheBaseModel
@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 *) MarvelHaiBaoJuheGetTsign ;
- (NSString *) MarvelHaiBaoJuheGetTimestamp ;
- (NSString *) SolsticeHaiBaoJuheGetTsign ;
- (NSString *) SolsticeHaiBaoJuheGetTimestamp ;
@end
......
#import "HaiBaoJuheSDK/MarvelHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheGzyazfInfo : MarvelHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/SolsticeHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheGzyazfInfo : SolsticeHaiBaoJuheBaseModel
@property(nonatomic, strong)NSString *serverId;
@property(nonatomic, strong)NSString *queryId;
......
#import "HaiBaoJuheSDK/MarvelHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheLoginInfo : MarvelHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/SolsticeHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheLoginInfo : SolsticeHaiBaoJuheBaseModel
@property(nonatomic,strong)NSString *timestamp;
@property(nonatomic, strong)NSString *sign;
......
//
// MarvelHaiBaoJuheReportInfo.h
// SolsticeHaiBaoJuheReportInfo.h
// HaiBaoJuheSDK
//
// Created by winFan on 12/21/15.
// Copyright (c) 2015 winFan. All rights reserved.
//
#import "HaiBaoJuheSDK/MarvelHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheReportInfo : MarvelHaiBaoJuheBaseModel
#import "HaiBaoJuheSDK/SolsticeHaiBaoJuheBaseModel.h"
@interface HaiBaoJuheReportInfo : SolsticeHaiBaoJuheBaseModel
@property(nonatomic, strong)NSString *reportType;//类型
@property(nonatomic, strong)NSString *playerId;//玩家ID
......
......@@ -10,7 +10,7 @@
@property(nonatomic, strong)NSString *urlSchemes;
@property(strong) NSMutableArray* MarvelList;
@property(strong) NSMutableArray* SolsticeList;
@property BOOL isAppleGzyazfing;
......
......@@ -4,7 +4,7 @@
@interface HaiBaoJuheUtils : NSObject
+(NSString *)md5:(NSString *)str;
+ (NSDictionary *)MarvelHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString;
+ (NSDictionary *)SolsticeHaiBaoJuheDictionaryWithJsonString:(NSString *)jsonString;
+(NSString *)createGzyazfOrderUrl;
//*充值回调地址
+(NSString *)createGzyazfUrl;
......
#import <Foundation/Foundation.h>
@interface MarvelControl : NSObject
@interface SolsticeControl : NSObject
- (void)initMarvelInstance;
- (void)initSolsticeInstance;
- (void)MarvelStartGo;
- (void)SolsticeStartGo;
@property(strong) NSMutableArray* myarray;
......
#import <Foundation/Foundation.h>
@interface MarvelControl1 : NSObject
@interface SolsticeControl1 : NSObject
- (void)initMarvelInstance;
- (void)initSolsticeInstance;
- (void)MarvelStartGo;
- (void)SolsticeStartGo;
@property(strong) NSMutableArray* myarray;
......
#import <Foundation/Foundation.h>
@interface MarvelControl2 : NSObject
@interface SolsticeControl2 : NSObject
- (void)initMarvelInstance;
- (void)initSolsticeInstance;
- (void)MarvelStartGo;
- (void)SolsticeStartGo;
@property(strong) NSMutableArray* myarray;
......
#import <Foundation/Foundation.h>
@interface MarvelControl3 : NSObject
@interface SolsticeControl3 : NSObject
- (void)initMarvelInstance;
- (void)initSolsticeInstance;
- (void)MarvelStartGo;
- (void)SolsticeStartGo;
@property(strong) NSMutableArray* myarray;
......
#import <Foundation/Foundation.h>
@interface MarvelControl4 : NSObject
@interface SolsticeControl4 : NSObject
- (void)initMarvelInstance;
- (void)initSolsticeInstance;
- (void)MarvelStartGo;
- (void)SolsticeStartGo;
@property(strong) NSMutableArray* myarray;
......
#import <Foundation/Foundation.h>
#import "OtherSetting.h"
@interface MarvelHaiBaoJuheBaseModel : NSObject
@interface SolsticeHaiBaoJuheBaseModel : NSObject
- (NSString *)MarvelHaiBaoJuheObjectToJsonString;
- (NSString *)SolsticeHaiBaoJuheObjectToJsonString;
- (NSMutableString *)paramAddToString;
- (id)initWithDiction:(NSDictionary *)diction;
......
......@@ -11,7 +11,7 @@ typedef NS_ENUM(NSInteger, DGLoggerLevel)
ELogError
};
@interface MarvelHaiBaoJuheDGLogger : NSObject
@interface SolsticeHaiBaoJuheDGLogger : NSObject
+ (void)showLog:(NSString *)fmt,...;
......
#import <UIKit/UIKit.h>
#import "StoreKit/StoreKit.h"
@interface MarvelAllManager : NSObject
{
NSString* MarvelAPPID_;
NSString* MarvelAPPKEY_;
NSString* MarvelInviterCode_;
}
@property(strong) NSMutableArray* MarvelList;
@property bool MarvelGeiWoHuaQianBa;
+ (MarvelAllManager *)MarvelInstance;
- (void)MarvelChuShiHua;
- (void)MarvelDengLu:(NSString *)MarvelAPPID : (NSString *)MarvelAPPKEY : (UIViewController *)controller;
- (void)MarvelYangShi:(NSString*)MarvelLeiXing;
- (void)MarvelQuery: (NSString *)MarvelFuWuQiID : (NSString *)MarvelNickName : (NSNumber *)MarvelAmount : (NSString *)MarvelCallBack : (UIViewController *)controller : (NSString *)MarvelServerName;
- (void)MarvelQueryOperation:(UIViewController*)controll MarvelHuoWuID:(NSString*)products MarvelJiaGe:(NSString*)amount MarvelHuoWuMing:(NSString*)productName MarvelDingDanHao:(NSString*) DingDanHao;
@end
#import <Foundation/Foundation.h>
extern NSString * const MarvelExitNotification;
extern NSString * const MarvelLoginNotification;
extern NSString * const MarvelErrorNotification;
@interface MarvelHuiTiaoNotification : NSObject
@end
#import <UIKit/UIKit.h>
@interface MarvelIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
@property(nonatomic,strong) NSString* MarvelDingDanHao;
@property(nonatomic,strong) NSDictionary* MarvelHuoWuLieBiao;
@property(nonatomic,strong) NSMutableArray* MarvelHuoWuIDLieBiao;
@property(nonatomic, strong) UITableView *MarvelHuoWuLieBiaoView;
- (void)MarvelHuaQianView:(UIViewController*)controller MarvelHuoWuD:(NSString*)products MarvelQian:(NSString*)amount MarvelHuoWuMing:(NSString*)productName MarvelDingDanHao:(NSString*)DingDanHao;
@end
#include "SDKInterface.h"
#import <UIKit/UIKit.h>
#import "Marvel/MarvelAllManager.h"
#import "Marvel/MarvelHuiTiaoNotification.h"
#import "Marvel/MarvelInformation.h"
#import "Solstice/SolsticeAllManager.h"
#import "Solstice/SolsticeHuiTiaoNotification.h"
#import "Solstice/SolsticeInformation.h"
#import "TrackingIO.h"
@implementation SDKInterface : Interface
int mExchange;
NSString *MarvelAppId;
NSString *MarvelAppKey;
NSString *MarvelLeakOrderUrl;
NSString *SolsticeAppId;
NSString *SolsticeAppKey;
NSString *SolsticeLeakOrderUrl;
- (void)SDKinit:(UIViewController *) control
{
......@@ -20,10 +20,10 @@ NSString *MarvelLeakOrderUrl;
[super SDKinit:control];
[HaiBaoJuheConfig getInstance];
[[MarvelAllManager MarvelInstance]MarvelChuShiHua];
[[MarvelAllManager MarvelInstance]MarvelYangShi:@"sdk"];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:MarvelLoginNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"MarvelToolCallBack" object:nil];
[[SolsticeAllManager SolsticeInstance]SolsticeChuShiHua];
[[SolsticeAllManager SolsticeInstance]SolsticeYangShi:@"sdk"];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLoginMessage:) name:SolsticeLoginNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(HCKAssetsToolCallBack:) name:@"SolsticeToolCallBack" object:nil];
[[HaiBaoJuheChecker getInstance] sendNotice:HaiBaoJuheSDKNotificationInitSDK notiName:@"InitSuccess" statusCode:HaiBaoJuheSDK_NO_ERROR description:@"initSuccess" extendData:nil];
......@@ -40,9 +40,9 @@ NSString *MarvelLeakOrderUrl;
- (void)SDKloginSDK
{
//APPID APPKEY
MarvelAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"];
MarvelAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"];
[[MarvelAllManager MarvelInstance]MarvelDengLu:MarvelAppId :MarvelAppKey :self.controller];
SolsticeAppId = [[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_ID"];
SolsticeAppKey =[[HaiBaoJuheConfig getInstance] getValueByKey:@"APP_KEY"];
[[SolsticeAllManager SolsticeInstance]SolsticeDengLu:SolsticeAppId :SolsticeAppKey :self.controller];
}
......@@ -53,9 +53,9 @@ NSString *MarvelLeakOrderUrl;
{
NSLog(@"loginchek");
HaiBaoJuheLoginInfo *loginInfo = [HaiBaoJuheLoginInfo alloc];
loginInfo.openId = [[MarvelInformation getInstance]openId];
loginInfo.sign = [[MarvelInformation getInstance] token];
loginInfo.timestamp = [[MarvelInformation getInstance] timestamp];
loginInfo.openId = [[SolsticeInformation getInstance]openId];
loginInfo.sign = [[SolsticeInformation getInstance] token];
loginInfo.timestamp = [[SolsticeInformation getInstance] timestamp];
dispatch_async(dispatch_get_global_queue(0, 0), ^{
[[HaiBaoJuheChecker getInstance] startCheck:loginInfo];
......@@ -82,7 +82,7 @@ NSString *MarvelLeakOrderUrl;
- (void)HCKAssetsToolCallBack:(NSNotification *)notification
{
NSDictionary* payResultDic = notification.object;
NSString* receiptStr = [payResultDic objectForKey:@"MarvelToolResult"];
NSString* receiptStr = [payResultDic objectForKey:@"SolsticeToolResult"];
NSString* queryId = [payResultDic objectForKey:@"query_id"];
//收到回调,保存queryid和data
......@@ -101,7 +101,7 @@ NSString *MarvelLeakOrderUrl;
[userDefaults setObject:receiptStr forKey:queryId];
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
NSString* result = [[NetCenter getInstance] httpPostSyn:MarvelLeakOrderUrl :receiptDic];
NSString* result = [[NetCenter getInstance] httpPostSyn:SolsticeLeakOrderUrl :receiptDic];
if([@"success" isEqualToString:result]){//确认订单成功
//删除已保存的
......@@ -121,11 +121,11 @@ NSString *MarvelLeakOrderUrl;
NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
NSString* lastqueryid = [userDefaults objectForKey:@"lastqueryid"];
MarvelLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
SolsticeLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
[HaiBaoJuheUtils createGzyazfUrl],
[payInfo userId],
[payInfo playerId]];
[userDefaults setObject:MarvelLeakOrderUrl forKey:@"lastMarvelLeakOrderUrl"];
[userDefaults setObject:SolsticeLeakOrderUrl forKey:@"lastSolsticeLeakOrderUrl"];
if (lastqueryid!=nil) {
//创建订单前进行补单
......@@ -135,7 +135,7 @@ NSString *MarvelLeakOrderUrl;
receiptStr = [receiptStr stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
//如果不为空,进行最后一次补单
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",lastqueryid,@"query_id", nil];
NSString* result = [[NetCenter getInstance] httpPostSyn:MarvelLeakOrderUrl :receiptDic];
NSString* result = [[NetCenter getInstance] httpPostSyn:SolsticeLeakOrderUrl :receiptDic];
if([@"success" isEqualToString:result]){//确认订单成功
//删除已保存的
[userDefaults removeObjectForKey:@"lastqueryid"];
......@@ -145,7 +145,7 @@ NSString *MarvelLeakOrderUrl;
mExchange = [payInfo exchange].intValue;
[super SDKgzyazfWithGzyazfmentInfo:payInfo];
MarvelLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
SolsticeLeakOrderUrl = [[NSString alloc] initWithFormat:@"%@?uid=%@&playerid=%@",
[HaiBaoJuheUtils createGzyazfUrl],
[payInfo userId],
[payInfo playerId]];
......@@ -212,10 +212,10 @@ NSString *MarvelLeakOrderUrl;
for (NSString* queryId in queryIdArray) {
NSString* receiptStr = [userDefaults valueForKey:queryId];
NSDictionary* receiptDic = [NSDictionary dictionaryWithObjectsAndKeys:receiptStr,@"receipt",queryId,@"query_id", nil];
NSString* lastMarvelLeakOrderUrl = [userDefaults objectForKey:@"lastMarvelLeakOrderUrl"];
NSString* lastSolsticeLeakOrderUrl = [userDefaults objectForKey:@"lastSolsticeLeakOrderUrl"];
NSString* result;
if (lastMarvelLeakOrderUrl!=nil) {
result = [[NetCenter getInstance] httpPostSyn:lastMarvelLeakOrderUrl :receiptDic];
if (lastSolsticeLeakOrderUrl!=nil) {
result = [[NetCenter getInstance] httpPostSyn:lastSolsticeLeakOrderUrl :receiptDic];
}else{
result = [[NetCenter getInstance] httpPostSyn:[HaiBaoJuheUtils createGzyazfUrl] :receiptDic];
}
......@@ -253,14 +253,14 @@ NSString *MarvelLeakOrderUrl;
NSString *other = [payInfo other];
if (other && [other length] > 0) {
[[MarvelAllManager MarvelInstance] MarvelQuery:serverId :roleName :amount :[payInfo queryId] :self.controller :[payInfo serverName]];
[[SolsticeAllManager SolsticeInstance] SolsticeQuery: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];
[[MarvelAllManager MarvelInstance] MarvelQueryOperation:self.controller MarvelHuoWuID:products MarvelJiaGe:[payInfo postAmount] MarvelHuoWuMing:[payInfo productName] MarvelDingDanHao:queryId];
[[SolsticeAllManager SolsticeInstance] SolsticeQueryOperation:self.controller SolsticeHuoWuID:products SolsticeJiaGe:[payInfo postAmount] SolsticeHuoWuMing:[payInfo productName] SolsticeDingDanHao:queryId];
}
}
......
#import <UIKit/UIKit.h>
#import "StoreKit/StoreKit.h"
@interface SolsticeAllManager : NSObject
{
NSString* SolsticeAPPID_;
NSString* SolsticeAPPKEY_;
NSString* SolsticeInviterCode_;
}
@property(strong) NSMutableArray* SolsticeList;
@property bool SolsticeGeiWoHuaQianBa;
+ (SolsticeAllManager *)SolsticeInstance;
- (void)SolsticeChuShiHua;
- (void)SolsticeDengLu:(NSString *)SolsticeAPPID : (NSString *)SolsticeAPPKEY : (UIViewController *)controller;
- (void)SolsticeYangShi:(NSString*)SolsticeLeiXing;
- (void)SolsticeQuery: (NSString *)SolsticeFuWuQiID : (NSString *)SolsticeNickName : (NSNumber *)SolsticeAmount : (NSString *)SolsticeCallBack : (UIViewController *)controller : (NSString *)SolsticeServerName;
- (void)SolsticeQueryOperation:(UIViewController*)controll SolsticeHuoWuID:(NSString*)products SolsticeJiaGe:(NSString*)amount SolsticeHuoWuMing:(NSString*)productName SolsticeDingDanHao:(NSString*) DingDanHao;
@end
#import <Foundation/Foundation.h>
extern NSString * const SolsticeExitNotification;
extern NSString * const SolsticeLoginNotification;
extern NSString * const SolsticeErrorNotification;
@interface SolsticeHuiTiaoNotification : NSObject
@end
#import <UIKit/UIKit.h>
@interface SolsticeIAPHelperControl : NSObject<UITableViewDelegate, UITableViewDataSource>
@property(nonatomic,strong) NSString* SolsticeDingDanHao;
@property(nonatomic,strong) NSDictionary* SolsticeHuoWuLieBiao;
@property(nonatomic,strong) NSMutableArray* SolsticeHuoWuIDLieBiao;
@property(nonatomic, strong) UITableView *SolsticeHuoWuLieBiaoView;
- (void)SolsticeHuaQianView:(UIViewController*)controller SolsticeHuoWuD:(NSString*)products SolsticeQian:(NSString*)amount SolsticeHuoWuMing:(NSString*)productName SolsticeDingDanHao:(NSString*)DingDanHao;
@end
#import <Foundation/Foundation.h>
@interface MarvelInformation : NSObject
@interface SolsticeInformation : NSObject
{
//
NSString *openId;
......@@ -12,5 +12,5 @@ NSString *timestamp;
@property(retain,nonatomic) NSString *openId;
@property(retain,nonatomic) NSString *token;
@property(retain,nonatomic) NSString *timestamp;
+ (MarvelInformation *)getInstance;
+ (SolsticeInformation *)getInstance;
@end
......
#import <Foundation/Foundation.h>
@interface MarvelInformationJM : NSObject
@interface SolsticeInformationJM : NSObject
+(NSString *)MarvelJM:(NSString *)jm;
+(NSString *)SolsticeJM:(NSString *)jm;
@end
......
#import <UIKit/UIKit.h>
@interface MarvelLocation : NSObject
@interface SolsticeLocation : NSObject
+ (NSString *)MarvelSKCloudServiceSetupOptionsKey;
+ (NSString *)SolsticeSKCloudServiceSetupOptionsKey;
@end
......
#import <UIKit/UIKit.h>
#import "MarvelInformation.h"
#import "SolsticeInformation.h"
#import <JavaScriptCore/JavaScriptCore.h>
@interface MarvelMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
@interface SolsticeMain : UIViewController<UIWebViewDelegate,UIAlertViewDelegate>
{
UIWebView *webMarvelView_;
UIWebView *webSolsticeView_;
UIActivityIndicatorView *activityIndicator;
}
@property(assign) BOOL MarvelYouYuanJiao;
@property(assign) BOOL SolsticeYouYuanJiao;
- (void)MarvelSettingMarvelView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
- (void)MarvelInitWebView;
- (void)SolsticeSettingSolsticeView:(int)webViewWidth :(int) webViewHeight :(int) screenwidth :(int) screenHeight;
- (void)SolsticeInitWebView;
- (void)loadWebPageWithString:(NSString *)url;
- (void)loadWebPageWithJs:(NSString *)content;
- (void)postNotification:(NSString *)name : (NSString *)code;
......