add files

GIGA/Common/BaseVC/GiGaBaseViewController.m

@@ -26,12 +26,15 @@
     // Do any additional setup after loading the view.
    
     //[self.navigationController.navigationBar cnSetBackgroundColor:GIGARGB(216, 216, 216, 1)];
+    //[self.navigationController.navigationBar setBarTintColor:GIGA_MAIN_BGCOLOR];
+    
    
 }
 
 - (void)viewDidAppear:(BOOL)animated{
     [super viewDidAppear:animated];
     
+    
 }
 -(void)viewWillDisappear:(BOOL)animated{
     [super viewWillDisappear:animated];
@@ -41,6 +44,7 @@
 -(void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
     [self.navigationController.navigationBar setBackgroundImage];
+    //[self.navigationController.navigationBar setTranslucent:YES];
     
 }
 

GIGA/Common/GiGaHelper.h

@@ -58,5 +58,12 @@
 +(NSString *)convertToJsonData:(NSDictionary *)dict;
 +(NSDictionary *)dictionaryWithJsonString:(NSString *)jsonString;
 
+/**
+ 6～20 密码 必须包含数字和字母
+
+ @return 必须包含数字和字母
+ */
+
++(BOOL)checkPassWord:(NSString *)pass;
 
 @end

GIGA/Common/GiGaHelper.m

@@ -230,10 +230,9 @@
     }
     //⚠️ 13.2.0库编码采用  isoLatin1
     
+    NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
     
-    //NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
-    
-    NSData *jsonData = [jsonString dataUsingEncoding:NSISOLatin1StringEncoding];
+    //NSData *jsonData = [jsonString dataUsingEncoding:NSISOLatin1StringEncoding];
     NSError *err;
     NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:jsonData
                                                         options:NSJSONReadingMutableContainers
@@ -254,4 +253,16 @@
     return [NSString stringWithUTF8String:[oldStr cStringUsingEncoding:enc]];
 }
 
+
++(BOOL)checkPassWord:(NSString *)pass
+{
+    //6-20位数字和字母组成
+    NSString *regex = @"^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$";
+    NSPredicate *   pred = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", regex];
+    if ([pred evaluateWithObject:pass]) {
+        return YES ;
+    }else
+        return NO;
+}
+
 @end

GIGA/Common/GiGaUserDB/GiGaUserDefault.h

@@ -50,6 +50,16 @@
 +(void)saveWeiXinaccesstokenInfoWithDic:(NSDictionary *)dic;
 +(NSDictionary *)getWeiXinAccessToenDic;
 
+//面膜时间  未登录用户默认16分钟  测试用户对应测试结果
+
+
+/**
+ 保存用户测试时间
+
+ @param time 秒
+ */
++(void)savaMaskeTime:(NSTimeInterval)time;
++(NSTimeInterval)getUserMaskeTime;
 
 
 @end

GIGA/Common/GiGaUserDB/GiGaUserDefault.m

@@ -15,6 +15,8 @@ NSString *const kShowAppGuard = @"ShowAppGuard";
 NSString *const kWeiXinSaveToken = @"WeiXinSaveToken";
 NSString *const kWeiXinUserInfo = @"WeiXinUserinfo";
 NSString *const kGiGaToken = @"GiGatoken";
+NSString *const kMaskeTime= @"userMaskeTime";
+#define MASKTIME_DEFAULT 20;
 
 @implementation GiGaUserDefault
 
@@ -54,7 +56,9 @@ NSString *const kGiGaToken = @"GiGatoken";
 }
 
 +(void)userLogOut{
+    
     UD_REMOVE_KEY(kGiGaToken);
+    UD_REMOVE_KEY(kMaskeTime);
     UD_REMOVE_KEY(GIGADEFAULTKEY_USERID);
 }
 
