Merge branch 'master' of https://git.oschina.net/gomore/total

Conflicts:
	total/GTOApp/Business/Repair/Views/GTOLicenceBoltView.m
	total/Info.plist
	total/Macro/GTOAppMacro.h

Podfile.lock

@@ -32,7 +32,7 @@ PODS:
   - FMDB/standard (2.6.2)
   - IQKeyboardManager (3.2.4)
   - JPushSDK (1.8.2)
-  - JSONModel (1.2.0)
+  - JSONModel (1.7.0)
   - Masonry (1.0.1)
   - MBProgressHUD (0.9.2)
   - MJRefresh (3.1.3)
@@ -57,7 +57,7 @@ DEPENDENCIES:
   - FMDB (~> 2.5)
   - IQKeyboardManager (~> 3.2.3)
   - JPushSDK (~> 1.8.2)
-  - JSONModel (~> 1.2.0)
+  - JSONModel (~> 1.7.0)
   - Masonry (~> 1.0.1)
   - MBProgressHUD (~> 0.9.1)
   - MJRefresh (~> 3.1.0)
@@ -76,7 +76,7 @@ SPEC CHECKSUMS:
   FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a
   IQKeyboardManager: 555b1231fefafb21b19278d7cca72986a27b748b
   JPushSDK: c68dd04c595a5c93aa003f212974010790410d8e
-  JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c
+  JSONModel: 840bc0fcffb24b8454d2c026bf26fea454b8e98d
   Masonry: a1a931a0d08870ed8ae415a2ea5ea68ebcac77df
   MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
   MJRefresh: e9005c294dd8a3d08cc7c50eea2b5016673f29c4

Pods/Headers/Private/JSONModel/JSONModelArray.h

-../../../JSONModel/JSONModel/JSONModel/JSONModelArray.h
\ No newline at end of file

Pods/Headers/Private/JSONModel/NSArray+JSONModel.h

-../../../JSONModel/JSONModel/JSONModelCategories/NSArray+JSONModel.h
\ No newline at end of file

Pods/Headers/Public/JSONModel/JSONModelArray.h

-../../../JSONModel/JSONModel/JSONModel/JSONModelArray.h
\ No newline at end of file

Pods/Headers/Public/JSONModel/NSArray+JSONModel.h

-../../../JSONModel/JSONModel/JSONModelCategories/NSArray+JSONModel.h
\ No newline at end of file

Pods/JSONModel/JSONModel/JSONModel/JSONModelArray.h

-//
-//  JSONModelArray.h
-//
-//  @version 0.8.0
-//  @author Marin Todorov (http://www.underplot.com) and contributors
-//
-
-// Copyright (c) 2012-2015 Marin Todorov, Underplot ltd.
-// This code is distributed under the terms and conditions of the MIT license.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-#import <Foundation/Foundation.h>
-
-/**
- * **Don't make instances of JSONModelArray yourself, except you know what you are doing.**
- *
- * You get automatically JSONModelArray instances, when you declare a convert on demand property, like so:
- * 
- * @property (strong, nonatomic) NSArray&lt;JSONModel, ConvertOnDemand&gt;* list;
- *
- * The class stores its contents as they come from JSON, and upon the first request
- * of each of the objects stored in the array, it'll be converted to the target model class.
- * Thus saving time upon the very first model creation.
- */
-@interface JSONModelArray : NSObject <NSFastEnumeration>
-
-/**
- * Don't make instances of JSONModelArray yourself, except you know what you are doing.
- * 
- * @param array an array of NSDictionary objects
- * @param cls the JSONModel sub-class you'd like the NSDictionaries to be converted to on demand
- */
-- (id)initWithArray:(NSArray *)array modelClass:(Class)cls;
-
-- (id)objectAtIndex:(NSUInteger)index;
-- (id)objectAtIndexedSubscript:(NSUInteger)index;
-- (void)forwardInvocation:(NSInvocation *)anInvocation;
-- (NSUInteger)count;
-- (id)firstObject;
-- (id)lastObject;
-
-/**
- * Looks up the array's contents and tries to find a JSONModel object
- * with matching index property value to the indexValue param.
- *
- * Will return nil if no matching model is found. Will return nil if there's no index property
- * defined on the models found in the array (will sample the first object, assuming the array
- * contains homogeneous collection of objects)
- *
- * @param indexValue the id value to search for
- * @return the found model or nil
- */
-- (id)modelWithIndexValue:(id)indexValue;
-
-@end

Pods/JSONModel/JSONModel/JSONModel/JSONModelArray.m

