1.调整POP模式和Manufacture模式界面。

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="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
@@ -21,12 +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="375" height="667"/>
                         <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"/>
-                                <color key="backgroundColor" red="1" green="0.36503490370000002" blue="0.75947671679999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <rect key="frame" x="47.5" y="50" width="280" height="280"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="280" id="0HU-zi-itA"/>
                                     <constraint firstAttribute="width" constant="200" id="CRQ-nA-AMT"/>
@@ -70,7 +69,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="47.5" y="560" width="60" height="60"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="60" id="K6W-Tz-wcn"/>
                                 </constraints>
@@ -95,7 +94,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="157.5" y="560" width="60" height="60"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="60" id="o6H-g4-n4a"/>
                                 </constraints>
@@ -105,13 +104,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="47.5" y="353" width="280" 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="Rvg-OG-bQ0">
-                                <rect key="frame" x="317" y="353" width="30" height="27"/>
+                                <rect key="frame" x="297.5" y="353" width="30" height="27"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="30" id="ART-XN-Nuf"/>
                                 </constraints>
@@ -123,8 +122,15 @@
                                     <action selector="typeBtnClick:" destination="K9i-vs-efO" eventType="touchUpInside" id="NoL-VF-6k9"/>
                                 </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"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jte-R6-noU">
+                                <rect key="frame" x="267.5" y="560" width="60" height="60"/>
+                                <state key="normal" backgroundImage="upload"/>
+                                <connections>
+                                    <action selector="uploadBtnClick:" destination="K9i-vs-efO" eventType="touchUpInside" id="raC-cp-9OQ"/>
+                                </connections>
+                            </button>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Photos" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m3e-vD-xep">
+                                <rect key="frame" x="47.5" y="310" width="280" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="mgg-Dx-4kA"/>
                                 </constraints>
@@ -132,17 +138,11 @@
                                 <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                 <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"/>
-                                <state key="normal" backgroundImage="upload"/>
-                                <connections>
-                                    <action selector="uploadBtnClick:" destination="K9i-vs-efO" eventType="touchUpInside" id="raC-cp-9OQ"/>
-                                </connections>
-                            </button>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="m3e-vD-xep" firstAttribute="width" secondItem="tx6-Jq-V78" secondAttribute="width" id="4MC-Nn-YNk"/>
+                            <constraint firstItem="m3e-vD-xep" firstAttribute="top" secondItem="tx6-Jq-V78" secondAttribute="bottom" constant="-20" id="4mA-uN-dip"/>
                             <constraint firstItem="7rM-i2-eHr" firstAttribute="bottom" secondItem="tx6-Jq-V78" secondAttribute="bottom" constant="50" id="5oU-RN-aAR"/>
                             <constraint firstItem="tx6-Jq-V78" firstAttribute="top" secondItem="dcO-dt-BeO" secondAttribute="bottom" constant="30" id="5rw-rk-Rgm"/>
                             <constraint firstAttribute="trailingMargin" secondItem="7rM-i2-eHr" secondAttribute="trailing" id="AnY-BM-aep"/>
@@ -160,7 +160,6 @@
                             <constraint firstItem="7rM-i2-eHr" firstAttribute="leading" secondItem="tx6-Jq-V78" secondAttribute="leading" id="IkZ-kb-uSH"/>
                             <constraint firstItem="7rM-i2-eHr" firstAttribute="width" secondItem="tx6-Jq-V78" secondAttribute="width" id="KLA-9l-yX3"/>
                             <constraint firstItem="Rvg-OG-bQ0" firstAttribute="centerY" secondItem="7rM-i2-eHr" secondAttribute="centerY" id="LEW-U8-sy4"/>
-                            <constraint firstItem="m3e-vD-xep" firstAttribute="top" secondItem="tx6-Jq-V78" secondAttribute="top" id="LmC-C6-vLP"/>
                             <constraint firstItem="6jr-Xw-2tL" firstAttribute="width" secondItem="NAz-nK-Hgz" secondAttribute="width" id="OGr-rO-amZ"/>
                             <constraint firstItem="NAz-nK-Hgz" firstAttribute="centerX" secondItem="7rM-i2-eHr" secondAttribute="centerX" id="PH0-8k-I6I"/>
                             <constraint firstItem="tx6-Jq-V78" firstAttribute="centerY" secondItem="QEg-TT-jt8" secondAttribute="centerY" id="PVr-4c-8If"/>
@@ -334,12 +333,12 @@
                         <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="375" height="667"/>
                         <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"/>
-                                <color key="backgroundColor" red="1" green="0.36503490370000002" blue="0.75947671679999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <rect key="frame" x="47.5" y="70" width="280" height="280"/>
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="200" id="P4F-3c-O90"/>
                                     <constraint firstAttribute="width" constant="300" id="RlC-zy-TdJ"/>
