iOS Team / CNLiveUserSystem · Commits

Commit 981f35085d9b16c23958a0fdcb6f5174e0441fd3

Authored by 张旭
1 parent d76a0408

更改变量名

Inline Side-by-side
Showing 1 changed file with 16 additions and 16 deletions
CNLiveUserSystemDemo/CNLiveUserSystemSDK/NSString+Keychain.m
  View file @981f350
@@ -9,8 +9,8 @@ @@ -9,8 +9,8 @@
9 #import "NSString+Keychain.h" 9 #import "NSString+Keychain.h"
10 #import <Security/Security.h> 10 #import <Security/Security.h>
11 11
12 -NSString * const KEY_UUID_INSTEAD = @"com.cnlive.CNLiveNetAdd.uuid";  
13 -NSString * const KEY_TIME_INSTEAD = @"com.cnlive.CNLiveNetAdd.time"; 12 +NSString * const CNUSER_KEY_UUID_INSTEAD = @"com.cnlive.CNLiveNetAdd.uuid";
  13 +NSString * const CNUSER_KEY_TIME_INSTEAD = @"com.cnlive.CNLiveNetAdd.time";
14 14
15 @implementation NSString (Keychain) 15 @implementation NSString (Keychain)
16 /** 16 /**
@@ -21,8 +21,8 @@ NSString * const KEY_TIME_INSTEAD = @&quot;com.cnlive.CNLiveNetAdd.time&quot;; @@ -21,8 +21,8 @@ NSString * const KEY_TIME_INSTEAD = @&quot;com.cnlive.CNLiveNetAdd.time&quot;;
21 */ 21 */
22 + (void)xw_saveUUID:(NSString *)UUID TS:(NSString *)TS { 22 + (void)xw_saveUUID:(NSString *)UUID TS:(NSString *)TS {
23 if (!XW_UUID_Exist || !XW_Timestamp_Exist) { 23 if (!XW_UUID_Exist || !XW_Timestamp_Exist) {
24 - [NSString xw_save:KEY_UUID_INSTEAD data:UUID];  
25 - [NSString xw_save:KEY_TIME_INSTEAD data:TS]; 24 + [NSString xw_save:CNUSER_KEY_UUID_INSTEAD data:UUID];
  25 + [NSString xw_save:CNUSER_KEY_TIME_INSTEAD data:TS];
26 } 26 }
27 } 27 }
28 /** 28 /**
@@ -35,14 +35,14 @@ NSString * const KEY_TIME_INSTEAD = @&quot;com.cnlive.CNLiveNetAdd.time&quot;; @@ -35,14 +35,14 @@ NSString * const KEY_TIME_INSTEAD = @&quot;com.cnlive.CNLiveNetAdd.time&quot;;
35 * @return 返回UUID字符串对象 35 * @return 返回UUID字符串对象
36 */ 36 */
37 + (NSString *)xw_getUUIDInKeychain { 37 + (NSString *)xw_getUUIDInKeychain {
38 - NSString *getUDIDInKeychain = (NSString *)[NSString xw_load:KEY_UUID_INSTEAD]; 38 + NSString *getUDIDInKeychain = (NSString *)[NSString xw_load:CNUSER_KEY_UUID_INSTEAD];
39 NSLog(@"最终 ———— UUID %@",getUDIDInKeychain); 39 NSLog(@"最终 ———— UUID %@",getUDIDInKeychain);
40 return getUDIDInKeychain; 40 return getUDIDInKeychain;
41 41
42 } 42 }
43 43
44 + (BOOL)xw_existUUID{ 44 + (BOOL)xw_existUUID{
45 - NSString *getUDIDInKeychain = (NSString *)[NSString xw_load:KEY_UUID_INSTEAD]; 45 + NSString *getUDIDInKeychain = (NSString *)[NSString xw_load:CNUSER_KEY_UUID_INSTEAD];
46 NSLog(@"从keychain中获取到的 UUID %@",getUDIDInKeychain); 46 NSLog(@"从keychain中获取到的 UUID %@",getUDIDInKeychain);
47 if (!getUDIDInKeychain ||[getUDIDInKeychain isEqualToString:@""]||[getUDIDInKeychain isKindOfClass:[NSNull class]]) { 47 if (!getUDIDInKeychain ||[getUDIDInKeychain isEqualToString:@""]||[getUDIDInKeychain isKindOfClass:[NSNull class]]) {
48 return NO; 48 return NO;
@@ -62,13 +62,13 @@ NSString * const KEY_TIME_INSTEAD = @&quot;com.cnlive.CNLiveNetAdd.time&quot;; @@ -62,13 +62,13 @@ NSString * const KEY_TIME_INSTEAD = @&quot;com.cnlive.CNLiveNetAdd.time&quot;;
62 * @return 返回时间戳字符串对象 62 * @return 返回时间戳字符串对象
63 */ 63 */
64 + (NSString *)xw_getTimestampInKeychain { 64 + (NSString *)xw_getTimestampInKeychain {
65 - NSString *getTimeInKeychain = (NSString *)[NSString xw_load:KEY_TIME_INSTEAD]; 65 + NSString *getTimeInKeychain = (NSString *)[NSString xw_load:CNUSER_KEY_TIME_INSTEAD];
66 return getTimeInKeychain; 66 return getTimeInKeychain;
67 67
68 } 68 }
69 69
70 + (BOOL)xw_existTimestamp{ 70 + (BOOL)xw_existTimestamp{
71 - NSString *getTimeInKeychain = (NSString *)[NSString xw_load:KEY_TIME_INSTEAD]; 71 + NSString *getTimeInKeychain = (NSString *)[NSString xw_load:CNUSER_KEY_TIME_INSTEAD];
72 NSLog(@"从keychain中获取到的 UUID %@",getTimeInKeychain); 72 NSLog(@"从keychain中获取到的 UUID %@",getTimeInKeychain);
73 if (!getTimeInKeychain ||[getTimeInKeychain isEqualToString:@""]||[getTimeInKeychain isKindOfClass:[NSNull class]]) { 73 if (!getTimeInKeychain ||[getTimeInKeychain isEqualToString:@""]||[getTimeInKeychain isKindOfClass:[NSNull class]]) {
74 return NO; 74 return NO;
@@ -91,7 +91,7 @@ NSString * const KEY_TIME_INSTEAD = @&quot;com.cnlive.CNLiveNetAdd.time&quot;; @@ -91,7 +91,7 @@ NSString * const KEY_TIME_INSTEAD = @&quot;com.cnlive.CNLiveNetAdd.time&quot;;
91 * @return 返回获取UUID和_和时间戳3个的拼接对象 91 * @return 返回获取UUID和_和时间戳3个的拼接对象
92 */ 92 */
93 - (NSString *)xw_getUUIDTimestampInKeychain { 93 - (NSString *)xw_getUUIDTimestampInKeychain {
94 - NSString *getUDIDInKeychain = (NSString *)[NSString xw_load:KEY_UUID_INSTEAD]; 94 + NSString *getUDIDInKeychain = (NSString *)[NSString xw_load:CNUSER_KEY_UUID_INSTEAD];
95 NSLog(@"从keychain中获取到的 UUID %@",getUDIDInKeychain); 95 NSLog(@"从keychain中获取到的 UUID %@",getUDIDInKeychain);
96 if (!getUDIDInKeychain ||[getUDIDInKeychain isEqualToString:@""]||[getUDIDInKeychain isKindOfClass:[NSNull class]]) { 96 if (!getUDIDInKeychain ||[getUDIDInKeychain isEqualToString:@""]||[getUDIDInKeychain isKindOfClass:[NSNull class]]) {
97 CFUUIDRef puuid = CFUUIDCreate( nil ); 97 CFUUIDRef puuid = CFUUIDCreate( nil );
@@ -102,14 +102,14 @@ NSString * const KEY_TIME_INSTEAD = @&quot;com.cnlive.CNLiveNetAdd.time&quot;; @@ -102,14 +102,14 @@ NSString * const KEY_TIME_INSTEAD = @&quot;com.cnlive.CNLiveNetAdd.time&quot;;
102 CFRelease(puuid); 102 CFRelease(puuid);
103 CFRelease(uuidString); 103 CFRelease(uuidString);
104 NSLog(@"\n \n \n _____重新存储 UUID_____\n \n \n %@",result); 104 NSLog(@"\n \n \n _____重新存储 UUID_____\n \n \n %@",result);
105 - [NSString xw_save:KEY_UUID_INSTEAD data:result];  
106 - getUDIDInKeychain = (NSString *)[NSString xw_load:KEY_UUID_INSTEAD]; 105 + [NSString xw_save:CNUSER_KEY_UUID_INSTEAD data:result];
  106 + getUDIDInKeychain = (NSString *)[NSString xw_load:CNUSER_KEY_UUID_INSTEAD];
107 } 107 }
108 108
109 - NSString *getTimeInKeychain = (NSString *)[NSString xw_load:KEY_TIME_INSTEAD]; 109 + NSString *getTimeInKeychain = (NSString *)[NSString xw_load:CNUSER_KEY_TIME_INSTEAD];
110 if (!getTimeInKeychain ||[getTimeInKeychain isEqualToString:@""]||[getTimeInKeychain isKindOfClass:[NSNull class]]) { 110 if (!getTimeInKeychain ||[getTimeInKeychain isEqualToString:@""]||[getTimeInKeychain isKindOfClass:[NSNull class]]) {
111 - [NSString xw_save:KEY_TIME_INSTEAD data:self];  
112 - getTimeInKeychain = (NSString *)[NSString xw_load:KEY_TIME_INSTEAD]; 111 + [NSString xw_save:CNUSER_KEY_TIME_INSTEAD data:self];
  112 + getTimeInKeychain = (NSString *)[NSString xw_load:CNUSER_KEY_TIME_INSTEAD];
113 } 113 }
114 114
115 NSString *string = [NSString stringWithFormat:@"%@_%@",getUDIDInKeychain,getTimeInKeychain]; 115 NSString *string = [NSString stringWithFormat:@"%@_%@",getUDIDInKeychain,getTimeInKeychain];
@@ -176,8 +176,8 @@ NSString * const KEY_TIME_INSTEAD = @&quot;com.cnlive.CNLiveNetAdd.time&quot;; @@ -176,8 +176,8 @@ NSString * const KEY_TIME_INSTEAD = @&quot;com.cnlive.CNLiveNetAdd.time&quot;;
176 } 176 }
177 177
178 + (void)xw_deletes{ 178 + (void)xw_deletes{
179 - [NSString xw_delete:KEY_UUID_INSTEAD];  
180 - [NSString xw_delete:KEY_TIME_INSTEAD]; 179 + [NSString xw_delete:CNUSER_KEY_UUID_INSTEAD];
  180 + [NSString xw_delete:CNUSER_KEY_TIME_INSTEAD];
181 181
182 } 182 }
183 183