-//
-//  JSONModelArray.m
-//
-//  @version 1.2
-//  @author Marin Todorov (http://www.underplot.com) and contributors
-//
-
-// Copyright (c) 2012-2015 Marin Todorov, Underplot ltd.
-// This code is distributed under the terms and conditions of the MIT license.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-#import "JSONModelArray.h"
-#import "JSONModel.h"
-
-@implementation JSONModelArray
-{
-    NSMutableArray* _storage;
-    Class _targetClass;
-}
-
--(id)initWithArray:(NSArray *)array modelClass:(Class)cls
-{
-    self = [super init];
-    
-    if (self) {
-        _storage = [NSMutableArray arrayWithArray:array];
-        _targetClass = cls;
-    }
-    return self;
-}
-
--(id)firstObject
-{
-    return [self objectAtIndex:0];
-}
-
--(id)lastObject
-{
-    return [self objectAtIndex:_storage.count - 1];
-}
-
--(id)objectAtIndex:(NSUInteger)index
-{
-	return [self objectAtIndexedSubscript:index];
-}
-
--(id)objectAtIndexedSubscript:(NSUInteger)index
-{
-    id object = _storage[index];
-    if (![object isMemberOfClass:_targetClass]) {
-        NSError* err = nil;
-        object = [[_targetClass alloc] initWithDictionary:object error:&err];
-        if (object) {
-            _storage[index] = object;
-        }
-    }
-    return object;
-}
-
--(void)forwardInvocation:(NSInvocation *)anInvocation
-{
-    [anInvocation invokeWithTarget:_storage];
-}
-
--(id)forwardingTargetForSelector:(SEL)selector
-{
-    static NSArray *overriddenMethods = nil;
-    if (!overriddenMethods) overriddenMethods = @[@"initWithArray:modelClass:", @"objectAtIndex:", @"objectAtIndexedSubscript:", @"count", @"modelWithIndexValue:", @"description", @"mutableCopy", @"firstObject", @"lastObject", @"countByEnumeratingWithState:objects:count:"];
-    if ([overriddenMethods containsObject:NSStringFromSelector(selector)]) {
-        return self;
-    }
-    return _storage;
-}
-
--(NSUInteger)count
-{
-    return _storage.count;
-}
-
--(id)modelWithIndexValue:(id)indexValue
-{
-    if (self.count==0) return nil;
-    if (![_storage[0] indexPropertyName]) return nil;
-    
-    for (JSONModel* model in _storage) {
-        if ([[model valueForKey:model.indexPropertyName] isEqual:indexValue]) {
-            return model;
-        }
-    }
-    
-    return nil;
-}
-
--(id)mutableCopy
-{
-    //it's already mutable
-    return self;
-}
-
-#pragma mark - description
--(NSString*)description
-{
-    NSMutableString* res = [NSMutableString stringWithFormat:@"<JSONModelArray[%@]>\n", [_targetClass description]];
-    for (id m in _storage) {
-        [res appendString: [m description]];
-        [res appendString: @",\n"];
-    }
-    [res appendFormat:@"\n</JSONModelArray>"];
-    return res;
-}
-
--(NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state
-								 objects:(id __unsafe_unretained [])stackbuf
-								   count:(NSUInteger)stackbufLength
-{
-    NSUInteger count = 0;
-    
-    unsigned long countOfItemsAlreadyEnumerated = state->state;
-    
-    if (countOfItemsAlreadyEnumerated == 0) {
-        state->mutationsPtr = &state->extra[0];
-    }
-	
-    if (countOfItemsAlreadyEnumerated < [self count]) {
-        state->itemsPtr = stackbuf;
-        while ((countOfItemsAlreadyEnumerated < [self count]) && (count < stackbufLength)) {
-            stackbuf[count] = [self objectAtIndex:countOfItemsAlreadyEnumerated];
-            countOfItemsAlreadyEnumerated++;
-            count++;
-        }
-    } else {
-        count = 0;
-    }
-	
-    state->state = countOfItemsAlreadyEnumerated;
-    
-    return count;
-}
-
-@end

Pods/JSONModel/JSONModel/JSONModel/JSONModelClassProperty.h

 //
 //  JSONModelClassProperty.h
+//  JSONModel
 //
-//  @version 1.2
-//  @author Marin Todorov (http://www.underplot.com) and contributors
-//
-
-// Copyright (c) 2012-2015 Marin Todorov, Underplot ltd.
-// This code is distributed under the terms and conditions of the MIT license.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
 
 #import <Foundation/Foundation.h>
 
-enum kCustomizationTypes {
-    kNotInspected = 0,
-    kCustom,
-    kNo
-    };
-
-typedef enum kCustomizationTypes PropertyGetterType;
-
 /**
  * **You do not need to instantiate this class yourself.** This class is used internally by JSONModel
  * to inspect the declared properties of your model class.
@@ -34,17 +15,20 @@ typedef enum kCustomizationTypes PropertyGetterType;
  */
 @interface JSONModelClassProperty : NSObject
 
+// deprecated
+@property (assign, nonatomic) BOOL isIndex DEPRECATED_ATTRIBUTE;
+
 /** The name of the declared property (not the ivar name) */
-@property (copy, nonatomic) NSString* name;
+@property (copy, nonatomic) NSString *name;
 
 /** A property class type  */
 @property (assign, nonatomic) Class type;
 
 /** Struct name if a struct */
-@property (strong, nonatomic) NSString* structName;
+@property (strong, nonatomic) NSString *structName;
 
 /** The name of the protocol the property conforms to (or nil) */
-@property (copy, nonatomic) NSString* protocol;
+@property (copy, nonatomic) NSString *protocol;
 
 /** If YES, it can be missing in the input data, and the input would be still valid */
 @property (assign, nonatomic) BOOL isOptional;
@@ -55,19 +39,10 @@ typedef enum kCustomizationTypes PropertyGetterType;
 /** If YES - create a mutable object for the value of the property */
 @property (assign, nonatomic) BOOL isMutable;
 
-/** If YES - create models on demand for the array members */
-@property (assign, nonatomic) BOOL convertsOnDemand;
-
-/** If YES - the value of this property determines equality to other models */
-@property (assign, nonatomic) BOOL isIndex;
-
-/** The status of property getter introspection in a model */
-@property (assign, nonatomic) PropertyGetterType getterType;
-
 /** a custom getter for this property, found in the owning model */
 @property (assign, nonatomic) SEL customGetter;
 
 /** custom setters for this property, found in the owning model */
-@property (strong, nonatomic) NSMutableDictionary<NSString *, id> *customSetters;
+@property (strong, nonatomic) NSMutableDictionary *customSetters;
 
 @end

Pods/JSONModel/JSONModel/JSONModel/JSONModelClassProperty.m

 //
 //  JSONModelClassProperty.m
+//  JSONModel
 //
-//  @version 1.2
-//  @author Marin Todorov (http://www.underplot.com) and contributors
-//
-
-// Copyright (c) 2012-2015 Marin Todorov, Underplot ltd.
-// This code is distributed under the terms and conditions of the MIT license.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
 
 #import "JSONModelClassProperty.h"
 
@@ -23,10 +12,13 @@
     //build the properties string for the current class property
     NSMutableArray* properties = [NSMutableArray arrayWithCapacity:8];
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     if (self.isIndex) [properties addObject:@"Index"];
+#pragma GCC diagnostic pop
+
     if (self.isOptional) [properties addObject:@"Optional"];
     if (self.isMutable) [properties addObject:@"Mutable"];
-    if (self.convertsOnDemand) [properties addObject:@"ConvertOnDemand"];
     if (self.isStandardJSONType) [properties addObject:@"Standard JSON type"];
     if (self.customGetter) [properties addObject:[NSString stringWithFormat: @"Getter = %@", NSStringFromSelector(self.customGetter)]];
 
@@ -36,8 +28,9 @@
 
         for (id obj in self.customSetters.allValues)
         {
-            if (obj != [NSNull null])
-                [setters addObject:obj];
+            SEL selector;
+            [obj getValue:&selector];
+            [setters addObject:NSStringFromSelector(selector)];
         }
 
         [properties addObject:[NSString stringWithFormat: @"Setters = [%@]", [setters componentsJoinedByString:@", "]]];

Pods/JSONModel/JSONModel/JSONModel/JSONModelError.h

 //
 //  JSONModelError.h
+//  JSONModel
 //
-//  @version 1.2
-//  @author Marin Todorov (http://www.underplot.com) and contributors
-//
-
-// Copyright (c) 2012-2015 Marin Todorov, Underplot ltd.
-// This code is distributed under the terms and conditions of the MIT license.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
 
 #import <Foundation/Foundation.h>
 
@@ -28,7 +17,7 @@ typedef NS_ENUM(int, kJSONModelErrorTypes)
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 /** The domain name used for the JSONModelError instances */
-extern NSString* const JSONModelErrorDomain;
+extern NSString *const JSONModelErrorDomain;
 
 /**
  * If the model JSON input misses keys that are required, check the
@@ -36,7 +25,7 @@ extern NSString* const JSONModelErrorDomain;
  * under the kJSONModelMissingKeys key you will find a list of the
  * names of the missing keys.
  */
-extern NSString* const kJSONModelMissingKeys;
+extern NSString *const kJSONModelMissingKeys;
 
 /**
  * If JSON input has a different type than expected by the model, check the
@@ -44,14 +33,14 @@ extern NSString* const kJSONModelMissingKeys;
  * under the kJSONModelTypeMismatch key you will find a description
  * of the mismatched types.
  */
-extern NSString* const kJSONModelTypeMismatch;
+extern NSString *const kJSONModelTypeMismatch;
 
 /**
  * If an error occurs in a nested model, check the userInfo dictionary of
  * the JSONModelError instance you get back - under the kJSONModelKeyPath
  * key you will find key-path at which the error occurred.
  */
-extern NSString* const kJSONModelKeyPath;
+extern NSString *const kJSONModelKeyPath;
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 /**
@@ -60,46 +49,46 @@ extern NSString* const kJSONModelKeyPath;
  */
 @interface JSONModelError : NSError
 
-@property (strong, nonatomic) NSHTTPURLResponse* httpResponse;
+@property (strong, nonatomic) NSHTTPURLResponse *httpResponse;
 
-@property (strong, nonatomic) NSData* responseData;
+@property (strong, nonatomic) NSData *responseData;
 
 /**
  * Creates a JSONModelError instance with code kJSONModelErrorInvalidData = 1
  */
-+(id)errorInvalidDataWithMessage:(NSString*)message;
++ (id)errorInvalidDataWithMessage:(NSString *)message;
 
 /**
  * Creates a JSONModelError instance with code kJSONModelErrorInvalidData = 1
  * @param keys a set of field names that were required, but not found in the input
  */
-+(id)errorInvalidDataWithMissingKeys:(NSSet*)keys;
++ (id)errorInvalidDataWithMissingKeys:(NSSet *)keys;
 
 /**
  * Creates a JSONModelError instance with code kJSONModelErrorInvalidData = 1
  * @param mismatchDescription description of the type mismatch that was encountered.
  */
-+(id)errorInvalidDataWithTypeMismatch:(NSString*)mismatchDescription;
++ (id)errorInvalidDataWithTypeMismatch:(NSString *)mismatchDescription;
 
 /**
  * Creates a JSONModelError instance with code kJSONModelErrorBadResponse = 2
  */
-+(id)errorBadResponse;
++ (id)errorBadResponse;
 
 /**
  * Creates a JSONModelError instance with code kJSONModelErrorBadJSON = 3
  */
-+(id)errorBadJSON;
++ (id)errorBadJSON;
 
 /**
  * Creates a JSONModelError instance with code kJSONModelErrorModelIsInvalid = 4
  */
-+(id)errorModelIsInvalid;
++ (id)errorModelIsInvalid;
 
 /**
  * Creates a JSONModelError instance with code kJSONModelErrorNilInput = 5
  */
-+(id)errorInputIsNil;
++ (id)errorInputIsNil;
 
 /**
  * Creates a new JSONModelError with the same values plus information about the key-path of the error.
@@ -108,7 +97,7 @@ extern NSString* const kJSONModelKeyPath;
  * This key contains the component string parameter. If the key is already present
  * then the new error object has the component string prepended to the existing value.
  */
-- (instancetype)errorByPrependingKeyPathComponent:(NSString*)component;
+- (instancetype)errorByPrependingKeyPathComponent:(NSString *)component;
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 @end

Pods/JSONModel/JSONModel/JSONModel/JSONModelError.m

 //
 //  JSONModelError.m
+//  JSONModel
 //
-//  @version 1.2
-//  @author Marin Todorov (http://www.underplot.com) and contributors
-//
-
-// Copyright (c) 2012-2015 Marin Todorov, Underplot ltd.
-// This code is distributed under the terms and conditions of the MIT license.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
 
 #import "JSONModelError.h"
 

Pods/JSONModel/JSONModel/JSONModelCategories/NSArray+JSONModel.h

-//
-//  NSArray+JSONModel.h
-//
-//  @version 1.2
-//  @author Marin Todorov (http://www.underplot.com) and contributors
-//
-
-// Copyright (c) 2012-2015 Marin Todorov, Underplot ltd.
-// This code is distributed under the terms and conditions of the MIT license.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-#import <Foundation/Foundation.h>
-#import "JSONModel.h"
-
-/**
- * Exposes invisible JSONModelArray methods
- */
-@interface NSArray(JSONModel)
-
-/**
- * Looks up the array's contents and tries to find a JSONModel object
- * with matching index property value to the indexValue param.
- * 
- * Will return nil if no matching model is found. Will return nil if there's no index property 
- * defined on the models found in the array (will sample the first object, assuming the array 
- * contains homogeneous collection of objects)
- *
- * @param indexValue the id value to search for
- * @return the found model or nil
- * @exception NSException throws exception if you call this method on an instance, which is not actually a JSONModelArray
- */
-- (id)modelWithIndexValue:(id)indexValue;
-
-@end

Pods/JSONModel/JSONModel/JSONModelCategories/NSArray+JSONModel.m

-//
-//  NSArray+JSONModel.m
-//
-//  @version 1.2
-//  @author Marin Todorov (http://www.underplot.com) and contributors
-//
-
-// Copyright (c) 2012-2015 Marin Todorov, Underplot ltd.
-// This code is distributed under the terms and conditions of the MIT license.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-#import "NSArray+JSONModel.h"
-
-@implementation NSArray(JSONModel)
-
-- (id)modelWithIndexValue:(id)indexValue
-{
-    NSAssert(NO, @"call modelWithIndexValue: on a ConvertOnDemand property, which is defined like that: @property (strong, nonatomic) NSArray<MyModel, ConvertOnDemand>* list;");
-    return nil;
-}
-
-@end

Pods/JSONModel/JSONModel/JSONModelLib.h

 //
 //  JSONModelLib.h
+//  JSONModel
 //
-//  @version 1.2
-//  @author Marin Todorov (http://www.underplot.com) and contributors
-//
-
-// Copyright (c) 2012-2015 Marin Todorov, Underplot ltd.
-// This code is distributed under the terms and conditions of the MIT license.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
 
 #import <Foundation/Foundation.h>
 
-//JSONModel transformations
+// core
+#import "JSONModel.h"
+#import "JSONModelError.h"
+
+// transformations
 #import "JSONValueTransformer.h"
 #import "JSONKeyMapper.h"
 
-//basic JSONModel classes
-#import "JSONModelError.h"
-#import "JSONModelClassProperty.h"
-#import "JSONModel.h"
-
-//network classes
+// networking (deprecated)
 #import "JSONHTTPClient.h"
 #import "JSONModel+networking.h"
 #import "JSONAPI.h"
-
-//models array
-#import "NSArray+JSONModel.h"
-#import "JSONModelArray.h"

Pods/JSONModel/JSONModel/JSONModelNetworking/JSONAPI.h

 //
 //  JSONAPI.h
-//
-//  @version 1.2
-//  @author Marin Todorov (http://www.underplot.com) and contributors
-//
-
-// Copyright (c) 2012-2015 Marin Todorov, Underplot ltd.
-// This code is distributed under the terms and conditions of the MIT license.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//  JSONModel
 //
 
-
 #import <Foundation/Foundation.h>
 #import "JSONHTTPClient.h"
 
-/////////////////////////////////////////////////////////////////////////////////////////////
-
-/**
- * @discussion Class for working with JSON APIs. It builds upon the JSONHTTPClient class
- * and facilitates making requests to the same web host. Also features helper
- * method for making calls to a JSON RPC service
- */
+DEPRECATED_ATTRIBUTE
 @interface JSONAPI : NSObject
 
-/////////////////////////////////////////////////////////////////////////////////////////////
-
-/** @name Configuring the API */
-/**
- * Sets the API url
- * @param base the API url as a string
- */
-+(void)setAPIBaseURLWithString:(NSString*)base;
-
-/**
- * Sets the default content type for the requests/responses
- * @param ctype The content-type as a string. Some possible types, 
- * depending on the service: application/json, text/json, x-application/javascript, etc.
- */
-+(void)setContentType:(NSString*)ctype;
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-
-/** @name Making GET API requests */
-/**
- * Makes an asynchronous GET request to the API
- * @param path the URL path to add to the base API URL for this HTTP call
- * @param params the variables to pass to the API
- * @param completeBlock a JSONObjectBlock block to execute upon completion
- */
-+(void)getWithPath:(NSString*)path andParams:(NSDictionary*)params completion:(JSONObjectBlock)completeBlock;
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-
-/** @name Making POST API requests */
-/**
- * Makes a POST request to the API
- * @param path the URL path to add to the base API URL for this HTTP call
- * @param params the variables to pass to the API
- * @param completeBlock a JSONObjectBlock block to execute upon completion
- */
-+(void)postWithPath:(NSString*)path andParams:(NSDictionary*)params completion:(JSONObjectBlock)completeBlock;
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-
-/** @name JSON RPC methods */
-/**
- * Makes an asynchronous JSON RPC request to the API. Read more: http://www.jsonrpc.org
- * @param method the HTTP method name; GET or POST only
- * @param args the list of arguments to pass to the API
- * @param completeBlock JSONObjectBlock to execute upon completion
- */
-+(void)rpcWithMethodName:(NSString*)method andArguments:(NSArray*)args completion:(JSONObjectBlock)completeBlock;
-
-/** @name JSON RPC (2.0) request method */
-/**
- * Makes an asynchronous JSON RPC 2.0 request to the API. Read more: http://www.jsonrpc.org
- * @param method the HTTP method name; GET or POST only
- * @param params the params to pass to the API - an NSArray or an NSDictionary, 
- * depending whether you're using named or unnamed parameters
- * @param completeBlock JSONObjectBlock to execute upon completion
- */
-+(void)rpc2WithMethodName:(NSString*)method andParams:(id)params completion:(JSONObjectBlock)completeBlock;
-
-/////////////////////////////////////////////////////////////////////////////////////////////
++ (void)setAPIBaseURLWithString:(NSString *)base DEPRECATED_ATTRIBUTE;
++ (void)setContentType:(NSString *)ctype DEPRECATED_ATTRIBUTE;
++ (void)getWithPath:(NSString *)path andParams:(NSDictionary *)params completion:(JSONObjectBlock)completeBlock DEPRECATED_ATTRIBUTE;
++ (void)postWithPath:(NSString *)path andParams:(NSDictionary *)params completion:(JSONObjectBlock)completeBlock DEPRECATED_ATTRIBUTE;
++ (void)rpcWithMethodName:(NSString *)method andArguments:(NSArray *)args completion:(JSONObjectBlock)completeBlock DEPRECATED_ATTRIBUTE;
++ (void)rpc2WithMethodName:(NSString *)method andParams:(id)params completion:(JSONObjectBlock)completeBlock DEPRECATED_ATTRIBUTE;
 
 @end

Pods/JSONModel/JSONModel/JSONModelNetworking/JSONAPI.m

 //
 //  JSONAPI.m
-//
-//  @version 1.2
-//  @author Marin Todorov (http://www.underplot.com) and contributors
-//
-
-// Copyright (c) 2012-2015 Marin Todorov, Underplot ltd.
-// This code is distributed under the terms and conditions of the MIT license.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//  JSONModel
 //
 
-
 #import "JSONAPI.h"
 
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#pragma GCC diagnostic ignored "-Wdeprecated-implementations"
+
 #pragma mark - helper error model class
 @interface JSONAPIRPCErrorModel: JSONModel
 @property (assign, nonatomic) int code;
@@ -26,6 +18,7 @@
 #pragma mark - static variables
 
 static JSONAPI* sharedInstance = nil;
+
 static long jsonRpcId = 0;
 
 #pragma mark - JSONAPI() private interface

Pods/JSONModel/JSONModel/JSONModelNetworking/JSONHTTPClient.m

 //
 //  JSONModelHTTPClient.m
+//  JSONModel
 //
-//  @version 1.2
-//  @author Marin Todorov (http://www.underplot.com) and contributors
-//
-
-// Copyright (c) 2012-2015 Marin Todorov, Underplot ltd.
-// This code is distributed under the terms and conditions of the MIT license.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
 
 #import "JSONHTTPClient.h"
 
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#pragma GCC diagnostic ignored "-Wdeprecated-implementations"
+
 typedef void (^RequestResultBlock)(NSData *data, JSONModelError *error);
 
 #pragma mark - constants

Pods/JSONModel/JSONModel/JSONModelNetworking/JSONModel+networking.h

 //
 //  JSONModel+networking.h
-//
-//  @version 1.2
-//  @author Marin Todorov (http://www.underplot.com) and contributors
-//
-
-// Copyright (c) 2012-2015 Marin Todorov, Underplot ltd.
-// This code is distributed under the terms and conditions of the MIT license.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//  JSONModel
 //
 
-
 #import "JSONModel.h"
 #import "JSONHTTPClient.h"
 
-typedef void (^JSONModelBlock)(id model, JSONModelError* err);
-
-/**
- * The JSONModel(networking) class category adds networking to JSONModel.
- * It adds initFromURLWithString: initializer, which makes a GET http request 
- * to the URL given and initializes the model with the returned JSON.
- * Use #import "JSONModel+networking.h" to import networking capabilities.
- */
-@interface JSONModel(Networking)
-
-@property (assign, nonatomic) BOOL isLoading;
-/** @name Asynchronously create a model over the network */
-/**
- * Asynchronously create a model over the network. Create a new model instance and initialize it with the JSON fetched from the given URL
- * @param urlString the absolute URL address of the JSON feed as a string
- * @param completeBlock JSONModelBlock executed upon completion. The JSONModelBlock type is defined as: void (^JSONModelBlock)(JSONModel* model, JSONModelError* e); the first parameter is the initialized model or nil, 
- * and second parameter holds the model initialization error, if any
- */
--(instancetype)initFromURLWithString:(NSString *)urlString completion:(JSONModelBlock)completeBlock;
-
-/**
- * Asynchronously gets the contents of a URL and constructs a JSONModel object from the response.
- * The constructed JSONModel object passed as the first parameter to the completion block will be of the same
- * class as the receiver. So call this method on yourJSONModel sub-class rather than directly on JSONModel.
- * @param	urlString		The absolute URL of the JSON resource, as a string
- * @param	completeBlock	The block to be called upon completion.
- *							JSONModelBlock type is defined as: void (^JSONModelBlock)(JSONModel* model, JSONModelError* err);
- *							The first parameter is the initialized model (of the same JSONModel sub-class as the receiver) or nil if there was an error;
- * 							The second parameter is the initialization error, if any.
- */
-+ (void)getModelFromURLWithString:(NSString*)urlString completion:(JSONModelBlock)completeBlock;
+typedef void (^JSONModelBlock)(id model, JSONModelError *err) DEPRECATED_ATTRIBUTE;
 
-/**
- * Asynchronously posts a JSONModel object (as JSON) to a URL and constructs a JSONModel object from the response.
- * The constructed JSONModel object passed as the first parameter to the completion block will be of the same
- * class as the receiver. So call this method on yourJSONModel sub-class rather than directly on JSONModel.
- * @param	post			A JSONModel object that will be converted to JSON and sent as the POST data to the HTTP request.
- * @param	urlString		The absolute URL of the JSON resource, as a string
- * @param	completeBlock	The block to be called upon completion.
- *							JSONModelBlock type is defined as: void (^JSONModelBlock)(JSONModel* model, JSONModelError* err);
- *							The first parameter is the initialized model (of the same JSONModel sub-class as the receiver) or nil if there was an error;
- * 							The second parameter is the initialization error, if any.
- */
-+ (void)postModel:(JSONModel*)post toURLWithString:(NSString*)urlString completion:(JSONModelBlock)completeBlock;
+@interface JSONModel (Networking)
 
+@property (assign, nonatomic) BOOL isLoading DEPRECATED_ATTRIBUTE;
+- (instancetype)initFromURLWithString:(NSString *)urlString completion:(JSONModelBlock)completeBlock DEPRECATED_ATTRIBUTE;
++ (void)getModelFromURLWithString:(NSString *)urlString completion:(JSONModelBlock)completeBlock DEPRECATED_ATTRIBUTE;
++ (void)postModel:(JSONModel *)post toURLWithString:(NSString *)urlString completion:(JSONModelBlock)completeBlock DEPRECATED_ATTRIBUTE;
 
 @end

Pods/JSONModel/JSONModel/JSONModelNetworking/JSONModel+networking.m

 //
 //  JSONModel+networking.m
+//  JSONModel
 //
-//  @version 1.2
-//  @author Marin Todorov (http://www.underplot.com) and contributors
-//
-
-// Copyright (c) 2012-2015 Marin Todorov, Underplot ltd.
-// This code is distributed under the terms and conditions of the MIT license.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
 
 #import "JSONModel+networking.h"
 #import "JSONHTTPClient.h"
 
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#pragma GCC diagnostic ignored "-Wdeprecated-implementations"
+
 BOOL _isLoading;
 
 @implementation JSONModel(Networking)

Pods/JSONModel/JSONModel/JSONModelTransformations/JSONKeyMapper.h

 //
 //  JSONKeyMapper.h
+//  JSONModel
 //
-//  @version 1.2
-//  @author Marin Todorov (http://www.underplot.com) and contributors
-//
-
-// Copyright (c) 2012-2015 Marin Todorov, Underplot ltd.
-// This code is distributed under the terms and conditions of the MIT license.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
 
 #import <Foundation/Foundation.h>
 
-typedef NSString* (^JSONModelKeyMapBlock)(NSString* keyName);
+typedef NSString *(^JSONModelKeyMapBlock)(NSString *keyName);
 
 /**
  * **You won't need to create or store instances of this class yourself.** If you want your model
@@ -32,71 +21,76 @@ typedef NSString* (^JSONModelKeyMapBlock)(NSString* keyName);
  * To comply with Obj-C accepted camelCase property naming for your classes,
  * you need to provide mapping between JSON keys and ObjC property names.
  *
- * In your model overwrite the +(JSONKeyMapper*)keyMapper method and provide a JSONKeyMapper
+ * In your model overwrite the + (JSONKeyMapper *)keyMapper method and provide a JSONKeyMapper
  * instance to convert the key names for your model.
  *
  * If you need custom mapping it's as easy as:
  * <pre>
- * +(JSONKeyMapper*)keyMapper {
+ * + (JSONKeyMapper *)keyMapper {
  * &nbsp; return [[JSONKeyMapper&nbsp;alloc]&nbsp;initWithDictionary:@{@"crazy_JSON_name":@"myCamelCaseName"}];
  * }
  * </pre>
  * In case you want to handle underscore_case, **use the predefined key mapper**, like so:
  * <pre>
- * +(JSONKeyMapper*)keyMapper {
+ * + (JSONKeyMapper *)keyMapper {
  * &nbsp; return [JSONKeyMapper&nbsp;mapperFromUnderscoreCaseToCamelCase];
  * }
  * </pre>
  */
 @interface JSONKeyMapper : NSObject
 
-/** @name Name converters */
-/** Block, which takes in a JSON key and converts it to the corresponding property name */
-@property (readonly, nonatomic) JSONModelKeyMapBlock JSONToModelKeyBlock;
+// deprecated
+@property (readonly, nonatomic) JSONModelKeyMapBlock JSONToModelKeyBlock DEPRECATED_ATTRIBUTE;
+- (NSString *)convertValue:(NSString *)value isImportingToModel:(BOOL)importing DEPRECATED_MSG_ATTRIBUTE("use convertValue:");
+- (instancetype)initWithDictionary:(NSDictionary *)map DEPRECATED_MSG_ATTRIBUTE("use initWithModelToJSONDictionary:");
+- (instancetype)initWithJSONToModelBlock:(JSONModelKeyMapBlock)toModel modelToJSONBlock:(JSONModelKeyMapBlock)toJSON DEPRECATED_MSG_ATTRIBUTE("use initWithModelToJSONBlock:");
++ (instancetype)mapper:(JSONKeyMapper *)baseKeyMapper withExceptions:(NSDictionary *)exceptions DEPRECATED_MSG_ATTRIBUTE("use baseMapper:withModelToJSONExceptions:");
++ (instancetype)mapperFromUnderscoreCaseToCamelCase DEPRECATED_MSG_ATTRIBUTE("use mapperForSnakeCase:");
++ (instancetype)mapperFromUpperCaseToLowerCase DEPRECATED_ATTRIBUTE;
 
+/** @name Name converters */
 /** Block, which takes in a property name and converts it to the corresponding JSON key name */
 @property (readonly, nonatomic) JSONModelKeyMapBlock modelToJSONKeyBlock;
 
 /** Combined converter method
-* @param value the source name
-* @param importing YES invokes JSONToModelKeyBlock, NO - modelToJSONKeyBlock
-* @return JSONKeyMapper instance
-*/
--(NSString*)convertValue:(NSString*)value isImportingToModel:(BOOL)importing;
+ * @param value the source name
+ * @return JSONKeyMapper instance
+ */
+- (NSString *)convertValue:(NSString *)value;
 
 /** @name Creating a key mapper */
 
 /**
- * Creates a JSONKeyMapper instance, based on the two blocks you provide this initializer.
- * The two parameters take in a JSONModelKeyMapBlock block:
- * <pre>NSString* (^JSONModelKeyMapBlock)(NSString* keyName)</pre>
+ * Creates a JSONKeyMapper instance, based on the block you provide this initializer.
+ * The parameter takes in a JSONModelKeyMapBlock block:
+ * <pre>NSString *(^JSONModelKeyMapBlock)(NSString *keyName)</pre>
  * The block takes in a string and returns the transformed (if at all) string.
- * @param toModel transforms JSON key name to your model property name
  * @param toJSON transforms your model property name to a JSON key
  */
--(instancetype)initWithJSONToModelBlock:(JSONModelKeyMapBlock)toModel
-                       modelToJSONBlock:(JSONModelKeyMapBlock)toJSON;
+- (instancetype)initWithModelToJSONBlock:(JSONModelKeyMapBlock)toJSON;
 
 /**
- * Creates a JSONKeyMapper instance, based on the mapping you provide
- * in the map parameter. Use the JSON key names as keys, your JSONModel 
- * property names as values.
- * @param map map dictionary, in the format: <pre>@{@"crazy_JSON_name":@"myCamelCaseName"}</pre>
+ * Creates a JSONKeyMapper instance, based on the mapping you provide.
+ * Use your JSONModel property names as keys, and the JSON key names as values.
+ * @param toJSON map dictionary, in the format: <pre>@{@"myCamelCaseName":@"crazy_JSON_name"}</pre>
  * @return JSONKeyMapper instance
  */
--(instancetype)initWithDictionary:(NSDictionary*)map;
+- (instancetype)initWithModelToJSONDictionary:(NSDictionary *)toJSON;
 
 /**
- * Creates a JSONKeyMapper, which converts underscore_case to camelCase and vice versa.
+ * Given a camelCase model property, this mapper finds JSON keys using the snake_case equivalent.
  */
-+(instancetype)mapperFromUnderscoreCaseToCamelCase;
++ (instancetype)mapperForSnakeCase;
 
-+(instancetype)mapperFromUpperCaseToLowerCase;
+/**
+ * Given a camelCase model property, this mapper finds JSON keys using the TitleCase equivalent.
+ */
++ (instancetype)mapperForTitleCase;
 
 /**
  * Creates a JSONKeyMapper based on a built-in JSONKeyMapper, with specific exceptions.
- * Use the original JSON key names as keys, and your JSONModel property names as values.
+ * Use your JSONModel property names as keys, and the JSON key names as values.
  */
-+ (instancetype)mapper:(JSONKeyMapper *)baseKeyMapper withExceptions:(NSDictionary *)exceptions;
++ (instancetype)baseMapper:(JSONKeyMapper *)baseKeyMapper withModelToJSONExceptions:(NSDictionary *)toJSON;
 
 @end

Pods/JSONModel/JSONModel/JSONModelTransformations/JSONValueTransformer.h

 //
 //  JSONValueTransformer.h
+//  JSONModel
 //
-//  @version 1.2
-//  @author Marin Todorov (http://www.underplot.com) and contributors
-//
-
-// Copyright (c) 2012-2015 Marin Todorov, Underplot ltd.
-// This code is distributed under the terms and conditions of the MIT license.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
 
 #import <Foundation/Foundation.h>
-#import "JSONModelArray.h"
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -44,7 +32,7 @@ extern BOOL isNull(id value);
  */
 @interface JSONValueTransformer : NSObject
 
-@property (strong, nonatomic, readonly) NSDictionary* primitivesNames;
+@property (strong, nonatomic, readonly) NSDictionary *primitivesNames;
 
 /** @name Resolving cluster class names */
 /**
@@ -54,7 +42,7 @@ extern BOOL isNull(id value);
  * @param sourceClass the class to get the umbrella class for
  * @return Class
  */
-+(Class)classByResolvingClusterClasses:(Class)sourceClass;
++ (Class)classByResolvingClusterClasses:(Class)sourceClass;
 
 #pragma mark - NSMutableString <-> NSString
 /** @name Transforming to Mutable copies */
@@ -63,7 +51,7 @@ extern BOOL isNull(id value);
  * @param string incoming string
  * @return mutable string
  */
--(NSMutableString*)NSMutableStringFromNSString:(NSString*)string;
+- (NSMutableString *)NSMutableStringFromNSString:(NSString *)string;
 
 #pragma mark - NSMutableArray <-> NSArray
 /**
@@ -71,16 +59,7 @@ extern BOOL isNull(id value);
  * @param array incoming array
  * @return mutable array
  */
--(NSMutableArray*)NSMutableArrayFromNSArray:(NSArray*)array;
-
-#pragma mark - NS(Mutable)Array <- JSONModelArray
-/**
- * Transforms an array to a JSONModelArray
- * @param array incoming array
- * @return JSONModelArray
- */
--(NSArray*)NSArrayFromJSONModelArray:(JSONModelArray*)array;
--(NSMutableArray*)NSMutableArrayFromJSONModelArray:(JSONModelArray*)array;
+- (NSMutableArray *)NSMutableArrayFromNSArray:(NSArray *)array;
 
 #pragma mark - NSMutableDictionary <-> NSDictionary
 /**
@@ -88,7 +67,7 @@ extern BOOL isNull(id value);
  * @param dict incoming dictionary
  * @return mutable dictionary
  */
--(NSMutableDictionary*)NSMutableDictionaryFromNSDictionary:(NSDictionary*)dict;
+- (NSMutableDictionary *)NSMutableDictionaryFromNSDictionary:(NSDictionary *)dict;
 
 #pragma mark - NSSet <-> NSArray
 /** @name Transforming Sets */
@@ -97,28 +76,28 @@ extern BOOL isNull(id value);
  * @param array incoming array
  * @return set with the array's elements
  */
--(NSSet*)NSSetFromNSArray:(NSArray*)array;
+- (NSSet *)NSSetFromNSArray:(NSArray *)array;
 
 /**
  * Transforms an array to a mutable set
  * @param array incoming array
  * @return mutable set with the array's elements
  */
--(NSMutableSet*)NSMutableSetFromNSArray:(NSArray*)array;
+- (NSMutableSet *)NSMutableSetFromNSArray:(NSArray *)array;
 
 /**
  * Transforms a set to an array
  * @param set incoming set
  * @return an array with the set's elements
  */
--(NSArray*)JSONObjectFromNSSet:(NSSet*)set;
+- (NSArray *)JSONObjectFromNSSet:(NSSet *)set;
 
 /**
  * Transforms a mutable set to an array
  * @param set incoming mutable set
  * @return an array with the set's elements
  */
--(NSArray*)JSONObjectFromNSMutableSet:(NSMutableSet*)set;
+- (NSArray *)JSONObjectFromNSMutableSet:(NSMutableSet *)set;
 
 #pragma mark - BOOL <-> number/string
 /** @name Transforming JSON types */
@@ -127,21 +106,21 @@ extern BOOL isNull(id value);
  * @param number the number to convert
  * @return the resulting number
  */
--(NSNumber*)BOOLFromNSNumber:(NSNumber*)number;
+- (NSNumber *)BOOLFromNSNumber:(NSNumber *)number;
 
 /**
  * Transforms a number object to a bool number object
  * @param string the string value to convert, "0" converts to NO, everything else to YES
  * @return the resulting number
  */
--(NSNumber*)BOOLFromNSString:(NSString*)string;
+- (NSNumber *)BOOLFromNSString:(NSString *)string;
 
 /**
  * Transforms a BOOL value to a bool number object
  * @param number an NSNumber value coming from the model
  * @return the result number
  */
--(NSNumber*)JSONObjectFromBOOL:(NSNumber*)number;
+- (NSNumber *)JSONObjectFromBOOL:(NSNumber *)number;
 
 #pragma mark - string <-> number
 /**
@@ -149,28 +128,28 @@ extern BOOL isNull(id value);
  * @param string the string to convert
  * @return the resulting number
  */
--(NSNumber*)NSNumberFromNSString:(NSString*)string;
+- (NSNumber *)NSNumberFromNSString:(NSString *)string;
 
 /**
  * Transforms a number object to a string object
  * @param number the number to convert
  * @return the resulting string
  */
--(NSString*)NSStringFromNSNumber:(NSNumber*)number;
+- (NSString *)NSStringFromNSNumber:(NSNumber *)number;
 
 /**
  * Transforms a string object to a nsdecimalnumber object
  * @param string the string to convert
  * @return the resulting number
  */
--(NSDecimalNumber*)NSDecimalNumberFromNSString:(NSString*)string;
+- (NSDecimalNumber *)NSDecimalNumberFromNSString:(NSString *)string;
 
 /**
  * Transforms a nsdecimalnumber object to a string object
  * @param number the number to convert
  * @return the resulting string
  */
--(NSString*)NSStringFromNSDecimalNumber:(NSDecimalNumber*)number;
+- (NSString *)NSStringFromNSDecimalNumber:(NSDecimalNumber *)number;
 
 
 #pragma mark - string <-> url
@@ -180,14 +159,14 @@ extern BOOL isNull(id value);
  * @param string the string to convert
  * @return the resulting url object
  */
--(NSURL*)NSURLFromNSString:(NSString*)string;
+- (NSURL *)NSURLFromNSString:(NSString *)string;
 
 /**
  * Transforms an NSURL object to a string
  * @param url the url object to convert
  * @return the resulting string
  */
--(NSString*)JSONObjectFromNSURL:(NSURL*)url;
+- (NSString *)JSONObjectFromNSURL:(NSURL *)url;
 
 #pragma mark - string <-> time zone
 
@@ -197,7 +176,7 @@ extern BOOL isNull(id value);
  * @param string the string to convert
  * @return the resulting NSTimeZone object
  */
-- (NSTimeZone *)NSTimeZoneFromNSString:(NSString*)string;
+- (NSTimeZone *)NSTimeZoneFromNSString:(NSString *)string;
 
 /**
  * Transforms an NSTimeZone object to a string
@@ -215,8 +194,8 @@ extern BOOL isNull(id value);
  * them in a category, so they have to stay hidden here.
  */
 
-//-(NSDate*)NSDateFromNSString:(NSString*)string;
-//-(NSString*)JSONObjectFromNSDate:(NSDate*)date;
+//- (NSDate *)NSDateFromNSString:(NSString *)string;
+//- (NSString *)JSONObjectFromNSDate:(NSDate *)date;
 
 #pragma mark - number <-> date
 
@@ -225,6 +204,6 @@ extern BOOL isNull(id value);
  * @param number the number to convert
  * @return the resulting date
  */
-- (NSDate*)NSDateFromNSNumber:(NSNumber*)number;
+- (NSDate *)NSDateFromNSNumber:(NSNumber *)number;
 
 @end

Pods/JSONModel/JSONModel/JSONModelTransformations/JSONValueTransformer.m

 //
 //  JSONValueTransformer.m
-//
-//  @version 1.2
-//  @author Marin Todorov (http://www.underplot.com) and contributors
-//
-
-// Copyright (c) 2012-2015 Marin Todorov, Underplot ltd.
-// This code is distributed under the terms and conditions of the MIT license.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//  JSONModel
 //
 
-
 #import "JSONValueTransformer.h"
-#import "JSONModelArray.h"
 
 #pragma mark - functions
 extern BOOL isNull(id value)
@@ -82,26 +70,9 @@ extern BOOL isNull(id value)
 #pragma mark - NSMutableArray <-> NSArray
 -(NSMutableArray*)NSMutableArrayFromNSArray:(NSArray*)array
 {
-    if ([array isKindOfClass:[JSONModelArray class]]) {
-        //it's a jsonmodelarray already, just return it
-        return (id)array;
-    }
-    
     return [NSMutableArray arrayWithArray:array];
 }
 
-#pragma mark - NS(Mutable)Array <- JSONModelArray
--(NSArray*)NSArrayFromJSONModelArray:(JSONModelArray*)array
-{
-    return (NSMutableArray*)array;
-}
-
--(NSMutableArray*)NSMutableArrayFromJSONModelArray:(JSONModelArray*)array
-{
-    return (NSMutableArray*)array;
-}
-
-
 #pragma mark - NSMutableDictionary <-> NSDictionary
 -(NSMutableDictionary*)NSMutableDictionaryFromNSDictionary:(NSDictionary*)dict
 {
@@ -179,7 +150,7 @@ extern BOOL isNull(id value)
 #pragma mark - string <-> number
 -(NSNumber*)NSNumberFromNSString:(NSString*)string
 {
-    return [NSNumber numberWithFloat: [string doubleValue]];
+    return [NSNumber numberWithDouble:[string doubleValue]];
 }
 
 -(NSString*)NSStringFromNSNumber:(NSNumber*)number
@@ -201,7 +172,7 @@ extern BOOL isNull(id value)
 -(NSURL*)NSURLFromNSString:(NSString*)string
 {
     // do not change this behavior - there are other ways of overriding it
-    // see: https://github.com/icanzilb/JSONModel/pull/119
+    // see: https://github.com/jsonmodel/jsonmodel/pull/119
     return [NSURL URLWithString:string];
 }
 
@@ -258,7 +229,7 @@ extern BOOL isNull(id value)
 }
 
 #pragma mark - hidden transform for empty dictionaries
-//https://github.com/icanzilb/JSONModel/issues/163
+//https://github.com/jsonmodel/jsonmodel/issues/163
 -(NSDictionary*)__NSDictionaryFromNSArray:(NSArray*)array
 {
     if (array.count==0) return @{};

Pods/JSONModel/LICENSE

+Copyright (c) 2012-2016 Marin Todorov and JSONModel contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Pods/JSONModel/LICENSE_jsonmodel.txt

-JSONModel
-
-Copyright (c) 2012-2014 Marin Todorov, Underplot ltd.
-This code is distributed under the terms and conditions of the MIT license.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of 
-this software and associated documentation files (the "Software"), to deal in the 
-Software without restriction, including without limitation the rights to use, copy, 
-modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, 
-and to permit persons to whom the Software is furnished to do so, subject to the 
-following conditions:
-
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF 
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
-OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-The MIT License in plain English: http://www.touch-code-magazine.com/JSONModel/MITLicense

Pods/Manifest.lock

@@ -32,7 +32,7 @@ PODS:
   - FMDB/standard (2.6.2)
   - IQKeyboardManager (3.2.4)
   - JPushSDK (1.8.2)
-  - JSONModel (1.2.0)
+  - JSONModel (1.7.0)
   - Masonry (1.0.1)
   - MBProgressHUD (0.9.2)
   - MJRefresh (3.1.3)
@@ -57,7 +57,7 @@ DEPENDENCIES:
   - FMDB (~> 2.5)
   - IQKeyboardManager (~> 3.2.3)
   - JPushSDK (~> 1.8.2)
-  - JSONModel (~> 1.2.0)
+  - JSONModel (~> 1.7.0)
   - Masonry (~> 1.0.1)
   - MBProgressHUD (~> 0.9.1)
   - MJRefresh (~> 3.1.0)
@@ -76,7 +76,7 @@ SPEC CHECKSUMS:
   FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a
   IQKeyboardManager: 555b1231fefafb21b19278d7cca72986a27b748b
   JPushSDK: c68dd04c595a5c93aa003f212974010790410d8e
-  JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c
+  JSONModel: 840bc0fcffb24b8454d2c026bf26fea454b8e98d
   Masonry: a1a931a0d08870ed8ae415a2ea5ea68ebcac77df
   MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
   MJRefresh: e9005c294dd8a3d08cc7c50eea2b5016673f29c4

Pods/Target Support Files/Pods/Pods-acknowledgements.markdown

@@ -132,29 +132,24 @@ LICENSE Copyright 2010 - 2014 JPush.cn, Inc. All rights reserved.
 
 ## JSONModel
 
-JSONModel
-
-Copyright (c) 2012-2014 Marin Todorov, Underplot ltd.
-This code is distributed under the terms and conditions of the MIT license.
+Copyright (c) 2012-2016 Marin Todorov and JSONModel contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in the 
-Software without restriction, including without limitation the rights to use, copy, 
-modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, 
-and to permit persons to whom the Software is furnished to do so, subject to the 
-following conditions:
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF 
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
-OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-The MIT License in plain English: http://www.touch-code-magazine.com/JSONModel/MITLicense
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 ## MBProgressHUD

Pods/Target Support Files/Pods/Pods-acknowledgements.plist

@@ -171,29 +171,24 @@ SOFTWARE.
 		</dict>
 		<dict>
 			<key>FooterText</key>
-			<string>JSONModel
-
-Copyright (c) 2012-2014 Marin Todorov, Underplot ltd.
-This code is distributed under the terms and conditions of the MIT license.
+			<string>Copyright (c) 2012-2016 Marin Todorov and JSONModel contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in the 
-Software without restriction, including without limitation the rights to use, copy, 
-modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, 
-and to permit persons to whom the Software is furnished to do so, subject to the 
-following conditions:
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF 
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
-OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-The MIT License in plain English: http://www.touch-code-magazine.com/JSONModel/MITLicense
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 </string>
 			<key>Title</key>
 			<string>JSONModel</string>

podfile

@@ -15,5 +15,5 @@ pod 'JPushSDK', '~> 1.8.2'
 pod 'RETableViewManager', '~> 1.6'
 pod 'YLProgressBar', '~> 3.8.1'
 pod 'WYPopoverController', '~> 0.3.9'
-pod 'JSONModel', '~> 1.2.0'
+pod 'JSONModel', '~> 1.7.0'
 pod 'DZNEmptyDataSet', '~> 1.8.1'

total.xcodeproj/project.pbxproj

@@ -3123,8 +3123,8 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3140,7 +3140,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomoe.total;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE = "f96494cb-c220-43ce-8034-75e000c2193f";
 				SWIFT_OBJC_BRIDGING_HEADER = "total/total-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				TARGETED_DEVICE_FAMILY = 1;
@@ -3171,7 +3171,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomoe.total;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE = "f96494cb-c220-43ce-8034-75e000c2193f";
 				SWIFT_OBJC_BRIDGING_HEADER = "total/total-Bridging-Header.h";
 				TARGETED_DEVICE_FAMILY = 1;
 				USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";

total/GTOApp/Business/Repair/Views/GTOLicenceBoltView.m

@@ -326,8 +326,6 @@
                 stateStr = GTO_LICENCE__STATE_APPROVED;
             }else if(indexPath.row == 7){
                 stateStr =GTO_LICENCE__STATE_FINISHED;
-            }else {
-                
             }
             [self.delegate getBoltValueSelectRow:stateStr];
         }

