Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client

client_Wu Xijin

2018-08-24 2c5187953ca0a32a76e50de81e983caef7805fe9

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client

 Assets/Plugins/iOS/ReYunTracking/ReYunTracking.a

old mode 100644
new mode 100755
Binary files differ

 Assets/Plugins/iOS/ReYunTracking/Tracking.h

old mode 100644
new mode 100755

 Assets/Plugins/iOS/The2thWorldSDK/UniversalSDK.mm

@@ -34,7 +34,8 @@

-(void) Init
{
    NSString* _configPath = [[NSBundle mainBundle] pathForResource:@"The2thWorldSDKConfig" ofType:@"plist"];
    NSString *_bundlePath = [[NSBundle mainBundle] pathForResource:@"The2thWorldRES.bundle" ofType:nil];
    NSString* _configPath = [[NSBundle bundleWithPath:_bundlePath] pathForResource:@"The2thWorldSDKConfig" ofType:@"plist"];
    NSMutableDictionary *_configDict = [[NSMutableDictionary alloc] initWithContentsOfFile:_configPath];
    
    UIDevice *_device = [UIDevice currentDevice];
@@ -273,7 +274,9 @@

-(void)JPushInit:(NSDictionary*)launchOptions {
    
    NSString* _configPath = [[NSBundle mainBundle] pathForResource:@"The2thWorldSDKConfig" ofType:@"plist"];
    
    NSString *_bundlePath = [[NSBundle mainBundle] pathForResource:@"The2thWorldRES.bundle" ofType:nil];
    NSString* _configPath = [[NSBundle bundleWithPath:_bundlePath] pathForResource:@"The2thWorldSDKConfig" ofType:@"plist"];
    NSMutableDictionary *_configDict = [[NSMutableDictionary alloc] initWithContentsOfFile:_configPath];
    
    JPUSHRegisterEntity *_entity = [[JPUSHRegisterEntity alloc] init];
@@ -357,7 +360,9 @@
            break;
        case U2S_FreePlatformInit:
        {
            NSString* _configPath = [[NSBundle mainBundle] pathForResource:@"The2thWorldSDKConfig" ofType:@"plist"];
            
            NSString *_bundlePath = [[NSBundle mainBundle] pathForResource:@"The2thWorldRES.bundle" ofType:nil];
            NSString* _configPath = [[NSBundle bundleWithPath:_bundlePath] pathForResource:@"The2thWorldSDKConfig" ofType:@"plist"];
            NSMutableDictionary *_configDict = [[NSMutableDictionary alloc] initWithContentsOfFile:_configPath];
            [self FreeSDKInit:_configDict[@"FreeSDK_AppID"]];
        }