fix 首页

GIGA/Common/GiGaHelper.m

@@ -229,12 +229,16 @@
         return nil;
     }
     //⚠️ 13.2.0库编码采用  isoLatin1
+    
+    
     //NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
+    
     NSData *jsonData = [jsonString dataUsingEncoding:NSISOLatin1StringEncoding];
     NSError *err;
     NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:jsonData
                                                         options:NSJSONReadingMutableContainers
                                                           error:&err];
+    
     if(err)
     {
         NSLog(@"json解析失败：%@",err);
@@ -243,4 +247,11 @@
     return dic;
 }
 
++(NSString *)_859ToUTF8:(NSString *)oldStr
+{
+    NSStringEncoding enc = CFStringConvertEncodingToNSStringEncoding(kCFStringEncodingISOLatin1);
+    
+    return [NSString stringWithUTF8String:[oldStr cStringUsingEncoding:enc]];
+}
+
 @end

GIGA/Common/GiGaNetTool/GiGaBaseAPiRequest.m

@@ -107,7 +107,7 @@
 - (void)analyseResponseInfo:(NSDictionary *)responseData headerFileds:(NSDictionary *)headerFields error:(NSError *)error
 {
     self.responseHeaderFields = headerFields;
-    NSString *token = headerFields[@"access-token"];
+    NSString *token = headerFields[@"token"];
     if (token && token.length > 0) {
         //更新token
         //[FFBMSConfig shareInstance].token = token;

GIGA/Common/GiGaNetTool/GiGaNetManager.m

@@ -9,6 +9,7 @@
 #import "GiGaNetManager.h"
 #import "AFNetworking.h"
 #import "GiGaServerConfig.h"
+#import "GiGaUserDefault.h"
 
 @interface GiGaNetManager()
 
@@ -23,7 +24,11 @@
 //    AFHTTPSessionManager*manager=[[AFHTTPSessionManager alloc] initWithBaseURL:baseUrl sessionConfiguration:configuration];
     AFHTTPSessionManager*manager=[[AFHTTPSessionManager alloc] init];
     manager.responseSerializer=[AFHTTPResponseSerializer serializer];
-   
+    NSString *token = [GiGaUserDefault getCurentToken];
+    if (token) {
+        [manager.requestSerializer setValue:token forHTTPHeaderField:@"token"];
+    }
+
     switch (requestMethod) {
         case RequestGetMethod:
             

GIGA/Common/GiGaUserDB/GiGaUserDefault.m

@@ -48,7 +48,7 @@ NSString *const kGiGaToken = @"GiGatoken";
 
 +(BOOL)isUserLogin{
     
-    NSString *uid = UD_GET_VALUE(GIGADEFAULTKEY_USERID);
+    NSString *uid = UD_GET_VALUE(kGiGaToken);
     return uid ? YES : NO;
     
 }

GIGA/Common/GiGaUserDB/GiGaUserManager.m

@@ -57,10 +57,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:user];
+    [_userArr addObject:userDic];
+    
+    
     [_store putObject:_userArr withId:userTableId intoTable:GIGA_USER_TABLE];
     [GiGaUserDefault saveUserId:userTableId];
     
@@ -72,7 +74,10 @@ const static NSInteger GIGADB_USER_VER  = 0;//当前数据库版本号
     NSString *useriD =  [GiGaUserDefault getCurentUserId];
     NSArray *usrA= [_store getObjectById:useriD fromTable:GIGA_USER_TABLE];
     if (usrA && usrA.count > 0) {
-        self.user = usrA[0];
+        //self.user = usrA[0];
+        NSDictionary *userdic = usrA[0];
+        GiGaUser *user = [[GiGaUser alloc] initWithDictionary:userdic error:nil];;
+        self.user = user;
     }
     return self.user;
 }