total/GTOApp/UserUtil/total_objc_json_client.h

@@ -993,25 +993,25 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *capacity;
+@property (nonatomic, strong) NSNumber *capacity;
 /**
  * 质量，单位公斤
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *quality;
+@property (nonatomic, strong) NSNumber *quality;
 /**
  * 密度
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *density;
+@property (nonatomic, strong) NSNumber *density;
 /**
  * 标准体积
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *volume;
+@property (nonatomic, strong) NSNumber *volume;
 @end /* interface GasMeasureValue */
 
 
@@ -1530,7 +1530,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *quantity;
+@property (nonatomic, strong) NSNumber *quantity;
 /**
  * 明细状态
  *
@@ -1593,7 +1593,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *guidancePrice;
+@property (nonatomic, strong) NSNumber *guidancePrice;
 /**
  * 售价
  * <p>
@@ -1626,7 +1626,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *salePrice;
+@property (nonatomic, strong) NSNumber *salePrice;
 /**
  * 生效时间
  *
@@ -1740,13 +1740,13 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *qty;
+@property (nonatomic, strong) NSNumber *qty;
 /**
  * 配油金额（元）
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *amount;
+@property (nonatomic, strong) NSNumber *amount;
 /**
  * 配油单号
  *
@@ -1820,7 +1820,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *total;
+@property (nonatomic, strong) NSNumber *total;
 /**
  * 付款凭证
  *
@@ -2288,7 +2288,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *quantity;
+@property (nonatomic, strong) NSNumber *quantity;
 /**
  * 油库
  *
@@ -2336,13 +2336,13 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *price;
+@property (nonatomic, strong) NSNumber *price;
 /**
  * 金额
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *total;
+@property (nonatomic, strong) NSNumber *total;
 /**
  * SO单是否已导出
  *
@@ -2462,13 +2462,13 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *billMeasure;
+@property (nonatomic, strong) NSNumber *billMeasure;
 /**
  * 发油公斤数
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *realMeasure;
+@property (nonatomic, strong) NSNumber *realMeasure;
 /**
  * 备注
  *
@@ -2504,19 +2504,19 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *pickFuelDensity;
+@property (nonatomic, strong) NSNumber *pickFuelDensity;
 /**
  * 发油升数
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *pickFuelDensityCapacity;
+@property (nonatomic, strong) NSNumber *pickFuelDensityCapacity;
 /**
  * 损耗升数
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *wasterCapacity;
+@property (nonatomic, strong) NSNumber *wasterCapacity;
 /**
  * 收油营业日期
  *
@@ -2528,7 +2528,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *wasterRate;
+@property (nonatomic, strong) NSNumber *wasterRate;
 /**
  * 承运商
  *
@@ -2540,7 +2540,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *price;
+@property (nonatomic, strong) NSNumber *price;
 @end /* interface ReceiveBill */
 
 
