add

GIGA/Common/GiGaHelper.h

@@ -68,4 +68,6 @@
 //
 +(int)convertToInt:(NSString*)strtemp;
 
++(NSString*)dictionaryToJson:(NSDictionary *)dic;
+
 @end

GIGA/Common/GiGaHelper.m

@@ -281,4 +281,17 @@
     }
     return strlength;
 }
+
++(NSString*)dictionaryToJson:(NSDictionary *)dic
+
+{
+    
+    NSError *parseError =nil;
+    
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:dic options:NSJSONWritingPrettyPrinted error:&parseError];
+    
+    return [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+    
+}
+
 @end

GIGA/Common/GiGaNetTool/GiGaNetManager.h

@@ -19,7 +19,7 @@ typedef void (^responseBlock)(NSDictionary *responseDict, NSDictionary *response
        success:(void (^)(id response))success
        failure:(void (^)(NSError *err))failure;
 
-// 测试题 ， 登录 body 传参
+// 测试题 ，登录 .. body 传参
 +(void)userbodyRequest:(NSString *)url params:(NSDictionary *)param completionHandler:(nullable void (^)(NSURLResponse *response, NSDictionary *resDic,  NSError * _Nullable error))completionHandler;
 
 //上传图片 1张

GIGA/Common/GiGaNetTool/GiGaNetManager.m

@@ -102,34 +102,61 @@
     }];
 }
 
-//登录body传参数
+//body传参数
 +(void)userbodyRequest:(NSString *)url params:(NSDictionary *)param completionHandler:(nullable void (^)(NSURLResponse *response,NSDictionary *resDic,  NSError * _Nullable error))completionHandler
 {
+        //NSString *jsonStr = [GiGaHelper dictionaryToJson:param];
     
         NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
         NSURL *baseUrl = [NSURL URLWithString:[GiGaServerConfig getMainUrl]];
         AFHTTPSessionManager*manager=[[AFHTTPSessionManager alloc] initWithBaseURL:baseUrl sessionConfiguration:configuration];
+    manager.securityPolicy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
+    manager.requestSerializer = [AFHTTPRequestSerializer serializer];
+    manager.responseSerializer = [AFHTTPResponseSerializer serializer];
+    
+    [manager.responseSerializer setAcceptableContentTypes:[NSSet setWithObjects:@"application/json",@"text/json", @"text/javascript",@"text/html",@"text/plain",nil]];
+    
+    NSString *token = [GiGaUserDefault getCurentToken];
+    
+    NSMutableURLRequest *requst = [[AFJSONRequestSerializer serializer]
+                                   requestWithMethod:@"POST" URLString:url parameters:nil error:nil];
+    
+    requst.timeoutInterval = 20.f;
+    
+    if (token) {
+        [manager.requestSerializer setValue:token forHTTPHeaderField:@"token"];
+        [requst setValue:token forHTTPHeaderField:@"token"];
+    }
     
-     NSMutableURLRequest *requst = [[AFJSONRequestSerializer serializer]
-                                   requestWithMethod:@"POST" URLString:url parameters:param error:nil];
-    requst.timeoutInterval = 10.f;
     [requst setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
     [requst setValue:@"application/json" forHTTPHeaderField:@"Accept"];
+    
+    
+   if (param && param.count > 0){
+       
+       NSError *parseError =nil;
+       NSData *jsonData = [NSJSONSerialization dataWithJSONObject:param options:NSJSONWritingPrettyPrinted error:&parseError];
+//        NSData *jsonData = [jsonStr dataUsingEncoding:NSUTF8StringEncoding];
+       [requst setHTTPBody:jsonData];
+    }
+
     NSURLSessionDataTask *task = [manager dataTaskWithRequest:requst uploadProgress:^(NSProgress * _Nonnull uploadProgress) {
         
     } downloadProgress:^(NSProgress * _Nonnull downloadProgress) {
         
     } completionHandler:^(NSURLResponse * _Nonnull response, id  _Nullable responseObject, NSError * _Nullable error) {
         
-        if (completionHandler) {
-            completionHandler(response,responseObject,error);
-        }
+        NSDictionary *responseDic = [NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers error:nil];
         
+        if (completionHandler) {
+            completionHandler(response,responseDic,error);
+        }
     }];
     
     [task resume];
     
 }
+
 //上传1张
 +(void)uploadImage:(NSString *)url
            imgData:(NSData *)imgData

GIGA/Common/GiGaNetTool/WeiIXinApiManager.h

@@ -32,4 +32,6 @@
                     success:(void (^)(id response))success
                     failure:(void (^)(NSError *err))failure;
 
+//+(void)shareMessageToWX:()
+
 @end

GIGA/Common/GiGaUserDB/GIGaUserFileHelper.h

@@ -24,4 +24,5 @@
 +(UIImage *)getUserFeedbackImag:(NSString *)imageName;
 +(void)delectAllfeedimages;
 
+
 @end

GIGA/Common/GiGaUserDB/GiGaUserManager.h

@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import "GiGaUser.h"
+#import "MaskTestResult.h"
 
 
 typedef void (^userDataresponseBlock)(GiGaUser *user);
@@ -16,6 +17,7 @@ typedef void (^userErrorMsgBlock)(NSDictionary *errorCodemsg);
 @interface GiGaUserManager : NSObject
 
 @property(nonatomic,strong) GiGaUser *user;
+@property(nonatomic,strong) MaskTestResult *testReult;
 
 +(instancetype)shareUser;
 - (void)saveUser:(GiGaUser *)user;
@@ -29,4 +31,8 @@ typedef void (^userErrorMsgBlock)(NSDictionary *errorCodemsg);
 
 -(void)synsisUserInfo:(userDataresponseBlock)block userErrorMsgBlock:(userErrorMsgBlock)errorCodeMsg;
 
+//保存肤质测试记录
+//-(void)saveLatestUserTestRecord:(MaskTestResult *)maskTestResult;
+//-(MaskTestResult *)latestMaskTestResult;
+
 @end

GIGA/Common/GiGaUserDB/GiGaUserManager.m

@@ -20,6 +20,7 @@ const static NSInteger GIGADB_USER_VER  = 0;//当前数据库版本号
 @property (nonatomic,strong) NSMutableArray *userArr;
 @property (nonatomic,copy) NSString *userTabId;
 
+
 @end
 
 @implementation GiGaUserManager
@@ -140,4 +141,12 @@ const static NSInteger GIGADB_USER_VER  = 0;//当前数据库版本号
     
 }
 
+//保留
+#pragma mark 最新一次测试记录
+-(void)saveLatestUserTestRecord:(MaskTestResult *)maskTestResult{
+     [_store createTableWithName:@"gigaLastestSkinTest"];
+     
+}
+
+
 @end