@@ -99,6 +103,7 @@ NSString *const kGiGaToken = @"GiGatoken";
 +(void)saveWeiXinaccesstokenInfoWithDic:(NSDictionary *)dic
 {
     [UD_STADARDUD setObject:dic forKey:kWeiXinSaveToken];
+    [UD_STADARDUD synchronize];
 }
 
 +(NSDictionary *)getWeiXinAccessToenDic{
@@ -109,6 +114,7 @@ NSString *const kGiGaToken = @"GiGatoken";
 +(void)saveWeiXinUserInfoDic:(NSDictionary *)dic
 {
     [UD_STADARDUD setObject:dic forKey:kWeiXinUserInfo];
+    [UD_STADARDUD synchronize];
 }
 
 +(NSDictionary *)getWeiXinUserInfoDic{
@@ -116,5 +122,19 @@ NSString *const kGiGaToken = @"GiGatoken";
     return   [UD_STADARDUD  objectForKey:kWeiXinUserInfo];
 }
 
++(void)savaMaskeTime:(NSTimeInterval)time{
+    [UD_STADARDUD setDouble:time forKey:kMaskeTime];
+    [UD_STADARDUD synchronize];
+}
+
++ (NSTimeInterval)getUserMaskeTime{
+    
+    NSTimeInterval time = [UD_STADARDUD doubleForKey:kMaskeTime];
+    if (time == 0) {
+        //time = 16 * 60;
+        time = MASKTIME_DEFAULT;
+    }
+    return time;
+}
 
 @end

GIGA/Common/GiGaUserDB/GiGaUserManager.h

@@ -8,6 +8,10 @@
 
 #import <Foundation/Foundation.h>
 #import "GiGaUser.h"
+
+
+typedef void (^userDataresponseBlock)(GiGaUser *user);
+
 @interface GiGaUserManager : NSObject
 
 @property(nonatomic,strong) GiGaUser *user;
@@ -22,4 +26,6 @@
  */
 //-(void)detectionUserUpgrade;
 
+-(void)synsisUserInfo:(userDataresponseBlock)block;
+
 @end

GIGA/Common/GiGaUserDB/GiGaUserManager.m

@@ -9,6 +9,7 @@
 #import "GiGaUserManager.h"
 #import "YTKKeyValueStore.h"
 #import "GiGaUserDefault.h"
+#import "GiGaBaseAPiRequest.h"
 
 NSString *const GIGA_USER_TABLE = @"user_table";
 const static NSInteger GIGADB_USER_VER  = 0;//当前数据库版本号
@@ -47,6 +48,29 @@ const static NSInteger GIGADB_USER_VER  = 0;//当前数据库版本号
     return self;
 }
 
+//登录成功后请求用户数据
+-(void)synsisUserInfo:(userDataresponseBlock)block{
+    
+    GiGaBaseAPiRequest *requst = [GiGaBaseAPiRequest initWithRequestPath:@"user/v1/info" method:RequestPostMethod parms:nil];
+    weakify(self);
+    [requst requstDataWithResult:^(GiGaAPIResult *result) {
+        
+        if (result.success) {
+            //更新用户信息
+            NSDictionary *userDic = result.dic[@"userInfo"];
+            GiGaUser *user = [[GiGaUser alloc] initWithDictionary:userDic error:nil];
+            self.user = user;
+            [weakSelf saveUser:user];
+            
+            if (block) {
+                block(user);
+            }
+            NSLog(@"user dic ***\n%@",result.dic);
+        }
+    }];
+    
+}
+
 //建表
 -(void)creatTableByName:(NSString *)tableName{
     [_store createTableWithName:tableName];
@@ -57,12 +81,12 @@ const static NSInteger GIGADB_USER_VER  = 0;//当前数据库版本号
     self.user = user;
     NSString *userTableId = [NSString stringWithFormat:@"%@",user.userId];
     self.userTabId = userTableId;
+    
     //暂定只保留一个用户
     NSDictionary *userDic = [user toDictionary];
     [_userArr removeAllObjects];
     [_userArr addObject:userDic];
-    
-    
+
     [_store putObject:_userArr withId:userTableId intoTable:GIGA_USER_TABLE];
     [GiGaUserDefault saveUserId:userTableId];
     
@@ -86,7 +110,8 @@ const static NSInteger GIGADB_USER_VER  = 0;//当前数据库版本号
 
 -(void)loginOut{
     self.user = nil;
-    [GiGaUserDefault removeUserId];
+    [GiGaUserDefault userLogOut];
+    
     
 }