Rename mj_keyValuesDidFinishConvertingToObject method (#707)

* deprecated converting to object method
* rename `didFinishConvertingTo` with `didConvertTo`
* rename `objectDidFinishConverting` with `objectDidConvert`
* add parameter for `mj_objectDidConvertToKeyValues` method

Author: kinarobin

MJExtension/MJExtensionConst.h

@@ -77,15 +77,15 @@ MJExtensionAssert2((param) != nil, returnValue)
  * 打印所有的属性
  */
 #define MJLogAllIvars \
--(NSString *)description \
+- (NSString *)description \
 { \
     return [self mj_keyValues].description; \
 }
 #define MJExtensionLogAllProperties MJLogAllIvars
 
 /** 仅在 Debugger 展示所有的属性 */
 #define MJImplementDebugDescription \
--(NSString *)debugDescription \
+- (NSString *)debugDescription \
 { \
 return [self mj_keyValues].debugDescription; \
 }

MJExtension/MJProperty.m

@@ -81,7 +81,7 @@ - (id)valueForObject:(id)object
     /** https://github.com/CoderMJLee/MJExtension/issues/545 */
     // 32 bit device OR 32 bit Simulator
 #if defined(__arm__) || (TARGET_OS_SIMULATOR && !__LP64__)
-    if(self.type.isBoolType) {
+    if (self.type.isBoolType) {
         value = @([(NSNumber *)value boolValue]);
     }
 #endif

MJExtension/NSObject+MJKeyValue.h

@@ -59,13 +59,16 @@
 /**
  *  当字典转模型完毕时调用
  */
-- (void)mj_keyValuesDidFinishConvertingToObject;
-- (void)mj_keyValuesDidFinishConvertingToObject:(NSDictionary *)keyValues;
+- (void)mj_keyValuesDidFinishConvertingToObject MJExtensionDeprecated("请使用`mj_didConvertToObjectWithKeyValues:`替代");
+- (void)mj_keyValuesDidFinishConvertingToObject:(NSDictionary *)keyValues MJExtensionDeprecated("请使用`mj_didConvertToObjectWithKeyValues:`替代");
+- (void)mj_didConvertToObjectWithKeyValues:(NSDictionary *)keyValues;
 
 /**
  *  当模型转字典完毕时调用
  */
-- (void)mj_objectDidFinishConvertingToKeyValues;
+- (void)mj_objectDidFinishConvertingToKeyValues MJExtensionDeprecated("请使用`mj_objectDidConvertToKeyValues:`替代");
+- (void)mj_objectDidConvertToKeyValues:(NSDictionary *)keyValues;
+
 @end
 
 @interface NSObject (MJKeyValue) <MJKeyValue>

MJExtension/NSObject+MJKeyValue.m

@@ -199,12 +199,18 @@ - (instancetype)mj_setKeyValues:(id)keyValues context:(NSManagedObjectContext *)
     }];
 
     // 转换完毕
+    if ([self respondsToSelector:@selector(mj_didConvertToObjectWithKeyValues:)]) {
+        [self mj_didConvertToObjectWithKeyValues:keyValues];
+    }
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored"-Wdeprecated-declarations"
     if ([self respondsToSelector:@selector(mj_keyValuesDidFinishConvertingToObject)]) {
         [self mj_keyValuesDidFinishConvertingToObject];
     }
     if ([self respondsToSelector:@selector(mj_keyValuesDidFinishConvertingToObject:)]) {
         [self mj_keyValuesDidFinishConvertingToObject:keyValues];
     }
+#pragma clang diagnostic pop
     return self;
 }
 
@@ -400,9 +406,15 @@ - (NSMutableDictionary *)mj_keyValuesWithKeys:(NSArray *)keys ignoredKeys:(NSArr
     }];
 
     // 转换完毕
+    if ([self respondsToSelector:@selector(mj_objectDidConvertToKeyValues:)]) {
+        [self mj_objectDidConvertToKeyValues:keyValues];
+    }
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored"-Wdeprecated-declarations"
     if ([self respondsToSelector:@selector(mj_objectDidFinishConvertingToKeyValues)]) {
         [self mj_objectDidFinishConvertingToKeyValues];
     }
+#pragma clang diagnostic pop
 
     return keyValues;
 }