1.完成iOS Apex Drivers首页Header。

Redant Drivers/Apex And Drivers.xcodeproj/project.pbxproj

@@ -123,6 +123,16 @@
 		42C1B2702134D61200637085 /* Filter.png in Resources */ = {isa = PBXBuildFile; fileRef = 42C1B26F2134D61100637085 /* Filter.png */; };
 		42C1B2742134F24C00637085 /* RADatePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42C1B2732134F24C00637085 /* RADatePickerViewController.m */; };
 		42D187802140BACC00C822C0 /* RAEditRequiredAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D1877F2140BACC00C822C0 /* RAEditRequiredAlert.m */; };
+		42D7B06421474EE30046FE89 /* unavailable.png in Resources */ = {isa = PBXBuildFile; fileRef = 42D7B06221474EE20046FE89 /* unavailable.png */; };
+		42D7B06521474EE30046FE89 /* available.png in Resources */ = {isa = PBXBuildFile; fileRef = 42D7B06321474EE30046FE89 /* available.png */; };
+		42D7B06B214770220046FE89 /* message.png in Resources */ = {isa = PBXBuildFile; fileRef = 42D7B06A214770210046FE89 /* message.png */; };
+		42D7B06D214770C40046FE89 /* setting.png in Resources */ = {isa = PBXBuildFile; fileRef = 42D7B06C214770C40046FE89 /* setting.png */; };
+		42D7B06F214771140046FE89 /* signout.png in Resources */ = {isa = PBXBuildFile; fileRef = 42D7B06E214771130046FE89 /* signout.png */; };
+		42D7B07121478D9C0046FE89 /* new_message.png in Resources */ = {isa = PBXBuildFile; fileRef = 42D7B07021478D9B0046FE89 /* new_message.png */; };
+		42D7B0762147945C0046FE89 /* RASettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D7B0752147945C0046FE89 /* RASettingViewController.m */; };
+		42D7B0792147946D0046FE89 /* RAMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D7B0782147946D0046FE89 /* RAMessageViewController.m */; };
+		42D7B07B2147949B0046FE89 /* setting.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42D7B07A2147949B0046FE89 /* setting.storyboard */; };
+		42D7B07D2147953D0046FE89 /* message.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42D7B07C2147953D0046FE89 /* message.storyboard */; };
 		42D8B8A320C2253E001C125F /* fake_order_list.json in Resources */ = {isa = PBXBuildFile; fileRef = 42D8B8A220C2253E001C125F /* fake_order_list.json */; };
 		42D8B8A820C23DD9001C125F /* RAOrderDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D8B8A720C23DD9001C125F /* RAOrderDetailViewController.m */; };
 		42D8B8AA20C23DF0001C125F /* Detail.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42D8B8A920C23DF0001C125F /* Detail.storyboard */; };
