Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/ScioLive

张旭
2 parents 928734f8 5af3b557
Showing 6 changed files with 113 additions and 4 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
CNLiveScioLive/Pages/Login/Controller/CNLiveLoginViewController.m
CNLiveScioLive/Pages/Tools/DeviceUUID/SdkMgr.h
CNLiveScioLive/Pages/Tools/DeviceUUID/SdkMgr.m
CNLiveScioLive/Pages/Tools/ValidationTool/NSString+Validation.h
Podfile
@@ -7,6 +7,7 @@
 	objects = {
  
 /* Begin PBXBuildFile section */
+		0802446D2624267800BD68E8 /* SdkMgr.m in Sources */ = {isa = PBXBuildFile; fileRef = 0802446C2624267800BD68E8 /* SdkMgr.m */; };
 		080AB4C6217AD4F4008BA78F /* TemplateShareManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 080AB4C5217AD4F4008BA78F /* TemplateShareManager.m */; };
 		080AB4C7217AD4F4008BA78F /* TemplateShareManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 080AB4C5217AD4F4008BA78F /* TemplateShareManager.m */; };
 		080AB4C8217AD4F4008BA78F /* TemplateShareManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 080AB4C5217AD4F4008BA78F /* TemplateShareManager.m */; };
@@ -754,6 +755,8 @@
 /* End PBXCopyFilesBuildPhase section */
  
 /* Begin PBXFileReference section */
+		0802446B2624267800BD68E8 /* SdkMgr.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SdkMgr.h; sourceTree = "<group>"; };
+		0802446C2624267800BD68E8 /* SdkMgr.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SdkMgr.m; sourceTree = "<group>"; };
 		080AB4C4217AD4F4008BA78F /* TemplateShareManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TemplateShareManager.h; sourceTree = "<group>"; };
 		080AB4C5217AD4F4008BA78F /* TemplateShareManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TemplateShareManager.m; sourceTree = "<group>"; };
 		083847DF215C5DDD00186618 /* VPImageCropperViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VPImageCropperViewController.h; sourceTree = "<group>"; };
@@ -1279,6 +1282,15 @@
 /* End PBXFrameworksBuildPhase section */
  
 /* Begin PBXGroup section */