@@ -383,7 +382,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8cw-MJ-Ahc">
-                                <rect key="frame" x="67" y="656" width="60" height="60"/>
+                                <rect key="frame" x="47.5" y="587" width="60" height="60"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="60" id="D8b-hb-4M4"/>
                                     <constraint firstAttribute="width" constant="60" id="qWl-ce-tQ1"/>
@@ -409,7 +408,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="951-qi-5kI">
-                                <rect key="frame" x="177" y="656" width="60" height="60"/>
+                                <rect key="frame" x="157.5" y="587" width="60" height="60"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="60" id="Vly-i4-6f7"/>
                                 </constraints>
@@ -419,26 +418,24 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xAA-t1-vMd">
-                                <rect key="frame" x="287" y="656" width="60" height="60"/>
+                                <rect key="frame" x="267.5" y="587" width="60" height="60"/>
                                 <state key="normal" backgroundImage="upload"/>
                                 <connections>
                                     <action selector="uploadBtnClick:" destination="7Iz-ry-1hB" eventType="touchUpInside" id="Iqc-0G-ztp"/>
                                 </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"/>
-                                <color key="backgroundColor" red="0.63798287620000005" green="0.61995456810000005" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <rect key="frame" x="47" y="32" width="280" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="swK-1l-5tG"/>
                                 </constraints>
-                                <state key="normal" title="Manufacturer"/>
+                                <state key="normal" title="Select Manufacturer"/>
                                 <connections>
                                     <action selector="manufactureBtnClick:" destination="7Iz-ry-1hB" eventType="touchUpInside" id="pYl-Hw-jI2"/>
                                 </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="250"/>
-                                <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                <rect key="frame" x="47.5" y="396" width="280" height="181"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                 <connections>
@@ -446,13 +443,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="47.5" y="360" width="280" 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="297.5" y="360" width="30" height="27"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="30" id="gjf-JE-DIU"/>
                                 </constraints>
@@ -464,8 +461,8 @@
                                     <action selector="typeBtnClick:" destination="7Iz-ry-1hB" eventType="touchUpInside" id="7gC-wE-byx"/>
                                 </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"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Photos" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JAw-ik-fYD">
+                                <rect key="frame" x="47.5" y="330" width="280" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="gr4-N2-NFP"/>
                                 </constraints>
@@ -490,7 +487,6 @@
                             <constraint firstItem="gY5-Tk-ev9" firstAttribute="leading" secondItem="i3W-S0-nip" secondAttribute="leading" id="7x0-YS-4WJ"/>
                             <constraint firstItem="RZK-hh-toU" firstAttribute="top" secondItem="i3W-S0-nip" secondAttribute="top" id="B3m-FM-7Wx"/>
                             <constraint firstItem="i3W-S0-nip" firstAttribute="top" secondItem="gY5-Tk-ev9" secondAttribute="bottom" constant="8" id="Bdg-Gf-Ion"/>
-                            <constraint firstItem="JAw-ik-fYD" firstAttribute="top" secondItem="i3W-S0-nip" secondAttribute="top" id="CAS-t5-5eZ"/>
                             <constraint firstItem="i3W-S0-nip" firstAttribute="centerX" secondItem="o96-bU-q7q" secondAttribute="centerX" id="Cyd-MP-wCx"/>
                             <constraint firstItem="8cw-MJ-Ahc" firstAttribute="leading" secondItem="RZK-hh-toU" secondAttribute="leading" id="DDb-NZ-fPw"/>
                             <constraint firstItem="xAA-t1-vMd" firstAttribute="height" secondItem="951-qi-5kI" secondAttribute="height" id="Fdp-ve-rXy"/>
@@ -536,6 +532,7 @@
                             <constraint firstItem="xAA-t1-vMd" firstAttribute="width" secondItem="951-qi-5kI" secondAttribute="width" id="lpK-C1-TrF"/>
                             <constraint firstItem="xAA-t1-vMd" firstAttribute="width" secondItem="951-qi-5kI" secondAttribute="width" id="mG3-eu-q03"/>
                             <constraint firstItem="951-qi-5kI" firstAttribute="centerX" secondItem="RZK-hh-toU" secondAttribute="centerX" id="mP3-Aw-Eg2"/>
+                            <constraint firstItem="JAw-ik-fYD" firstAttribute="bottom" secondItem="i3W-S0-nip" secondAttribute="bottom" id="nea-5d-6lF"/>
                             <constraint firstItem="i3W-S0-nip" firstAttribute="top" secondItem="4Aa-BZ-4nb" secondAttribute="bottom" constant="50" id="oUd-Hv-bEF"/>
                             <constraint firstItem="xAA-t1-vMd" firstAttribute="trailing" secondItem="RZK-hh-toU" secondAttribute="trailing" id="obK-KN-Wre"/>
                             <constraint firstItem="951-qi-5kI" firstAttribute="height" secondItem="8cw-MJ-Ahc" secondAttribute="height" id="pTh-mC-e27"/>
