完美解决属性类型不确定造成的bug.

完美解决属性类型不确定造成的bug.

Author: huangzhibiao

BGFMDB.xcodeproj/project.xcworkspace/xcuserdata/biao.xcuserdatad/UserInterfaceState.xcuserstate

@@ -20,11 +20,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BGFMDB/ViewController.m"
-            timestampString = "542713492.037143"
+            timestampString = "543403640.977806"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "411"
-            endingLineNumber = "411"
+            startingLineNumber = "414"
+            endingLineNumber = "414"
             landmarkName = "-testT"
             landmarkType = "7">
          </BreakpointContent>
@@ -84,7 +84,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BGFMDB/ViewController.m"
-            timestampString = "542713492.037796"
+            timestampString = "543403640.978277"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "195"
@@ -100,7 +100,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "BGFMDB/ViewController.m"
-            timestampString = "542713492.03819"
+            timestampString = "543403640.978541"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "190"

BGFMDB.xcodeproj/xcuserdata/biao.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -401,9 +401,12 @@ -(void)testT{
     testT* test = [testT new];
     T2* t2 = [T2 new];
     t2.t2 = @"t2";
+    t2.name = @"t2_name";
     /*------*/
     T3* t3 = [T3 new];
     t3.t3 = @"t3";
+    t3.name = @"t3_name";
+    t3.t2 = t2;
 
     test.t1 = t3;
     [test bg_save];

BGFMDB/ViewController.m

@@ -45,11 +45,6 @@ @implementation BGModelInfo
             //设置属性值
             [info setValue:propertyValue forKey:@"propertyValue"];
             sqlValue = [BGTool getSqlValue:propertyValue type:propertyType encode:YES];
-            //非系统类型特殊处理sqlValue
-            if(![BGTool isKindOfSystemType:propertyType]){
-                //设置将要存储到数据库的值
-                sqlValue = [NSString stringWithFormat:@"%@%@%@",propertyType,BG_CUSTOM_TYPE_SEPARATOR,sqlValue];
-            }
             [info setValue:sqlValue forKey:@"sqlColumnValue"];
             [modelInfos addObject:info];
         }

BGFMDB/libs/BG/BGModelInfo.m

@@ -15,8 +15,6 @@
 #define bg_tableNameKey @"bg_tableName"
 #define bg_rowid @"rowid"
 
-#define BG_CUSTOM_TYPE_SEPARATOR @":::BGCUSTOMTYPE:::"
-
 #define bg_uniqueKeysSelector NSSelectorFromString(@"bg_uniqueKeys")
 #define bg_ignoreKeysSelector NSSelectorFromString(@"bg_ignoreKeys")
 #define bg_unionPrimaryKeysSelector NSSelectorFromString(@"bg_unionPrimaryKeys")

BGFMDB/libs/BG/BGTool.h

@@ -30,9 +30,6 @@
 //100M大小限制.
 #define MaxData @(838860800)
 
-//如果有不确定的属性类型时，将此开关打开
-//#define HaveDynamicProperty
-
 /**
  *  遍历所有类的block（父类）
  */
@@ -219,8 +216,7 @@ +(NSArray*)getClassIvarList:(__unsafe_unretained Class)cla Object:(_Nullable id)
         [keys addObject:[NSString stringWithFormat:@"%@*@\"NSString\"",bg_createTimeKey]];
         [keys addObject:[NSString stringWithFormat:@"%@*@\"NSString\"",bg_updateTimeKey]];
     }
