更新增加送餐

送餐
MrLoong · Dec 17, 2015 · 4b38ff3 · 4b38ff3
1 parent 1e0e54e
commit 4b38ff3
Show file tree

Hide file tree

Showing 16 changed files with 222 additions and 69 deletions.
diff --git a/CityBox.xcodeproj/project.pbxproj b/CityBox.xcodeproj/project.pbxproj
@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		E2590B753E27E4FBEACEF1BB /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C531455320F6DA891FE9C2FF /* libPods.a */; };
+		FC063F551C225F4B00ABD72F /* SelectViewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC063F541C225F4B00ABD72F /* SelectViewViewController.m */; };
 		FC0A34421C0199A000AF820B /* Order.m in Sources */ = {isa = PBXBuildFile; fileRef = FC0A34411C0199A000AF820B /* Order.m */; };
 		FC0A34451C0199BB00AF820B /* Menu.m in Sources */ = {isa = PBXBuildFile; fileRef = FC0A34441C0199BB00AF820B /* Menu.m */; };
 		FC42B2621BFB7F7400096262 /* UICollectionViewLeftAlignedLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = FC42B2611BFB7F7400096262 /* UICollectionViewLeftAlignedLayout.m */; };
@@ -74,6 +75,8 @@
 		41F419E6AD6CE44100A879DF /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
 		B06A61D1435CEA929640A65D /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
 		C531455320F6DA891FE9C2FF /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		FC063F531C225F4B00ABD72F /* SelectViewViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectViewViewController.h; sourceTree = "<group>"; };
+		FC063F541C225F4B00ABD72F /* SelectViewViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SelectViewViewController.m; sourceTree = "<group>"; };
 		FC0A34401C0199A000AF820B /* Order.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Order.h; sourceTree = "<group>"; };
 		FC0A34411C0199A000AF820B /* Order.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Order.m; sourceTree = "<group>"; };
 		FC0A34431C0199BB00AF820B /* Menu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Menu.h; sourceTree = "<group>"; };
@@ -361,6 +364,8 @@
 				FC73778B1C016DFE0082ED87 /* SubmitOrders.m */,
 				FC79A9B61C042A46000651F6 /* ConfirmationorderViewController.h */,
 				FC79A9B71C042A46000651F6 /* ConfirmationorderViewController.m */,
+				FC063F531C225F4B00ABD72F /* SelectViewViewController.h */,
+				FC063F541C225F4B00ABD72F /* SelectViewViewController.m */,
 			);
 			name = FoodController;
 			sourceTree = "<group>";
@@ -699,6 +704,7 @@
 				FC7377901C017B730082ED87 /* FoodviewCell.m in Sources */,
 				FC85C4281BFB766D00D204A9 /* AboutViewController.m in Sources */,
 				FC85C3EE1BFB750400D204A9 /* AppDelegate.m in Sources */,
+				FC063F551C225F4B00ABD72F /* SelectViewViewController.m in Sources */,
 				FC85C3F71BFB750400D204A9 /* CityBox.xcdatamodeld in Sources */,
 				FC85C4551BFB79E200D204A9 /* FBShimmeringLayer.m in Sources */,
 				FC0A34421C0199A000AF820B /* Order.m in Sources */,

diff --git a/CityBox.xcworkspace/xcuserdata/LastDay.xcuserdatad/UserInterfaceState.xcuserstate b/CityBox.xcworkspace/xcuserdata/LastDay.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/CityBox/Base.lproj/LaunchScreen.storyboard b/CityBox/Base.lproj/LaunchScreen.storyboard
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" 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="9060" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
+        <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <scenes>
@@ -19,9 +21,11 @@
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="we" translatesAutoresizingMaskIntoConstraints="NO" id="MBm-aW-u9h">
                                 <rect key="frame" x="0.0" y="0.0" width="240" height="128"/>
+                                <animations/>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="V2.0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ebk-WQ-t2r">
                                 <rect key="frame" x="-42" y="-21" width="42" height="21"/>
+                                <animations/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <nil key="highlightedColor"/>
@@ -43,12 +47,12 @@
                                 <exclude reference="ebk-WQ-t2r"/>
                             </mask>
                             <mask key="constraints">
+                                <exclude reference="zzz-RK-DUb"/>
+                                <exclude reference="dxM-qo-88m"/>
                                 <exclude reference="4IA-wi-d8S"/>
                                 <exclude reference="f7Q-z0-S7L"/>
                                 <exclude reference="haK-hM-ok2"/>
                                 <exclude reference="uec-Uf-7R7"/>
-                                <exclude reference="zzz-RK-DUb"/>
-                                <exclude reference="dxM-qo-88m"/>
                             </mask>
                         </variation>
                         <variation key="widthClass=compact">
@@ -57,12 +61,12 @@
                                 <include reference="ebk-WQ-t2r"/>
                             </mask>
                             <mask key="constraints">
+                                <include reference="zzz-RK-DUb"/>
+                                <include reference="dxM-qo-88m"/>
                                 <include reference="4IA-wi-d8S"/>
                                 <include reference="f7Q-z0-S7L"/>
                                 <include reference="haK-hM-ok2"/>
                                 <include reference="uec-Uf-7R7"/>
-                                <include reference="zzz-RK-DUb"/>
-                                <include reference="dxM-qo-88m"/>
                             </mask>
                         </variation>
                     </view>