更改存储uid到钥匙串

张旭
1 parent 2e268434
Showing 11 changed files with 309 additions and 387 deletions
CNLiveUserSystemDemo.xcodeproj/project.pbxproj
CNLiveUserSystemDemo/AppDelegate.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserManager.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserSystemTools.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/NSString+Keychain.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK/NSString+Keychain.m
CNLiveUserSystemSDK.xcodeproj/project.pbxproj
Products/CNLiveUserSystemSDK.framework/CNLiveUserSystemSDK
Products/CNLiveUserSystemSDK.framework/Headers/CNLiveUserSystemCenter.h
Products/CNLiveUserSystemSDK.framework/Headers/CNLiveUserSystemTypeDef.h
Products/CNLiveUserSystemSDK.framework/Info.plist
@@ -83,6 +83,7 @@
 		B6B54BEA1D8D009800089C9C /* UserInfoHeaderImageTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B54BE91D8D009800089C9C /* UserInfoHeaderImageTableViewCell.m */; };
 		B6B54BED1D8D011000089C9C /* UserInfoTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B54BEC1D8D011000089C9C /* UserInfoTableViewCell.m */; };
 		B6B54BF01D8D025A00089C9C /* ModifyUserInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B54BEF1D8D025A00089C9C /* ModifyUserInfoViewController.m */; };
+		D23A472722D48B8C00A4B465 /* NSString+Keychain.m in Sources */ = {isa = PBXBuildFile; fileRef = D23A472522D48B8C00A4B465 /* NSString+Keychain.m */; };
 		D273A1DC1ED7CC9D00AE3F35 /* CNLiveEmailModifyPassword.m in Sources */ = {isa = PBXBuildFile; fileRef = D273A1DB1ED7CC9D00AE3F35 /* CNLiveEmailModifyPassword.m */; };
 		D273A1DF1ED7F81E00AE3F35 /* CNLiveCheckVerificationCode.m in Sources */ = {isa = PBXBuildFile; fileRef = D273A1DE1ED7F81E00AE3F35 /* CNLiveCheckVerificationCode.m */; };
 		D2D25B171ED94BCE00B4B18B /* EmailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2D25B161ED94BCE00B4B18B /* EmailViewController.m */; };
@@ -255,6 +256,8 @@
 		B6B54BEC1D8D011000089C9C /* UserInfoTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfoTableViewCell.m; sourceTree = "<group>"; };
 		B6B54BEE1D8D025A00089C9C /* ModifyUserInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModifyUserInfoViewController.h; sourceTree = "<group>"; };
 		B6B54BEF1D8D025A00089C9C /* ModifyUserInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModifyUserInfoViewController.m; sourceTree = "<group>"; };
+		D23A472522D48B8C00A4B465 /* NSString+Keychain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Keychain.m"; sourceTree = "<group>"; };
+		D23A472622D48B8C00A4B465 /* NSString+Keychain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+Keychain.h"; sourceTree = "<group>"; };
 		D273A1DA1ED7CC9D00AE3F35 /* CNLiveEmailModifyPassword.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveEmailModifyPassword.h; sourceTree = "<group>"; };
 		D273A1DB1ED7CC9D00AE3F35 /* CNLiveEmailModifyPassword.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveEmailModifyPassword.m; sourceTree = "<group>"; };
 		D273A1DD1ED7F81E00AE3F35 /* CNLiveCheckVerificationCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveCheckVerificationCode.h; sourceTree = "<group>"; };
@@ -517,6 +520,8 @@
 		812642F71D86A7E500B402CA /* CNLiveUserSystemSDK */ = {
 			isa = PBXGroup;
 			children = (
+				D23A472622D48B8C00A4B465 /* NSString+Keychain.h */,
+				D23A472522D48B8C00A4B465 /* NSString+Keychain.m */,
 				812642F81D86A83100B402CA /* CNLiveUserSystemCenter.h */,
 				812642F91D86A83100B402CA /* CNLiveUserSystemCenter.m */,
 				8187A8FC1D8E90C5007FAFB6 /* CNLiveUserManager.h */,
@@ -693,6 +698,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -766,6 +772,7 @@
 				8116F8F11D891BCD0084FE49 /* RegistBasicInformationView.m in Sources */,
 				8187A8F61D8E6486007FAFB6 /* NSObject+UserModel.m in Sources */,
 				811600F11D927E7E003CAE7D /* SDWebImageCompat.m in Sources */,
+				D23A472722D48B8C00A4B465 /* NSString+Keychain.m in Sources */,
 				811600F31D927E7E003CAE7D /* SDWebImageDownloader.m in Sources */,
 				811600F41D927E7E003CAE7D /* SDWebImageDownloaderOperation.m in Sources */,
 				811600F21D927E7E003CAE7D /* SDWebImageDecoder.m in Sources */,
@@ -974,7 +981,7 @@
 					"-fobjc-arc",
 					"-ObjC",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "shixunzhongguo-cnlive";
+				PRODUCT_BUNDLE_IDENTIFIER = "shixunzhongguo-cnlive8";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1007,7 +1014,7 @@
 					"-fobjc-arc",
 					"-ObjC",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "shixunzhongguo-cnlive";
+				PRODUCT_BUNDLE_IDENTIFIER = "shixunzhongguo-cnlive8";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -18,7 +18,7 @@
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-
+    
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     ViewController *vc = [[ViewController alloc] init];
     UINavigationController *nvc = [[UINavigationController alloc] initWithRootViewController:vc];
@@ -30,7 +30,7 @@
     [WXApi registerApp:WeChatAppKey];
     [WeiboSDK enableDebugMode:YES];
     [WeiboSDK registerApp:SinaAppKey];
-    
+    NSLog(@"111didFinishLaunchingWithOptions");
     return YES;
 }
@@ -60,6 +60,7 @@
 }
 - (void)applicationDidBecomeActive:(UIApplication *)application {
+    NSLog(@"111applicationDidBecomeActive");
     // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
 }