@@ -598,8 +595,6 @@
                                 <exclude reference="RPz-TG-EgB"/>
                                 <exclude reference="h3X-Sv-4VE"/>
                                 <exclude reference="vZx-LD-eJX"/>
-                                <exclude reference="5QC-IL-i1w"/>
-                                <exclude reference="rgN-nI-NeD"/>
                                 <exclude reference="0l7-5q-3zf"/>
                                 <exclude reference="7GX-rm-Lu7"/>
                                 <exclude reference="IP5-P6-wmP"/>
@@ -624,6 +619,8 @@
                                 <exclude reference="mG3-eu-q03"/>
                                 <exclude reference="obK-KN-Wre"/>
                                 <exclude reference="xbY-aK-MNO"/>
+                                <exclude reference="5QC-IL-i1w"/>
+                                <exclude reference="rgN-nI-NeD"/>
                             </mask>
                         </variation>
                         <variation key="heightClass=compact-widthClass=compact">
@@ -670,7 +667,6 @@
                                 <include reference="PKZ-co-q6C"/>
                                 <include reference="RPz-TG-EgB"/>
                                 <include reference="vZx-LD-eJX"/>
-                                <include reference="5QC-IL-i1w"/>
                                 <include reference="IP5-P6-wmP"/>
                                 <include reference="mP3-Aw-Eg2"/>
                                 <include reference="ukF-93-xfZ"/>
@@ -678,6 +674,7 @@
                                 <include reference="Fdp-ve-rXy"/>
                                 <include reference="Med-B3-2rc"/>
                                 <include reference="obK-KN-Wre"/>
+                                <include reference="5QC-IL-i1w"/>
                             </mask>
                         </variation>
                         <variation key="heightClass=regular-widthClass=compact">
@@ -696,7 +693,6 @@
                                 <include reference="gUk-GU-v1u"/>
                                 <include reference="sMx-RK-bdo"/>
                                 <include reference="DDb-NZ-fPw"/>
-                                <include reference="rgN-nI-NeD"/>
                                 <include reference="7GX-rm-Lu7"/>
                                 <include reference="XMG-Nj-hPo"/>
                                 <include reference="lgt-jy-gsD"/>
@@ -705,6 +701,7 @@
                                 <include reference="Hru-49-ooh"/>
                                 <include reference="mG3-eu-q03"/>
                                 <include reference="xbY-aK-MNO"/>
+                                <include reference="rgN-nI-NeD"/>
                             </mask>
                         </variation>
                     </view>
@@ -733,22 +730,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="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="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="375" height="647"/>
                                 <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="375" 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="43.666666666666664"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" 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="320" height="43.666666666666664"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                                     <nil key="textColor"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <textInputTraits key="textInputTraits"/>

RA Image/RA Image/ModelModeViewController.m

@@ -38,6 +38,8 @@
     self.noteTextView.layer.borderWidth = 1.0f;    
     [self registListenKeyboard];
     
+    self.imgBtn.layer.borderColor = [UIColor blackColor].CGColor;
+    self.imgBtn.layer.borderWidth = 1.0f;
 }
 
 
@@ -49,7 +51,7 @@
 
 - (void)clear {
     self.barcode = nil;
-    self.manufacturer = nil;
+//    self.manufacturer = nil;
     self.noteTextView.text = @"Note:";
     [self.imgBtn setBackgroundImage:nil forState:UIControlStateNormal];
     [self clearPhotos];
@@ -97,7 +99,7 @@
     
     NSString *manufacturer = self.manufacturer;
     if (self.manufacturerList.count && self.manufacturer.length == 0) {
-        [RAUtils message_alert:@"You should select a manufacturer." title:@"Warning" controller:self];
+        [RAUtils message_alert:@"Manufacturer does not set." title:@"Warning" controller:self];
         return;
     }
     NSString *note = self.noteTextView.text;
@@ -158,7 +160,7 @@
 
 - (void)setManufacturer:(NSString *)manufacturer {
     _manufacturer = manufacturer;
-    NSString *title = @"Manufacturer";
+    NSString *title = @"Select Manufacturer";
     if (manufacturer.length) {
         title = manufacturer;
     }
@@ -196,11 +198,17 @@
 
 - (BOOL)textViewShouldBeginEditing:(UITextView *)textView {
     self.currentFirstResponder = textView;
+    if ([textView.text isEqualToString:@"Note:"]) {
+        textView.text = nil;
+    }
     return YES;
 }
 
 - (BOOL)textViewShouldEndEditing:(UITextView *)textView {
     self.currentFirstResponder = nil;
+    if (!textView.text.length) {
+        textView.text = @"Note:";
+    }
     return YES;
 }
 

RA Image/RA Image/PopModeViewController.m

@@ -27,7 +27,9 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-
+    
+    self.imgBtn.layer.borderColor = [UIColor blackColor].CGColor;
+    self.imgBtn.layer.borderWidth = 1.0f;
 }
 
 - (void)didReceiveMemoryWarning {