1.修改Model模式用户界面，调整在5s下部分控件显示不全。

RA Image/RA Image.xcodeproj/xcuserdata/macmini1.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -19,13 +19,13 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "../common/upload/RAUploadManager.m"
-            timestampString = "516013083.763092"
+            filePath = "../common/upload/RAUploadOperation.m"
+            timestampString = "516015205.417642"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "227"
-            endingLineNumber = "227"
-            landmarkName = "-startTask:"
+            startingLineNumber = "59"
+            endingLineNumber = "59"
+            landmarkName = "-start"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

RA Image/RA Image/Mode.storyboard

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina5_5" orientation="portrait">
+    <device id="retina4_7" orientation="landscape">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
@@ -21,11 +21,11 @@
                         <viewControllerLayoutGuide type="bottom" id="8eX-wZ-j58"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="QEg-TT-jt8">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                        <rect key="frame" x="0.0" y="0.0" width="667" height="375"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tx6-Jq-V78">
-                                <rect key="frame" x="67" y="50" width="280" height="280"/>
+                                <rect key="frame" x="50" y="87.5" width="200" height="200"/>
                                 <color key="backgroundColor" red="1" green="0.36503490374616099" blue="0.7594767167726002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="280" id="0HU-zi-itA"/>
@@ -70,7 +70,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6jr-Xw-2tL">
-                                <rect key="frame" x="67" y="629" width="60" height="60"/>
+                                <rect key="frame" x="280" y="227.5" width="60" height="60"/>
                                 <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="60" id="K6W-Tz-wcn"/>
@@ -96,7 +96,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NAz-nK-Hgz">
-                                <rect key="frame" x="177" y="629" width="60" height="60"/>
+                                <rect key="frame" x="433.5" y="227.5" width="60" height="60"/>
                                 <color key="backgroundColor" red="0.45257410590000002" green="1" blue="0.65812935640000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="60" id="o6H-g4-n4a"/>
@@ -107,13 +107,13 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="PIID:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7rM-i2-eHr">
-                                <rect key="frame" x="67" y="353" width="280" height="27"/>
+                                <rect key="frame" x="280" y="87.5" width="367" height="27"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jte-R6-noU">
-                                <rect key="frame" x="287" y="629" width="60" height="60"/>
+                                <rect key="frame" x="587" y="227.5" width="60" height="60"/>
                                 <color key="backgroundColor" red="0.25435081980000002" green="0.75957768849999996" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <state key="normal" title="Upload"/>
                                 <connections>
@@ -121,7 +121,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rvg-OG-bQ0">
-                                <rect key="frame" x="317" y="353" width="30" height="27"/>
+                                <rect key="frame" x="617" y="87.5" width="30" height="27"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="30" id="ART-XN-Nuf"/>
                                 </constraints>
@@ -134,7 +134,7 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="5 Photos" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m3e-vD-xep">
-                                <rect key="frame" x="67" y="50" width="280" height="20"/>
+                                <rect key="frame" x="50" y="87.5" width="200" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="mgg-Dx-4kA"/>
                                 </constraints>
@@ -218,7 +218,6 @@
                                 <exclude reference="rZO-Cu-PjR"/>
                                 <exclude reference="sxc-Kf-lRS"/>
                                 <exclude reference="wjm-RD-ue6"/>
-                                <exclude reference="UFG-NX-fXs"/>
                                 <exclude reference="ITb-vM-nLr"/>
                                 <exclude reference="OGr-rO-amZ"/>
                                 <exclude reference="PaT-5f-5BR"/>
@@ -249,6 +248,7 @@
                                 <exclude reference="mIV-7G-bzr"/>
                                 <exclude reference="oYB-P2-H5S"/>
                                 <exclude reference="xNj-Z3-CKd"/>
+                                <exclude reference="UFG-NX-fXs"/>
                             </mask>
                         </variation>
                         <variation key="heightClass=compact-widthClass=compact">
@@ -297,7 +297,6 @@
                                 <include reference="5oU-RN-aAR"/>
                                 <include reference="IkZ-kb-uSH"/>
                                 <include reference="KLA-9l-yX3"/>
-                                <include reference="UFG-NX-fXs"/>
                                 <include reference="dXd-PM-PHl"/>
                                 <include reference="Azo-Ej-bva"/>
                                 <include reference="fWf-CG-Oxq"/>
@@ -308,6 +307,7 @@
                                 <include reference="aEa-b6-mFx"/>
                                 <include reference="fPr-5K-jIw"/>
                                 <include reference="xNj-Z3-CKd"/>
+                                <include reference="UFG-NX-fXs"/>
                             </mask>
                         </variation>
                     </view>
