Explorar o código

1.修改iOS Apex Mobile Result Addition约束冲突。

Pen Li %!s(int64=7) %!d(string=hai) anos
pai
achega
c626a151f3

+ 4 - 0
Apex Mobile/Apex Mobile.xcodeproj/project.pbxproj

@@ -68,6 +68,7 @@
 		42C6754E21E2F1D4001E3FF4 /* ApexResultAdditionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 42C6754D21E2F1D4001E3FF4 /* ApexResultAdditionView.m */; };
 		42C6755221E32654001E3FF4 /* ApexResultViewController+QuickLook.m in Sources */ = {isa = PBXBuildFile; fileRef = 42C6755121E32654001E3FF4 /* ApexResultViewController+QuickLook.m */; };
 		42DE626220A41907005FB582 /* AMTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 42DE626120A41907005FB582 /* AMTextField.m */; };
+		42E8212F21F6ED1800127705 /* ApexResultAdditionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 42E8212E21F6ED1800127705 /* ApexResultAdditionView.xib */; };
 		42FB6EB921F2B9FE00F694AB /* ApexResultContainerCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 42FB6EB821F2B9FE00F694AB /* ApexResultContainerCell.xib */; };
 		42FB6EBD21F2BAB800F694AB /* ApexResultBLInfoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 42FB6EBB21F2BAB800F694AB /* ApexResultBLInfoCell.m */; };
 		42FB6EBE21F2BAB800F694AB /* ApexResultBLInfoCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 42FB6EBC21F2BAB800F694AB /* ApexResultBLInfoCell.xib */; };
@@ -325,6 +326,7 @@
 		42C6755121E32654001E3FF4 /* ApexResultViewController+QuickLook.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "ApexResultViewController+QuickLook.m"; sourceTree = "<group>"; };
 		42DE626020A41907005FB582 /* AMTextField.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AMTextField.h; sourceTree = "<group>"; };
 		42DE626120A41907005FB582 /* AMTextField.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AMTextField.m; sourceTree = "<group>"; };
+		42E8212E21F6ED1800127705 /* ApexResultAdditionView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ApexResultAdditionView.xib; sourceTree = "<group>"; };
 		42FB6EB821F2B9FE00F694AB /* ApexResultContainerCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ApexResultContainerCell.xib; sourceTree = "<group>"; };
 		42FB6EBA21F2BAB800F694AB /* ApexResultBLInfoCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ApexResultBLInfoCell.h; sourceTree = "<group>"; };
 		42FB6EBB21F2BAB800F694AB /* ApexResultBLInfoCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ApexResultBLInfoCell.m; sourceTree = "<group>"; };
@@ -671,6 +673,7 @@
 				42FB6EC121F2BB6400F694AB /* ApexResultBookingCell.xib */,
 				42C6754C21E2F1D4001E3FF4 /* ApexResultAdditionView.h */,
 				42C6754D21E2F1D4001E3FF4 /* ApexResultAdditionView.m */,
+				42E8212E21F6ED1800127705 /* ApexResultAdditionView.xib */,
 			);
 			path = Cell;
 			sourceTree = "<group>";
@@ -1506,6 +1509,7 @@
 				427CF5D02023F5560041472A /* NewImages.xcassets in Resources */,
 				4225E42621E08576009D2364 /* ApexResult.storyboard in Resources */,
 				425660DB202015E1002DB0CA /* Launch.storyboard in Resources */,
+				42E8212F21F6ED1800127705 /* ApexResultAdditionView.xib in Resources */,
 				420DEF2720A1898500720524 /* AMCommHeadCell.xib in Resources */,
 				42BB740B2084737800B9B6E4 /* KPILegendCell.xib in Resources */,
 				425390262079B9B500ECF982 /* KPI.json in Resources */,

+ 9 - 3
Apex Mobile/Apex Mobile/Result/Cell/ApexResultAdditionView.m

@@ -19,8 +19,14 @@
 @implementation ApexResultAdditionView
 
 + (instancetype)additionView {
-    ApexResultAdditionView *v = [ApexResultAdditionView new];
-    [v setup];
+
+//    ApexResultAdditionView *v = [ApexResultAdditionView new];
+//    [v setup];
+//    return v;
+    
+    ApexResultAdditionView *v = [[[NSBundle mainBundle] loadNibNamed:@"ApexResultAdditionView" owner:nil options:nil] firstObject];
+    v.titleLabel = [v viewWithTag:1234];
+    v.valueLabel = [v viewWithTag:1235];
     return v;
 }
 
@@ -49,7 +55,7 @@
         maker.left.ra_equalTo(weakSelf.titleLabel.right).ra_offset(5);
         maker.top.ra_equalTo(weakSelf.titleLabel.top);
         maker.height.ra_equalTo(weakSelf.titleLabel.height);
-        maker.right.ra_lessThanOrEqualTo(weakSelf.right);
+        maker.right.ra_equalTo(weakSelf.right).ra_priority(1000);
     }];
     
 //    [self ra_applyConstraints:^(RAConstraintMaker *maker) {

+ 49 - 0
Apex Mobile/Apex Mobile/Result/Cell/ApexResultAdditionView.xib

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="ApexResultAdditionView">
+            <rect key="frame" x="0.0" y="0.0" width="492" height="41"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <label opaque="NO" userInteractionEnabled="NO" tag="1234" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Shipper:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lyt-Cn-yhj">
+                    <rect key="frame" x="0.0" y="0.0" width="57.5" height="20"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="20" id="ofq-Qq-jPI"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                    <nil key="textColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <label opaque="NO" userInteractionEnabled="NO" tag="1235" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="NINGBO UNITED GROUP IMPORT AND EXPORT CO.,LTD" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HmZ-ib-xIm">
+                    <rect key="frame" x="62.5" y="0.0" width="429.5" height="20"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                    <nil key="textColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="HmZ-ib-xIm" firstAttribute="leading" secondItem="Lyt-Cn-yhj" secondAttribute="trailing" constant="5" id="HqY-6o-I5g"/>
+                <constraint firstAttribute="trailing" secondItem="HmZ-ib-xIm" secondAttribute="trailing" id="TAf-ek-m0x"/>
+                <constraint firstItem="Lyt-Cn-yhj" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Tj4-EI-WwP"/>
+                <constraint firstItem="HmZ-ib-xIm" firstAttribute="height" secondItem="Lyt-Cn-yhj" secondAttribute="height" id="W3a-m3-rVF"/>
+                <constraint firstItem="Lyt-Cn-yhj" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="fmK-BL-x0H"/>
+                <constraint firstItem="HmZ-ib-xIm" firstAttribute="top" secondItem="Lyt-Cn-yhj" secondAttribute="top" id="tjD-B8-a8o"/>
+            </constraints>
+            <nil key="simulatedTopBarMetrics"/>
+            <nil key="simulatedBottomBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="225.59999999999999" y="-127.28635682158921"/>
+        </view>
+    </objects>
+</document>