Skip to content

Commit

Permalink
新增电影
Browse files Browse the repository at this point in the history
  • Loading branch information
@lookingstars
lookingstars committed Oct 19, 2015
1 parent 07668d6 commit 4b1948d
Show file tree
Hide file tree
Showing 16 changed files with 568 additions and 5 deletions.
42 changes: 42 additions & 0 deletions nuomi.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,9 @@
E3B7F24A1BB3E7AB001F4E16 /* JZNetworkSingleton.m in Sources */ = {isa = PBXBuildFile; fileRef = E3B7F2491BB3E7AB001F4E16 /* JZNetworkSingleton.m */; };
E3B7F2501BB3E90F001F4E16 /* OPDataResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = E3B7F24F1BB3E90F001F4E16 /* OPDataResponse.m */; };
E3B7F2581BB3F6D7001F4E16 /* JZHomeShopModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E3B7F2571BB3F6D7001F4E16 /* JZHomeShopModel.m */; };
E3BE79751BD48A6900BAB30A /* JZMovieViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E3BE79741BD48A6900BAB30A /* JZMovieViewController.m */; };
E3BE79791BD48FFD00BAB30A /* JZMovieItemCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E3BE79781BD48FFD00BAB30A /* JZMovieItemCell.m */; };
E3BE797D1BD4951800BAB30A /* JZMovieItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E3BE797C1BD4951800BAB30A /* JZMovieItemModel.m */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -708,6 +711,12 @@
E3B7F24F1BB3E90F001F4E16 /* OPDataResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPDataResponse.m; sourceTree = "<group>"; };
E3B7F2561BB3F6D7001F4E16 /* JZHomeShopModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JZHomeShopModel.h; sourceTree = "<group>"; };
E3B7F2571BB3F6D7001F4E16 /* JZHomeShopModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JZHomeShopModel.m; sourceTree = "<group>"; };
E3BE79731BD48A6900BAB30A /* JZMovieViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JZMovieViewController.h; sourceTree = "<group>"; };
E3BE79741BD48A6900BAB30A /* JZMovieViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JZMovieViewController.m; sourceTree = "<group>"; };
E3BE79771BD48FFD00BAB30A /* JZMovieItemCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JZMovieItemCell.h; sourceTree = "<group>"; };
E3BE79781BD48FFD00BAB30A /* JZMovieItemCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JZMovieItemCell.m; sourceTree = "<group>"; };
E3BE797B1BD4951800BAB30A /* JZMovieItemModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JZMovieItemModel.h; sourceTree = "<group>"; };
E3BE797C1BD4951800BAB30A /* JZMovieItemModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JZMovieItemModel.m; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -1500,6 +1509,7 @@
E3B7F2341BB3C83D001F4E16 /* 首页 */ = {
isa = PBXGroup;
children = (
E3BE79721BD48A5000BAB30A /* 电影 */,
E3A3FBEF1BC75E9A000E9729 /* 城市 */,
E3A3FB6F1BBA8AC7000E9729 /* 网页 */,
E3A3FB491BB9310E000E9729 /* 店铺详情 */,
Expand Down Expand Up @@ -1537,6 +1547,7 @@
E3B7F23B1BB3CCFE001F4E16 /* 首页 */ = {
isa = PBXGroup;
children = (
E3BE79761BD48FDE00BAB30A /* 电影 */,
E3A3FBD41BBB8106000E9729 /* 精选抢购 */,
E3A3FB5F1BBA2F36000E9729 /* 店铺详情 */,
E3A3FB391BB90CD8000E9729 /* 主题 */,
Expand Down Expand Up @@ -1590,6 +1601,7 @@
E3B7F2531BB3F664001F4E16 /* 首页 */ = {
isa = PBXGroup;
children = (
E3BE797A1BD494C400BAB30A /* 电影 */,
E3A3FBDE1BBB85BE000E9729 /* 精选抢购 */,
E3A3FB551BBA2110000E9729 /* 店铺详情 */,
E3A3FB401BB91082000E9729 /* 主题 */,
Expand All @@ -1615,6 +1627,33 @@
path = "猜你喜欢";
sourceTree = "<group>";
};
E3BE79721BD48A5000BAB30A /* 电影 */ = {
isa = PBXGroup;
children = (
E3BE79731BD48A6900BAB30A /* JZMovieViewController.h */,
E3BE79741BD48A6900BAB30A /* JZMovieViewController.m */,
);
path = "电影";
sourceTree = "<group>";
};
E3BE79761BD48FDE00BAB30A /* 电影 */ = {
isa = PBXGroup;
children = (
E3BE79771BD48FFD00BAB30A /* JZMovieItemCell.h */,
E3BE79781BD48FFD00BAB30A /* JZMovieItemCell.m */,
);
path = "电影";
sourceTree = "<group>";
};
E3BE797A1BD494C400BAB30A /* 电影 */ = {
isa = PBXGroup;
children = (
E3BE797B1BD4951800BAB30A /* JZMovieItemModel.h */,
E3BE797C1BD4951800BAB30A /* JZMovieItemModel.m */,
);
path = "电影";
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -2034,10 +2073,12 @@
E3A3FB5E1BBA23E3000E9729 /* JZShopRelatedModel.m in Sources */,
E3A3FB6B1BBA652F000E9729 /* JZShopCommentCell.m in Sources */,
E3A3FBE41BC63DDA000E9729 /* JZTabbarJXViewController.m in Sources */,
E3BE79751BD48A6900BAB30A /* JZMovieViewController.m in Sources */,
E36837AA1BCCB9B30077DB09 /* JZAnimationTestViewController.m in Sources */,
E3A3FC071BCB8F36000E9729 /* JZNearItemCell.m in Sources */,
E3B7F0601BB23600001F4E16 /* AppDelegate.m in Sources */,
E3A3FB461BB91906000E9729 /* NSString+convertImgStr.m in Sources */,
E3BE797D1BD4951800BAB30A /* JZMovieItemModel.m in Sources */,
E3A3FB3C1BB90D01000E9729 /* JZTopicImageCell.m in Sources */,
E3A3FB721BBA8AE4000E9729 /* JZWebViewController.m in Sources */,
E3B7F2381BB3C866001F4E16 /* JZHomeViewController.m in Sources */,
Expand All @@ -2057,6 +2098,7 @@
E3A3FBE11BBB85DE000E9729 /* JZJingXuanModel.m in Sources */,
E3B7F2201BB39B97001F4E16 /* JZMenuButton.m in Sources */,
E3A3FB5B1BBA228F000E9729 /* JZShopCommentModel.m in Sources */,
E3BE79791BD48FFD00BAB30A /* JZMovieItemCell.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Binary file modified nuomi.xcworkspace/xcuserdata/jinzelu.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
18 changes: 18 additions & 0 deletions nuomi.xcworkspace/xcuserdata/jinzelu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,22 @@
<Bucket
type = "0"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "nuomi/Controller/&#x9996;&#x9875;/&#x7535;&#x5f71;/JZMovieViewController.m"
timestampString = "466917917.92872"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "64"
endingLineNumber = "64"
landmarkName = "-getMovieItemData"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
104 changes: 103 additions & 1 deletion nuomi/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1204,6 +1204,7 @@
<outlet property="searchTextField" destination="9VA-F4-ItF" id="ahd-qE-wBa"/>
<outlet property="tableView" destination="nbQ-gQ-Bh6" id="zFl-Hg-LMM"/>
<segue destination="ij4-Aj-Wvw" kind="push" id="9oe-KH-qVB"/>
<segue destination="pLH-5S-yYC" kind="push" identifier="pushToMovie" id="AlB-w0-pxL"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="YLT-hU-xMI" userLabel="First Responder" sceneMemberID="firstResponder"/>
Expand Down Expand Up @@ -1443,6 +1444,107 @@
</objects>
<point key="canvasLocation" x="2098.5" y="-1823.5"/>
</scene>
<!--电影-->
<scene sceneID="KKJ-rb-W8t">
<objects>
<viewController hidesBottomBarWhenPushed="YES" id="pLH-5S-yYC" userLabel="电影" customClass="JZMovieViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="qhl-XE-3eS"/>
<viewControllerLayoutGuide type="bottom" id="2Ac-s8-ELy"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="nSg-bm-HFq">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="RXt-Xx-fAv">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="JZMovieItemCell" rowHeight="100" id="6Oh-1K-BW5" customClass="JZMovieItemCell">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6Oh-1K-BW5" id="mlr-AO-qYg">
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="美嘉欢乐影城(中关村店)" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fNq-v9-FXU">
<rect key="frame" x="8" y="13" width="159" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="北京市海淀区中关村**街**号" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VrG-Tx-qEy">
<rect key="frame" x="8" y="42" width="279" height="15"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥41起" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="96K-aq-sjM">
<rect key="frame" x="8" y="65" width="54" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.98823529409999999" green="0.2901960784" blue="0.51764705879999995" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="100m" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ttM-un-XRV">
<rect key="frame" x="335" y="42" width="32" height="15"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="座|团" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5HP-xs-YHx">
<rect key="frame" x="340" y="68" width="27" height="15"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="VrG-Tx-qEy" firstAttribute="top" secondItem="fNq-v9-FXU" secondAttribute="bottom" constant="11" id="9Sy-AT-JYV"/>
<constraint firstItem="ttM-un-XRV" firstAttribute="trailing" secondItem="mlr-AO-qYg" secondAttribute="trailingMargin" id="Al3-hS-Iw2"/>
<constraint firstItem="96K-aq-sjM" firstAttribute="leading" secondItem="mlr-AO-qYg" secondAttribute="leadingMargin" id="E31-MU-Tg4"/>
<constraint firstItem="VrG-Tx-qEy" firstAttribute="leading" secondItem="mlr-AO-qYg" secondAttribute="leading" constant="8" id="UrF-Gl-sh6"/>
<constraint firstItem="fNq-v9-FXU" firstAttribute="leading" secondItem="mlr-AO-qYg" secondAttribute="leading" constant="8" id="X1C-PI-a2X"/>
<constraint firstItem="96K-aq-sjM" firstAttribute="top" secondItem="VrG-Tx-qEy" secondAttribute="bottom" constant="8" id="aQB-Nv-SLx"/>
<constraint firstAttribute="trailing" secondItem="VrG-Tx-qEy" secondAttribute="trailing" constant="88" id="crT-AI-N41"/>
<constraint firstItem="5HP-xs-YHx" firstAttribute="trailing" secondItem="mlr-AO-qYg" secondAttribute="trailingMargin" id="ih9-6x-ygK"/>
<constraint firstItem="5HP-xs-YHx" firstAttribute="top" secondItem="ttM-un-XRV" secondAttribute="bottom" constant="11" id="l6f-zd-b5s"/>
<constraint firstItem="ttM-un-XRV" firstAttribute="top" secondItem="mlr-AO-qYg" secondAttribute="topMargin" constant="34" id="sFU-bi-ZgQ"/>
<constraint firstItem="fNq-v9-FXU" firstAttribute="top" secondItem="mlr-AO-qYg" secondAttribute="top" constant="13" id="yvw-4S-xwM"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="shopAddressLabel" destination="VrG-Tx-qEy" id="u6E-wI-gfB"/>
<outlet property="shopDistanceLabel" destination="ttM-un-XRV" id="nLh-yx-Omk"/>
<outlet property="shopNameLabel" destination="fNq-v9-FXU" id="e5H-fH-Evs"/>
<outlet property="shopPriceLabel" destination="96K-aq-sjM" id="RdN-MF-f2o"/>
<outlet property="shopTuanLabel" destination="5HP-xs-YHx" id="wtU-Gh-Afw"/>
</connections>
</tableViewCell>
</prototypes>
<connections>
<outlet property="dataSource" destination="pLH-5S-yYC" id="Qwc-qH-9yN"/>
<outlet property="delegate" destination="pLH-5S-yYC" id="DTt-R2-5Yq"/>
</connections>
</tableView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="RXt-Xx-fAv" secondAttribute="trailing" id="3Tw-e4-AmN"/>
<constraint firstItem="RXt-Xx-fAv" firstAttribute="top" secondItem="nSg-bm-HFq" secondAttribute="top" id="5kF-Y2-8mR"/>
<constraint firstAttribute="bottom" secondItem="RXt-Xx-fAv" secondAttribute="bottom" id="Bpj-7T-hko"/>
<constraint firstItem="RXt-Xx-fAv" firstAttribute="leading" secondItem="nSg-bm-HFq" secondAttribute="leading" id="hEO-po-FMm"/>
</constraints>
</view>
<navigationItem key="navigationItem" title="电影" id="7k7-Nm-hPy"/>
<simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
<connections>
<outlet property="tableView" destination="RXt-Xx-fAv" id="EIt-dL-8co"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="gZP-FO-vMm" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2614.5" y="-1823.5"/>
</scene>
<!--新用户立减-->
<scene sceneID="HKm-rb-5yf">
<objects>
Expand Down Expand Up @@ -1884,6 +1986,6 @@
<image name="ugc_photo" width="68" height="68"/>
</resources>
<inferredMetricsTieBreakers>
<segue reference="7OA-zj-cMz"/>
<segue reference="Pzg-rT-esF"/>
</inferredMetricsTieBreakers>
</document>
Loading

0 comments on commit 4b1948d

Please sign in to comment.