@@ -81,6 +81,7 @@
         stamp = [stamp stringByReplacingOccurrencesOfString:@"." withString:@""];
         NSString *baseUrl = formalStatUrl;
         NSString *vvUrl = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=apple&spid=&appid=%@&version=1005_%@&eventid=1320&uri=&sid=%@&plat=i_%@&objid=",baseUrl,kSVer,[CNLiveUserSystemTools uidForStat:realTime],stamp,self.appId,SDKVersion, [CNLiveUserManager manager].userId ? [CNLiveUserManager manager].userId: @"",StatAppVersion];
+        NSLog(@"url start:\n%@",vvUrl);
         [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:vvUrl]] delegate:nil];
     }];
@@ -101,6 +102,7 @@
         NSString *vvUrl = [NSString stringWithFormat:@"%@?sver=%@&uid=%@&tm=%@&from=apple&spid=&appid=%@&version=1005_%@&eventid=1321&uri=%@&sid=%@&plat=i_%@&objid=",baseUrl,kSVer,[CNLiveUserSystemTools uidForStat:realTime],stamp,self.appId,SDKVersion,endDate,[CNLiveUserManager manager].userId ? [CNLiveUserManager manager].userId: @"",StatAppVersion];
+        NSLog(@"url end:\n%@",vvUrl);
         [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:vvUrl]] delegate:nil];
     }];
 }
@@ -11,6 +11,7 @@
 #import "CommonCrypto/CommonDigest.h"
 #import "Common.h"
 #import "CNLiveUserManager.h"
+#import "NSString+Keychain.h"
 #define testStatUrl @"http://app.sta.cnlive.com/app.jpg"
 #define formalStatUrl @"http://app.sta.cnlive.com/app.jpg"
@@ -25,23 +26,27 @@
     NSUserDefaults *defauts = [NSUserDefaults standardUserDefaults];
     NSString *userKey = @"kCNLiveUserDefaultsUIDKey";
+//    [NSString xw_deletes];
     if ([defauts objectForKey:userKey]) {
+        //老用户升级新版本后,没删App
         uid = [[defauts objectForKey:userKey] copy];
+        NSArray <NSString *>*arr = [uid componentsSeparatedByString:@"_"];
+        NSString *uuid = arr[0];
+        NSString *ts = arr[1];
+        [NSString xw_saveUUID:uuid TS:ts];
+        return uid;
+    }else if (XW_UUID_Exist){//老用户,删了App
+        uid = XW_UUID_Timestamp(dateStr);
+        [defauts setObject:uid forKey:userKey];
+        [defauts synchronize];
         return uid;
     }
     else {
-        
-        NSString *stamp = dateStr;
-        stamp = [stamp stringByReplacingOccurrencesOfString:@"." withString:@""];
-        
-        NSString *idfv = [[[[UIDevice currentDevice] identifierForVendor] UUIDString] stringByReplacingOccurrencesOfString:@"-" withString:@""];
-        uid = [NSString stringWithFormat:@"%@_%@", idfv, stamp];
-        
+        uid =  XW_UUID_Timestamp(dateStr);
         [defauts setObject:uid forKey:userKey];
         [defauts synchronize];
+        return uid;
     }
-    
-    return uid;
 }
 #pragma mark - 加密