@@ -334,11 +334,11 @@
                         <viewControllerLayoutGuide type="bottom" id="H4g-H8-jhv"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="o96-bU-q7q">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                        <rect key="frame" x="0.0" y="0.0" width="667" height="375"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="i3W-S0-nip">
-                                <rect key="frame" x="67" y="70" width="280" height="280"/>
+                                <rect key="frame" x="50" y="107.5" width="200" height="200"/>
                                 <color key="backgroundColor" red="1" green="0.36503490370000002" blue="0.75947671679999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="200" id="P4F-3c-O90"/>
@@ -383,7 +383,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8cw-MJ-Ahc">
-                                <rect key="frame" x="67" y="629" width="60" height="60"/>
+                                <rect key="frame" x="280" y="247.5" width="60" height="60"/>
                                 <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="60" id="qWl-ce-tQ1"/>
@@ -409,7 +409,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="951-qi-5kI">
-                                <rect key="frame" x="177" y="629" width="60" height="60"/>
+                                <rect key="frame" x="433.5" y="247.5" width="60" height="60"/>
                                 <color key="backgroundColor" red="0.45257410590000002" green="1" blue="0.65812935640000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="60" id="Vly-i4-6f7"/>
@@ -420,7 +420,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xAA-t1-vMd">
-                                <rect key="frame" x="287" y="629" width="60" height="60"/>
+                                <rect key="frame" x="587" y="247.5" width="60" height="60"/>
                                 <color key="backgroundColor" red="0.25435081980000002" green="0.75957768849999996" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <state key="normal" title="Upload"/>
                                 <connections>
@@ -428,7 +428,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gY5-Tk-ev9">
-                                <rect key="frame" x="66.666666666666686" y="32" width="280" height="30"/>
+                                <rect key="frame" x="49.5" y="72.5" width="200" height="30"/>
                                 <color key="backgroundColor" red="0.63798287620000005" green="0.61995456810000005" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="swK-1l-5tG"/>
@@ -439,7 +439,7 @@
                                 </connections>
                             </button>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" keyboardDismissMode="interactive" text="Note:" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="ZS1-pc-kXu">
-                                <rect key="frame" x="67" y="396" width="280" height="213"/>
+                                <rect key="frame" x="280" y="154" width="367" height="83.5"/>
                                 <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
@@ -448,13 +448,13 @@
                                 </connections>
                             </textView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Model:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RZK-hh-toU">
-                                <rect key="frame" x="67" y="360" width="280" height="27"/>
+                                <rect key="frame" x="280" y="107.5" width="367" height="27"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="A3O-9b-0D7">
-                                <rect key="frame" x="317" y="360" width="30" height="27"/>
+                                <rect key="frame" x="617" y="107.5" width="30" height="27"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="30" id="gjf-JE-DIU"/>
                                 </constraints>
@@ -467,7 +467,7 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="5 Photos" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JAw-ik-fYD">
-                                <rect key="frame" x="67" y="70" width="280" height="20"/>
+                                <rect key="frame" x="50" y="107.5" width="200" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="gr4-N2-NFP"/>
                                 </constraints>
@@ -502,7 +502,7 @@
                             <constraint firstItem="951-qi-5kI" firstAttribute="bottom" secondItem="8cw-MJ-Ahc" secondAttribute="bottom" id="IP5-P6-wmP"/>
                             <constraint firstItem="A3O-9b-0D7" firstAttribute="centerY" secondItem="RZK-hh-toU" secondAttribute="centerY" id="JhH-ed-LhG"/>
                             <constraint firstItem="gY5-Tk-ev9" firstAttribute="leading" secondItem="i3W-S0-nip" secondAttribute="leading" id="K9I-2J-kAA"/>
-                            <constraint firstItem="i3W-S0-nip" firstAttribute="centerY" secondItem="o96-bU-q7q" secondAttribute="centerY" id="Lc8-bZ-SAh"/>
+                            <constraint firstItem="i3W-S0-nip" firstAttribute="centerY" secondItem="o96-bU-q7q" secondAttribute="centerY" constant="20" id="MLA-mq-fRm"/>
                             <constraint firstItem="i3W-S0-nip" firstAttribute="leading" secondItem="o96-bU-q7q" secondAttribute="leadingMargin" constant="30" id="MQm-vi-n8A"/>
                             <constraint firstItem="xAA-t1-vMd" firstAttribute="bottom" secondItem="951-qi-5kI" secondAttribute="bottom" id="Med-B3-2rc"/>
                             <constraint firstItem="8cw-MJ-Ahc" firstAttribute="leading" secondItem="RZK-hh-toU" secondAttribute="leading" id="PFl-di-byG"/>