@@ -396,6 +406,18 @@
 		42C1B2732134F24C00637085 /* RADatePickerViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RADatePickerViewController.m; sourceTree = "<group>"; };
 		42D1877E2140BACC00C822C0 /* RAEditRequiredAlert.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAEditRequiredAlert.h; sourceTree = "<group>"; };
 		42D1877F2140BACC00C822C0 /* RAEditRequiredAlert.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAEditRequiredAlert.m; sourceTree = "<group>"; };
+		42D7B06221474EE20046FE89 /* unavailable.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = unavailable.png; sourceTree = "<group>"; };
+		42D7B06321474EE30046FE89 /* available.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = available.png; sourceTree = "<group>"; };
+		42D7B06A214770210046FE89 /* message.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = message.png; sourceTree = "<group>"; };
+		42D7B06C214770C40046FE89 /* setting.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = setting.png; sourceTree = "<group>"; };
+		42D7B06E214771130046FE89 /* signout.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = signout.png; sourceTree = "<group>"; };
+		42D7B07021478D9B0046FE89 /* new_message.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = new_message.png; sourceTree = "<group>"; };
+		42D7B0742147945C0046FE89 /* RASettingViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RASettingViewController.h; sourceTree = "<group>"; };
+		42D7B0752147945C0046FE89 /* RASettingViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RASettingViewController.m; sourceTree = "<group>"; };
+		42D7B0772147946D0046FE89 /* RAMessageViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAMessageViewController.h; sourceTree = "<group>"; };
+		42D7B0782147946D0046FE89 /* RAMessageViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAMessageViewController.m; sourceTree = "<group>"; };
+		42D7B07A2147949B0046FE89 /* setting.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = setting.storyboard; sourceTree = "<group>"; };
+		42D7B07C2147953D0046FE89 /* message.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = message.storyboard; sourceTree = "<group>"; };
 		42D8B8A220C2253E001C125F /* fake_order_list.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = fake_order_list.json; sourceTree = "<group>"; };
 		42D8B8A620C23DD9001C125F /* RAOrderDetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAOrderDetailViewController.h; sourceTree = "<group>"; };
 		42D8B8A720C23DD9001C125F /* RAOrderDetailViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAOrderDetailViewController.m; sourceTree = "<group>"; };
@@ -896,6 +918,26 @@
 			path = RequiredAlertVC;
 			sourceTree = "<group>";
 		};
+		42D7B072214794380046FE89 /* Setting */ = {
+			isa = PBXGroup;
+			children = (
+				42D7B0742147945C0046FE89 /* RASettingViewController.h */,
+				42D7B0752147945C0046FE89 /* RASettingViewController.m */,
+				42D7B07A2147949B0046FE89 /* setting.storyboard */,
+			);
+			path = Setting;
+			sourceTree = "<group>";
+		};
+		42D7B073214794420046FE89 /* Message */ = {
+			isa = PBXGroup;
+			children = (
+				42D7B0772147946D0046FE89 /* RAMessageViewController.h */,
+				42D7B0782147946D0046FE89 /* RAMessageViewController.m */,
+				42D7B07C2147953D0046FE89 /* message.storyboard */,
+			);
+			path = Message;
+			sourceTree = "<group>";
+		};
 		42D8B8A120C224EE001C125F /* FakeData */ = {
 			isa = PBXGroup;
 			children = (
@@ -1046,6 +1088,12 @@
 		71EAA32520B9571B002F003C = {
 			isa = PBXGroup;
 			children = (
+				42D7B07021478D9B0046FE89 /* new_message.png */,
+				42D7B06E214771130046FE89 /* signout.png */,
+				42D7B06C214770C40046FE89 /* setting.png */,
+				42D7B06A214770210046FE89 /* message.png */,
+				42D7B06321474EE30046FE89 /* available.png */,
+				42D7B06221474EE20046FE89 /* unavailable.png */,
 				422BD959213CE06300DF8E89 /* backend_flag.png */,
 				42C1B26F2134D61100637085 /* Filter.png */,
 				420D11222133F7A700149B37 /* Checkmark.png */,
@@ -1071,6 +1119,8 @@
 		71EAA33020B9571B002F003C /* Apex And Drivers */ = {
 			isa = PBXGroup;
 			children = (
+				42D7B073214794420046FE89 /* Message */,
+				42D7B072214794380046FE89 /* Setting */,
 				42DFE267213F81F8000213C2 /* EmptyView */,
 				42DFE260213F80AF000213C2 /* UIScrollVIew+Empty */,
 				422DA1BD2134FA510021BD70 /* PresentationController */,
@@ -1210,11 +1260,18 @@
 			buildActionMask = 2147483647;
 			files = (
 				42C1B2702134D61200637085 /* Filter.png in Resources */,
+				42D7B07121478D9C0046FE89 /* new_message.png in Resources */,
+				42D7B06521474EE30046FE89 /* available.png in Resources */,
+				42D7B06B214770220046FE89 /* message.png in Resources */,
 				71EAA33E20B95720002F003C /* LaunchScreen.storyboard in Resources */,
 				420D112B2133F98600149B37 /* fake_order_filter.json in Resources */,
+				42D7B06F214771140046FE89 /* signout.png in Resources */,
+				42D7B06D214770C40046FE89 /* setting.png in Resources */,
 				4255EC8220C51A5000E5DA24 /* Barcode_n.png in Resources */,
+				42D7B07D2147953D0046FE89 /* message.storyboard in Resources */,
 				422BD95C213CE0F300DF8E89 /* HomeHeader.xib in Resources */,
 				4235FAAB213E255D000B6672 /* signature.storyboard in Resources */,
+				42D7B07B2147949B0046FE89 /* setting.storyboard in Resources */,
 				4255ECA120C5400400E5DA24 /* Barcode_h.png in Resources */,
 				4258D16320CE298500067071 /* list.png in Resources */,
 				422BD95A213CE06300DF8E89 /* backend_flag.png in Resources */,
@@ -1233,6 +1290,7 @@
 				4258D16120CE296E00067071 /* logout.png in Resources */,
 				425B97EA20C7BF4E00B35713 /* Upload.storyboard in Resources */,
 				420D11232133F7A700149B37 /* Checkmark.png in Resources */,
+				42D7B06421474EE30046FE89 /* unavailable.png in Resources */,
 				4255EC7620C5097200E5DA24 /* Edit.storyboard in Resources */,
 				4205FD6320C136F900DB42B4 /* Home.storyboard in Resources */,
 				4205FD4420C0F2C000DB42B4 /* Login.storyboard in Resources */,
@@ -1274,6 +1332,7 @@
 				425B97D120C78ABE00B35713 /* RAUploadOperation.m in Sources */,
 				4255EC7120C4E2EC00E5DA24 /* RADetailActionSelectionModel.m in Sources */,
 				420D11092133EE5D00149B37 /* RAOrderFilterSectionModel.m in Sources */,
+				42D7B0762147945C0046FE89 /* RASettingViewController.m in Sources */,
 				42D8B8DE20C279BA001C125F /* RAOrderDetailViewController+TableViewDelegate.m in Sources */,
 				425B97E520C7BD3800B35713 /* UIView+Toast.m in Sources */,
 				42DFE26A213F821E000213C2 /* RAEmptyView.m in Sources */,
@@ -1318,6 +1377,7 @@
 				42D8B8B420C2463D001C125F /* RADetailLocationCell.m in Sources */,
 				4281100520E4D47000315156 /* UIView+JLExtension.m in Sources */,
 				423C6A4E20C909FC00455E27 /* RANotificationNameCenter.m in Sources */,
+				42D7B0792147946D0046FE89 /* RAMessageViewController.m in Sources */,
 				42529D3A20C0EA3F000C0F4D /* mztools.c in Sources */,
 				4235FAB3213E25AC000B6672 /* RAEditSignatureCell.m in Sources */,
 				4235FAA0213E1236000B6672 /* RADetailPhotoModel.m in Sources */,

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

@@ -160,6 +160,7 @@
                                                     </constraints>
                                                 </view>
                                             </subviews>
+                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <constraints>
                                                 <constraint firstAttribute="trailing" secondItem="etn-cW-0fL" secondAttribute="trailing" constant="5" id="3KZ-gN-bqD"/>
                                                 <constraint firstItem="etn-cW-0fL" firstAttribute="top" secondItem="86U-Ij-DDb" secondAttribute="top" constant="5" id="AD6-kf-Ryl"/>
@@ -169,6 +170,7 @@
                                                 <constraint firstItem="etn-cW-0fL" firstAttribute="centerY" secondItem="86U-Ij-DDb" secondAttribute="centerY" id="tFY-KQ-PJm"/>
                                             </constraints>
                                         </tableViewCellContentView>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <connections>
                                             <outlet property="containerNoLabel" destination="ODR-wu-t8u" id="E2o-Ya-c8a"/>
                                             <outlet property="contentContainer" destination="etn-cW-0fL" id="Csc-aw-fMh"/>
@@ -354,6 +356,7 @@
                                                     </constraints>
                                                 </view>
                                             </subviews>
+                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <constraints>
                                                 <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"/>
@@ -363,6 +366,7 @@
                                                 <constraint firstAttribute="bottom" secondItem="Ez1-e3-yIq" secondAttribute="bottom" constant="5" id="wg4-2c-FU6"/>
                                             </constraints>
                                         </tableViewCellContentView>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <connections>
                                             <outlet property="containerNoLabel" destination="Kd7-FH-8p2" id="Tcr-ch-u2z"/>
                                             <outlet property="contentContainer" destination="Ez1-e3-yIq" id="qKN-cW-0Ck"/>

Redant Drivers/Apex And Drivers/Home/HomeHeader.xib

@@ -16,6 +16,10 @@
             <rect key="frame" x="0.0" y="0.0" width="658" height="44"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="l4u-F8-Ddb">
+                    <rect key="frame" x="5" y="0.0" width="648" height="44"/>
+                    <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                </view>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zid-Ks-zO5">
                     <rect key="frame" x="10" y="12" width="42" height="21"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -35,41 +39,46 @@
                     </constraints>
                 </view>
             </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstItem="m5T-tW-9hq" firstAttribute="trailing" secondItem="J4X-Vt-JUe" secondAttribute="trailing" constant="10" id="3b3-JN-LZE"/>
                 <constraint firstItem="J4X-Vt-JUe" firstAttribute="centerY" secondItem="m5T-tW-9hq" secondAttribute="centerY" id="9Rn-o7-OPT"/>
                 <constraint firstItem="68c-5k-TZT" firstAttribute="leading" secondItem="zid-Ks-zO5" secondAttribute="trailing" constant="5" id="DeO-mo-zFg"/>
+                <constraint firstItem="l4u-F8-Ddb" firstAttribute="top" secondItem="Of7-Zs-dma" secondAttribute="top" id="KLS-Bh-dOJ"/>
+                <constraint firstAttribute="bottom" secondItem="l4u-F8-Ddb" secondAttribute="bottom" id="Pnz-Mv-2S2"/>
                 <constraint firstItem="68c-5k-TZT" firstAttribute="centerY" secondItem="zid-Ks-zO5" secondAttribute="centerY" id="UuK-J4-dxh"/>
+                <constraint firstItem="m5T-tW-9hq" firstAttribute="trailing" secondItem="l4u-F8-Ddb" secondAttribute="trailing" constant="5" id="ZPG-3z-pR3"/>
                 <constraint firstItem="J4X-Vt-JUe" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="68c-5k-TZT" secondAttribute="trailing" priority="999" constant="5" id="n9j-ds-8Ub"/>
+                <constraint firstItem="l4u-F8-Ddb" firstAttribute="leading" secondItem="m5T-tW-9hq" secondAttribute="leading" constant="5" id="p6U-Tk-YtX"/>
                 <constraint firstItem="zid-Ks-zO5" firstAttribute="leading" secondItem="m5T-tW-9hq" secondAttribute="leading" constant="10" id="yj0-oj-G87"/>
                 <constraint firstItem="zid-Ks-zO5" firstAttribute="centerY" secondItem="m5T-tW-9hq" secondAttribute="centerY" id="zTW-Hz-NFg"/>
             </constraints>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <viewLayoutGuide key="safeArea" id="m5T-tW-9hq"/>
             <connections>
+                <outlet property="backgroundView" destination="l4u-F8-Ddb" id="HgP-1x-dWV"/>
                 <outlet property="badgeView" destination="68c-5k-TZT" id="AR6-eW-kbc"/>
                 <outlet property="moreBtn" destination="J4X-Vt-JUe" id="GLd-pT-vvy"/>
                 <outlet property="titleLaebl" destination="zid-Ks-zO5" id="kFh-0I-zJe"/>
             </connections>
             <point key="canvasLocation" x="988" y="291"/>
         </view>
-        <view contentMode="scaleToFill" id="CmN-WL-UzN">
-            <rect key="frame" x="0.0" y="0.0" width="658" height="165"/>
+        <view contentMode="scaleToFill" id="CmN-WL-UzN" customClass="RAHomeHeaderView">
+            <rect key="frame" x="0.0" y="0.0" width="658" height="145"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="q6Y-ok-z0V">
-                    <rect key="frame" x="0.0" y="-835" width="658" height="1000"/>
-                    <color key="backgroundColor" red="0.99917410539999996" green="0.82124866299999999" blue="0.23193136440000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <rect key="frame" x="0.0" y="-895" width="658" height="1000"/>
+                    <color key="backgroundColor" red="0.31186315860000002" green="0.73688559149999999" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="1000" id="fD7-Vn-lfh"/>
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kUV-Ds-Cp0">
-                    <rect key="frame" x="5" y="70" width="648" height="90"/>
+                    <rect key="frame" x="5" y="70" width="648" height="70"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oNA-fq-R2b">
-                            <rect key="frame" x="5" y="5" width="156" height="80"/>
+                            <rect key="frame" x="5" y="-15" width="156" height="80"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sign Out" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="moB-91-AOW">
                                     <rect key="frame" x="50.5" y="61" width="56" height="17"/>
@@ -77,26 +86,28 @@
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
                                 </label>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DoZ-Kc-GDv">
-                                    <rect key="frame" x="53" y="6" width="50" height="50"/>
-                                    <color key="backgroundColor" red="0.13660016199169084" green="0.13939174194564607" blue="0.67000001669999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DoZ-Kc-GDv">
+                                    <rect key="frame" x="58" y="19" width="40" height="40"/>
                                     <constraints>
-                                        <constraint firstAttribute="height" constant="50" id="4Sr-1p-bEQ"/>
-                                        <constraint firstAttribute="width" constant="50" id="gv7-gD-7iB"/>
+                                        <constraint firstAttribute="height" constant="40" id="4Sr-1p-bEQ"/>
+                                        <constraint firstAttribute="width" constant="40" id="gv7-gD-7iB"/>
                                     </constraints>
+                                    <state key="normal" image="signout.png"/>
+                                    <connections>
+                                        <action selector="signoutBtnClick:" destination="CmN-WL-UzN" eventType="touchUpInside" id="X1D-gl-Zqf"/>
+                                    </connections>
                                 </button>
                             </subviews>
-                            <color key="backgroundColor" red="0.34185270566415227" green="0.67000001669999998" blue="0.41932404711053578" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
                                 <constraint firstItem="DoZ-Kc-GDv" firstAttribute="centerX" secondItem="oNA-fq-R2b" secondAttribute="centerX" id="Q1t-8S-8Zh"/>
-                                <constraint firstItem="moB-91-AOW" firstAttribute="top" secondItem="DoZ-Kc-GDv" secondAttribute="bottom" constant="5" id="WrK-S5-iW2"/>
+                                <constraint firstItem="moB-91-AOW" firstAttribute="top" secondItem="DoZ-Kc-GDv" secondAttribute="bottom" constant="2" id="WrK-S5-iW2"/>
                                 <constraint firstAttribute="bottom" secondItem="moB-91-AOW" secondAttribute="bottom" constant="2" id="lJt-lC-uqw"/>
                                 <constraint firstItem="moB-91-AOW" firstAttribute="centerX" secondItem="oNA-fq-R2b" secondAttribute="centerX" id="smn-aP-g6P"/>
                                 <constraint firstAttribute="height" constant="80" id="vze-jF-PXl"/>
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="y3L-Ku-sNt">
-                            <rect key="frame" x="166" y="5" width="155.5" height="80"/>
+                            <rect key="frame" x="166" y="-15" width="155.5" height="80"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Setting" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JIY-pR-ykw">
                                     <rect key="frame" x="54.5" y="61" width="46.5" height="17"/>
@@ -104,19 +115,21 @@
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
                                 </label>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vJn-m4-oEg">
-                                    <rect key="frame" x="53" y="6" width="50" height="50"/>
-                                    <color key="backgroundColor" red="0.13660016199169084" green="0.13939174194564607" blue="0.67000001669999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vJn-m4-oEg">
+                                    <rect key="frame" x="58" y="19" width="40" height="40"/>
+                                    <state key="normal" image="setting.png"/>
+                                    <connections>
+                                        <action selector="settingBtnClick:" destination="CmN-WL-UzN" eventType="touchUpInside" id="Z0b-02-8mY"/>
+                                    </connections>
                                 </button>
                             </subviews>
-                            <color key="backgroundColor" red="0.99917410539999996" green="0.82124866299999999" blue="0.23193136440000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
                                 <constraint firstItem="vJn-m4-oEg" firstAttribute="centerX" secondItem="y3L-Ku-sNt" secondAttribute="centerX" id="UoL-47-ze8"/>
                                 <constraint firstItem="JIY-pR-ykw" firstAttribute="centerX" secondItem="y3L-Ku-sNt" secondAttribute="centerX" id="uEn-Zw-Duc"/>
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2aS-CO-3jY">
-                            <rect key="frame" x="326.5" y="5" width="155.5" height="80"/>
+                            <rect key="frame" x="326.5" y="-15" width="155.5" height="80"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Available" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hae-rx-iyX">
                                     <rect key="frame" x="50" y="61" width="57" height="17"/>
@@ -124,19 +137,22 @@
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
                                 </label>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zav-l2-wiC">
-                                    <rect key="frame" x="53" y="6" width="50" height="50"/>
-                                    <color key="backgroundColor" red="0.13660016199169084" green="0.13939174194564607" blue="0.67000001669999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zav-l2-wiC">
+                                    <rect key="frame" x="58" y="19" width="40" height="40"/>
+                                    <state key="normal" image="available.png"/>
+                                    <state key="selected" image="unavailable.png"/>
+                                    <connections>
+                                        <action selector="availableBtnClick:" destination="CmN-WL-UzN" eventType="touchUpInside" id="8u5-0b-SlC"/>
+                                    </connections>
                                 </button>
                             </subviews>
-                            <color key="backgroundColor" red="1" green="0.1047433005" blue="0.075207091899999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
                                 <constraint firstItem="Hae-rx-iyX" firstAttribute="centerX" secondItem="2aS-CO-3jY" secondAttribute="centerX" id="LUa-Up-UxI"/>
                                 <constraint firstItem="zav-l2-wiC" firstAttribute="centerX" secondItem="2aS-CO-3jY" secondAttribute="centerX" id="qYz-dD-V8c"/>
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iQb-jc-IpW">
-                            <rect key="frame" x="487" y="5" width="155.5" height="80"/>
+                            <rect key="frame" x="487" y="-15" width="155.5" height="80"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Message" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T2T-ct-zc2">
                                     <rect key="frame" x="49" y="61" width="58" height="17"/>
@@ -144,12 +160,15 @@
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
                                 </label>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="g4U-M8-oMo">
-                                    <rect key="frame" x="53" y="6" width="50" height="50"/>
-                                    <color key="backgroundColor" red="0.13660016199169084" green="0.13939174194564607" blue="0.67000001669999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="g4U-M8-oMo">
+                                    <rect key="frame" x="58.5" y="19" width="40" height="40"/>
+                                    <state key="normal" image="message.png"/>
+                                    <state key="selected" image="new_message.png"/>
+                                    <connections>
+                                        <action selector="messageBtnClick:" destination="CmN-WL-UzN" eventType="touchUpInside" id="rtb-6D-QVQ"/>
+                                    </connections>
                                 </button>
                             </subviews>
-                            <color key="backgroundColor" red="0.31186315860000002" green="0.73688559149999999" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
                                 <constraint firstItem="g4U-M8-oMo" firstAttribute="centerX" secondItem="iQb-jc-IpW" secondAttribute="centerX" id="Hcz-d3-Oxr"/>
                                 <constraint firstItem="T2T-ct-zc2" firstAttribute="centerX" secondItem="iQb-jc-IpW" secondAttribute="centerX" id="Rm8-84-grW"/>
@@ -188,7 +207,7 @@
                     </constraints>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
-                            <integer key="value" value="5"/>
+                            <integer key="value" value="10"/>
                         </userDefinedRuntimeAttribute>
                         <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
                     </userDefinedRuntimeAttributes>
@@ -202,17 +221,16 @@
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="121" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U0M-Uc-xWZ">
                                     <rect key="frame" x="0.0" y="7.5" width="212.5" height="21"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                    <nil key="textColor"/>
+                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hNz-uM-4Kh">
                                     <rect key="frame" x="0.0" y="31.5" width="212.5" height="21"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                    <nil key="textColor"/>
+                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                             </subviews>
-                            <color key="backgroundColor" red="0.64783424140000001" green="0.22448275840000001" blue="0.21907054149999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
                                 <constraint firstItem="U0M-Uc-xWZ" firstAttribute="leading" secondItem="xlF-8W-Q64" secondAttribute="leading" id="ACy-Uj-7zK"/>
                                 <constraint firstItem="hNz-uM-4Kh" firstAttribute="centerX" secondItem="xlF-8W-Q64" secondAttribute="centerX" id="IQG-0W-Xff"/>
@@ -231,17 +249,16 @@
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="132" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vBo-bi-6Qy">
                                     <rect key="frame" x="0.0" y="7.5" width="213" height="21"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                    <nil key="textColor"/>
+                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Processing" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ebH-bD-mco">
                                     <rect key="frame" x="0.0" y="31.5" width="213" height="21"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                    <nil key="textColor"/>
+                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                             </subviews>
-                            <color key="backgroundColor" red="0.081770886230000006" green="0.40781933069999998" blue="0.094417002809999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
                                 <constraint firstItem="vBo-bi-6Qy" firstAttribute="centerY" secondItem="PMs-34-A9a" secondAttribute="centerY" constant="-12" id="0BN-oB-DHB"/>
                                 <constraint firstAttribute="trailing" secondItem="ebH-bD-mco" secondAttribute="trailing" id="E68-Id-wFs"/>
@@ -257,17 +274,16 @@
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="5555" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="apL-NL-f18">
                                     <rect key="frame" x="0.0" y="7.5" width="212.5" height="21"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                    <nil key="textColor"/>
+                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <nil key="highlightedColor"/>
                                 </label>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Finish" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xea-9I-xck">
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Finished" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xea-9I-xck">
                                     <rect key="frame" x="0.0" y="31.5" width="212.5" height="21"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                    <nil key="textColor"/>
+                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                             </subviews>
-                            <color key="backgroundColor" red="0.86933290155440412" green="0.66196060733770723" blue="0.46316586088286715" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
                                 <constraint firstItem="xea-9I-xck" firstAttribute="centerY" secondItem="thx-28-zRP" secondAttribute="centerY" constant="12" id="2wL-0D-0KN"/>
                                 <constraint firstItem="apL-NL-f18" firstAttribute="centerY" secondItem="thx-28-zRP" secondAttribute="centerY" constant="-12" id="B5I-8D-OXj"/>
@@ -298,7 +314,6 @@
                     </constraints>
                 </view>
             </subviews>
-            <color key="backgroundColor" red="0.99917410539999996" green="0.82124866299999999" blue="0.23193136440000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="IHY-tg-LLn" firstAttribute="trailing" secondItem="kUV-Ds-Cp0" secondAttribute="trailing" constant="5" id="1nn-JE-xhd"/>
                 <constraint firstItem="IHY-tg-LLn" firstAttribute="trailing" secondItem="q6Y-ok-z0V" secondAttribute="trailing" id="8VI-Lt-KWR"/>
@@ -306,14 +321,33 @@
                 <constraint firstItem="q6Y-ok-z0V" firstAttribute="leading" secondItem="IHY-tg-LLn" secondAttribute="leading" id="any-aM-O02"/>
                 <constraint firstItem="kyi-82-tau" firstAttribute="top" secondItem="IHY-tg-LLn" secondAttribute="top" constant="5" id="cbo-BF-nmR"/>
                 <constraint firstItem="kyi-82-tau" firstAttribute="leading" secondItem="IHY-tg-LLn" secondAttribute="leading" constant="5" id="eU2-rB-Slw"/>
-                <constraint firstItem="IHY-tg-LLn" firstAttribute="bottom" secondItem="q6Y-ok-z0V" secondAttribute="bottom" id="gkh-x9-khp"/>
+                <constraint firstItem="IHY-tg-LLn" firstAttribute="bottom" secondItem="q6Y-ok-z0V" secondAttribute="bottom" constant="40" id="gkh-x9-khp"/>
                 <constraint firstItem="IHY-tg-LLn" firstAttribute="trailing" secondItem="kyi-82-tau" secondAttribute="trailing" constant="5" id="hGE-sn-97J"/>
                 <constraint firstItem="IHY-tg-LLn" firstAttribute="bottom" secondItem="kUV-Ds-Cp0" secondAttribute="bottom" constant="5" id="hZr-Do-zh2"/>
                 <constraint firstItem="kUV-Ds-Cp0" firstAttribute="top" secondItem="kyi-82-tau" secondAttribute="bottom" constant="5" id="qif-M5-WcJ"/>
             </constraints>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <viewLayoutGuide key="safeArea" id="IHY-tg-LLn"/>
+            <connections>
+                <outlet property="FinishCountLabel" destination="apL-NL-f18" id="p7I-uf-608"/>
+                <outlet property="NewCountLabel" destination="U0M-Uc-xWZ" id="7DF-6T-Oia"/>
+                <outlet property="ProcessingCountLabel" destination="vBo-bi-6Qy" id="6fO-7e-9ZT"/>
+                <outlet property="availableBtn" destination="zav-l2-wiC" id="dGa-tn-DL6"/>
+                <outlet property="availableTitleLabel" destination="Hae-rx-iyX" id="Mlr-72-rTe"/>
+                <outlet property="backgroundView" destination="q6Y-ok-z0V" id="O1Q-PB-BO0"/>
+                <outlet property="messageBtn" destination="g4U-M8-oMo" id="s8m-Kt-9Rw"/>
+                <outlet property="settingBtn" destination="vJn-m4-oEg" id="rqD-th-mZy"/>
+                <outlet property="signoutBtn" destination="DoZ-Kc-GDv" id="gj7-9F-yXR"/>
+            </connections>
             <point key="canvasLocation" x="205" y="255.5"/>
         </view>
     </objects>
+    <resources>
+        <image name="available.png" width="48" height="48"/>
+        <image name="message.png" width="48" height="48"/>
+        <image name="new_message.png" width="48" height="48"/>
+        <image name="setting.png" width="48" height="48"/>
+        <image name="signout.png" width="48" height="48"/>
+        <image name="unavailable.png" width="48" height="48"/>
+    </resources>
 </document>

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

@@ -67,7 +67,7 @@ typedef enum {
 
 - (void)configureNavigationBar {
     
-    UIBarButtonItem *filterItem = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"Filter"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]
+    UIBarButtonItem *filterItem = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"Filter"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
                                                                    style:UIBarButtonItemStylePlain
                                                                   target:self
                                                                   action:@selector(filterItemClick:)];

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

@@ -8,8 +8,26 @@
 
 #import <UIKit/UIKit.h>
 
+@protocol RAHomeHeaderDelegate <NSObject>
+
+@optional
+- (void)signoutClick:(UIButton *)sender;
+- (void)settingClick:(UIButton *)sender;
+- (void)availableClick:(UIButton *)sender;
+- (void)messageClick:(UIButton *)sender;
+
+@end
+
 @interface RAHomeHeaderView : UIView
 
+@property (nonatomic,assign) NSInteger NewOrderCount;
+@property (nonatomic,assign) NSInteger ProcessingOrderCount;
+@property (nonatomic,assign) NSInteger FinishOrderCount;
+@property (nonatomic,assign) BOOL availabel;
+@property (nonatomic,assign) BOOL existNewMessage;
+
+@property (nonatomic,weak) id<RAHomeHeaderDelegate> delegate;
+
 + (instancetype)homeHeader;
 
 @end

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

@@ -8,6 +8,24 @@
 
 #import "RAHomeHeaderView.h"
 
+@interface RAHomeHeaderView ()
+
+@property (nonatomic,strong) IBOutlet UILabel *NewCountLabel;
+@property (nonatomic,strong) IBOutlet UILabel *ProcessingCountLabel;
+@property (nonatomic,strong) IBOutlet UILabel *FinishCountLabel;
+@property (nonatomic,strong) IBOutlet UIView *backgroundView;
+
+@property (nonatomic,strong) IBOutlet UIButton *signoutBtn;
+
+@property (nonatomic,strong) IBOutlet UIButton *settingBtn;
+
+@property (nonatomic,strong) IBOutlet UIButton *availableBtn;
+@property (nonatomic,strong) IBOutlet UILabel *availableTitleLabel;
+
+@property (nonatomic,strong) IBOutlet UIButton *messageBtn;
+
+@end
+
 @implementation RAHomeHeaderView
 
 + (instancetype)homeHeader {
@@ -16,6 +34,74 @@
 
 - (void)awakeFromNib {
     [super awakeFromNib];
+    
+    self.NewOrderCount = self.ProcessingOrderCount = self.FinishOrderCount = 0;
+    self.availabel = self.existNewMessage = NO;
+    
+    self.backgroundView.backgroundColor = ApexDriverOrangeColor;
+}
+
+- (void)setNewOrderCount:(NSInteger)NewOrderCount {
+    _NewOrderCount = NewOrderCount;
+    self.NewCountLabel.text = [self _textFromCount:_NewOrderCount];
+}
+
+- (void)setProcessingOrderCount:(NSInteger)ProcessingOrderCount {
+    _ProcessingOrderCount = ProcessingOrderCount;
+    
+    self.ProcessingCountLabel.text = [self _textFromCount:_ProcessingOrderCount];
+}
+
+- (void)setFinishOrderCount:(NSInteger)FinishOrderCount {
+    _FinishOrderCount = FinishOrderCount;
+    
+    self.FinishCountLabel.text = [self _textFromCount:_FinishOrderCount];
+}
+
+- (NSString *)_textFromCount:(NSInteger)count {
+    
+    NSString *str = nil;
+    if (count >= 0) {
+        str = [NSString stringWithFormat:@"%lu",count];
+    }
+    return str;
+}
+
+- (void)setAvailabel:(BOOL)availabel {
+    _availabel = availabel;
+    self.availableBtn.selected = !_availabel;
+    self.availableTitleLabel.text = _availabel ? @"Available" : @"Unavailable";
+}
+
+- (void)setExistNewMessage:(BOOL)existNewMessage {
+    _existNewMessage = existNewMessage;
+    self.messageBtn.selected = _existNewMessage;
+}
+
+#pragma mark - Action
+
+- (IBAction)signoutBtnClick:(id)sender {
+    if (self.delegate && [self.delegate respondsToSelector:@selector(signoutClick:)]) {
+        [self.delegate signoutClick:sender];
+    }
+}
+
+- (IBAction)settingBtnClick:(id)sender {
+    if (self.delegate && [self.delegate respondsToSelector:@selector(settingClick:)]) {
+        [self.delegate settingClick:sender];
+    }
+}
+
+- (IBAction)availableBtnClick:(id)sender {
+    if (self.delegate && [self.delegate respondsToSelector:@selector(availableClick:)]) {
+        [self.delegate availableClick:sender];
+    }
+}
+
+- (IBAction)messageBtnClick:(id)sender {
+    if (self.delegate && [self.delegate respondsToSelector:@selector(messageClick:)]) {
+        [self.delegate messageClick:sender];
+    }
 }
 
 @end

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

@@ -16,6 +16,7 @@ const int TagBase = 6000;
 @property (nonatomic,strong) IBOutlet UILabel *titleLaebl;
 @property (nonatomic,strong) IBOutlet RABadgeNumberView *badgeView;
 @property (nonatomic,strong) IBOutlet UIButton *moreBtn;
+@property (nonatomic,strong) IBOutlet UIView *backgroundView;
 
 @end
 
@@ -29,7 +30,12 @@ const int TagBase = 6000;
     [super awakeFromNib];
     
     self.model = nil;
-    self.backgroundColor = [UIColor colorWithRed:0.8 green:0.8 blue:0.8 alpha:0.8];
+    
+    self.backgroundView.layer.cornerRadius = 10.0f;
+    self.backgroundView.layer.masksToBounds = YES;
+    self.backgroundView.backgroundColor = ApexDriverGrayColor;
+    self.titleLaebl.textColor = ApexDriverWhiteColor;
+    [self.moreBtn setTitleColor:ApexDriverOrangeColor forState:UIControlStateNormal];
 }
 
 

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

@@ -34,7 +34,7 @@
 @end
 
 #pragma mark - View Controller
-
+@class RAHomeHeaderView;
 @interface RAHomeViewController : RABaseViewController
 
 @property (strong, nonatomic) IBOutlet UITableView *homeOrderTableView;
@@ -43,6 +43,8 @@
 
 @property (nonatomic,assign) BOOL reloadFlag;///<视图显示时Reload
 
+@property (nonatomic,strong, readonly) RAHomeHeaderView *headerView;
+
 #pragma mark - Getter
 
 - (NSUInteger)orderSectionCount;

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

@@ -15,6 +15,8 @@
 #import "UIScrollView+Empty.h"
 #import "RAEmptyView.h"
 #import "RAHomeHeaderView.h"
+#import "RAMessageViewController.h"
+#import "RASettingViewController.h"
 
 @implementation RAHomeSectionModel
 
@@ -73,7 +75,7 @@
 
 #pragma mark - View Controller
 
-@interface RAHomeViewController ()
+@interface RAHomeViewController () <RAHomeHeaderDelegate>
 
 @property (nonatomic,strong) NSMutableArray <RAHomeSectionModel *> *sectionArray;
 @property (nonatomic,strong) NSIndexPath *currentIndexPath;
@@ -129,7 +131,7 @@
     } else {
         self.automaticallyAdjustsScrollViewInsets = NO;
     }
-    
+    self.homeOrderTableView.backgroundColor = [UIColor colorWithRed:0.9 green:0.9 blue:0.9 alpha:1];
     self.homeOrderTableView.tableFooterView = [UIView new];
     self.homeOrderTableView.separatorInset = UIEdgeInsetsMake(0, 0, 0, 0);
     
@@ -145,22 +147,26 @@
     }];
     
     // Header
-    RAHomeHeaderView *header = [RAHomeHeaderView homeHeader];
-    self.homeOrderTableView.tableHeaderView = header;
+    self.headerView = [RAHomeHeaderView homeHeader];
+    self.headerView.delegate = self;
+    self.homeOrderTableView.tableHeaderView = self.headerView;
 }
 
 - (void)configureNavigationBar {
-    UIBarButtonItem *uploadListItem = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"upload_list"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]
+    UIBarButtonItem *uploadListItem = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"upload_list"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
                                                                        style:UIBarButtonItemStylePlain
                                                                        target:self
                                                                       action:@selector(uploadListItemClick:)];
+
+    self.navigationItem.rightBarButtonItems = @[uploadListItem];
+//    UIBarButtonItem *logoutItem = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"logout"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]
+//                                                                   style:UIBarButtonItemStylePlain
+//                                                                  target:self
+//                                                                  action:@selector(logoutItemClick:)];
+//
+//    self.navigationItem.rightBarButtonItems = @[logoutItem,uploadListItem];
     
-    UIBarButtonItem *logoutItem = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"logout"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]
-                                                                   style:UIBarButtonItemStylePlain
-                                                                  target:self
-                                                                  action:@selector(logoutItemClick:)];
-    
-    self.navigationItem.rightBarButtonItems = @[logoutItem,uploadListItem];
+    self.title = RASingleton.sharedInstance.user;
 }
 
 - (void)registNotification {
@@ -203,6 +209,12 @@
     [self loadData];
 }
 