+//
+//  NSString+Keychain.h
+//  XWTest
+//
+//  Created by CNLive-zxw on 2019/7/8.
+//  Copyright © 2019 CNLive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+// 获取UUID
+#define XW_UUID [NSString xw_getUUIDInKeychain]
+// 是否存在UUID
+#define XW_UUID_Exist [NSString xw_existUUID]
+
+// 获取时间戳
+#define XW_Timestamp [NSString xw_getTimestampInKeychain]
+// 是否存在时间戳
+#define XW_Timestamp_Exist [NSString xw_existTimestamp]
+
+// 获取UUID_时间戳 传入时间戳
+#define XW_UUID_Timestamp(Timestamp) [Timestamp xw_getUUIDTimestampInKeychain]
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface NSString (Keychain)
+
+/**
+ * @abstract  获取设备UUID
+ *
+ * 本方法是得到 UUID 后存入系统中的 keychain 的方法
+ * 程序删除后重装,仍可以得到相同的唯一标示
+ * 但是当系统刷机后,系统中的钥匙串会被清空,此时本方法失效
+ *
+ * @return  返回UUID字符串对象
+ */
++ (NSString *)xw_getUUIDInKeychain;
++ (BOOL)xw_existUUID;
+
+
+/**
+ * @abstract  获取时间戳
+ * 获取的时间戳就是第一次调用xw_getTimeInKeychain这个方法,此方法会把传入的时间戳存入系统中的 keychain
+ * 我们调用此方法获取时间戳的时候,如果有,则返回;如果没有,则返回当前时间戳
+ * 一定确保此方法在xw_getTimeInKeychain之后调用 *
+ *
+ * @return  返回时间戳字符串对象
+ */
++ (NSString *)xw_getTimestampInKeychain;
++ (BOOL)xw_existTimestamp;
+
+
+/**
+ * @abstract  获取UUID和_和时间戳3个的拼接对象
+ *
+ * 本方法一定要使用时间戳字符串调用 *
+ * 本方法是得到 UUID_时间戳 后存入系统中的 keychain 的方法
+ * 程序删除后重装,仍可以得到相同的唯一标示
+ * 但是当系统刷机后,系统中的钥匙串会被清空,此时本方法失效
+ *
+ * @return  返回获取UUID和_和时间戳3个的拼接对象
+ */
+- (NSString *)xw_getUUIDTimestampInKeychain;
+
+
+//保存数据至钥匙串中
++ (void)xw_save:(NSString *)service data:(id)data;
+
+
+//从钥匙串中加载数据
++ (id)xw_load:(NSString *)service;
+
+
+//删除数据
++ (void)xw_delete:(NSString *)service;
++ (void)xw_deletes;
+
+/**
+ * 保存已有的UUID_TS到钥匙串
+ *
+ * @param UUID UUID的字符串
+ * @param TS TS的字符串
+ */
++ (void)xw_saveUUID:(NSString *)UUID TS:(NSString *)TS;
+    
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  NSString+Keychain.m
+//  XWTest
+//
+//  Created by CNLive-zxw on 2019/7/8.
+//  Copyright © 2019 CNLive. All rights reserved.
+//
+
+#import "NSString+Keychain.h"
+#import <Security/Security.h>
+
+NSString * const KEY_UUID_INSTEAD = @"com.cnlive.CNLiveNetAdd.uuid";
+NSString * const KEY_TIME_INSTEAD = @"com.cnlive.CNLiveNetAdd.time";
+
+@implementation NSString (Keychain)
+/**
+* 保存已有的UUID_TS到钥匙串
+*
+* @param UUID UUID的字符串
+* @param TS TS的字符串
+*/
++ (void)xw_saveUUID:(NSString *)UUID TS:(NSString *)TS {
+    if (!XW_UUID_Exist || !XW_Timestamp_Exist) {
+        [NSString xw_save:KEY_UUID_INSTEAD data:UUID];
+        [NSString xw_save:KEY_TIME_INSTEAD data:TS];
+    }
+}
+/**
+ * @abstract  获取设备UUID
+ *
+ * 本方法是得到 UUID 后存入系统中的 keychain 的方法
+ * 程序删除后重装,仍可以得到相同的唯一标示
+ * 但是当系统刷机后,系统中的钥匙串会被清空,此时本方法失效
+ *
+ * @return 返回UUID字符串对象
+ */
++ (NSString *)xw_getUUIDInKeychain {
+    NSString *getUDIDInKeychain = (NSString *)[NSString xw_load:KEY_UUID_INSTEAD];
+    NSLog(@"最终 ———— UUID %@",getUDIDInKeychain);
+    return getUDIDInKeychain;
+    
+}
+
++ (BOOL)xw_existUUID{
+    NSString *getUDIDInKeychain = (NSString *)[NSString xw_load:KEY_UUID_INSTEAD];
+    NSLog(@"从keychain中获取到的 UUID %@",getUDIDInKeychain);
+    if (!getUDIDInKeychain ||[getUDIDInKeychain isEqualToString:@""]||[getUDIDInKeychain isKindOfClass:[NSNull class]]) {
+        return NO;
+    }else{
+        return YES;
+        
+    }
+    
+}
+
+/**
+ * @abstract  获取时间戳
+ * 获取的时间戳就是第一次调用xw_getTimeInKeychain这个方法,此方法会把传入的时间戳存入系统中的 keychain
+ * 我们调用此方法获取时间戳的时候,如果有,则返回;如果没有,则返回当前时间戳
+ * 一定确保此方法在xw_getTimeInKeychain之后调用 *
+ *
+ * @return  返回时间戳字符串对象
+ */
++ (NSString *)xw_getTimestampInKeychain {
+    NSString *getTimeInKeychain = (NSString *)[NSString xw_load:KEY_TIME_INSTEAD];
+    return getTimeInKeychain;
+    
+}
+
++ (BOOL)xw_existTimestamp{
+    NSString *getTimeInKeychain = (NSString *)[NSString xw_load:KEY_TIME_INSTEAD];
+    NSLog(@"从keychain中获取到的 UUID %@",getTimeInKeychain);
+    if (!getTimeInKeychain ||[getTimeInKeychain isEqualToString:@""]||[getTimeInKeychain isKindOfClass:[NSNull class]]) {
+        return NO;
+    }else{
+        return YES;
+        
+    }
+    
+}
+
+
+/**
+ * @abstract 获取UUID和_和时间戳3个的拼接对象
+ *
+ * 本方法一定要使用时间戳字符串调用 *
+ * 本方法是得到 UUID_时间戳 后存入系统中的 keychain 的方法
+ * 程序删除后重装,仍可以得到相同的唯一标示
+ * 但是当系统刷机后,系统中的钥匙串会被清空,此时本方法失效
+ *
+ * @return 返回获取UUID和_和时间戳3个的拼接对象
+ */
+- (NSString *)xw_getUUIDTimestampInKeychain {
+    NSString *getUDIDInKeychain = (NSString *)[NSString xw_load:KEY_UUID_INSTEAD];
+    NSLog(@"从keychain中获取到的 UUID %@",getUDIDInKeychain);
+    if (!getUDIDInKeychain ||[getUDIDInKeychain isEqualToString:@""]||[getUDIDInKeychain isKindOfClass:[NSNull class]]) {
+        CFUUIDRef puuid = CFUUIDCreate( nil );
+        CFStringRef uuidString = CFUUIDCreateString( nil, puuid );
+        NSString * idfv = (NSString *)CFBridgingRelease(CFStringCreateCopy( NULL, uuidString));
+        NSString *result = [idfv stringByReplacingOccurrencesOfString:@"-" withString:@""];
+        
+        CFRelease(puuid);
+        CFRelease(uuidString);
+        NSLog(@"\n \n \n _____重新存储 UUID_____\n \n \n  %@",result);
+        [NSString xw_save:KEY_UUID_INSTEAD data:result];
+        getUDIDInKeychain = (NSString *)[NSString xw_load:KEY_UUID_INSTEAD];
+    }
+    
+    NSString *getTimeInKeychain = (NSString *)[NSString xw_load:KEY_TIME_INSTEAD];
+    if (!getTimeInKeychain ||[getTimeInKeychain isEqualToString:@""]||[getTimeInKeychain isKindOfClass:[NSNull class]]) {
+        [NSString xw_save:KEY_TIME_INSTEAD data:self];
+        getTimeInKeychain = (NSString *)[NSString xw_load:KEY_TIME_INSTEAD];
+    }
+    
+    NSString *string = [NSString stringWithFormat:@"%@_%@",getUDIDInKeychain,getTimeInKeychain];
+    NSLog(@"最终 ———— UUID_时间戳 %@",string);
+    return string;
+    
+}
+
+
+//保存数据至钥匙串中
++ (void)xw_save:(NSString *)service data:(id)data {
+    //Get search dictionary
+    NSMutableDictionary *keychainQuery = [self getKeychainQuery:service];
+    //Delete old item before add new item
+    SecItemDelete((CFDictionaryRef)keychainQuery);
+    //Add new object to search dictionary(Attention:the data format)
+    [keychainQuery setObject:[NSKeyedArchiver archivedDataWithRootObject:data] forKey:(id)kSecValueData];
+    //Add item to keychain with the search dictionary
+    SecItemAdd((CFDictionaryRef)keychainQuery, NULL);
+    
+}
+
+
+//从钥匙串中加载数据
++ (id)xw_load:(NSString *)service {
+    id ret = nil;
+    NSMutableDictionary *keychainQuery = [self getKeychainQuery:service];
+    //Configure the search setting
+    //Since in our simple case we are expecting only a single attribute to be returned (the password) we can set the attribute kSecReturnData to kCFBooleanTrue
+    [keychainQuery setObject:(id)kCFBooleanTrue forKey:(id)kSecReturnData];
+    [keychainQuery setObject:(id)kSecMatchLimitOne forKey:(id)kSecMatchLimit];
+    CFDataRef keyData = NULL;
+    if (SecItemCopyMatching((CFDictionaryRef)keychainQuery, (CFTypeRef *)&keyData) == noErr) {
+        @try {
+            ret = [NSKeyedUnarchiver unarchiveObjectWithData:(__bridge NSData *)keyData];
+        } @catch (NSException *e) {
+            NSLog(@"Unarchive of %@ failed: %@", service, e);
+        } @finally {
+        }
+    }
+    if (keyData)
+        CFRelease(keyData);
+    return ret;
+    
+}
+
+
+//删除数据
++ (void)xw_delete:(NSString *)service {
+    NSMutableDictionary *keychainQuery = [self getKeychainQuery:service];
+    SecItemDelete((CFDictionaryRef)keychainQuery);
+    
+}
+
+
+//通过 key 获取数据
++ (NSMutableDictionary *)getKeychainQuery:(NSString *)service {
+    return [NSMutableDictionary dictionaryWithObjectsAndKeys:
+            (id)kSecClassGenericPassword,(id)kSecClass,
+            service, (id)kSecAttrService,
+            service, (id)kSecAttrAccount,
+            (id)kSecAttrAccessibleAfterFirstUnlock,(id)kSecAttrAccessible,
+            nil];
+}
+
++ (void)xw_deletes{
+    [NSString xw_delete:KEY_UUID_INSTEAD];
+    [NSString xw_delete:KEY_TIME_INSTEAD];
+
+}
+
+@end
@@ -33,6 +33,8 @@
 		8187351D1DA8F60100046D84 /* CNLiveVerificationCode.m in Sources */ = {isa = PBXBuildFile; fileRef = 818735041DA8F60100046D84 /* CNLiveVerificationCode.m */; };
 		8187351E1DA8F60100046D84 /* NSDictionary+Safety.h in Headers */ = {isa = PBXBuildFile; fileRef = 818735051DA8F60100046D84 /* NSDictionary+Safety.h */; };
 		8187351F1DA8F60100046D84 /* NSDictionary+Safety.m in Sources */ = {isa = PBXBuildFile; fileRef = 818735061DA8F60100046D84 /* NSDictionary+Safety.m */; };
