修改一些图片，增加工具类

ALand.xcodeproj/project.pbxproj

@@ -7,8 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		1929F16D1C9FCB62000E9B26 /* NSDictionary+Category.m in Sources */ = {isa = PBXBuildFile; fileRef = 1929F16C1C9FCB62000E9B26 /* NSDictionary+Category.m */; };
+		1929F16F1C9FCFA6000E9B26 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1929F16E1C9FCFA6000E9B26 /* Assets.xcassets */; };
 		1940D2EC1C9A56730080678C /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 1940D2EB1C9A56730080678C /* main.m */; };
-		1940D2F11C9A56730080678C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1940D2F01C9A56730080678C /* Assets.xcassets */; };
 		1940D2F41C9A56730080678C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1940D2F21C9A56730080678C /* LaunchScreen.storyboard */; };
 		1940D2FF1C9A56730080678C /* ALandTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1940D2FE1C9A56730080678C /* ALandTests.m */; };
 		1940D30A1C9A56730080678C /* ALandUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1940D3091C9A56730080678C /* ALandUITests.m */; };
@@ -124,9 +125,11 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		1929F16B1C9FCB62000E9B26 /* NSDictionary+Category.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+Category.h"; sourceTree = "<group>"; };
+		1929F16C1C9FCB62000E9B26 /* NSDictionary+Category.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+Category.m"; sourceTree = "<group>"; };
+		1929F16E1C9FCFA6000E9B26 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		1940D2E71C9A56730080678C /* ALand.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ALand.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		1940D2EB1C9A56730080678C /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		1940D2F01C9A56730080678C /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		1940D2F31C9A56730080678C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		1940D2F51C9A56730080678C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		1940D2FA1C9A56730080678C /* ALandTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ALandTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -387,6 +390,7 @@
 		1940D2E91C9A56730080678C /* ALand */ = {
 			isa = PBXGroup;
 			children = (
+				1929F16E1C9FCFA6000E9B26 /* Assets.xcassets */,
 				19DCCBF21C9AA2180072C3BF /* UIAlertView-Blocks */,
 				19DCCBE71C9AA1D50072C3BF /* UserUtil */,
 				19DCCB7E1C9AA0450072C3BF /* General */,
@@ -396,7 +400,6 @@
 				1940D3181C9A57070080678C /* BaseClass */,
 				1940D3191C9A57070080678C /* CodeClass */,
 				1940D3171C9A56A00080678C /* Managers */,
-				1940D2F01C9A56730080678C /* Assets.xcassets */,
 				1940D2F21C9A56730080678C /* LaunchScreen.storyboard */,
 				1940D2F51C9A56730080678C /* Info.plist */,
 				1940D2EA1C9A56730080678C /* Supporting Files */,
@@ -853,6 +856,8 @@
 				19DCCBA31C9AA0450072C3BF /* UIView+ViewFrameGeometry.m */,
 				19DCCBA41C9AA0450072C3BF /* UIViewController+LogicController.h */,
 				19DCCBA51C9AA0450072C3BF /* UIViewController+LogicController.m */,
+				1929F16B1C9FCB62000E9B26 /* NSDictionary+Category.h */,
+				1929F16C1C9FCB62000E9B26 /* NSDictionary+Category.m */,
 			);
 			path = Categories;
 			sourceTree = "<group>";
@@ -1051,12 +1056,12 @@
 			buildActionMask = 2147483647;
 			files = (
 				199BC7CD1C9BA5BA00E4E0B8 /* NextResetPasswordViewController.xib in Resources */,
-				1940D2F11C9A56730080678C /* Assets.xcassets in Resources */,
 				199BC7B81C9ADD5500E4E0B8 /* ToLoginViewController.xib in Resources */,
 				1940D2F41C9A56730080678C /* LaunchScreen.storyboard in Resources */,
 				199BC7BF1C9B045B00E4E0B8 /* RigistViewController.xib in Resources */,
 				199BC7B21C9AD4FD00E4E0B8 /* LoginViewController.xib in Resources */,
 				199BC7C81C9BA2A300E4E0B8 /* ResetPasswordViewController.xib in Resources */,
+				1929F16F1C9FCFA6000E9B26 /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1211,6 +1216,7 @@
 				19DCCBCD1C9AA0450072C3BF /* UIFont+Custom.m in Sources */,
 				19DCCBE41C9AA0450072C3BF /* ICRFunctionEntity.m in Sources */,
 				19DCCB6E1C9A9EB30072C3BF /* IBTTableViewCell.m in Sources */,
+				1929F16D1C9FCB62000E9B26 /* NSDictionary+Category.m in Sources */,
 				19DCCBDC1C9AA0450072C3BF /* IBTDatePickerViewController.m in Sources */,
 				19DCCB781C9A9EB30072C3BF /* IBTWebProgressBar.m in Sources */,
 				19DCCBFE1C9AA2A90072C3BF /* ICRDataBaseController.m in Sources */,

ALand/Assets.xcassets/home_tabbar/home_selected_tabbar.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "home_selected_tabbar.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "home_selected_tabbar@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

ALand/Assets.xcassets/home_tabbar/message_selected_tabbar.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "message_selected_tabbar.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "message_selected_tabbar@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

ALand/Assets.xcassets/home_tabbar/shopping_tabbar.imageset/Contents.json → ALand/Assets.xcassets/home_tabbar/message_tabbar.imageset/Contents.json

@@ -2,12 +2,12 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "shopping_tabbar.png",
+      "filename" : "message_tabbar.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "shopping_tabbar@2x.png",
+      "filename" : "message_tabbar@2x.png",
       "scale" : "2x"
     },
     {

ALand/Assets.xcassets/home_tabbar/mine_selected_tabbar.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "mine_selected_tabbar.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mine_selected_tabbar@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

ALand/Assets.xcassets/home_tabbar/store_selected_tabbar.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "store_selected_tabbar.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "store_selected_tabbar@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

ALand/Base.lproj/LaunchScreen.storyboard

 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -15,7 +16,6 @@
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                     </view>
                 </viewController>

ALand/BaseClass/BaseViewController.m

@@ -30,12 +30,11 @@
     
 
     
-    [self addChildVC:homeVC title:@"店铺" imageName:@"home_tabbar" selectImgName:@"shouye@2x"];
-    [self addChildVC:storeVC title:@"商城" imageName:@"store_tabbar" selectImgName:@"faxian@2x"];
+    [self addChildVC:homeVC title:@"店铺" imageName:@"home_tabbar" selectImgName:@"home_selected_tabbar"];
+    [self addChildVC:storeVC title:@"商城" imageName:@"store_tabbar" selectImgName:@"store_selected_tabbar"];
 
-    [self addChildVC:masageVC title:@"消息" imageName:@"shopping_tabbar" selectImgName:@"dingdan@2x"];
-    [self addChildVC:mineVC title:@"我的" imageName:@"mine_tabbar" selectImgName:@"geren@2x"];
-    
+    [self addChildVC:masageVC title:@"消息" imageName:@"message_tabbar" selectImgName:@"message_selected_tabbar"];
+    [self addChildVC:mineVC title:@"我的" imageName:@"mine_tabbar" selectImgName:@"mine_selected_tabbar"];
     
     UIView *bgView = [[UIView alloc] initWithFrame:self.tabBar.bounds];
     bgView.backgroundColor = [UIColor colorWithWhite:0.941 alpha:1.000];

ALand/General/Categories/NSDictionary+Category.h

+//
+//  NSDictionary+Category.h
+//  ALand
+//
+//  Created by Z on 16/3/21.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSDictionary (Category)
+
+/**
+ *  字典转换为json字符串
+ *
+ *  @return
+ */
+- (NSString *)JSONString;
+@end

ALand/General/Categories/NSDictionary+Category.m

+//
+//  NSDictionary+Category.m
+//  ALand
+//
+//  Created by Z on 16/3/21.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "NSDictionary+Category.h"
+
+@implementation NSDictionary (Category)
+- (NSString *)JSONString {
+
+    NSError *parseError = nil;
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:self options:NSJSONWritingPrettyPrinted error:&parseError];
+    return [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+}
+@end

ALand/General/Categories/UIButton+Category/UIButton+countDown.h

@@ -11,14 +11,16 @@
 @interface UIButton (countDown)
 
 /**
- *  倒计时按钮
- *
- *  @param timeLine 倒计时总时间
- *  @param title    还没倒计时的title
- *  @param subTitle 倒计时中的子名字，如时、分
- *  @param mColor   还没倒计时的颜色
- *  @param color    倒计时中的颜色
- */
+*  倒计时按钮
+*
+*  @param timeLine 倒计时总时间
+*  @param title    还没倒计时的title
+*  @param subTitle 倒计时中的子名字，如时、分
+*  @param mColor   还没倒计时的背景颜色
+*  @param color    倒计时中的背景颜色
+*  @param mainTitleColor  还没倒计时的文字颜色
+*  @param countTitleColor 倒计时中的文字颜色
+*/
 - (void)startWithTime:(NSInteger)timeLine title:(NSString *)title countDownTitle:(NSString *)subTitle mainColor:(UIColor *)mColor countColor:(UIColor *)color mainTitleColor:(UIColor *)mainTitleColor countTitleColor:(UIColor *)countTitleColor;
 
 @end