+#pragma mark - Setter
+
+- (void)setHeaderView:(RAHomeHeaderView *)headerView {
+    _headerView = headerView;
+}
+
 #pragma mark - Getter
 
 - (NSMutableArray *)sectionArray {
@@ -302,6 +314,9 @@
                     BOOL requiredLocation = [[json objectForKey:@"requiredLocation"] boolValue];
                     [RASingleton sharedInstance].requiredLocation = requiredLocation;
                     
+                    BOOL driverAvailable = [[json objectForKey:@"driver_available"] boolValue];
+                    strongSelf.headerView.availabel = driverAvailable;
+                    
                     NSArray *sectionArray = [json objectForKey:@"sections"];
                     
                     NSMutableArray *tmpSectionArr = [NSMutableArray array];
@@ -356,6 +371,35 @@
     });
 }
 
+- (void)updateDriverAvailable:(BOOL)available {
+    
+    // show progress
+    RAProgressHUD *hud = [RAProgressHUD showHUDOnView:self.view];
+    
+    __weak typeof(self) weakSelf = self;
+    dispatch_async(dispatch_get_global_queue(0, 0), ^{
+        
+        NSDictionary *json = [RADataProvider updateDriverAvailable:available];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            
+            [hud dismiss];
+            
+            int result = [[json objectForKey:@"result"] intValue];
+            if (result == RESULT_TRUE) {
+                
+                weakSelf.headerView.availabel = available;
+                
+            } else {
+                
+                NSString *msg = [json objectForKey:@"err_msg"];
+                [weakSelf showAlertTilte:@"Warning" message:msg];
+            }
+        });
+        
+    });
+    
+}
+
 #pragma mark - Controller Action
 
 - (void)pushDetailViewControllerForModel:(RAHomeOrderModel *)model {
@@ -413,4 +457,40 @@
     }
 }
 