-    //判断是否有自定义类型标志，有则不缓存.
-    __block BOOL isKindOfCustomFlag = NO;
+    
     [self bg_enumerateClasses:cla complete:^(__unsafe_unretained Class c, BOOL *stop) {
         unsigned int numIvars; //成员变量个数
         Ivar *vars = class_copyIvarList(c, &numIvars);
@@ -233,30 +229,14 @@ +(NSArray*)getClassIvarList:(__unsafe_unretained Class)cla Object:(_Nullable id)
             if (!onlyKey) {
                 //获取成员变量的数据类型
                 NSString* type = [NSString stringWithUTF8String:ivar_getTypeEncoding(thisIvar)];
-                if(![self isKindOfSystemType:type]){
-                    isKindOfCustomFlag = YES;
-                    if(object&&[object valueForKey:key]){
-                        type = [NSString stringWithFormat:@"@\"%@\"",[[object valueForKey:key] class]];
-                        //NSLog(@"自定义  key = %@ , type = %@",key,type);
-                    }
-                }else{
-                        //NSLog(@"系统  key = %@ , type = %@",key,type);
-                }
                 key = [NSString stringWithFormat:@"%@*%@",key,type];
             }
             [keys addObject:key];//存储对象的变量名
         }
         free(vars);//释放资源
     }];
 
-#ifdef HaveDynamicProperty
-    if(!isKindOfCustomFlag) {
-        //缓存的属性信息
-        [cache setObject:keys forKey:cacheKey];
-    }
-#else
     [cache setObject:keys forKey:cacheKey];
-#endif
 
     return keys;
 }
@@ -533,12 +513,6 @@ +(NSString*)stringWithDate:(NSDate*)date{
 +(id)getSqlValue:(id)value type:(NSString*)type encode:(BOOL)encode{
     if(!value || [value isKindOfClass:[NSNull class]])return nil;
 
-    if(!encode){//特殊处理被重复解码的问题.
-        if(![value isKindOfClass:[NSString class]]){
-            return value;
-        }
-    }
-    
     if([type containsString:@"String"]){
         if([type containsString:@"AttributedString"]){//处理富文本.
             if(encode) {
@@ -661,12 +635,9 @@ +(id)getSqlValue:(id)value type:(NSString*)type encode:(BOOL)encode{
         return value;
     }else{
         if(encode){
-            NSString* jsonString = [self jsonStringWithObject:value];
-            return jsonString;
+            return [self jsonStringWithArray:@[value]];
         }else{
-            NSDictionary* dict = [self jsonWithString:value];
-            type = [type substringWithRange:NSMakeRange(2,type.length-3)];
-            return [self objectFromJsonStringWithTableName:type class:NSClassFromString(type) valueDict:dict];
+            return [self arrayFromJsonString:value].firstObject;
         }
     }
 }
@@ -736,11 +707,6 @@ +(id)objectFromJsonStringWithTableName:(NSString* _Nonnull)tablename class:(__un
 
             if ([tempSqlKey isEqualToString:key]){
                 NSString* tempValue = valueDict[sqlKey];
-                if([tempValue isKindOfClass:[NSString class]] && [tempValue containsString:BG_CUSTOM_TYPE_SEPARATOR]){
-                    NSArray* arrTempTV = [tempValue componentsSeparatedByString:BG_CUSTOM_TYPE_SEPARATOR];
-                    type = [arrTempTV firstObject];
-                    tempValue = [arrTempTV lastObject];
-                }
                 id ivarValue = [self getSqlValue:tempValue type:type encode:NO];
                 !ivarValue?:[object setValue:ivarValue forKey:key];
                 [keyAndTypes removeObject:keyAndType];

BGFMDB/libs/BG/BGTool.m

@@ -107,11 +107,11 @@
 
 @class T1;
 @interface testT:NSObject
-@property(nonatomic,strong)id t1;
+@property(nonatomic,strong) id t1;
 @end
 
 @interface T1:  NSObject
-@property(nonatomic,copy)NSString* name;
+@property(nonatomic,copy) NSString* name;
 @end
 
 @interface T2: T1
@@ -120,4 +120,5 @@
 
 @interface T3 : T1
 @property(nonatomic,copy) NSString* t3;
+@property(nonatomic,strong) id t2;
 @end