首页

iOSwang · Sep 23, 2015 · 5bb494d · 5bb494d
1 parent 3cd7e55
commit 5bb494d
Show file tree

Hide file tree

Showing 57 changed files with 653 additions and 23 deletions.
diff --git a/nuomi.xcodeproj/project.pbxproj b/nuomi.xcodeproj/project.pbxproj
@@ -40,6 +40,7 @@
 		E3B7F0E01BB27D24001F4E16 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E3B7F0DF1BB27D24001F4E16 /* libsqlite3.dylib */; };
 		E3B7F0E21BB27D2D001F4E16 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E3B7F0E11BB27D2D001F4E16 /* CoreTelephony.framework */; };
 		E3B7F0E41BB27D38001F4E16 /* libstdc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E3B7F0E31BB27D38001F4E16 /* libstdc++.dylib */; };
+		E3B7F0E71BB2A8AF001F4E16 /* JZBaseTabBarViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E3B7F0E61BB2A8AF001F4E16 /* JZBaseTabBarViewController.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -115,6 +116,8 @@
 		E3B7F0DF1BB27D24001F4E16 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
 		E3B7F0E11BB27D2D001F4E16 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
 		E3B7F0E31BB27D38001F4E16 /* libstdc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.dylib"; path = "usr/lib/libstdc++.dylib"; sourceTree = SDKROOT; };
+		E3B7F0E51BB2A8AF001F4E16 /* JZBaseTabBarViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JZBaseTabBarViewController.h; sourceTree = "<group>"; };
+		E3B7F0E61BB2A8AF001F4E16 /* JZBaseTabBarViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JZBaseTabBarViewController.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -268,6 +271,8 @@
 		E3B7F08D1BB277C1001F4E16 /* Base */ = {
 			isa = PBXGroup;
 			children = (
+				E3B7F0E51BB2A8AF001F4E16 /* JZBaseTabBarViewController.h */,
+				E3B7F0E61BB2A8AF001F4E16 /* JZBaseTabBarViewController.m */,
 			);
 			path = Base;
 			sourceTree = "<group>";
@@ -589,6 +594,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				E3B7F0631BB23600001F4E16 /* ViewController.m in Sources */,
+				E3B7F0E71BB2A8AF001F4E16 /* JZBaseTabBarViewController.m in Sources */,
 				E3B7F0601BB23600001F4E16 /* AppDelegate.m in Sources */,
 				E3B7F05D1BB23600001F4E16 /* main.m in Sources */,
 			);
@@ -732,6 +738,7 @@
 				);
 				GCC_PREFIX_HEADER = "$(SRCROOT)/nuomi/PrefixHeader.pch";
 				INFOPLIST_FILE = nuomi/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -756,6 +763,7 @@
 				);
 				GCC_PREFIX_HEADER = "$(SRCROOT)/nuomi/PrefixHeader.pch";
 				INFOPLIST_FILE = nuomi/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/nuomi.xcworkspace/xcuserdata/jinzelu.xcuserdatad/UserInterfaceState.xcuserstate b/nuomi.xcworkspace/xcuserdata/jinzelu.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/nuomi.xcworkspace/xcuserdata/jinzelu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/nuomi.xcworkspace/xcuserdata/jinzelu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "0"
+   version = "2.0">
+</Bucket>
diff --git a/nuomi/AppDelegate.m b/nuomi/AppDelegate.m
@@ -25,13 +25,11 @@ - (void)initMob {
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     // Override point for customization after application launch.
 
-
-
-
-
-
     [self initMob];
 
+//    [[UITabBar appearance] setShadowImage:[[UIImage alloc] init]];
+//    [[UITabBar appearance] setTintColor:RGB(252, 74, 132)];
+
 
     return YES;
 }