+#pragma mark - Header Delegate
+
+- (void)signoutClick:(UIButton *)sender {
+    [self logoutItemClick:nil];
+}
+
+- (void)settingClick:(UIButton *)sender {
+    RASettingViewController *settingVC = [RASettingViewController viewControllerFromStoryboard];
+    [self.navigationController pushViewController:settingVC animated:YES];
+}
+
+- (void)availableClick:(UIButton *)sender {
+    
+    NSString *msg = [NSString stringWithFormat:@"are you sure to change status to %@",self.headerView.availabel ? @"Unavailable" : @"Available"];
+    UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"Warning" message:msg preferredStyle:UIAlertControllerStyleAlert];
+    
+    UIAlertAction *yesAction = [UIAlertAction actionWithTitle:@"Yes" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        [self updateDriverAvailable:!self.headerView.availabel];
+    }];
+    
+    UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        
+    }];
+    
+    
+    [alertVC addAction:cancelAction];
+    [alertVC addAction:yesAction];
+    
+    [self presentViewController:alertVC animated:YES completion:nil];
+}
+
+- (void)messageClick:(UIButton *)sender {
+    RAMessageViewController *messageVC = [RAMessageViewController viewControllerFromStoryboard];
+    [self.navigationController pushViewController:messageVC animated:YES];
+}
+
 @end

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

