Skip to content

C
Car-iOS-Merchant
Commit 1fcb66b7 authored by Sandy's avatar Sandy
Browse files
Options

修改订单cell图片约束为自适应，防止图片变形

parent cd5f8851
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 43 deletions
Car.xcodeproj/project.pbxproj
View file @ 1fcb66b7
......@@ -7,9 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
19413CC62AA7F91BAA93A7AC /* libPods-car_base-Car.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5E1689EFB8A98572A90A6D3 /* libPods-car_base-Car.a */; };
3ACF93FF5CBBDE59C28DC356 /* libPods-car_base-Car-Customer Release.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C54D3C7AD614F01AAF598ED8 /* libPods-car_base-Car-Customer Release.a */; };
53DE6594F962D3D35D9FB355 /* libPods-car_base-Car Release.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E3A60FCFD401BA3D051DAF70 /* libPods-car_base-Car Release.a */; };
8F2095511E15171600FBED74 /* UMengHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2095501E15171600FBED74 /* UMengHelper.m */; };
8F2095521E15171600FBED74 /* UMengHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2095501E15171600FBED74 /* UMengHelper.m */; };
8F2095551E15188500FBED74 /* JPushHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2095541E15188500FBED74 /* JPushHelper.m */; };
......@@ -281,7 +279,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
19413CC62AA7F91BAA93A7AC /* libPods-car_base-Car.a in Frameworks */,
F16EFE19711BD2F266C2D5A4 /* libPods-car_base-Car-Customer.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -304,7 +301,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
53DE6594F962D3D35D9FB355 /* libPods-car_base-Car Release.a in Frameworks */,
3ACF93FF5CBBDE59C28DC356 /* libPods-car_base-Car-Customer Release.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
......
Car/Base.lproj/Main.storyboard
View file @ 1fcb66b7
......@@ -218,11 +218,9 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="A4G-MF-BfU" customClass="CardView">
<rect key="frame" x="0.0" y="159" width="375" height="127"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="J5O-UN-YD8">
<rect key="frame" x="16" y="8" width="90" height="111"/>
<constraints>
<constraint firstAttribute="width" constant="90" id="tRm-af-iSA"/>
</constraints>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J5O-UN-YD8">
<rect key="frame" x="16" y="8" width="90" height="108.5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="美年体验" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9RQ-zc-tgY">
<rect key="frame" x="114" y="8" width="245" height="21"/>
......@@ -248,7 +246,7 @@
<color key="textColor" red="0.50196081400000003" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="2110000888" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t0I-7e-zXg">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="2110000888" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t0I-7e-zXg">
<rect key="frame" x="149" y="78.5" width="82.5" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.50196081400000003" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
......@@ -280,6 +278,9 @@
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="2018.1.7-2018.3.7" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NFE-En-JUU">
<rect key="frame" x="182" y="99.5" width="177" height="17"/>
<constraints>
<constraint firstAttribute="height" constant="17" id="Nfj-OP-MFs"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.50196081400000003" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
......@@ -294,32 +295,28 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="mA5-Kq-bqR" firstAttribute="leading" secondItem="J5O-UN-YD8" secondAttribute="trailing" constant="8" id="2ZV-qG-ajn"/>
<constraint firstAttribute="trailing" secondItem="9RQ-zc-tgY" secondAttribute="trailing" constant="16" id="5Mp-9S-tFT"/>
<constraint firstItem="J5O-UN-YD8" firstAttribute="top" secondItem="A4G-MF-BfU" secondAttribute="top" constant="8" id="81E-XF-jYY"/>
<constraint firstItem="vGs-5Q-2Ha" firstAttribute="leading" secondItem="UTS-5m-4en" secondAttribute="trailing" constant="4" id="BBr-d5-J4y"/>
<constraint firstAttribute="trailing" secondItem="4lK-Hc-wVy" secondAttribute="trailing" id="BLt-Vq-QIh"/>
<constraint firstItem="UTS-5m-4en" firstAttribute="bottom" secondItem="vGs-5Q-2Ha" secondAttribute="bottom" constant="-2" id="HW1-HP-Zk5"/>
<constraint firstItem="NFE-En-JUU" firstAttribute="top" secondItem="t0I-7e-zXg" secondAttribute="bottom" constant="4" id="HyS-me-IxB"/>
<constraint firstItem="mA5-Kq-bqR" firstAttribute="top" secondItem="9RQ-zc-tgY" secondAttribute="bottom" constant="8" id="KAZ-2g-CP2"/>
<constraint firstItem="NFE-En-JUU" firstAttribute="leading" secondItem="r76-rY-QY7" secondAttribute="trailing" id="LiZ-uf-e99"/>
<constraint firstItem="r76-rY-QY7" firstAttribute="leading" secondItem="J5O-UN-YD8" secondAttribute="trailing" constant="8" id="Nds-oD-j7z"/>
<constraint firstAttribute="bottom" secondItem="J5O-UN-YD8" secondAttribute="bottom" constant="8" id="QLC-Sj-zc2"/>
<constraint firstAttribute="height" constant="127" id="SiL-ge-fNE"/>
<constraint firstAttribute="trailing" secondItem="vGs-5Q-2Ha" secondAttribute="trailing" constant="16" id="T1O-ze-Wmc"/>
<constraint firstItem="t0I-7e-zXg" firstAttribute="top" secondItem="mA5-Kq-bqR" secondAttribute="bottom" constant="8" id="U2j-o7-fHp"/>
<constraint firstItem="vGs-5Q-2Ha" firstAttribute="centerY" secondItem="A4G-MF-BfU" secondAttribute="centerY" constant="-8" id="Uun-tF-BXb"/>
<constraint firstItem="r76-rY-QY7" firstAttribute="top" secondItem="t0I-7e-zXg" secondAttribute="bottom" constant="4" id="V4l-Wu-uev"/>
<constraint firstAttribute="bottom" secondItem="r76-rY-QY7" secondAttribute="bottom" constant="10.5" id="VG7-Jd-u98"/>
<constraint firstItem="dak-2V-HiQ" firstAttribute="leading" secondItem="J5O-UN-YD8" secondAttribute="trailing" constant="8" id="VNq-Zt-RVv"/>
<constraint firstItem="4lK-Hc-wVy" firstAttribute="top" secondItem="A4G-MF-BfU" secondAttribute="top" id="Yfv-J9-HBS"/>
<constraint firstAttribute="bottom" secondItem="NFE-En-JUU" secondAttribute="bottom" constant="10.5" id="dyU-yQ-lsH"/>
<constraint firstItem="9RQ-zc-tgY" firstAttribute="leading" secondItem="A4G-MF-BfU" secondAttribute="leading" constant="114" id="eUT-oR-Dfv"/>
<constraint firstItem="dak-2V-HiQ" firstAttribute="leading" secondItem="9RQ-zc-tgY" secondAttribute="leading" id="fXy-r9-4Ni"/>
<constraint firstAttribute="trailing" secondItem="NFE-En-JUU" secondAttribute="trailing" constant="16" id="h5q-3L-9lx"/>
<constraint firstItem="dak-2V-HiQ" firstAttribute="centerY" secondItem="t0I-7e-zXg" secondAttribute="centerY" id="j2p-uo-U43"/>
<constraint firstItem="mA5-Kq-bqR" firstAttribute="leading" secondItem="9RQ-zc-tgY" secondAttribute="leading" id="kPP-Pl-sXU"/>
<constraint firstItem="9RQ-zc-tgY" firstAttribute="top" secondItem="A4G-MF-BfU" secondAttribute="top" constant="8" id="lue-r8-cxO"/>
<constraint firstItem="r76-rY-QY7" firstAttribute="leading" secondItem="9RQ-zc-tgY" secondAttribute="leading" id="m5F-hL-wtV"/>
<constraint firstItem="UTS-5m-4en" firstAttribute="leading" secondItem="mA5-Kq-bqR" secondAttribute="trailing" constant="3" id="r0r-5K-LjA"/>
<constraint firstItem="t0I-7e-zXg" firstAttribute="leading" secondItem="dak-2V-HiQ" secondAttribute="trailing" id="twS-E1-tNY"/>
<constraint firstItem="9RQ-zc-tgY" firstAttribute="leading" secondItem="J5O-UN-YD8" secondAttribute="trailing" constant="8" id="vwi-3d-YyO"/>
<constraint firstItem="J5O-UN-YD8" firstAttribute="leading" secondItem="A4G-MF-BfU" secondAttribute="leading" constant="16" id="y0C-D4-QpZ"/>
</constraints>
<connections>
<outlet property="imgLogo" destination="J5O-UN-YD8" id="Mzw-hd-M5T"/>
......@@ -690,11 +687,9 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EMk-Xg-ghT" customClass="CardView">
<rect key="frame" x="0.0" y="0.0" width="375" height="127"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="CHD-Pe-WEP">
<rect key="frame" x="16" y="8" width="90" height="111"/>
<constraints>
<constraint firstAttribute="width" constant="90" id="YaF-LN-zRs"/>
</constraints>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="CHD-Pe-WEP">
<rect key="frame" x="16" y="8" width="90" height="108.5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="美年体验" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3b2-8b-QTU">
<rect key="frame" x="114" y="8" width="245" height="21"/>
......@@ -705,7 +700,7 @@
<color key="textColor" red="0.50196081400000003" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="持本券可至美年体检中心享受 150元体检套餐" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="F66-us-Om2">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="持本券可至美年体检中心享受 150元体检套餐" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="F66-us-Om2">
<rect key="frame" x="114" y="37" width="170" height="33.5"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.50196081400000003" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
......@@ -772,25 +767,22 @@
<constraint firstItem="WJt-FQ-BuY" firstAttribute="bottom" secondItem="c3Y-ie-Xav" secondAttribute="bottom" constant="-2" id="C1j-EF-AbX"/>
<constraint firstAttribute="trailing" secondItem="Xuc-hU-rho" secondAttribute="trailing" id="CHC-jN-lbp"/>
<constraint firstItem="c3Y-ie-Xav" firstAttribute="centerY" secondItem="EMk-Xg-ghT" secondAttribute="centerY" constant="-8" id="CK1-cJ-E8D"/>
<constraint firstAttribute="bottom" secondItem="CHD-Pe-WEP" secondAttribute="bottom" constant="8" id="FOa-PD-r8N"/>
<constraint firstAttribute="trailing" secondItem="ntz-3c-WfB" secondAttribute="trailing" constant="16" id="KtI-Sh-44Z"/>
<constraint firstItem="3b2-8b-QTU" firstAttribute="leading" secondItem="CHD-Pe-WEP" secondAttribute="trailing" constant="8" id="LXU-H4-Xlu"/>
<constraint firstItem="CHD-Pe-WEP" firstAttribute="top" secondItem="EMk-Xg-ghT" secondAttribute="top" constant="8" id="LbE-Ve-fWE"/>
<constraint firstAttribute="bottom" secondItem="ybf-JI-v6z" secondAttribute="bottom" constant="10.5" id="QGP-aC-M1z"/>
<constraint firstItem="ntz-3c-WfB" firstAttribute="top" secondItem="wKO-ji-8eT" secondAttribute="bottom" constant="4" id="QIZ-Kq-Dnu"/>
<constraint firstItem="F66-us-Om2" firstAttribute="leading" secondItem="CHD-Pe-WEP" secondAttribute="trailing" constant="8" id="TaH-pf-tsW"/>
<constraint firstItem="ybf-JI-v6z" firstAttribute="leading" secondItem="3b2-8b-QTU" secondAttribute="leading" id="S2Q-Eh-O2R"/>
<constraint firstItem="F66-us-Om2" firstAttribute="leading" secondItem="3b2-8b-QTU" secondAttribute="leading" id="U2a-K4-ijs"/>
<constraint firstItem="4gE-Tw-xPl" firstAttribute="centerY" secondItem="wKO-ji-8eT" secondAttribute="centerY" id="Y9W-gl-SYx"/>
<constraint firstAttribute="trailing" secondItem="c3Y-ie-Xav" secondAttribute="trailing" constant="16" id="ZJN-Fj-p5Y"/>
<constraint firstItem="3b2-8b-QTU" firstAttribute="top" secondItem="EMk-Xg-ghT" secondAttribute="top" constant="8" id="Zdc-0g-flc"/>
<constraint firstItem="ybf-JI-v6z" firstAttribute="leading" secondItem="CHD-Pe-WEP" secondAttribute="trailing" constant="8" id="ZvU-46-gM0"/>
<constraint firstItem="4gE-Tw-xPl" firstAttribute="leading" secondItem="CHD-Pe-WEP" secondAttribute="trailing" constant="8" id="ddr-zJ-GDg"/>
<constraint firstItem="3b2-8b-QTU" firstAttribute="leading" secondItem="EMk-Xg-ghT" secondAttribute="leading" constant="114" id="drh-Ch-jFi"/>
<constraint firstItem="F66-us-Om2" firstAttribute="top" secondItem="3b2-8b-QTU" secondAttribute="bottom" constant="8" id="ePZ-NN-4qX"/>
<constraint firstItem="ybf-JI-v6z" firstAttribute="top" secondItem="wKO-ji-8eT" secondAttribute="bottom" constant="4" id="gyD-BS-RBL"/>
<constraint firstItem="WJt-FQ-BuY" firstAttribute="leading" secondItem="F66-us-Om2" secondAttribute="trailing" constant="3" id="hcF-gF-J2n"/>
<constraint firstItem="c3Y-ie-Xav" firstAttribute="leading" secondItem="WJt-FQ-BuY" secondAttribute="trailing" constant="4" id="hgW-Wt-QhQ"/>
<constraint firstItem="CHD-Pe-WEP" firstAttribute="leading" secondItem="EMk-Xg-ghT" secondAttribute="leading" constant="16" id="iAM-6r-hA7"/>
<constraint firstItem="ntz-3c-WfB" firstAttribute="leading" secondItem="ybf-JI-v6z" secondAttribute="trailing" id="jmE-9N-feV"/>
<constraint firstItem="wKO-ji-8eT" firstAttribute="top" secondItem="F66-us-Om2" secondAttribute="bottom" constant="8" id="kxZ-Az-Jd8"/>
<constraint firstItem="4gE-Tw-xPl" firstAttribute="leading" secondItem="3b2-8b-QTU" secondAttribute="leading" id="t2T-Yg-kzK"/>
</constraints>
</view>
</subviews>
......
Car/CodeClass/Main/ViewControllers/MainViewController.m
View file @ 1fcb66b7
......@@ -64,9 +64,9 @@
}];
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
return 128;
}
//- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
// return 128;
//}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
......
Car/tools/BaseClass/BaseListViewController.m
View file @ 1fcb66b7
......@@ -112,19 +112,23 @@
- (void)listTableViewReloadData {
[MBProgressHUD j_hideLoadingView];
if (self.page == 0) {
[self.tableView j_endRefresh];
[self.tableView.mj_footer resetNoMoreData];
} else {
if (self.tableView.mj_header.isRefreshing) {
[self.tableView.mj_header endRefreshing];
if (self.arrData.count == self.pageSize) {
[self.tableView.mj_footer resetNoMoreData];
}else{
[self.tableView.mj_footer endRefreshingWithNoMoreData];
}
}else if (self.tableView.mj_footer.isRefreshing){
if (self.arrData.count < self.pageSize * self.page) {
[self.tableView.mj_footer endRefreshingWithNoMoreData];
} else {
[self.tableView j_endRefresh];
[self.tableView.mj_footer endRefreshing];
}
}
[self.tableView reloadData];
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment