1.完成iOS Apex Drivers Order列表显示，增肌Order Type以及图像加载。

Redant Drivers/Apex And Drivers/Assets.xcassets/logo.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "logo_2.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "logo_2@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "logo_2@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Redant Drivers/Apex And Drivers/Assets.xcassets/logout.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "logout.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "logout@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "logout@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Redant Drivers/Apex And Drivers/Assets.xcassets/status_cancel.imageset/Contents.json

@@ -0,0 +1 @@
+{"images": [{"idiom": "universal", "filename": "status_cancel.png", "scale": "1x"}, {"idiom": "universal", "filename": "status_cancel@2x.png", "scale": "2x"}, {"idiom": "universal", "filename": "status_cancel@3x.png", "scale": "3x"}], "info": {"version": 1, "author": "xcode"}}

Redant Drivers/Apex And Drivers/Assets.xcassets/status_delivered.imageset/Contents.json

@@ -0,0 +1 @@
+{"images": [{"idiom": "universal", "filename": "status_delivered.png", "scale": "1x"}, {"idiom": "universal", "filename": "status_delivered@2x.png", "scale": "2x"}, {"idiom": "universal", "filename": "status_delivered@3x.png", "scale": "3x"}], "info": {"version": 1, "author": "xcode"}}

Redant Drivers/Apex And Drivers/Assets.xcassets/status_new.imageset/Contents.json

@@ -0,0 +1 @@
+{"images": [{"idiom": "universal", "filename": "status_new.png", "scale": "1x"}, {"idiom": "universal", "filename": "status_new@2x.png", "scale": "2x"}, {"idiom": "universal", "filename": "status_new@3x.png", "scale": "3x"}], "info": {"version": 1, "author": "xcode"}}

Redant Drivers/Apex And Drivers/Assets.xcassets/status_on_the _way.imageset/Contents.json

@@ -0,0 +1 @@
+{"images": [{"idiom": "universal", "filename": "status_on_the _way.png", "scale": "1x"}, {"idiom": "universal", "filename": "status_on_the _way@2x.png", "scale": "2x"}, {"idiom": "universal", "filename": "status_on_the _way@3x.png", "scale": "3x"}], "info": {"version": 1, "author": "xcode"}}

Redant Drivers/Apex And Drivers/Assets.xcassets/status_reject.imageset/Contents.json

@@ -0,0 +1 @@
+{"images": [{"idiom": "universal", "filename": "status_reject.png", "scale": "1x"}, {"idiom": "universal", "filename": "status_reject@2x.png", "scale": "2x"}, {"idiom": "universal", "filename": "status_reject@3x.png", "scale": "3x"}], "info": {"version": 1, "author": "xcode"}}

Redant Drivers/Apex And Drivers/Assets.xcassets/status_returning.imageset/Contents.json

@@ -0,0 +1 @@
+{"images": [{"idiom": "universal", "filename": "status_returning.png", "scale": "1x"}, {"idiom": "universal", "filename": "status_returning@2x.png", "scale": "2x"}, {"idiom": "universal", "filename": "status_returning@3x.png", "scale": "3x"}], "info": {"version": 1, "author": "xcode"}}

Redant Drivers/Apex And Drivers/Assets.xcassets/status_wait_ confirm.imageset/Contents.json

@@ -0,0 +1 @@
+{"images": [{"idiom": "universal", "filename": "status_wait_ confirm.png", "scale": "1x"}, {"idiom": "universal", "filename": "status_wait_ confirm@2x.png", "scale": "2x"}, {"idiom": "universal", "filename": "status_wait_ confirm@3x.png", "scale": "3x"}], "info": {"version": 1, "author": "xcode"}}

Redant Drivers/Apex And Drivers/Assets.xcassets/status_wait_pick_up.imageset/Contents.json

@@ -0,0 +1 @@
+{"images": [{"idiom": "universal", "filename": "status_wait_pick_up.png", "scale": "1x"}, {"idiom": "universal", "filename": "status_wait_pick_up@2x.png", "scale": "2x"}, {"idiom": "universal", "filename": "status_wait_pick_up@3x.png", "scale": "3x"}], "info": {"version": 1, "author": "xcode"}}

Redant Drivers/Apex And Drivers/Assets.xcassets/upload_list.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "upload_list.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "upload_list@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "upload_list@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Redant Drivers/Apex And Drivers/Home/Home.storyboard

@@ -22,25 +22,25 @@
                                 <rect key="frame" x="0.0" y="20" width="375" height="647"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="RAOrderCell" rowHeight="120" id="7yW-4E-SX2" customClass="RAOrderCell">
-                                        <rect key="frame" x="0.0" y="28" width="375" height="120"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="RAOrderCell" rowHeight="140" id="7yW-4E-SX2" customClass="RAOrderCell">
+                                        <rect key="frame" x="0.0" y="28" width="375" height="140"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="7yW-4E-SX2" id="86U-Ij-DDb">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="120"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="140"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="etn-cW-0fL">
-                                                    <rect key="frame" x="5" y="5" width="365" height="109.5"/>
+                                                    <rect key="frame" x="5" y="5" width="365" height="130"/>
                                                     <subviews>
-                                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="V2e-NM-tUq">
-                                                            <rect key="frame" x="10" y="36" width="60" height="60"/>
+                                                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="V2e-NM-tUq">
+                                                            <rect key="frame" x="10" y="47" width="70" height="70"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="height" constant="60" id="fW9-0H-jGG"/>
-                                                                <constraint firstAttribute="width" constant="60" id="pcF-Ms-1eF"/>
+                                                                <constraint firstAttribute="height" constant="70" id="fW9-0H-jGG"/>
+                                                                <constraint firstAttribute="width" constant="70" id="pcF-Ms-1eF"/>
                                                             </constraints>
                                                         </imageView>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Pickup Order New" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y2j-9I-xL6">
-                                                            <rect key="frame" x="10" y="5" width="325" height="21"/>
+                                                            <rect key="frame" x="10" y="5" width="139" height="21"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="21" id="vQr-l2-y2d"/>
                                                             </constraints>
@@ -48,12 +48,6 @@
                                                             <nil key="textColor"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Date:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KA0-85-9AI">
-                                                            <rect key="frame" x="80" y="80" width="34.5" height="17"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                            <nil key="textColor"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
                                                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Rxe-zz-m6W">
                                                             <rect key="frame" x="340" y="5.5" width="20" height="20"/>
                                                             <constraints>
@@ -61,57 +55,107 @@
                                                                 <constraint firstAttribute="width" constant="20" id="SmO-AW-5Qc"/>
                                                             </constraints>
                                                         </imageView>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="5/30/2018" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="89d-EX-Krm">
-                                                            <rect key="frame" x="120" y="80" width="67" height="17"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                            <nil key="textColor"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AFS180530001200" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZZd-1e-a8S">
-                                                            <rect key="frame" x="152.5" y="36" width="125" height="17"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                            <nil key="textColor"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Order No.:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LR1-3j-ccn">
-                                                            <rect key="frame" x="80" y="36" width="67.5" height="17"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                            <nil key="textColor"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Container No.:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u11-fA-GhG">
-                                                            <rect key="frame" x="80" y="58" width="93" height="17"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                            <nil key="textColor"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TCNU6432476" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ODR-wu-t8u">
-                                                            <rect key="frame" x="178" y="58" width="98.5" height="17"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                            <nil key="textColor"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
+                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0oy-zO-2fZ">
+                                                            <rect key="frame" x="85" y="34" width="275" height="96"/>
+                                                            <subviews>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="5/30/2018" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="89d-EX-Krm">
+                                                                    <rect key="frame" x="40" y="69" width="235" height="17"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AFS180530001200" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZZd-1e-a8S">
+                                                                    <rect key="frame" x="73" y="0.0" width="202" height="17"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Order No.:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LR1-3j-ccn">
+                                                                    <rect key="frame" x="0.0" y="0.0" width="67.5" height="17"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="67.5" id="IvA-Il-Mqr"/>
+                                                                    </constraints>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Container No.:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u11-fA-GhG">
+                                                                    <rect key="frame" x="0.0" y="22" width="93" height="17"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="93" id="R8R-j3-Dyr"/>
+                                                                    </constraints>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Pick Up" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Utf-Vm-dJV">
+                                                                    <rect key="frame" x="81.5" y="44" width="193.5" height="17"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Date:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KA0-85-9AI">
+                                                                    <rect key="frame" x="0.0" y="69" width="35" height="17"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="35" id="MrT-gb-mPk"/>
+                                                                    </constraints>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TCNU6432476" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ODR-wu-t8u">
+                                                                    <rect key="frame" x="98" y="22" width="177" height="17"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Order Type:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NOq-3t-C3T">
+                                                                    <rect key="frame" x="0.0" y="44" width="76.5" height="17"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="76.5" id="WTH-5X-MQE"/>
+                                                                    </constraints>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                            </subviews>
+                                                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                            <constraints>
+                                                                <constraint firstItem="ZZd-1e-a8S" firstAttribute="centerY" secondItem="LR1-3j-ccn" secondAttribute="centerY" id="2e6-SE-gyj"/>
+                                                                <constraint firstItem="KA0-85-9AI" firstAttribute="top" secondItem="NOq-3t-C3T" secondAttribute="bottom" constant="8" id="5G8-6w-YbI"/>
+                                                                <constraint firstItem="KA0-85-9AI" firstAttribute="leading" secondItem="NOq-3t-C3T" secondAttribute="leading" id="7Yw-02-DIX"/>
+                                                                <constraint firstItem="89d-EX-Krm" firstAttribute="centerY" secondItem="KA0-85-9AI" secondAttribute="centerY" id="D4b-WU-0cF"/>
+                                                                <constraint firstItem="u11-fA-GhG" firstAttribute="top" secondItem="LR1-3j-ccn" secondAttribute="bottom" constant="5" id="Ef8-0U-Uuw"/>
+                                                                <constraint firstItem="ODR-wu-t8u" firstAttribute="centerY" secondItem="u11-fA-GhG" secondAttribute="centerY" id="M8l-JP-Tnv"/>
+                                                                <constraint firstItem="89d-EX-Krm" firstAttribute="leading" secondItem="KA0-85-9AI" secondAttribute="trailing" constant="5" id="Nca-by-zST"/>
+                                                                <constraint firstItem="u11-fA-GhG" firstAttribute="leading" secondItem="LR1-3j-ccn" secondAttribute="leading" id="NrT-iy-oq4"/>
+                                                                <constraint firstItem="Utf-Vm-dJV" firstAttribute="centerY" secondItem="NOq-3t-C3T" secondAttribute="centerY" id="OYF-8T-RWt"/>
+                                                                <constraint firstItem="LR1-3j-ccn" firstAttribute="top" secondItem="0oy-zO-2fZ" secondAttribute="top" id="Tso-pR-fvU"/>
+                                                                <constraint firstItem="NOq-3t-C3T" firstAttribute="top" secondItem="u11-fA-GhG" secondAttribute="bottom" constant="5" id="X97-Qa-oFA"/>
+                                                                <constraint firstItem="ZZd-1e-a8S" firstAttribute="leading" secondItem="LR1-3j-ccn" secondAttribute="trailing" constant="5" id="f7b-mK-l0a"/>
+                                                                <constraint firstAttribute="trailing" secondItem="ZZd-1e-a8S" secondAttribute="trailing" id="fZQ-md-DKc"/>
+                                                                <constraint firstAttribute="trailing" secondItem="Utf-Vm-dJV" secondAttribute="trailing" id="iCJ-y6-OgK"/>
+                                                                <constraint firstAttribute="trailing" secondItem="ODR-wu-t8u" secondAttribute="trailing" id="o0N-5l-zT6"/>
+                                                                <constraint firstItem="ODR-wu-t8u" firstAttribute="leading" secondItem="u11-fA-GhG" secondAttribute="trailing" constant="5" id="og9-QM-rLE"/>
+                                                                <constraint firstItem="Utf-Vm-dJV" firstAttribute="leading" secondItem="NOq-3t-C3T" secondAttribute="trailing" constant="5" id="rC0-aX-f7h"/>
+                                                                <constraint firstAttribute="trailing" secondItem="89d-EX-Krm" secondAttribute="trailing" id="ujL-u0-85e"/>
+                                                                <constraint firstItem="NOq-3t-C3T" firstAttribute="leading" secondItem="u11-fA-GhG" secondAttribute="leading" id="vJA-GJ-7co"/>
+                                                                <constraint firstItem="LR1-3j-ccn" firstAttribute="leading" secondItem="0oy-zO-2fZ" secondAttribute="leading" id="wXZ-Kd-16P"/>
+                                                            </constraints>
+                                                        </view>
                                                     </subviews>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <constraints>
-                                                        <constraint firstItem="u11-fA-GhG" firstAttribute="leading" secondItem="LR1-3j-ccn" secondAttribute="leading" id="0oX-Kt-Rj1"/>
-                                                        <constraint firstItem="u11-fA-GhG" firstAttribute="top" secondItem="LR1-3j-ccn" secondAttribute="bottom" constant="5" id="2ay-ov-WSp"/>
-                                                        <constraint firstItem="KA0-85-9AI" firstAttribute="leading" secondItem="u11-fA-GhG" secondAttribute="leading" id="70m-cG-or7"/>
-                                                        <constraint firstItem="89d-EX-Krm" firstAttribute="centerY" secondItem="KA0-85-9AI" secondAttribute="centerY" id="EVx-1O-SQt"/>
-                                                        <constraint firstItem="89d-EX-Krm" firstAttribute="leading" secondItem="KA0-85-9AI" secondAttribute="trailing" constant="5" id="H1x-iC-YgR"/>
+                                                        <constraint firstItem="0oy-zO-2fZ" firstAttribute="leading" secondItem="V2e-NM-tUq" secondAttribute="trailing" constant="5" id="7KA-O9-0Sw"/>
+                                                        <constraint firstItem="Rxe-zz-m6W" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="y2j-9I-xL6" secondAttribute="trailing" priority="999" constant="5" id="DnA-3X-1WX"/>
                                                         <constraint firstAttribute="trailing" secondItem="Rxe-zz-m6W" secondAttribute="trailing" constant="5" id="LFL-kC-1K5"/>
-                                                        <constraint firstItem="ZZd-1e-a8S" firstAttribute="leading" secondItem="LR1-3j-ccn" secondAttribute="trailing" constant="5" id="McV-Qt-dH1"/>
-                                                        <constraint firstItem="LR1-3j-ccn" firstAttribute="leading" secondItem="V2e-NM-tUq" secondAttribute="trailing" constant="10" id="Nip-3l-8yv"/>
                                                         <constraint firstItem="y2j-9I-xL6" firstAttribute="leading" secondItem="etn-cW-0fL" secondAttribute="leading" constant="10" id="Qm2-OM-HzS"/>
+                                                        <constraint firstAttribute="bottom" secondItem="0oy-zO-2fZ" secondAttribute="bottom" id="WpU-nw-Gp9"/>
+                                                        <constraint firstItem="V2e-NM-tUq" firstAttribute="centerY" secondItem="0oy-zO-2fZ" secondAttribute="centerY" id="abX-9a-uwY"/>
+                                                        <constraint firstItem="0oy-zO-2fZ" firstAttribute="trailing" secondItem="Rxe-zz-m6W" secondAttribute="trailing" id="drm-jE-S9k"/>
                                                         <constraint firstItem="Rxe-zz-m6W" firstAttribute="centerY" secondItem="y2j-9I-xL6" secondAttribute="centerY" id="eIq-Fm-AyY"/>
-                                                        <constraint firstItem="Rxe-zz-m6W" firstAttribute="leading" secondItem="y2j-9I-xL6" secondAttribute="trailing" constant="5" id="eRd-r4-mLb"/>
+                                                        <constraint firstItem="0oy-zO-2fZ" firstAttribute="top" secondItem="y2j-9I-xL6" secondAttribute="bottom" constant="8" id="efZ-Uk-CRn"/>
                                                         <constraint firstItem="y2j-9I-xL6" firstAttribute="top" secondItem="etn-cW-0fL" secondAttribute="top" constant="5" id="gyS-0m-TZb"/>
-                                                        <constraint firstItem="ODR-wu-t8u" firstAttribute="leading" secondItem="u11-fA-GhG" secondAttribute="trailing" constant="5" id="jf6-un-4zk"/>
-                                                        <constraint firstItem="LR1-3j-ccn" firstAttribute="top" secondItem="V2e-NM-tUq" secondAttribute="top" id="k3x-FF-bLV"/>
-                                                        <constraint firstItem="ODR-wu-t8u" firstAttribute="centerY" secondItem="u11-fA-GhG" secondAttribute="centerY" id="nJv-T7-BCe"/>
-                                                        <constraint firstItem="ZZd-1e-a8S" firstAttribute="centerY" secondItem="LR1-3j-ccn" secondAttribute="centerY" id="pEM-YN-4lI"/>
-                                                        <constraint firstItem="KA0-85-9AI" firstAttribute="top" secondItem="u11-fA-GhG" secondAttribute="bottom" constant="5" id="rTK-Sw-W3L"/>
-                                                        <constraint firstItem="V2e-NM-tUq" firstAttribute="top" secondItem="y2j-9I-xL6" secondAttribute="bottom" constant="10" id="uOg-hk-TX6"/>
                                                         <constraint firstItem="V2e-NM-tUq" firstAttribute="leading" secondItem="y2j-9I-xL6" secondAttribute="leading" id="y8C-4T-ykP"/>
                                                     </constraints>
                                                 </view>
@@ -131,6 +175,7 @@
                                             <outlet property="dateLabel" destination="89d-EX-Krm" id="b0e-0A-H0f"/>
                                             <outlet property="markView" destination="Rxe-zz-m6W" id="7oc-i1-cKw"/>
                                             <outlet property="orderNoLabel" destination="ZZd-1e-a8S" id="nJJ-JC-dEN"/>
+                                            <outlet property="orderType2Label" destination="Utf-Vm-dJV" id="C1T-zQ-vnr"/>
                                             <outlet property="statusView" destination="V2e-NM-tUq" id="sls-Iw-UWW"/>
                                             <outlet property="titleLabel" destination="y2j-9I-xL6" id="YPB-Xg-Bwr"/>
                                         </connections>
@@ -157,7 +202,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="gdf-PJ-wGP" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-79.200000000000003" y="128.18590704647679"/>
+            <point key="canvasLocation" x="-481" y="107"/>
         </scene>
         <!--Home More View Controller-->
         <scene sceneID="zUT-kE-485">
@@ -171,117 +216,162 @@
                                 <rect key="frame" x="0.0" y="20" width="375" height="647"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="RAOrderCell" rowHeight="120" id="Skn-d2-ZCi" customClass="RAOrderCell">
-                                        <rect key="frame" x="0.0" y="28" width="375" height="120"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="RAOrderCell" rowHeight="140" id="dS5-dF-bbX" customClass="RAOrderCell">
+                                        <rect key="frame" x="0.0" y="28" width="375" height="140"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Skn-d2-ZCi" id="fJB-KB-1Fw">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="120"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="dS5-dF-bbX" id="I21-oc-ERc">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="140"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6Xp-zb-7Ya">
-                                                    <rect key="frame" x="5" y="5" width="365" height="109.5"/>
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ez1-e3-yIq">
+                                                    <rect key="frame" x="5" y="5" width="365" height="130"/>
                                                     <subviews>
-                                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="FDn-7f-r7i">
-                                                            <rect key="frame" x="10" y="36" width="60" height="60"/>
+                                                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="r8P-b3-SYP">
+                                                            <rect key="frame" x="10" y="47" width="70" height="70"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="height" constant="60" id="JYb-02-EUv"/>
-                                                                <constraint firstAttribute="width" constant="60" id="haw-9A-ATo"/>
+                                                                <constraint firstAttribute="width" constant="70" id="E4g-9T-EpV"/>
+                                                                <constraint firstAttribute="height" constant="70" id="z9o-Ex-Ffd"/>
                                                             </constraints>
                                                         </imageView>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Pickup Order New" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Erv-Jh-gKY">
-                                                            <rect key="frame" x="10" y="5" width="325" height="21"/>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Pickup Order New" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6qD-i1-tev">
+                                                            <rect key="frame" x="10" y="5" width="139" height="21"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="height" constant="21" id="Bd1-WE-OUn"/>
+                                                                <constraint firstAttribute="height" constant="21" id="GG4-X2-FoD"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                             <nil key="textColor"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Date:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QOi-AI-kif">
-                                                            <rect key="frame" x="80" y="80" width="34.5" height="17"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                            <nil key="textColor"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="poS-lq-bjc">
+                                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="wDi-Zy-4rB">
                                                             <rect key="frame" x="340" y="5.5" width="20" height="20"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="height" constant="20" id="G2B-fl-iTa"/>
-                                                                <constraint firstAttribute="width" constant="20" id="Jnw-Fu-4Uf"/>
+                                                                <constraint firstAttribute="width" constant="20" id="RNz-ZX-3Xe"/>
+                                                                <constraint firstAttribute="height" constant="20" id="g1E-Ne-GiV"/>
                                                             </constraints>
                                                         </imageView>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="5/30/2018" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zPE-Be-KVC">
-                                                            <rect key="frame" x="120" y="80" width="67" height="17"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                            <nil key="textColor"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AFS180530001200" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XEo-6C-1rh">
-                                                            <rect key="frame" x="152.5" y="36" width="125" height="17"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                            <nil key="textColor"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Order No.:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gDN-mh-cR7">
-                                                            <rect key="frame" x="80" y="36" width="67.5" height="17"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                            <nil key="textColor"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Container No.:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MdI-bS-3zE">
-                                                            <rect key="frame" x="80" y="58" width="93" height="17"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                            <nil key="textColor"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TCNU6432476" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nVf-At-hXD">
-                                                            <rect key="frame" x="178" y="58" width="98.5" height="17"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                            <nil key="textColor"/>
-                                                            <nil key="highlightedColor"/>
-                                                        </label>
+                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iT9-Mg-UwI">
+                                                            <rect key="frame" x="85" y="34" width="275" height="96"/>
+                                                            <subviews>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="5/30/2018" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z8k-hS-sOz">
+                                                                    <rect key="frame" x="40" y="69" width="235" height="17"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AFS180530001200" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hNu-AY-bfS">
+                                                                    <rect key="frame" x="73" y="0.0" width="202" height="17"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Order No.:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NwP-AP-5zX">
+                                                                    <rect key="frame" x="0.0" y="0.0" width="67.5" height="17"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="67.5" id="oJK-gi-e2D"/>
+                                                                    </constraints>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Container No.:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yb1-KB-PDL">
+                                                                    <rect key="frame" x="0.0" y="22" width="93" height="17"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="93" id="SJc-mf-6Zm"/>
+                                                                    </constraints>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Pick Up" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1vU-Ly-MVu">
+                                                                    <rect key="frame" x="81.5" y="44" width="193.5" height="17"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Date:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hZL-d6-pXB">
+                                                                    <rect key="frame" x="0.0" y="69" width="35" height="17"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="35" id="F8N-4w-b8K"/>
+                                                                    </constraints>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TCNU6432476" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kd7-FH-8p2">
+                                                                    <rect key="frame" x="98" y="22" width="177" height="17"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Order Type:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FLu-57-E2d">
+                                                                    <rect key="frame" x="0.0" y="44" width="76.5" height="17"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="76.5" id="gvd-Xg-iLW"/>
+                                                                    </constraints>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                            </subviews>
+                                                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                            <constraints>
+                                                                <constraint firstItem="hNu-AY-bfS" firstAttribute="leading" secondItem="NwP-AP-5zX" secondAttribute="trailing" constant="5" id="2M1-1N-RWo"/>
+                                                                <constraint firstItem="Z8k-hS-sOz" firstAttribute="centerY" secondItem="hZL-d6-pXB" secondAttribute="centerY" id="4MG-Bk-SRS"/>
+                                                                <constraint firstAttribute="trailing" secondItem="1vU-Ly-MVu" secondAttribute="trailing" id="6Q7-sQ-Ikl"/>
+                                                                <constraint firstAttribute="trailing" secondItem="Kd7-FH-8p2" secondAttribute="trailing" id="K7O-ze-ncq"/>
+                                                                <constraint firstItem="NwP-AP-5zX" firstAttribute="leading" secondItem="iT9-Mg-UwI" secondAttribute="leading" id="TPG-zR-W6W"/>
+                                                                <constraint firstItem="hNu-AY-bfS" firstAttribute="centerY" secondItem="NwP-AP-5zX" secondAttribute="centerY" id="atC-Mc-OOG"/>
+                                                                <constraint firstItem="FLu-57-E2d" firstAttribute="top" secondItem="Yb1-KB-PDL" secondAttribute="bottom" constant="5" id="bng-Aq-2rH"/>
+                                                                <constraint firstItem="Z8k-hS-sOz" firstAttribute="leading" secondItem="hZL-d6-pXB" secondAttribute="trailing" constant="5" id="cLL-Pn-D3i"/>
+                                                                <constraint firstItem="NwP-AP-5zX" firstAttribute="top" secondItem="iT9-Mg-UwI" secondAttribute="top" id="cjh-fB-Lht"/>
+                                                                <constraint firstAttribute="trailing" secondItem="hNu-AY-bfS" secondAttribute="trailing" id="gC7-XZ-BAV"/>
+                                                                <constraint firstItem="Yb1-KB-PDL" firstAttribute="leading" secondItem="NwP-AP-5zX" secondAttribute="leading" id="hwV-pI-p5t"/>
+                                                                <constraint firstItem="Kd7-FH-8p2" firstAttribute="centerY" secondItem="Yb1-KB-PDL" secondAttribute="centerY" id="jWq-fh-DVG"/>
+                                                                <constraint firstItem="hZL-d6-pXB" firstAttribute="top" secondItem="FLu-57-E2d" secondAttribute="bottom" constant="8" id="kR1-R1-zlJ"/>
+                                                                <constraint firstAttribute="trailing" secondItem="Z8k-hS-sOz" secondAttribute="trailing" id="pUh-NT-AZf"/>
+                                                                <constraint firstItem="1vU-Ly-MVu" firstAttribute="centerY" secondItem="FLu-57-E2d" secondAttribute="centerY" id="rES-Xz-BEd"/>
+                                                                <constraint firstItem="Kd7-FH-8p2" firstAttribute="leading" secondItem="Yb1-KB-PDL" secondAttribute="trailing" constant="5" id="ra1-Xf-cyr"/>
+                                                                <constraint firstItem="FLu-57-E2d" firstAttribute="leading" secondItem="Yb1-KB-PDL" secondAttribute="leading" id="stZ-rq-Sen"/>
+                                                                <constraint firstItem="Yb1-KB-PDL" firstAttribute="top" secondItem="NwP-AP-5zX" secondAttribute="bottom" constant="5" id="wpQ-bJ-dke"/>
+                                                                <constraint firstItem="1vU-Ly-MVu" firstAttribute="leading" secondItem="FLu-57-E2d" secondAttribute="trailing" constant="5" id="xsy-FA-gXx"/>
+                                                                <constraint firstItem="hZL-d6-pXB" firstAttribute="leading" secondItem="FLu-57-E2d" secondAttribute="leading" id="xyd-uk-3pa"/>
+                                                            </constraints>
+                                                        </view>
                                                     </subviews>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <constraints>
-                                                        <constraint firstItem="gDN-mh-cR7" firstAttribute="leading" secondItem="FDn-7f-r7i" secondAttribute="trailing" constant="10" id="0cc-OD-uCA"/>
-                                                        <constraint firstItem="QOi-AI-kif" firstAttribute="top" secondItem="MdI-bS-3zE" secondAttribute="bottom" constant="5" id="0dK-aW-Y6M"/>
-                                                        <constraint firstItem="Erv-Jh-gKY" firstAttribute="top" secondItem="6Xp-zb-7Ya" secondAttribute="top" constant="5" id="0m4-jx-cBe"/>
-                                                        <constraint firstItem="MdI-bS-3zE" firstAttribute="top" secondItem="gDN-mh-cR7" secondAttribute="bottom" constant="5" id="5ZY-9W-On4"/>
-                                                        <constraint firstItem="XEo-6C-1rh" firstAttribute="leading" secondItem="gDN-mh-cR7" secondAttribute="trailing" constant="5" id="Aky-24-TsC"/>
-                                                        <constraint firstItem="poS-lq-bjc" firstAttribute="centerY" secondItem="Erv-Jh-gKY" secondAttribute="centerY" id="Ewb-m4-sdJ"/>
-                                                        <constraint firstItem="nVf-At-hXD" firstAttribute="centerY" secondItem="MdI-bS-3zE" secondAttribute="centerY" id="JQP-i3-wOV"/>
-                                                        <constraint firstItem="Erv-Jh-gKY" firstAttribute="leading" secondItem="6Xp-zb-7Ya" secondAttribute="leading" constant="10" id="MCS-Wi-Mi5"/>
-                                                        <constraint firstItem="gDN-mh-cR7" firstAttribute="top" secondItem="FDn-7f-r7i" secondAttribute="top" id="OPx-EH-r5x"/>
-                                                        <constraint firstItem="QOi-AI-kif" firstAttribute="leading" secondItem="MdI-bS-3zE" secondAttribute="leading" id="PE4-kj-9ka"/>
-                                                        <constraint firstItem="MdI-bS-3zE" firstAttribute="leading" secondItem="gDN-mh-cR7" secondAttribute="leading" id="QFd-rb-m9L"/>
-                                                        <constraint firstItem="poS-lq-bjc" firstAttribute="leading" secondItem="Erv-Jh-gKY" secondAttribute="trailing" constant="5" id="UUr-1E-E64"/>
-                                                        <constraint firstAttribute="trailing" secondItem="poS-lq-bjc" secondAttribute="trailing" constant="5" id="ZEs-7A-24P"/>
-                                                        <constraint firstItem="FDn-7f-r7i" firstAttribute="top" secondItem="Erv-Jh-gKY" secondAttribute="bottom" constant="10" id="bCM-Sb-reR"/>
-                                                        <constraint firstItem="FDn-7f-r7i" firstAttribute="leading" secondItem="Erv-Jh-gKY" secondAttribute="leading" id="rmP-5A-Ijy"/>
-                                                        <constraint firstItem="zPE-Be-KVC" firstAttribute="centerY" secondItem="QOi-AI-kif" secondAttribute="centerY" id="u1N-XE-8fd"/>
-                                                        <constraint firstItem="zPE-Be-KVC" firstAttribute="leading" secondItem="QOi-AI-kif" secondAttribute="trailing" constant="5" id="uMx-xV-QvM"/>
-                                                        <constraint firstItem="XEo-6C-1rh" firstAttribute="centerY" secondItem="gDN-mh-cR7" secondAttribute="centerY" id="wUu-ii-rg8"/>
-                                                        <constraint firstItem="nVf-At-hXD" firstAttribute="leading" secondItem="MdI-bS-3zE" secondAttribute="trailing" constant="5" id="wXx-hy-QsZ"/>
+                                                        <constraint firstItem="wDi-Zy-4rB" firstAttribute="centerY" secondItem="6qD-i1-tev" secondAttribute="centerY" id="4Ot-oK-p45"/>
+                                                        <constraint firstItem="iT9-Mg-UwI" firstAttribute="leading" secondItem="r8P-b3-SYP" secondAttribute="trailing" constant="5" id="6Ls-Et-nsC"/>
+                                                        <constraint firstAttribute="trailing" secondItem="wDi-Zy-4rB" secondAttribute="trailing" constant="5" id="9CO-bv-pcD"/>
+                                                        <constraint firstItem="r8P-b3-SYP" firstAttribute="centerY" secondItem="iT9-Mg-UwI" secondAttribute="centerY" id="TQt-hT-qBQ"/>
+                                                        <constraint firstItem="wDi-Zy-4rB" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="6qD-i1-tev" secondAttribute="trailing" priority="999" constant="5" id="dOh-AW-rh3"/>
+                                                        <constraint firstItem="6qD-i1-tev" firstAttribute="top" secondItem="Ez1-e3-yIq" secondAttribute="top" constant="5" id="dpT-RF-kkz"/>
+                                                        <constraint firstItem="iT9-Mg-UwI" firstAttribute="top" secondItem="6qD-i1-tev" secondAttribute="bottom" constant="8" id="fHt-7S-OuY"/>
+                                                        <constraint firstItem="6qD-i1-tev" firstAttribute="leading" secondItem="Ez1-e3-yIq" secondAttribute="leading" constant="10" id="fQ4-iB-Dey"/>
+                                                        <constraint firstAttribute="bottom" secondItem="iT9-Mg-UwI" secondAttribute="bottom" id="jY3-w0-Ad3"/>
+                                                        <constraint firstItem="iT9-Mg-UwI" firstAttribute="trailing" secondItem="wDi-Zy-4rB" secondAttribute="trailing" id="yrN-v9-UOy"/>
+                                                        <constraint firstItem="r8P-b3-SYP" firstAttribute="leading" secondItem="6qD-i1-tev" secondAttribute="leading" id="zBB-26-ymt"/>
                                                     </constraints>
                                                 </view>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="6Xp-zb-7Ya" firstAttribute="centerY" secondItem="fJB-KB-1Fw" secondAttribute="centerY" id="7lg-Ge-GzJ"/>
-                                                <constraint firstItem="6Xp-zb-7Ya" firstAttribute="leading" secondItem="fJB-KB-1Fw" secondAttribute="leading" constant="5" id="Ojs-Sm-buP"/>
-                                                <constraint firstAttribute="trailing" secondItem="6Xp-zb-7Ya" secondAttribute="trailing" constant="5" id="WaR-a3-UHk"/>
-                                                <constraint firstItem="6Xp-zb-7Ya" firstAttribute="top" secondItem="fJB-KB-1Fw" secondAttribute="top" constant="5" id="WrD-ey-nWT"/>
-                                                <constraint firstItem="6Xp-zb-7Ya" firstAttribute="centerX" secondItem="fJB-KB-1Fw" secondAttribute="centerX" id="ZIQ-Rv-YZH"/>
-                                                <constraint firstAttribute="bottom" secondItem="6Xp-zb-7Ya" secondAttribute="bottom" constant="5" id="hfN-WW-Ehd"/>
+                                                <constraint firstItem="Ez1-e3-yIq" firstAttribute="top" secondItem="I21-oc-ERc" secondAttribute="top" constant="5" id="0Zo-rO-xeT"/>
+                                                <constraint firstItem="Ez1-e3-yIq" firstAttribute="centerY" secondItem="I21-oc-ERc" secondAttribute="centerY" id="NI8-fT-chU"/>
+                                                <constraint firstItem="Ez1-e3-yIq" firstAttribute="leading" secondItem="I21-oc-ERc" secondAttribute="leading" constant="5" id="OCu-ya-hL0"/>
+                                                <constraint firstAttribute="trailing" secondItem="Ez1-e3-yIq" secondAttribute="trailing" constant="5" id="XOO-MU-ATD"/>
+                                                <constraint firstItem="Ez1-e3-yIq" firstAttribute="centerX" secondItem="I21-oc-ERc" secondAttribute="centerX" id="ph4-YP-UNB"/>
+                                                <constraint firstAttribute="bottom" secondItem="Ez1-e3-yIq" secondAttribute="bottom" constant="5" id="wg4-2c-FU6"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                         <connections>
-                                            <outlet property="containerNoLabel" destination="nVf-At-hXD" id="4Jj-3C-vhy"/>
-                                            <outlet property="contentContainer" destination="6Xp-zb-7Ya" id="jDc-VQ-ge6"/>
-                                            <outlet property="dateLabel" destination="zPE-Be-KVC" id="zSY-Nu-f5v"/>
-                                            <outlet property="markView" destination="poS-lq-bjc" id="7zY-ak-N3W"/>
-                                            <outlet property="orderNoLabel" destination="XEo-6C-1rh" id="hpG-Wc-5fV"/>
-                                            <outlet property="statusView" destination="FDn-7f-r7i" id="zHf-k4-BIO"/>
-                                            <outlet property="titleLabel" destination="Erv-Jh-gKY" id="zeC-jH-ZYk"/>
+                                            <outlet property="containerNoLabel" destination="Kd7-FH-8p2" id="Tcr-ch-u2z"/>
+                                            <outlet property="contentContainer" destination="Ez1-e3-yIq" id="qKN-cW-0Ck"/>
+                                            <outlet property="dateLabel" destination="Z8k-hS-sOz" id="iYz-xc-L6c"/>
+                                            <outlet property="markView" destination="wDi-Zy-4rB" id="Ekf-Yy-ghj"/>
+                                            <outlet property="orderNoLabel" destination="hNu-AY-bfS" id="0D3-Cf-5I0"/>
+                                            <outlet property="orderType2Label" destination="1vU-Ly-MVu" id="Yb8-6d-lWK"/>
+                                            <outlet property="statusView" destination="r8P-b3-SYP" id="wcM-lv-Pd0"/>
+                                            <outlet property="titleLabel" destination="6qD-i1-tev" id="dUi-Fs-0KB"/>
                                         </connections>
                                     </tableViewCell>
                                 </prototypes>
@@ -306,7 +396,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="a36-Fz-dNB" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-79.200000000000003" y="128.18590704647679"/>
+            <point key="canvasLocation" x="262" y="126"/>
         </scene>
     </scenes>
 </document>

Redant Drivers/Apex And Drivers/Home/More/RAHomeMoreViewController+TableDelegate.m

@@ -13,7 +13,7 @@
 #pragma mark - TableView Delegate
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-    return 120.0f;
+    return 140.0f;
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {

Redant Drivers/Apex And Drivers/Home/More/RAHomeMoreViewController.m

@@ -30,6 +30,7 @@ typedef enum {
 @property (nonatomic,strong) NSMutableArray<RAHomeOrderModel *> *orderArray;
 @property (nonatomic,strong) JLRefreshFooter *refreshFooter;
 
+@property (nonatomic,strong) NSDictionary *filterTemplate;
 @property (nonatomic,strong) NSDictionary *filter;
 
 @end
@@ -123,8 +124,12 @@ typedef enum {
 }
 
 - (void)filterItemClick:(id)sender {
+    
+//    self.filterTemplate = [RADataProvider loadFakeData:@"fake_order_filter.json"];
+    
     RAOrderFilterViewController *filterVC = [RAOrderFilterViewController viewControllerFromStoryboard];
-    [filterVC setFilter:[RADataProvider loadFakeData:@"fake_order_filter.json"]];
+    [filterVC setFilter:self.filterTemplate];
+    
     __weak typeof(self) weakSelf = self;
     filterVC.searchBlk = ^(NSDictionary *params) {
         weakSelf.filter = params;
@@ -188,6 +193,7 @@ typedef enum {
                 int result = [[json objectForKey:@"result"] intValue];
                 if (result == RESULT_TRUE) {
                     
+                    strongSelf.filterTemplate = [json objectForKey:@"filter"];
                     NSArray *orders = [json objectForKey:@"orders"];
                     
                     if (actionType != LoadDataActionTypeLoadMore) {
@@ -205,9 +211,7 @@ typedef enum {
                         [strongSelf.orderArray addObject:orderModel];
                     }
                     
-                    if (orders.count > 0) {
-                        [strongSelf.homeMoreTableView reloadData];
-                    }
+                    [strongSelf.homeMoreTableView reloadData];
                     
                 } else {
                     

Redant Drivers/Apex And Drivers/Home/RAHomeOrderModel.h

@@ -14,6 +14,12 @@ typedef enum {
     RAOrderStatusNew = 2
 } RAOrderStatus;
 
+@protocol RAHomeOrderModelDelegate <NSObject>
+
+- (void)refreshUI;
+
+@end
+
 @interface RAHomeOrderModel : NSObject
 
 @property (nonatomic,assign) RAOrderStatus status;
@@ -23,5 +29,10 @@ typedef enum {
 @property (nonatomic,copy) NSString *date;
 @property (nonatomic,copy) NSString *orderID;
 @property (nonatomic,copy) NSString *order_type2;
+@property (nonatomic,copy) NSString *iconURL;
+
+@property (nonatomic,strong,readonly) UIImage *icon;
+
+@property (nonatomic,weak) id<RAHomeOrderModelDelegate> delegate;
 
 @end

Redant Drivers/Apex And Drivers/Home/RAHomeOrderModel.m

@@ -7,11 +7,51 @@
 //
 
 #import "RAHomeOrderModel.h"
+#import "UIImage+RedAnt.h"
 
-@implementation RAHomeOrderModel
+@implementation RAHomeOrderModel {
+    UIImage *_icon;
+}
 
 - (void)setValue:(id)value forUndefinedKey:(NSString *)key {
     
 }
 
+- (UIImage *)icon {
+    return _icon;
+}
+
+- (void)setIcon:(UIImage *)icon {
+    _icon = icon;
+    
+    if (self.delegate && [self.delegate respondsToSelector:@selector(refreshUI)]) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self.delegate refreshUI];
+        });
+    }
+}
+
+- (void)setValuesForKeysWithDictionary:(NSDictionary<NSString *,id> *)keyedValues {
+    [super setValuesForKeysWithDictionary:keyedValues];
+    
+    [self setIconURL:@"https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1536134884&di=9ea523019212b373ac04f4411e8aa56b&imgtype=jpg&er=1&src=http%3A%2F%2Fp3.music.126.net%2Fyp-UZgqWp6FV_AN4hPozjQ%3D%3D%2F109951163414711232.jpg"];
+}
+
+- (void)setIconURL:(NSString *)iconURL {
+    _iconURL = iconURL;
+    if (_iconURL.length > 0 && [_iconURL hasPrefix:@"http"]) {
+        __weak typeof(self) weakSelf = self;
+        [RASingleton.sharedInstance.networkQueue addOperationWithBlock:^{
+            
+            UIImage *icon = [UIImage ra_imageWithURL:[NSURL URLWithString:iconURL]];
+            
+            if (weakSelf) {
+                __strong typeof(weakSelf) strongSelf = weakSelf;
+                [strongSelf setIcon:icon];
+            }
+            
+        }];
+    }
+}
+
 @end

Redant Drivers/Apex And Drivers/Home/RAHomeViewController+HomeTableDelegate.m

@@ -15,7 +15,7 @@
 #pragma mark - TableView Delegate
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-    return 120.0f;
+    return 140.0f;
 }
 
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {

Redant Drivers/Apex And Drivers/Home/RAHomeViewController.m

@@ -141,7 +141,7 @@
 }
 
 - (void)configureNavigationBar {
-    UIBarButtonItem *uploadListItem = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"list"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]
+    UIBarButtonItem *uploadListItem = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"upload_list"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]
                                                                        style:UIBarButtonItemStylePlain
                                                                        target:self
                                                                       action:@selector(uploadListItemClick:)];
@@ -259,7 +259,8 @@
                     [RASingleton sharedInstance].requiredLocation = requiredLocation;
                     
                     NSArray *sectionArray = [json objectForKey:@"sections"];
-                    [strongSelf.sectionArray removeAllObjects];
+                    
+                    NSMutableArray *tmpSectionArr = [NSMutableArray array];
                     strongSelf.currentIndexPath = nil;
                     
                     for (int i = 0; i < sectionArray.count; i++) {
@@ -267,7 +268,7 @@
                         RAHomeSectionModel *sectionModel = [RAHomeSectionModel new];
                         sectionModel.section = i;
                         [sectionModel setValuesForKeysWithDictionary:section];
-                        [strongSelf.sectionArray addObject:sectionModel];
+                        [tmpSectionArr addObject:sectionModel];
                         if (strongSelf.currentOrderID.length > 0) {
                             NSInteger idx = [sectionModel orderModelIndexForID:self.currentOrderID];
                             if (idx > -1) {
@@ -276,6 +277,7 @@
                         }
                     }
 
+                    strongSelf.sectionArray = tmpSectionArr;
                     [strongSelf.homeOrderTableView reloadData];
                     if (strongSelf.currentIndexPath) {
 //                        [strongSelf.homeOrderTableView scrollToRowAtIndexPath:self.currentIndexPath atScrollPosition:UITableViewScrollPositionMiddle animated:NO];

Redant Drivers/Apex And Drivers/Home/RAOrderCell.m

@@ -9,7 +9,7 @@
 #import "RAOrderCell.h"
 #import "RAHomeOrderModel.h"
 
-@interface RAOrderCell ()
+@interface RAOrderCell () <RAHomeOrderModelDelegate>
 
 @property (strong, nonatomic) IBOutlet UIView *contentContainer;
 @property (strong, nonatomic) IBOutlet UILabel *titleLabel;
@@ -18,6 +18,8 @@
 @property (strong, nonatomic) IBOutlet UILabel *dateLabel;
 @property (strong, nonatomic) IBOutlet UIImageView *markView;
 @property (strong, nonatomic) IBOutlet UIImageView *statusView;
+@property (strong, nonatomic) IBOutlet UILabel *orderType2Label;
+
 @property (nonatomic,strong) UIView *selectionView;
 
 
@@ -76,15 +78,11 @@
 #pragma mark - Set
 
 - (void)setOrderModel:(RAHomeOrderModel *)orderModel {
+    _orderModel.delegate = nil;
     _orderModel = orderModel;
+    _orderModel.delegate = self;
     
-    NSString *title = _orderModel.title;
-    NSString *orderNo = _orderModel.orderNo;
-    NSString *containerNo = _orderModel.containerNo;
-    NSString *date = _orderModel.date;
-    RAOrderStatus status = _orderModel.status;
-    
-    [[[[[self setTitle:title] setOrderNo:orderNo] setContainerNo:containerNo] setDate:date] setStatus:status];
+    [self refreshUI];
 }
 
 - (instancetype)setTitle:(NSString *)title {
@@ -111,6 +109,12 @@
     return self;
 }
 
+- (instancetype)setOrderType2:(NSString *)orderType2 {
+    self.orderType2Label.text = orderType2;
+    
+    return self;
+}
+
 - (instancetype)setStatus:(RAOrderStatus)status {
 
     self.markView.hidden = status != RAOrderStatusNew;
@@ -118,4 +122,26 @@
     return self;
 }
 
+- (instancetype)setStatusIcon:(UIImage *)icon {
+    self.statusView.image = icon;
+    
+    return self;
+}
+
+#pragma mark - Model Delegate
+
+- (void)refreshUI {
+    
+    NSString *title = _orderModel.title;
+    NSString *orderNo = _orderModel.orderNo;
+    NSString *containerNo = _orderModel.containerNo;
+    NSString *date = _orderModel.date;
+    NSString *orderType2 = _orderModel.order_type2;
+    RAOrderStatus status = _orderModel.status;
+    UIImage *icon = _orderModel.icon;
+    
+    [[[[[[[self setTitle:title] setOrderNo:orderNo] setContainerNo:containerNo] setDate:date] setStatus:status] setOrderType2:orderType2] setStatusIcon:icon];
+    
+}
+
 @end

Redant Drivers/Apex And Drivers/Login/Login.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -81,7 +81,7 @@
                                     <constraint firstItem="vy2-V9-9ML" firstAttribute="centerY" secondItem="Qz0-oF-i3d" secondAttribute="centerY" id="qjq-Ld-Wsm"/>
                                 </constraints>
                             </view>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="apexlogo-1" translatesAutoresizingMaskIntoConstraints="NO" id="uPR-4Z-qVR">
+                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="uPR-4Z-qVR">
                                 <rect key="frame" x="49.5" y="49" width="276" height="120"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="120" id="4oM-B6-IP5"/>
@@ -234,7 +234,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="apexlogo-1" width="16" height="16"/>
+        <image name="logo" width="276" height="120"/>
         <image name="unchecked_32" width="16" height="16"/>
     </resources>
 </document>

Redant Drivers/Apex And Drivers/RASingleton.h

@@ -24,6 +24,8 @@
 @property (nonatomic,copy) NSString *notificationToken;
 @property (nonatomic,assign) BOOL requiredLocation;
 
+@property (nonatomic,strong) NSOperationQueue *networkQueue;
+
 - (void)saveUserInfo;
 
 - (NSString *)savedUser;

Redant Drivers/Apex And Drivers/RASingleton.m

@@ -157,4 +157,15 @@ static RASingleton *singleton;
     return [AESCrypt decrypt:str password:self.secretKey];
 }
 
+#pragma mark - NetworkQueue
+
+- (NSOperationQueue *)networkQueue {
+    if (!_networkQueue) {
+        _networkQueue = [[NSOperationQueue alloc] init];
+        _networkQueue.maxConcurrentOperationCount = 5;
+        _networkQueue.qualityOfService = NSQualityOfServiceUtility;
+    }
+    return _networkQueue;
+}
+
 @end

Redant Drivers/Apex And Drivers/UIImage+RedAnt.h

@@ -0,0 +1,15 @@
+//
+//  UIImage+RedAnt.h
+//  Apex And Drivers
+//
+//  Created by Jack on 2018/8/29.
+//  Copyright © 2018年 USAI. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface UIImage (RedAnt)
+
++ (instancetype)ra_imageWithURL:(NSURL *)url;
+
+@end

Redant Drivers/Apex And Drivers/UIImage+RedAnt.m

@@ -0,0 +1,80 @@
+//
+//  UIImage+RedAnt.m
+//  Apex And Drivers
+//
+//  Created by Jack on 2018/8/29.
+//  Copyright © 2018年 USAI. All rights reserved.
+//
+
+#import "UIImage+RedAnt.h"
+#import <CommonCrypto/CommonCrypto.h>
+
+static dispatch_semaphore_t _lock;
+
+#define Lock() dispatch_semaphore_wait(_lock, DISPATCH_TIME_FOREVER)
+#define Unlock() dispatch_semaphore_signal(_lock)
+
+@implementation UIImage (RedAnt)
+
++ (void)load {
+    _lock = dispatch_semaphore_create(1);
+}
+
++ (instancetype)ra_imageWithURL:(NSURL *)url {
+    
+    if (url == nil) {
+        return nil;
+    }
+    
+    if ([url.scheme isEqualToString:@"file"]) {
+        return [UIImage imageWithContentsOfFile:url.absoluteString];
+    }
+    
+    NSString *md5 = [self md5:url.absoluteString];
+    
+    NSString *imgDir = [self imageCacheDir];
+    NSString *imgPath = [imgDir stringByAppendingPathComponent:md5];
+    
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    
+    BOOL isDir = NO;
+    BOOL exist = [fileManager fileExistsAtPath:imgPath isDirectory:&isDir];
+    
+    if (exist && !isDir) {
+        return [UIImage imageWithContentsOfFile:imgPath];
+    } else {
+        
+        NSData *imgData = [NSData dataWithContentsOfURL:url];
+        
+        exist = [fileManager fileExistsAtPath:imgDir isDirectory:&isDir];
+        if ((exist && isDir) || !exist) {
+            [fileManager createDirectoryAtPath:imgDir withIntermediateDirectories:YES attributes:nil error:nil];
+        }
+        
+        Lock();
+        [imgData writeToFile:imgPath atomically:NO];
+        Unlock();
+        
+        return [UIImage imageWithData:imgData];
+    }
+}
+
++ (NSString *)imageCacheDir {
+    return [[NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) lastObject] stringByAppendingPathComponent:@"ra_image"];
+}
+
++ (nullable NSString *)md5:(nullable NSString *)str {
+    if (!str) return nil;
+    
+    const char *cStr = str.UTF8String;
+    unsigned char result[CC_MD5_DIGEST_LENGTH];
+    CC_MD5(cStr, (CC_LONG)strlen(cStr), result);
+    
+    NSMutableString *md5Str = [NSMutableString string];
+    for (int i = 0; i < CC_MD5_DIGEST_LENGTH; ++i) {
+        [md5Str appendFormat:@"%02x", result[i]];
+    }
+    return md5Str;
+}
+
+@end