@@ -33,7 +33,7 @@
     
     [self setOrderModel:nil];
     
-    self.contentContainer.layer.cornerRadius = 5.0f;
+    self.contentContainer.layer.cornerRadius = 10.0f;
     self.contentContainer.layer.masksToBounds = YES;
     self.contentContainer.layer.shadowColor = [UIColor lightGrayColor].CGColor;
     self.contentContainer.layer.borderColor = [UIColor lightGrayColor].CGColor;
@@ -66,7 +66,7 @@
         unsigned long color = strtoul([@"0xaad3df" UTF8String],0,16);
         _selectionView.backgroundColor = UIColorFromRGB(color);
         
-        _selectionView.layer.cornerRadius = 5.0f;
+        _selectionView.layer.cornerRadius = 10.0f;
         _selectionView.layer.masksToBounds = YES;
         _selectionView.layer.shadowColor = UIColorFromRGB(color).CGColor;
         _selectionView.layer.borderColor = UIColorFromRGB(color).CGColor;

Redant Drivers/Apex And Drivers/Message/RAMessageViewController.h

@@ -0,0 +1,13 @@
+//
+//  RAMessageViewController.h
+//  Apex And Drivers
+//
+//  Created by Jack on 2018/9/11.
+//  Copyright © 2018年 USAI. All rights reserved.
+//
+
+#import "RABaseViewController.h"
+
+@interface RAMessageViewController : RABaseViewController
+
+@end

Redant Drivers/Apex And Drivers/Message/RAMessageViewController.m

@@ -0,0 +1,43 @@
+//
+//  RAMessageViewController.m
+//  Apex And Drivers
+//
+//  Created by Jack on 2018/9/11.
+//  Copyright © 2018年 USAI. All rights reserved.
+//
+
+#import "RAMessageViewController.h"
+
+@interface RAMessageViewController ()
+
+@end
+
+@implementation RAMessageViewController
+
++ (instancetype)viewControllerFromStoryboard {
+    RAMessageViewController *messageVC = [[UIStoryboard storyboardWithName:@"message" bundle:nil] instantiateViewControllerWithIdentifier:[self storyboardID]];
+    return messageVC;
+}
+
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

Redant Drivers/Apex And Drivers/Message/message.storyboard

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Message-->
+        <scene sceneID="Sqf-SQ-YzZ">
+            <objects>
+                <viewController storyboardIdentifier="RAMessageViewController" title="Message" useStoryboardIdentifierAsRestorationIdentifier="YES" id="5yA-KC-iwJ" customClass="RAMessageViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="tnD-pT-LaF">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <viewLayoutGuide key="safeArea" id="DqC-qh-2uh"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="9lF-s7-t8P" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="154" y="-265"/>
+        </scene>
+    </scenes>
+</document>

Redant Drivers/Apex And Drivers/RADataProvider.h

@@ -38,4 +38,6 @@
 
 + (NSDictionary *)loadFakeData:(NSString *)fileName;
 
++ (NSDictionary *)updateDriverAvailable:(BOOL)available;
+
 @end

Redant Drivers/Apex And Drivers/RADataProvider.m

@@ -334,6 +334,16 @@
 //             };
 //}
 
++ (NSDictionary *)updateDriverAvailable:(BOOL)available {
+    
+    NSMutableDictionary *params = [NSMutableDictionary dictionary];
+    [params setObject:@(available) forKey:@"available"];
+    
+    NSData* json=[self get_json:URL_DRIVER_AVAILABLE parameters:params  file:nil];
+    
+    return [self handleJsonData:json];
+}
+
 #pragma mark - Utils
 
 + (NSString *)dic2String:(NSDictionary *)dic {

Redant Drivers/Apex And Drivers/RANavigationController.m

@@ -18,7 +18,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    
+    [self _configAppearance];
     [self registNotification];
 }
 
@@ -31,6 +31,19 @@
     // Dispose of any resources that can be recreated.
 }
 
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    return UIStatusBarStyleLightContent;
+}
+
+- (void)_configAppearance {
+    
+    [self.navigationBar setTitleTextAttributes:@{NSForegroundColorAttributeName:ApexDriverWhiteColor}]; // Title Color
+    [self.navigationBar setTintColor:ApexDriverWhiteColor]; // BarItem颜色
+    self.navigationBar.barTintColor = ApexDriverOrangeColor; // 背景色
+    self.navigationBar.translucent = NO;
+    self.navigationBar.shadowImage = [UIImage new]; // 去除Bar黑色分割线
+}
+
 - (void)registNotification {
 //    [RASingleton.sharedInstance writeLog:[NSString stringWithFormat:@"%s",__func__]];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveHandleOrderNotification:) name:RANotificationHandleOrder object:nil];

Redant Drivers/Apex And Drivers/Setting/RASettingViewController.h

@@ -0,0 +1,13 @@
+//
+//  RASettingViewController.h
+//  Apex And Drivers
+//
+//  Created by Jack on 2018/9/11.
+//  Copyright © 2018年 USAI. All rights reserved.
+//
+
+#import "RABaseViewController.h"
+
+@interface RASettingViewController : RABaseViewController
+
+@end

Redant Drivers/Apex And Drivers/Setting/RASettingViewController.m

@@ -0,0 +1,42 @@
+//
+//  RASettingViewController.m
+//  Apex And Drivers
+//
+//  Created by Jack on 2018/9/11.
+//  Copyright © 2018年 USAI. All rights reserved.
+//
+
+#import "RASettingViewController.h"
+
+@interface RASettingViewController ()
+
+@end
+
+@implementation RASettingViewController
+
++ (instancetype)viewControllerFromStoryboard {
+    RASettingViewController *settingVC = [[UIStoryboard storyboardWithName:@"setting" bundle:nil] instantiateViewControllerWithIdentifier:[self storyboardID]];
+    return settingVC;
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

Redant Drivers/Apex And Drivers/Setting/setting.storyboard

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Setting-->
+        <scene sceneID="FjW-8J-mfq">
+            <objects>
+                <viewController storyboardIdentifier="RASettingViewController" title="Setting" useStoryboardIdentifierAsRestorationIdentifier="YES" id="K1Z-ea-fUh" customClass="RASettingViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="8S7-LR-mQz">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <viewLayoutGuide key="safeArea" id="oTy-yr-RHK"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="hs2-jY-gRV" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-238" y="54"/>
+        </scene>
+    </scenes>
+</document>

Redant Drivers/Apex And Drivers/Update/RAOrderEditViewController.m

@@ -379,9 +379,10 @@
     formatter.dateFormat = @"MM/dd/YYYY HH:mm";
     NSString *time = [formatter stringFromDate:date];
     
+    NSString *serial = [json objectForKey:@"serial"];
     for (RAEditImageBaseModel *model in photos) {
         
-        NSString *serial = [json objectForKey:model.key];
+        
         if (serial.length) {
             
             NSMutableDictionary *params = [NSMutableDictionary dictionary];
@@ -389,6 +390,11 @@
             if (self.orderType2) {
                 [params setObject:self.orderType2 forKey:@"orderType2"];
             }
+            if (model.key) {
+                [params setObject:model.key forKey:@"key"];
+            }
+            [params setObject:@(model.type) forKey:@"type"];
+            
             [params setObject:[RASingleton.sharedInstance encryptUser] forKey:@"name"];
             [params setObject:[RASingleton.sharedInstance encryptPassword] forKey:@"password"];
             [params setObject:@"iOS" forKey:@"platform"];
@@ -422,10 +428,12 @@
            
             int retryCount = 0;
             NSMutableArray *completArr = [NSMutableArray array];
+            NSString *serial = [json objectForKey:@"serial"];
+            
             // 同步上传照片
             for (int i = 0; i < photoArr.count; i++) {
                 RAEditImageBaseModel *model = [photoArr objectAtIndex:i];
-                NSString *serial = [json objectForKey:model.key];
+                
                 if (serial.length) {
                     
                     NSMutableDictionary *fileParams = [NSMutableDictionary dictionary];
@@ -433,6 +441,10 @@
                     if (self.orderType2) {
                         [fileParams setObject:self.orderType2 forKey:@"orderType2"];
                     }
+                    if (model.key) {
+                        [fileParams setObject:model.key forKey:@"key"];
+                    }
+                    [fileParams setObject:@(model.type) forKey:@"type"];
                     
                     NSString *photoPath = [self.photoDir stringByAppendingPathComponent:model.imageName];
                     NSDictionary *uploadJson = [RADataProvider uploadFile:photoPath parameters:fileParams];

Redant Drivers/Apex And Drivers/config.h

@@ -9,6 +9,10 @@
 #ifndef config_h
 #define config_h
 
+#define ApexDriverOrangeColor UIColorFromRGB(0xEC6C23)
+#define ApexDriverGrayColor UIColorFromRGB(0x4f5356)
+#define ApexDriverWhiteColor UIColorFromRGB(0xffffff)
+
 #define URL_HOST                @"http://192.168.0.124:8080"
 #define APPENDING_STR(var)      [URL_HOST stringByAppendingString:var]
 
@@ -24,6 +28,7 @@
 #define URL_REPORT_LOCATION     APPENDING_STR(@"/j/mobile/uploadDriverLocation.mo/")
 #define URL_REPORT_TOKEN        APPENDING_STR(@"/j/mobile/uploadToken.mo/")
 #define URL_RETRIVE_PASSWORD    APPENDING_STR(@"/j/mobile/resetPassword.mo/")
+#define URL_DRIVER_AVAILABLE    APPENDING_STR(@"/j/mobile/updateDriverAvailable.mo/")
 
 //#define URL_HOME                @"http://192.168.0.130:8080/MyWeb/Test"
 //#define URL_LOGIN               @"http://192.168.0.130:8080/MyWeb/Test"