Merge branch 'master' into leonard

client_Wu Xijin

2018-08-14 31c2cebbccba45a00a755981dd6d0cdd0a0459e9

 Assets/Plugins/iOS/The2thWorldSDK/UniversalSDK.h

@@ -11,43 +11,49 @@
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>

#define CODE_SDK_FREEPLATFORM_INIT_OK       3000
#define CODE_SDK_FREEPLATFORM_INIT_FAIL     3001
#define CODE_SDK_FREEPLATFORM_LOGIN_OK      3002
#define CODE_SDK_FREEPLATFORM_LOGIN_FAIL    3003
#define CODE_SDK_FREEPLATFORM_LOGOUT_OK     3004
#define CODE_SDK_FREEPLATFORM_LOGOUT_FAIL   3005
#define CODE_SDK_FREEPLATFORM_PAY_OK        3006
#define CODE_SDK_FREEPLATFORM_PAY_FAIL      3007
#define CODE_SDK_FREEPLATFORM_PAY_CANCEL    3008
#define CODE_SDK_FREEPLATFORM_BIND_OK       3009
#define CODE_SDK_FREEPLATFORM_BIND_FAIL     3010
#define CODE_SDK_FREEPLATFORM_REG_OK        3011
#define UNITY_OBJ_NAME "SDKUtility"
#define UNITY_FUNC_NAME "HandleSdkMessage"

#define CODE_SDK_FREEPLATFORM_LOGIN         3101
#define CODE_SDK_FREEPLATFORM_LOGOUT        3102
#define CODE_SDK_FREEPLATFORM_PAY           3103
#define S2U_BatteryLevel                1
#define S2U_BatteryCharging             2
#define S2U_DeviceInfo                  3
#define S2U_PushClientID                4
#define S2U_FreePlatformInitOk          10
#define S2U_FreePlatformInitFail        11
#define S2U_FreePlatformLoginOk         12
#define S2U_FreePlatformLoginFail       13
#define S2U_FreePlatformLoginCancel     14
#define S2U_FreePlatformLogoutOk        15
#define S2U_FreePlatformLogoutFail      16
#define S2U_FreePlatformSwitchAccountOk 17
#define S2U_FreePlatformPayOk           18
#define S2U_FreePlatformPayFail         19
#define S2U_FreePlatformPayCancel       20
#define S2U_FreePlatformRegisterOk      21
#define S2U_SdkInitComplete             90

#define CODE_SDK_ADSDK_TOKEN                4000
#define U2S_BatteryListenStart          1
#define U2S_BatteryListenStop           2
#define U2S_CopyContent                 7
#define U2S_OpenWebView                 8
#define U2S_Init                        9
#define U2S_FreePlatformInit            100
#define U2S_FreePlatformLogin           101
#define U2S_FreePlatformLogout          102
#define U2S_FreePlatformSwitchAccount   103
#define U2S_FreePlatformPay             104
#define U2S_PayFinished                 105
#define U2S_JPushAddLocalMessage        200
#define U2S_JPushRemoveLocalMessage     201
#define U2S_MakeKeyAndVisible           300

#define CODE_SDK_BATTERY_STATE_CHANGED      2012
#define CODE_SDK_BATTERY_LEVEL_CHANGED      2002
#define CODE_SDK_NETWORK_STATE_CHANGED      2003
#define CODE_SDK_GETUI_CLIENT_ID            2004
#define CODE_SDK_GETUI_LOCALMSG_DATETIME    2005
#define CODE_SDK_GETUI_REMOVE_MSG           2006
#define CODE_SDK_GETUI_REMOVE_ALLMSG        2007
#define KIsiPhoneX ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1125, 2436), [[UIScreen mainScreen] currentMode].size) : NO)

#define CODE_SDK_GET_BATTERY_STATE          2101
#define CODE_SDK_GET_BATTERY_LEVEL          2102

#define KIsiPhoneX ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1125, 2436), [[UIScreen mainScreen] currentMode].size) : NO) 

static NSString *JPush_AppKey = @"22186239fee975f883198cf4";
static NSString *JPush_Channel = @"Develop";
static NSString *JPush_AppKey      = @"22186239fee975f883198cf4";
static NSString *JPush_Channel     = @"Develop";
static BOOL     JPush_IsProduction = FALSE;

static NSString *FreeSDK_AppID = @"508021130";
static NSString *FreeSDK_AppID     = @"508021130";
static NSString *ADSdk_Token;

@interface UniversalSDK : NSObject {
@@ -55,19 +61,16 @@
    UIButton* m_CloseBtn;
}

-(void) MessageHandler:(NSString*) json;
-(void) HandleUnityMessage:(NSString*) json;
-(void) Init;
-(void) FreeSDKInit;
-(void) FreeSDKLoginOK;
-(void) FreeSDKCancelLogin;
-(id) APNativeJSONObject:(NSData*) data;
-(NSData*) APNativeJSONData:(id) obj;
-(void) RemoveLocalNotificationWithIdentifierKey:(NSString*) idKey;
-(void) ClearAllLocalNotification;
-(void) MakeKeyAndVisible;

-(void) JPushInit:(NSDictionary*)launchOptions;
-(NSString*) GetUniqueID;
-(void) GetDeviceInfo;

@end