ios / yh_analytics · Commits

Go to a project

Authored by 周蓉君
Commit e8c0de232a4a0f369d9bbaf2d675a569c8407d9a 2 parents a114754b 48a809c2

Merge branch 'master' into yoho

Inline Side-by-side
Showing 2 changed files with 13 additions and 9 deletions
... ... @@ -28,8 +28,8 @@
self = [super initWithDataType:YHItemDataTypeStatus];
if (self) {
self.net = @"0";
self.av = [[[NSBundle mainBundle] infoDictionary]objectForKey:@"CFBundleShortVersionString"];
self.ab = [[NSBundle mainBundle] objectForInfoDictionaryKey: (NSString *)kCFBundleVersionKey];
self.av = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
self.ab = [[NSBundle mainBundle] objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleVersionKey];
self.la = [[NSNumber numberWithDouble:kCLLocationCoordinate2DInvalid.latitude] stringValue];
self.lo = [[NSNumber numberWithDouble:kCLLocationCoordinate2DInvalid.longitude] stringValue];
self.udid = [OpenUDID value];
... ...
... ... @@ -66,8 +66,8 @@ static NSString * const kOpenUDIDOOTSKey = @"OpenUDID_optOutTS";
static NSString * const kOpenUDIDDomain = @"org.OpenUDID";
static NSString * const kOpenUDIDSlotPBPrefix = @"org.OpenUDID.slot.";
static int const kOpenUDIDRedundancySlots = 100;
static NSString * const kYohoSecretInfo = @"com.yoho.buy.secretinfo";
static NSString * const kYohoBuyUdid = @"com.yoho.buy.udid";
static NSString * const kYohoSecretInfo = @"secretinfo";
static NSString * const kYohoBuyUdid = @"udid";
static BOOL isNew = YES;
static NSString * const kYohoDeviceInfo = @"com.yoho.buy.deviceinfo";
... ... @@ -168,14 +168,18 @@ static NSString * const kYohoBuyFirstLaunch = @"com.yoho.buy.firstlaunch";
static NSString * shareUdidString = nil;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
NSMutableDictionary *keychainnamepasswordKVPairs = (NSMutableDictionary *)[YH_KeychainStore load:kYohoSecretInfo];
NSString * udidString = [keychainnamepasswordKVPairs objectForKey:kYohoBuyUdid];
NSString *bundleId = [[[NSBundle mainBundle] infoDictionary] objectForKey:(__bridge NSString *)kCFBundleIdentifierKey];
NSString *secretInfoKey = [NSString stringWithFormat:@"%@.%@", bundleId, kYohoSecretInfo];
NSString *appUdidKey = [NSString stringWithFormat:@"%@.%@", bundleId, kYohoBuyUdid];
NSMutableDictionary *keychainnamepasswordKVPairs = (NSMutableDictionary *)[YH_KeychainStore load:secretInfoKey];
NSString * udidString = [keychainnamepasswordKVPairs objectForKey:appUdidKey];
if (udidString == nil || udidString.length == 0) {
NSString* lvstring = [OpenUDID valueWithError:nil];
NSString * lvstring = [OpenUDID valueWithError:nil];
NSMutableDictionary * yohoinfoKVPairs = [NSMutableDictionary dictionary];
[yohoinfoKVPairs setObject:lvstring forKey:kYohoBuyUdid];
[YH_KeychainStore save:kYohoSecretInfo data:yohoinfoKVPairs];
[yohoinfoKVPairs setObject:lvstring forKey:appUdidKey];
[YH_KeychainStore save:secretInfoKey data:yohoinfoKVPairs];
udidString = lvstring;
}
shareUdidString = [NSString stringWithString:udidString];
... ...