diff --git a/nuomi/Base.lproj/Main.storyboard b/nuomi/Base.lproj/Main.storyboard
diff --git a/nuomi/Base/JZBaseTabBarViewController.h b/nuomi/Base/JZBaseTabBarViewController.h
@@ -0,0 +1,13 @@
+//
+//  JZBaseTabBarViewController.h
+//  nuomi
+//
+//  Created by jinzelu on 15/9/23.
+//  Copyright (c) 2015年 jinzelu. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface JZBaseTabBarViewController : UITabBarController
+
+@end
diff --git a/nuomi/Base/JZBaseTabBarViewController.m b/nuomi/Base/JZBaseTabBarViewController.m
@@ -0,0 +1,65 @@
+//
+//  JZBaseTabBarViewController.m
+//  nuomi
+//
+//  Created by jinzelu on 15/9/23.
+//  Copyright (c) 2015年 jinzelu. All rights reserved.
+//
+
+#import "JZBaseTabBarViewController.h"
+
+@interface JZBaseTabBarViewController ()
+
+@end
+
+@implementation JZBaseTabBarViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+
+    [self initTabBarItem];
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+- (void)initTabBarItem {
+    UITabBar *tabbar = self.tabBar;
+//    self.tabBarController.tabBar;
+    UITabBarItem *item0 = [tabbar.items objectAtIndex:0];
+    UITabBarItem *item1 = [tabbar.items objectAtIndex:1];
+    UITabBarItem *item2 = [tabbar.items objectAtIndex:2];
+    UITabBarItem *item3 = [tabbar.items objectAtIndex:3];
+    UITabBarItem *item4 = [tabbar.items objectAtIndex:4];
+
+    item0.selectedImage = [[UIImage imageNamed:@"icon_tab_shouye_highlight"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+    item0.image = [[UIImage imageNamed:@"icon_tab_shouye_normal"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+    item1.selectedImage = [[UIImage imageNamed:@"icon_tab_fujin_highlight"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+    item1.image = [[UIImage imageNamed:@"icon_tab_fujin_normal"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+
+    item2.selectedImage = [[UIImage imageNamed:@"tabbar_voice_icon"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+    item2.image = [[UIImage imageNamed:@"tabbar_voice_icon"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+    item2.imageInsets = UIEdgeInsetsMake(6, 0, -6, 0);//注意这里的两个值
+
+    item3.selectedImage = [[UIImage imageNamed:@"tab_icon_selection_highlight"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+    item3.image = [[UIImage imageNamed:@"tab_icon_selection_normal"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+    item4.selectedImage = [[UIImage imageNamed:@"icon_tab_wode_highlight"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+    item4.image = [[UIImage imageNamed:@"icon_tab_wode_normal"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+    //改变UITabBarItem字体颜色
+    [[UITabBarItem appearance] setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:navigationBarColor,UITextAttributeTextColor, nil] forState:UIControlStateSelected];
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end
diff --git a/nuomi/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png b/nuomi/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png
diff --git a/nuomi/Images.xcassets/AppIcon.appiconset/AppIcon29x29@3x.png b/nuomi/Images.xcassets/AppIcon.appiconset/AppIcon29x29@3x.png
diff --git a/nuomi/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png b/nuomi/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png
diff --git a/nuomi/Images.xcassets/AppIcon.appiconset/AppIcon40x40@3x.png b/nuomi/Images.xcassets/AppIcon.appiconset/AppIcon40x40@3x.png
diff --git a/nuomi/Images.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png b/nuomi/Images.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png
diff --git a/nuomi/Images.xcassets/AppIcon.appiconset/AppIcon60x60@3x.png b/nuomi/Images.xcassets/AppIcon.appiconset/AppIcon60x60@3x.png
diff --git a/nuomi/Images.xcassets/AppIcon.appiconset/Contents.json b/nuomi/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,33 +1,39 @@
 {
   "images" : [
     {
-      "idiom" : "iphone",
       "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "AppIcon29x29@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "AppIcon29x29@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "AppIcon40x40@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "AppIcon40x40@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "AppIcon60x60@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "AppIcon60x60@3x.png",
       "scale" : "3x"
     }
   ],

diff --git a/nuomi/Images.xcassets/Tabbar/icon_tab_fujin_highlight.imageset/Contents.json b/nuomi/Images.xcassets/Tabbar/icon_tab_fujin_highlight.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "icon_tab_fujin_highlight@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "icon_tab_fujin_highlight@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/...assets/Tabbar/icon_tab_fujin_highlight.imageset/icon_tab_fujin_highlight@2x.png b/...assets/Tabbar/icon_tab_fujin_highlight.imageset/icon_tab_fujin_highlight@2x.png
diff --git a/...assets/Tabbar/icon_tab_fujin_highlight.imageset/icon_tab_fujin_highlight@3x.png b/...assets/Tabbar/icon_tab_fujin_highlight.imageset/icon_tab_fujin_highlight@3x.png
diff --git a/nuomi/Images.xcassets/Tabbar/icon_tab_fujin_normal.imageset/Contents.json b/nuomi/Images.xcassets/Tabbar/icon_tab_fujin_normal.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "icon_tab_fujin_normal@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "icon_tab_fujin_normal@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/...ges.xcassets/Tabbar/icon_tab_fujin_normal.imageset/icon_tab_fujin_normal@2x.png b/...ges.xcassets/Tabbar/icon_tab_fujin_normal.imageset/icon_tab_fujin_normal@2x.png
diff --git a/...ges.xcassets/Tabbar/icon_tab_fujin_normal.imageset/icon_tab_fujin_normal@3x.png b/...ges.xcassets/Tabbar/icon_tab_fujin_normal.imageset/icon_tab_fujin_normal@3x.png
diff --git a/nuomi/Images.xcassets/Tabbar/icon_tab_fujin_normal_light.imageset/Contents.json b/nuomi/Images.xcassets/Tabbar/icon_tab_fujin_normal_light.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "icon_tab_fujin_normal_light@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "icon_tab_fujin_normal_light@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/.../Tabbar/icon_tab_fujin_normal_light.imageset/icon_tab_fujin_normal_light@2x.png b/.../Tabbar/icon_tab_fujin_normal_light.imageset/icon_tab_fujin_normal_light@2x.png
diff --git a/.../Tabbar/icon_tab_fujin_normal_light.imageset/icon_tab_fujin_normal_light@3x.png b/.../Tabbar/icon_tab_fujin_normal_light.imageset/icon_tab_fujin_normal_light@3x.png
diff --git a/nuomi/Images.xcassets/Tabbar/icon_tab_shouye_highlight.imageset/Contents.json b/nuomi/Images.xcassets/Tabbar/icon_tab_shouye_highlight.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "icon_tab_shouye_highlight@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "icon_tab_shouye_highlight@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/...sets/Tabbar/icon_tab_shouye_highlight.imageset/icon_tab_shouye_highlight@2x.png b/...sets/Tabbar/icon_tab_shouye_highlight.imageset/icon_tab_shouye_highlight@2x.png
diff --git a/...sets/Tabbar/icon_tab_shouye_highlight.imageset/icon_tab_shouye_highlight@3x.png b/...sets/Tabbar/icon_tab_shouye_highlight.imageset/icon_tab_shouye_highlight@3x.png
diff --git a/nuomi/Images.xcassets/Tabbar/icon_tab_shouye_normal.imageset/Contents.json b/nuomi/Images.xcassets/Tabbar/icon_tab_shouye_normal.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "icon_tab_shouye_normal@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "icon_tab_shouye_normal@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/...s.xcassets/Tabbar/icon_tab_shouye_normal.imageset/icon_tab_shouye_normal@2x.png b/...s.xcassets/Tabbar/icon_tab_shouye_normal.imageset/icon_tab_shouye_normal@2x.png
diff --git a/...s.xcassets/Tabbar/icon_tab_shouye_normal.imageset/icon_tab_shouye_normal@3x.png b/...s.xcassets/Tabbar/icon_tab_shouye_normal.imageset/icon_tab_shouye_normal@3x.png
diff --git a/nuomi/Images.xcassets/Tabbar/icon_tab_shouye_normal_light.imageset/Contents.json b/nuomi/Images.xcassets/Tabbar/icon_tab_shouye_normal_light.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "icon_tab_shouye_normal_light@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "icon_tab_shouye_normal_light@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/...abbar/icon_tab_shouye_normal_light.imageset/icon_tab_shouye_normal_light@2x.png b/...abbar/icon_tab_shouye_normal_light.imageset/icon_tab_shouye_normal_light@2x.png
diff --git a/...abbar/icon_tab_shouye_normal_light.imageset/icon_tab_shouye_normal_light@3x.png b/...abbar/icon_tab_shouye_normal_light.imageset/icon_tab_shouye_normal_light@3x.png
diff --git a/nuomi/Images.xcassets/Tabbar/icon_tab_wode_highlight.imageset/Contents.json b/nuomi/Images.xcassets/Tabbar/icon_tab_wode_highlight.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "icon_tab_wode_highlight@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "icon_tab_wode_highlight@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/...xcassets/Tabbar/icon_tab_wode_highlight.imageset/icon_tab_wode_highlight@2x.png b/...xcassets/Tabbar/icon_tab_wode_highlight.imageset/icon_tab_wode_highlight@2x.png
diff --git a/...xcassets/Tabbar/icon_tab_wode_highlight.imageset/icon_tab_wode_highlight@3x.png b/...xcassets/Tabbar/icon_tab_wode_highlight.imageset/icon_tab_wode_highlight@3x.png
diff --git a/nuomi/Images.xcassets/Tabbar/icon_tab_wode_normal.imageset/Contents.json b/nuomi/Images.xcassets/Tabbar/icon_tab_wode_normal.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "icon_tab_wode_normal@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "icon_tab_wode_normal@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/...mages.xcassets/Tabbar/icon_tab_wode_normal.imageset/icon_tab_wode_normal@2x.png b/...mages.xcassets/Tabbar/icon_tab_wode_normal.imageset/icon_tab_wode_normal@2x.png
diff --git a/...mages.xcassets/Tabbar/icon_tab_wode_normal.imageset/icon_tab_wode_normal@3x.png b/...mages.xcassets/Tabbar/icon_tab_wode_normal.imageset/icon_tab_wode_normal@3x.png