@@ -2888,7 +2888,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *quantity;
+@property (nonatomic, strong) NSNumber *quantity;
 /**
  * 备注
  *
@@ -2912,7 +2912,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *price;
+@property (nonatomic, strong) NSNumber *price;
 /**
  * 配送区域
  *
@@ -2966,7 +2966,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *price;
+@property (nonatomic, strong) NSNumber *price;
 /**
  * (no documentation provided)
  *
@@ -3026,13 +3026,13 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *reqPrice;
+@property (nonatomic, strong) NSNumber *reqPrice;
 /**
  * 申请数量
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *quantity;
+@property (nonatomic, strong) NSNumber *quantity;
 /**
  * 备注
  *
@@ -3068,7 +3068,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *minQuantity;
+@property (nonatomic, strong) NSNumber *minQuantity;
 @end /* interface ContractNumber */
 
 
@@ -3125,7 +3125,7 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *total;
+@property (nonatomic, strong) NSNumber *total;
 @end /* interface DepotInv */
 
 
@@ -3188,19 +3188,19 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *price;
+@property (nonatomic, strong) NSNumber *price;
 /**
  * 建仓数量（吨）
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *quantity;
+@property (nonatomic, strong) NSNumber *quantity;
 /**
  * 建仓金额
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *amount;
+@property (nonatomic, strong) NSNumber *amount;
 /**
  * 付款时间范围
  *
@@ -3230,25 +3230,25 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *unpayAmount;
+@property (nonatomic, strong) NSNumber *unpayAmount;
 /**
  * 未增加库存数
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *undepotInv;
+@property (nonatomic, strong) NSNumber *undepotInv;
 /**
  * 已缴纳保证金额
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *payMarginAmount;
+@property (nonatomic, strong) NSNumber *payMarginAmount;
 /**
  * 剩余库存
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *total;
+@property (nonatomic, strong) NSNumber *total;
 @end /* interface DepotBill */
 
 