+		D23A472022D43E7B00A4B465 /* NSString+Keychain.h in Headers */ = {isa = PBXBuildFile; fileRef = D23A471E22D43E7A00A4B465 /* NSString+Keychain.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		D23A472122D43E7B00A4B465 /* NSString+Keychain.m in Sources */ = {isa = PBXBuildFile; fileRef = D23A471F22D43E7B00A4B465 /* NSString+Keychain.m */; };
 		D2470C3A1EE65B2800C16A1F /* CNLiveEmailModifyPassword.m in Sources */ = {isa = PBXBuildFile; fileRef = D2470C361EE65B2800C16A1F /* CNLiveEmailModifyPassword.m */; };
 		D2470C3B1EE65B2800C16A1F /* CNLiveEmailModifyPassword.h in Headers */ = {isa = PBXBuildFile; fileRef = D2470C371EE65B2800C16A1F /* CNLiveEmailModifyPassword.h */; };
 		D2470C3C1EE65B2800C16A1F /* CNLiveCheckVerificationCode.m in Sources */ = {isa = PBXBuildFile; fileRef = D2470C381EE65B2800C16A1F /* CNLiveCheckVerificationCode.m */; };
@@ -68,6 +70,8 @@
 		818735041DA8F60100046D84 /* CNLiveVerificationCode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveVerificationCode.m; sourceTree = "<group>"; };
 		818735051DA8F60100046D84 /* NSDictionary+Safety.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+Safety.h"; sourceTree = "<group>"; };
 		818735061DA8F60100046D84 /* NSDictionary+Safety.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+Safety.m"; sourceTree = "<group>"; };
+		D23A471E22D43E7A00A4B465 /* NSString+Keychain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+Keychain.h"; sourceTree = "<group>"; };
+		D23A471F22D43E7B00A4B465 /* NSString+Keychain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Keychain.m"; sourceTree = "<group>"; };
 		D2470C361EE65B2800C16A1F /* CNLiveEmailModifyPassword.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveEmailModifyPassword.m; sourceTree = "<group>"; };
 		D2470C371EE65B2800C16A1F /* CNLiveEmailModifyPassword.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveEmailModifyPassword.h; sourceTree = "<group>"; };
 		D2470C381EE65B2800C16A1F /* CNLiveCheckVerificationCode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveCheckVerificationCode.m; sourceTree = "<group>"; };
@@ -126,6 +130,8 @@
 		818734F11DA8F60100046D84 /* CNLiveUserSystemSDK */ = {
 			isa = PBXGroup;
 			children = (
+				D23A471E22D43E7A00A4B465 /* NSString+Keychain.h */,
+				D23A471F22D43E7B00A4B465 /* NSString+Keychain.m */,
 				8131D9241DA9E55B00F03C91 /* Common.h */,
 				818734F21DA8F60100046D84 /* CNLiveFeedback.h */,
 				818734F31DA8F60100046D84 /* CNLiveFeedback.m */,
@@ -166,6 +172,7 @@
 			files = (
 				D2470C3D1EE65B2800C16A1F /* CNLiveCheckVerificationCode.h in Headers */,
 				8187351B1DA8F60100046D84 /* CNLiveUserSystemTypeDef.h in Headers */,
+				D23A472022D43E7B00A4B465 /* NSString+Keychain.h in Headers */,
 				818735171DA8F60100046D84 /* CNLiveUserSystemCenter.h in Headers */,
 				8187351C1DA8F60100046D84 /* CNLiveVerificationCode.h in Headers */,
 				8187350F1DA8F60100046D84 /* CNLiveRegister.h in Headers */,
@@ -225,6 +232,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 818734D71DA8F5B900046D84;
@@ -278,6 +286,7 @@
 				D2470C3A1EE65B2800C16A1F /* CNLiveEmailModifyPassword.m in Sources */,
 				811A0B101E7BBB3200B56CC9 /* CNLiveUserNetworkManager.m in Sources */,
 				8187350A1DA8F60100046D84 /* CNLiveURLRequestSerialization.m in Sources */,
+				D23A472122D43E7B00A4B465 /* NSString+Keychain.m in Sources */,
 				8187350E1DA8F60100046D84 /* CNLiveLogin.m in Sources */,
 				818735121DA8F60100046D84 /* CNLiveUploadIcon.m in Sources */,
 				8187350C1DA8F60100046D84 /* CNLiveFeedback.m in Sources */,
-//
-//  CNLiveUserSystemCenter.h
-//  CNLiveUserSystemDemo
-//
-//  Created by iOS on 16/9/12.
-//  Copyright © 2016年 zhulin. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "CNLiveUserSystemTypeDef.h"
-#import <UIKit/UIKit.h>
-
-@interface CNLiveUserSystemCenter : NSObject
-
-/**
- @abstract      初始化
- @param         appId                   注册成功获得应用ID
- @param         appKey                  注册成功获得应用key
- @param         appSecret               注册成功获得应用secret
- @param         isTestEnvironment       测试环境开关
- @warning       必传参数
- 必须在 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions; 方法中调用
-  */
- + (void)setAppId:(NSString *)appId appKey:(NSString *)appKey appSecret:(NSString *)appSecret isTestEnvironment:(BOOL)isTestEnvironment;
-
-/**
- 用户ID
-
- @param userId 用户ID
- */
-+ (void)setUserId:(NSString *)userId;
-
-/**
- @abstract      初始化
- @param         appId                   注册成功获得应用ID
- @param         appKey                  注册成功获得应用key
- @param         appSecret               注册成功获得应用secret
- @warning       必传参数
- 必须在 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions; 方法中调用
- *此方法环境默认为正式环境,建议使用如下方法初始化.
- + (void)setAppId:(NSString *)appId appKey:(NSString *)appKey appSecret:(NSString *)appSecret isTestEnvironment:(BOOL)isTestEnvironment;
- 
- */
-+ (void)setAppId:(NSString *)appId appKey:(NSString *)appKey appSecret:(NSString *)appSecret;
-
-/**
- @abstract      注册
- @param         userName                邮箱或手机
- @param         password                密码
- @param         verificationCode        手机验证码（手机号注册时必填）
- @param         invitationCode          邀请码（非必填）
- @param         frmId                   渠道ID（非必填）
- @param         success                 成功回调
- @param         failure                 失败回调
- */
-+ (void)registerWithUserName:(NSString *)userName password:(NSString *)password verificationCode:(NSString *)verificationCode invitationCode:(NSString *)invitationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
-
-
-/**
- @abstract      第三方登录
- @param         plat                    第三方平台编号（如plat: 1:sina weibo 2:qq 3:weixin 4:renren 注:如qq登录,plat=@"2"）
- @param         thirdPartyId            第三方用户ID
- @param         nickName                用户昵称
- @param         gender                  性别，m：男、f：女、n：未知（非必填）
- @param         location                用户所在地（非必填）
- @param         faceUrl                 头像，约100*100（非必填）
- @param         frmId                   渠道ID（非必填）
- @param         success                 成功回调
- @param         failure                 失败回调
- */
-+ (void)thirdPartyLoginWithThirdPartyPlatType:(NSString *)plat thirdPartyId:(NSString *)thirdPartyId nickName:(NSString *)nickName gender:(NSString *)gender location:(NSString *)location faceUrl:(NSString *)faceUrl frmId:(NSString *)frmId success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
-
-
-/**
- @abstract      快捷登录(旧)
- @param         userName                手机号
- @param         verificationCode        验证码
- @param         frmId                   渠道ID（非必填）
- @param         success                 成功回调
- @param         failure                 失败回调
- */
-+ (void)shortcutLoginWithUserName:(NSString *)userName verificationCode:(NSString *)verificationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
-
-/**
- @abstract      快捷登录(新)
- @param         userName                手机号
- @param         countryCode             手机号国家码
- @param         verificationCode        验证码
- @param         frmId                   渠道ID（非必填）
- @param         success                 成功回调
- @param         failure                 失败回调
- */+ (void)shortcutLoginWithUserName:(NSString *)userName countryCode:(NSString *)countryCode verificationCode:(NSString *)verificationCode frmId:(NSString *)frmId success:(void (^)(id))success failure :(void (^)(NSDictionary *))failure;
-
-/**
- @abstract      登录
- @param         userName                手机号或邮箱
- @param         password                密码
- @param         frmId                   渠道ID（非必填）
- @param         success                 成功回调
- @param         failure                 失败回调
- */
-+ (void)loginWithUserName:(NSString *)userName password:(NSString *)password frmId:(NSString *)frmId success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
-
-
-/**
- @abstract      发送验证码(旧)
- @param         mobile                  手机号
- @param         type                    发送验证码类型（详见VerificationCodeType）
- @param         success                 成功回调
- @param         failure                 失败回调
- */
-+ (void)verificationCodeType:(VerificationCodeType)type mobile:(NSString *)mobile success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
-
-/**
- @abstract      发送验证码(新)
- @param         type                    发送验证码类型（详见VerificationCodeType）
- @param         mobile                  手机号
- @param         countryCode             手机号国家码
- @param         success                 成功回调
- @param         failure                 失败回调
- */
-+ (void)verificationCodeType:(VerificationCodeType)type mobile:(NSString *)mobile countryCode:(NSString *)countryCode success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
-
-
-/**
- @abstract      更新用户附加信息
- @param         uid                     用户ID
- @param         extInfo                 扩展信息（格式由对方自己组织，平台只负责存储和原样读取，NSString类型）
- @param         success                 成功回调
- @param         failure                 失败回调
- */
-+ (void)updateOtherInfoWithUid:(NSString *)uid extInfo:(NSString *)extInfo success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
-
-
-/**
- @abstract      修改用户单项信息
- @param         type                    修改类型（nickName-昵称，gender-性别，email-邮箱, location-联系方式（地址））
- @param         uid                     用户ID
- @param         info                    对应的信息（注gender对应f/m/n）
- @param         success                 成功回调
- @param         failure                 失败回调
- */
-+ (void)modifyUserInfoType:(UserInfoType)type uid:(NSString *)uid modifyInfo:(NSString *)info success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
-
-
-/**
- @abstract      更新手机号(旧)
- @param         uid                     用户ID
- @param         mobile                  手机号
- @param         verificationCode        验证码
- @param         success                 成功回调
- @param         failure                 失败回调
- */
-+ (void)updateMobileWithUid:(NSString *)uid mobile:(NSString *)mobile verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
-
-/**
- @abstract      更新手机号(新)
- @param         uid                     用户ID
- @param         mobile                  手机号
- @param         countryCode             手机号国家码
- @param         verificationCode        验证码
- @param         success                 成功回调
- @param         failure                 失败回调
- */
-+(void)updateMobileWithUid:(NSString *)uid mobile:(NSString *)mobile countryCode:(NSString *)countryCode verificationCode:(NSString *)verificationCode success:(void (^)(id))success failure:(void (^)(NSDictionary *))failure;
-
-/**
- @abstract      绑定第三方账号
- @param         uid                     用户ID
- @param         plat                    第三方平台编号（如platform: 1:sina weibo 2:qq  3:weixin 4:renren                注:如绑定qq,thirdPartyPlat = @"2"）
- @param         thirdPartyId            第三方用户ID
- @param         success                 成功回调
- @param         failure                 失败回调
- */
-+ (void)bindingThirdPartyWithUid:(NSString *)uid thirdPartyPlatType:(NSString *)plat thirdPartyId:(NSString *)thirdPartyId success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
-
-
-/**
- @abstract      修改密码（通过手机号修改）
- @param         mobile                  手机号
- @param         verificationCode        验证码
- @param         newPassword             新密码
- @param         success                 成功回调
- @param         failure                 失败回调
- */
-+ (void)changePasswordWithMobile:(NSString *)mobile verificationCode:(NSString *)verificationCode newPassword:(NSString *)newPassword success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
-
-
-/**
- @abstract      上传头像
- @param         uid                     用户ID
- @param         icon                    头像 (图片质量 0.5)
- @param         success                 成功回调
- @param         failure                 失败回调
- */
-+ (void)uploadIconWithUid:(NSString *)uid icon:(UIImage *)icon success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
-
-/**
- @abstract      上传头像 新增
- @param         uid                     用户ID
- @param         compressionQuality      头像质量 0-1 Default 0.5
- @param         icon                    头像
- @param         success                 成功回调
- @param         failure                 失败回调
- 
- */
-+ (void)uploadIconWithUid:(NSString *)uid icon:(UIImage *)icon compressionQuality:(CGFloat)compressionQuality success:(void (^)(id))success failure:(void (^)(NSDictionary *))failure;
-
-/**
- @abstract      查询用户信息
- @param         uid                     用户ID
- @param         srcUid                  被查询用户ID
- @param         success                 成功回调
- @param         failure                 失败回调
- */
-+ (void)queryUserInfoWithUid:(NSString *)uid srcUid:(NSString *)srcUid success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
-
-
-/**
- @abstract      查询多条用户信息
- @param         uid                     用户ID
- @param         srcUids                 被查询用户IDs
- @param         success                 成功回调
- @param         failure                 失败回调
- */
-+ (void)queryMoreUserInfosWithUid:(NSString *)uid srcUids:(NSArray *)srcUids success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
-
-
-/**
- @abstract      用户反馈
- @param         contentId               举报内容ID
- @param         message                 举报内容(app自己组织-不能带特殊字符&号等)
- @param         success                 成功回调
- @param         failure                 失败回调
- */
-+ (void)feedbackWithContentId:(NSString *)contentId message:(NSString *)message success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
-
-
-/**
- 通过邮箱修改密码
-
- @param email 邮箱
- @param newPwd 新密码
- @param success 成功回调
- @param failure 失败回调
- */
-+ (void)modifyPwdWithEmail:(NSString *)email newPwd:(NSString *)newPwd success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
-
-
-/**
- 通过原密码修改密码
-
- @param uid 用户ID
- @param pwd 原密码
- @param newPwd 新密码
- @param success 成功回调
- @param failure 失败回调
- */
-+ (void)oldPwdChangePasswordWithUid:(NSString *)uid pwd:(NSString *)pwd newPwd:(NSString *)newPwd success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
-
-
-/**
- 注册前校验手机验证码(旧)
-
- @param mobile 手机号
- @param verificationCode 验证码
- @param success 成功回调
- @param failure 失败回调
- */
-+ (void)registerCheckVerificationCodeWithMobile:(NSString *)mobile verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
-
-/**
- 注册前校验手机验证码(新)
- 
- @param mobile 手机号
- @param countryCode 手机号国家码
- @param verificationCode 验证码
- @param success 成功回调
- @param failure 失败回调
- */
-+ (void)registerCheckVerificationCodeWithMobile:(NSString *)mobile countryCode:(NSString *)countryCode verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
-
-/**
- 快捷登录前校验手机验证码(旧)
-
- @param mobile 手机号
- @param verificationCode 验证码
- @param success 成功回调
- @param failure 失败回调
- */
-+ (void)shortcutLoginCheckVerificationCodeWithMobile:(NSString *)mobile verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
-
-/**
- 快捷登录前校验手机验证码(新)
- 
- @param mobile 手机号
- @param countryCode 手机号国家码
- @param success 成功回调
- @param failure 失败回调
- */
-+ (void)shortcutLoginCheckVerificationCodeWithMobile:(NSString *)mobile countryCode:(NSString *)countryCode verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
-
-/**
- 验证第三方账号是否注册,若注册则直接登录返回用户信息,若未注册返回errorCode
-
- @param plat  第三方平台编号（如plat: 1:sina weibo 2:qq 3:weixin 4:renren 注:如qq登录,plat=@"2"）
- @param thirdPartyId 第三方用户ID
- @param frmId 渠道ID（非必填）
- @param success 成功回调
- @param failure 失败回调
- */
-+ (void)thirdPartyCheckLoginWithThirdPartyPlatType:(NSString *)plat thirdPartyId:(NSString *)thirdPartyId frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
-
-
-/**
- 第三方注册强制绑定手机号登录: 手机号+密码+验证码+三方账号
-
- @param plat  第三方平台编号（如plat: 1:sina weibo 2:qq 3:weixin 4:renren 注:如qq登录,plat=@"2"）
- @param thirdPartyId 第三方用户ID
- @param nickName 用户昵称
- @param gender 性别，m：男、f：女、n：未知（非必填）
- @param location 用户所在地（非必填）
- @param faceUrl 头像，约100*100（非必填）
- @param mobile 手机号
- @param verificationCode 验证码 (验证码类型为快捷登录VerificationCodeTypeShortcutLogin)
- @param pawd 注册密码
- @param frmId 渠道ID（非必填）
- @param success 成功回调
- @param failure 失败回调
- */
-+ (void)thirdPartyBindMobileLoginWithThirdPartyPlatType:(NSString *)plat thirdPartyId:(NSString *)thirdPartyId nickName:(NSString *)nickName gender:(NSString *)gender location:(NSString *)location faceUrl:(NSString *)faceUrl mobile:(NSString *)mobile verificationCode:(NSString *)verificationCode pawd:(NSString *)pawd frmId:(NSString *)frmId success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
-
-
-/**
- *  获取SDK版本号 v2.1.0
- */
-+ (NSString *)getVersion;
-
-
-
-@end
-//
-//  CNLiveUserSystemTypeDef.h
-//  CNLiveUserSystemDemo
-//
-//  Created by iOS on 16/9/12.
-//  Copyright © 2016年 zhulin. All rights reserved.
-//
-
-#ifndef CNLiveUserSystemTypeDef_h
-#define CNLiveUserSystemTypeDef_h
-
-//获取验证码
-typedef NS_ENUM(NSUInteger, VerificationCodeType) {
-    VerificationCodeTypeShortcutLogin = 0,      //快捷登录
-    VerificationCodeTypeRegister,               //注册或修改手机号
-    VerificationCodeTypeRetrievePassword        //找回或修改密码
-};
-
-//修改单项用户信息类型
-typedef NS_ENUM(NSUInteger, UserInfoType) {
-    UserInfoTypeNickName = 0,                   //昵称
-    UserInfoTypeGender,                         //性别（f/m/n）
-    UserInfoTypeEmail,                          //邮箱
-    UserInfoTypeLocation,                       //联系方式（地址）
-};
-
-//校验验证码
-typedef NS_ENUM(NSInteger, CheckVerificationCodeType) {
-    CheckVerificationCodeTypeRegister          = 0,//注册前校验验证码
-    CheckVerificationCodeTypeShortcutLogin         //快捷登录前校验验证码
-};
-
-#endif /* CNLiveUserSystemTypeDef_h */