+		0802446A262425DB00BD68E8 /* DeviceUUID */ = {
+			isa = PBXGroup;
+			children = (
+				0802446B2624267800BD68E8 /* SdkMgr.h */,
+				0802446C2624267800BD68E8 /* SdkMgr.m */,
+			);
+			path = DeviceUUID;
+			sourceTree = "<group>";
+		};
 		080AB4BE217AD457008BA78F /* ShareTool */ = {
 			isa = PBXGroup;
 			children = (
@@ -2014,6 +2026,7 @@
 		08C08FCF214FA01B00E23D16 /* Tools */ = {
 			isa = PBXGroup;
 			children = (
+				0802446A262425DB00BD68E8 /* DeviceUUID */,
 				08C721A924CAC9B700970100 /* SDCycleScrollView */,
 				080AB4BE217AD457008BA78F /* ShareTool */,
 				08585DD7215B70DA00FC2CA2 /* JSONKit */,
@@ -3067,6 +3080,7 @@
 				08940D752154EB2C00F85DB6 /* UILabel+TextAlign.m in Sources */,
 				08585D83215B4C7200FC2CA2 /* PGDatePicker+DateAndTime.m in Sources */,
 				08585CF9215B3AA900FC2CA2 /* ArticleTableViewCell.m in Sources */,
+				0802446D2624267800BD68E8 /* SdkMgr.m in Sources */,
 				C3A6D061215278CE00FB7759 /* CNLiveForgotPasswordViewController.m in Sources */,
 				084ACE272154C6980089E035 /* CNLiveNewsNoPicTableViewCell.m in Sources */,
 				08585CF0215B3AA900FC2CA2 /* SearchHistoryTableViewCell.m in Sources */,
@@ -15,6 +15,8 @@
 #import "ZXWUserModel.h"
 #import <AuthenticationServices/AuthenticationServices.h>
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
+#import "NSString+Validation.h"
+#import "SdkMgr.h"
  
 @interface CNLiveLoginViewController ()<ASAuthorizationControllerDelegate, ASAuthorizationControllerPresentationContextProviding>
 @property (nonatomic, strong) CNLiveLoginInputView *account;
@@ -471,7 +473,7 @@
     [mDict setValue:@"i" forKey:@"plat"];
     [mDict setValue:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"] forKey:@"ver"];
     [mDict setObject:CNLiveAppId forKey:@"appId"];
-    [mDict setValue:[[[[UIDevice currentDevice] identifierForVendor] UUIDString] stringByReplacingOccurrencesOfString:@"-" withString:@""] forKey:@"uuid"];
+    [mDict setValue:[SdkMgr getDeviceUUID] forKey:@"uuid"];
  
     [CNLiveNetworking setupDefaultParam:mDict];
     [CNLiveNetworking setupShowResult:NO];
@@ -480,7 +482,6 @@
     [CNLiveNetworking setResponseSerializerType:CNLiveResponseSerializerJSON];
  
 }
-
 - (UIStatusBarStyle)preferredStatusBarStyle {
     return UIStatusBarStyleLightContent;
 }
+//
+//  SdkMgr.h
+//  CNLiveScioLive
+//
+//  Created by CNLive on 2021/4/12.
+//  Copyright © 2021 CNLive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SdkMgr : NSObject
++(NSString *)getDeviceUUID;
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  SdkMgr.m
+//  CNLiveScioLive
+//
+//  Created by CNLive on 2021/4/12.
+//  Copyright © 2021 CNLive. All rights reserved.
+//
+
+#import "SdkMgr.h"
+
+@implementation SdkMgr
+NSString * const KEY_UDID_INSTEAD = @"com.app.uuid.test";
+
++(NSString *)getDeviceUUID{
+    NSString *getUDIDInKeychain = (NSString *)[SdkMgr load:KEY_UDID_INSTEAD];
+    if (!getUDIDInKeychain ||[getUDIDInKeychain isEqualToString:@""]||[getUDIDInKeychain isKindOfClass:[NSNull class]]) {
+        CFUUIDRef puuid = CFUUIDCreate( nil );
+        CFStringRef uuidString = CFUUIDCreateString( nil, puuid );
+        NSString * result = (NSString *)CFBridgingRelease(CFStringCreateCopy( NULL, uuidString));
+        CFRelease(puuid);
+        CFRelease(uuidString);
+        
+        //去掉横线，保留32位长度
+        NSString *rst = [result stringByReplacingOccurrencesOfString:@"-" withString:@""];
+        [SdkMgr save:KEY_UDID_INSTEAD data:rst];
+        getUDIDInKeychain = (NSString *)[SdkMgr load:KEY_UDID_INSTEAD];
+    }
+    return getUDIDInKeychain;
+}
+
+#pragma mark - private
+
++ (NSMutableDictionary *)getKeychainQuery:(NSString *)service {
+    return [NSMutableDictionary dictionaryWithObjectsAndKeys:
+            (id)kSecClassGenericPassword,(id)kSecClass,
+            service, (id)kSecAttrService,
+            service, (id)kSecAttrAccount,
+            (id)kSecAttrAccessibleAfterFirstUnlock,(id)kSecAttrAccessible,
+            nil];
+}
+
++ (void)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)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)delete:(NSString *)service {
+    NSMutableDictionary *keychainQuery = [self getKeychainQuery:service];
+    SecItemDelete((CFDictionaryRef)keychainQuery);
+}
+@end
@@ -60,5 +60,4 @@
 - (BOOL)isValidPassWordLegal;
 - (BOOL)isValidPasswordString;
 + (NSString *)numberSuitScanf:(NSString*)number;
-
 @end
@@ -16,7 +16,7 @@ target &#39;CNLiveScioLive&#39; do
     pod 'SDWebImage/GIF'
     pod 'SDWebImage', '~> 4.0.0'
     pod 'AFNetworking'#, '~> 3.1.0'
-    pod 'YYKit', '~> 1.0.9'
+#    pod 'YYKit', '~> 1.0.9'
     pod 'MJRefresh', '~> 3.1.12'
     pod 'Masonry', '~> 1.0.2'
     pod 'WebViewJavascriptBridge', '~> 6.0.3'