@@ -3296,19 +3296,19 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *beforeTotal;
+@property (nonatomic, strong) NSNumber *beforeTotal;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *subTotal;
+@property (nonatomic, strong) NSNumber *subTotal;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *nowTotal;
+@property (nonatomic, strong) NSNumber *nowTotal;
 /**
  * (no documentation provided)
  *
@@ -3398,13 +3398,13 @@ extern NSString * const POSITIONTYPE_NONE;
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *quantity;
+@property (nonatomic, strong) NSNumber *quantity;
 /**
  * (no documentation provided)
  *
  *
  */
-@property (nonatomic, strong) NSDecimalNumber *realQuantity;
+@property (nonatomic, strong) NSNumber *realQuantity;
 /**
  * (no documentation provided)
  *

total/Macro/GTOAppMacro.h

@@ -79,8 +79,8 @@
 //#define HTTP_LOCAL_BASE_URL    @"http://218.244.151.129:7580"
 
 ////正式环境
-//#define HTTP_REST_API_BASE_URL        @"http://139.196.39.77:7080/total-server/rest"
-//#define HTTP_LOCAL_BASE_URL    @"http://139.196.39.77:7080"
+#define HTTP_REST_API_BASE_URL        @"http://139.196.39.77:7080/total-server/rest"
+#define HTTP_LOCAL_BASE_URL    @"http://139.196.39.77:7080"
 //
 //测试环境
 //#define HTTP_REST_API_BASE_URL        @"http://139.196.39.77:8180/total-server/rest"
@@ -96,8 +96,6 @@
 
 #define    HTTP_WEATHER_URL @"http://apis.baidu.com/heweather/weather/free"
 
-
-
 //refreshUpdateDate
 #define PurchaseNoticeUpdateDate    @"purchaseNoticeUpdateDate"
 #define TemplateNameUpdateDate    @"templateNameUpdateDate"