@@ -543,7 +543,7 @@
                             <constraint firstItem="951-qi-5kI" firstAttribute="height" secondItem="8cw-MJ-Ahc" secondAttribute="height" id="pTh-mC-e27"/>
                             <constraint firstItem="A3O-9b-0D7" firstAttribute="height" secondItem="RZK-hh-toU" secondAttribute="height" id="qwy-hz-W4h"/>
                             <constraint firstItem="RZK-hh-toU" firstAttribute="leading" secondItem="i3W-S0-nip" secondAttribute="trailing" constant="20" id="rco-TJ-C6H"/>
-                            <constraint firstItem="H4g-H8-jhv" firstAttribute="top" secondItem="951-qi-5kI" secondAttribute="bottom" constant="47" id="rgN-nI-NeD"/>
+                            <constraint firstItem="H4g-H8-jhv" firstAttribute="top" secondItem="951-qi-5kI" secondAttribute="bottom" constant="20" id="rgN-nI-NeD"/>
                             <constraint firstAttribute="trailingMargin" secondItem="RZK-hh-toU" secondAttribute="trailing" id="ruP-WY-u3Q"/>
                             <constraint firstItem="ZS1-pc-kXu" firstAttribute="width" secondItem="RZK-hh-toU" secondAttribute="width" id="sMx-RK-bdo"/>
                             <constraint firstItem="951-qi-5kI" firstAttribute="top" secondItem="8cw-MJ-Ahc" secondAttribute="top" id="sli-1k-i5W"/>
@@ -555,7 +555,7 @@
                             <constraint firstItem="i3W-S0-nip" firstAttribute="leading" secondItem="o96-bU-q7q" secondAttribute="leadingMargin" constant="30" id="w45-Qc-74D"/>
                             <constraint firstItem="951-qi-5kI" firstAttribute="firstBaseline" secondItem="8cw-MJ-Ahc" secondAttribute="baseline" id="waZ-2w-RW1"/>
                             <constraint firstItem="xAA-t1-vMd" firstAttribute="trailing" secondItem="i3W-S0-nip" secondAttribute="trailing" id="xbY-aK-MNO"/>
-                            <constraint firstItem="951-qi-5kI" firstAttribute="top" secondItem="ZS1-pc-kXu" secondAttribute="bottom" constant="20" id="xdL-hU-8Np"/>
+                            <constraint firstItem="951-qi-5kI" firstAttribute="top" secondItem="ZS1-pc-kXu" secondAttribute="bottom" constant="10" id="xdL-hU-8Np"/>
                         </constraints>
                         <variation key="default">
                             <mask key="constraints">
@@ -567,7 +567,7 @@
                                 <exclude reference="cAf-h5-l3V"/>
                                 <exclude reference="Bdg-Gf-Ion"/>
                                 <exclude reference="Cyd-MP-wCx"/>
-                                <exclude reference="Lc8-bZ-SAh"/>
+                                <exclude reference="MLA-mq-fRm"/>
                                 <exclude reference="MQm-vi-n8A"/>
                                 <exclude reference="Pvi-Wv-s7Q"/>
                                 <exclude reference="dZe-Lr-jbB"/>
@@ -636,7 +636,7 @@
                             <mask key="constraints">
                                 <include reference="K9I-2J-kAA"/>
                                 <include reference="b1h-sL-21M"/>
-                                <include reference="Lc8-bZ-SAh"/>
+                                <include reference="MLA-mq-fRm"/>
                                 <include reference="MQm-vi-n8A"/>
                                 <include reference="Pvi-Wv-s7Q"/>
                                 <include reference="2Hh-7b-Cr1"/>
@@ -741,22 +741,22 @@
                         <viewControllerLayoutGuide type="bottom" id="SjT-JB-7Rp"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="MEt-dL-S54">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                        <rect key="frame" x="0.0" y="0.0" width="667" height="375"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="l46-Cv-WLh">
-                                <rect key="frame" x="0.0" y="20" width="414" height="716"/>
+                                <rect key="frame" x="0.0" y="20" width="667" height="355"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ManufacturerCell" id="Scm-6H-13W" customClass="ManufacturerCell">
-                                        <rect key="frame" x="0.0" y="28" width="414" height="44"/>
+                                        <rect key="frame" x="0.0" y="28" width="667" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Scm-6H-13W" id="WlG-lg-3va">
-                                            <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="667" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="Manufacturer" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="NYL-AQ-1Xx">
-                                                    <rect key="frame" x="0.0" y="0.0" width="414" height="43.666666666666664"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="568" height="43.5"/>
                                                     <nil key="textColor"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <textInputTraits key="textInputTraits"/>