ソースを参照

1.修改iOS Apex Driver设置,增加隐私政策以及APP Icon圆角。
2.修改iOS Apex Driver Detail照片和签名可点击查看大图。
3.修改iOS Apex Driver首页加载失败时背景是白色。

Pen Li 7 年 前
コミット
39137e6220
22 ファイル変更296 行追加66 行削除
  1. 12 0
      Redant Drivers/Apex And Drivers.xcodeproj/project.pbxproj
  2. 10 1
      Redant Drivers/Apex And Drivers/Detail/Cell/RADetailPhotoCell.h
  3. 11 0
      Redant Drivers/Apex And Drivers/Detail/Cell/RADetailPhotoCell.m
  4. 10 1
      Redant Drivers/Apex And Drivers/Detail/Cell/RADetailSignatureCell.h
  5. 10 0
      Redant Drivers/Apex And Drivers/Detail/Cell/RADetailSignatureCell.m
  6. 35 35
      Redant Drivers/Apex And Drivers/Detail/Detail.storyboard
  7. 3 1
      Redant Drivers/Apex And Drivers/Detail/RAOrderDetailViewController+TableViewDataSource.h
  8. 22 2
      Redant Drivers/Apex And Drivers/Detail/RAOrderDetailViewController+TableViewDataSource.m
  9. 2 0
      Redant Drivers/Apex And Drivers/PhotoPreView/RAPhotoPreviewController.h
  10. 5 3
      Redant Drivers/Apex And Drivers/PhotoPreView/RAPhotoPreviewController.m
  11. 3 0
      Redant Drivers/Apex And Drivers/Setting/Cell/RASettingAboutCell.m
  12. 17 0
      Redant Drivers/Apex And Drivers/Setting/Cell/RASettingLinkCell.h
  13. 37 0
      Redant Drivers/Apex And Drivers/Setting/Cell/RASettingLinkCell.m
  14. 10 1
      Redant Drivers/Apex And Drivers/Setting/Data/setting.json
  15. 2 1
      Redant Drivers/Apex And Drivers/Setting/Model/RASettingBaseModel.h
  16. 17 0
      Redant Drivers/Apex And Drivers/Setting/Model/RASettingLinkModel.h
  17. 17 0
      Redant Drivers/Apex And Drivers/Setting/Model/RASettingLinkModel.m
  18. 5 1
      Redant Drivers/Apex And Drivers/Setting/Model/RASettingSectionModel.m
  19. 4 0
      Redant Drivers/Apex And Drivers/Setting/RASettingViewController+TableDataSource.m
  20. 17 0
      Redant Drivers/Apex And Drivers/Setting/RASettingViewController+TableDelegate.m
  21. 46 19
      Redant Drivers/Apex And Drivers/Setting/setting.storyboard
  22. 1 1
      Redant Drivers/Apex And Drivers/UIScrollVIew+Empty/RAEmptyDataView.m

+ 12 - 0
Redant Drivers/Apex And Drivers.xcodeproj/project.pbxproj

@@ -127,6 +127,8 @@
 		4281100320E4D47000315156 /* JLRefreshBasis.m in Sources */ = {isa = PBXBuildFile; fileRef = 42810FFC20E4D46F00315156 /* JLRefreshBasis.m */; };
 		4281100420E4D47000315156 /* UIScrollView+JLRefresh.m in Sources */ = {isa = PBXBuildFile; fileRef = 42810FFE20E4D46F00315156 /* UIScrollView+JLRefresh.m */; };
 		4281100520E4D47000315156 /* UIView+JLExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 4281100020E4D46F00315156 /* UIView+JLExtension.m */; };
+		429A0AD7216CA666004DEF7A /* RASettingLinkCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 429A0AD6216CA666004DEF7A /* RASettingLinkCell.m */; };
+		429A0ADA216CA6A6004DEF7A /* RASettingLinkModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 429A0AD9216CA6A6004DEF7A /* RASettingLinkModel.m */; };
 		429CF61C20E0E32E00CE8DAD /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 429CF61E20E0E32E00CE8DAD /* Localizable.strings */; };
 		42C1B2742134F24C00637085 /* RADatePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42C1B2732134F24C00637085 /* RADatePickerViewController.m */; };
 		42C6074C21536E5A003E5379 /* RAExceptionHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 42C6074B21536E59003E5379 /* RAExceptionHandler.m */; };
@@ -430,6 +432,10 @@
 		42810FFE20E4D46F00315156 /* UIScrollView+JLRefresh.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIScrollView+JLRefresh.m"; sourceTree = "<group>"; };
 		42810FFF20E4D46F00315156 /* UIView+JLExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+JLExtension.h"; sourceTree = "<group>"; };
 		4281100020E4D46F00315156 /* UIView+JLExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+JLExtension.m"; sourceTree = "<group>"; };
+		429A0AD5216CA666004DEF7A /* RASettingLinkCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RASettingLinkCell.h; sourceTree = "<group>"; };
+		429A0AD6216CA666004DEF7A /* RASettingLinkCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RASettingLinkCell.m; sourceTree = "<group>"; };
+		429A0AD8216CA6A6004DEF7A /* RASettingLinkModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RASettingLinkModel.h; sourceTree = "<group>"; };
+		429A0AD9216CA6A6004DEF7A /* RASettingLinkModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RASettingLinkModel.m; sourceTree = "<group>"; };
 		429CF61F20E0E35D00CE8DAD /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = "<group>"; };
 		42C1B2722134F24C00637085 /* RADatePickerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RADatePickerViewController.h; sourceTree = "<group>"; };
 		42C1B2732134F24C00637085 /* RADatePickerViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RADatePickerViewController.m; sourceTree = "<group>"; };
@@ -876,6 +882,8 @@
 				4259597C2148F39300F7DD41 /* RASettingActionModel.m */,
 				42ECE180214A04BE00AD8283 /* RASettingAboutModel.h */,
 				42ECE181214A04BE00AD8283 /* RASettingAboutModel.m */,
+				429A0AD8216CA6A6004DEF7A /* RASettingLinkModel.h */,
+				429A0AD9216CA6A6004DEF7A /* RASettingLinkModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -893,6 +901,8 @@
 				425959882148F85F00F7DD41 /* RASettingActionCell.m */,
 				42ECE183214A08A900AD8283 /* RASettingAboutCell.h */,
 				42ECE184214A08A900AD8283 /* RASettingAboutCell.m */,
+				429A0AD5216CA666004DEF7A /* RASettingLinkCell.h */,
+				429A0AD6216CA666004DEF7A /* RASettingLinkCell.m */,
 			);
 			path = Cell;
 			sourceTree = "<group>";
@@ -1504,12 +1514,14 @@
 				42D8B8B420C2463D001C125F /* RADetailLocationCell.m in Sources */,
 				4281100520E4D47000315156 /* UIView+JLExtension.m in Sources */,
 				423C6A4E20C909FC00455E27 /* RANotificationNameCenter.m in Sources */,
+				429A0ADA216CA6A6004DEF7A /* RASettingLinkModel.m in Sources */,
 				42ECE185214A08A900AD8283 /* RASettingAboutCell.m in Sources */,
 				4259597D2148F39300F7DD41 /* RASettingActionModel.m in Sources */,
 				42D7B0792147946D0046FE89 /* RAMessageViewController.m in Sources */,
 				42529D3A20C0EA3F000C0F4D /* mztools.c in Sources */,
 				4235FAB3213E25AC000B6672 /* RAEditSignatureCell.m in Sources */,
 				4235FAA0213E1236000B6672 /* RADetailPhotoModel.m in Sources */,
+				429A0AD7216CA666004DEF7A /* RASettingLinkCell.m in Sources */,
 				4205FD5C20C1316200DB42B4 /* RABaseViewController.m in Sources */,
 				425959802148F82600F7DD41 /* RASettingBaseCell.m in Sources */,
 				425F1B6C2138F0470031B2C7 /* RANavigationController.m in Sources */,

+ 10 - 1
Redant Drivers/Apex And Drivers/Detail/Cell/RADetailPhotoCell.h

@@ -8,9 +8,18 @@
 
 #import <UIKit/UIKit.h>
 
-@class RADetailPhotoModel;
+@class RADetailPhotoModel,RADetailPhotoCell;
+
+@protocol RADetailPhotoCellDelegate <NSObject>
+
+- (void)photoCell:(RADetailPhotoCell *)cell didClickPhoto:(RADetailPhotoModel *)model;
+
+@end
+
 @interface RADetailPhotoCell : UITableViewCell
 
 @property (nonatomic,strong) RADetailPhotoModel *model;
 
+@property (nonatomic,weak) id<RADetailPhotoCellDelegate> delegate;
+
 @end

+ 11 - 0
Redant Drivers/Apex And Drivers/Detail/Cell/RADetailPhotoCell.m

@@ -24,6 +24,9 @@
     
     self.photoView.layer.borderWidth = 0.5f;
     self.photoView.layer.borderColor = [UIColor lightGrayColor].CGColor;
+    
+    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(photoViewClick:)];
+    [self.photoView addGestureRecognizer:tap];
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
@@ -50,4 +53,12 @@
     self.photoView.image = _model.photo;
 }
 
+- (void)photoViewClick:(id)sender {
+    
+    if (self.delegate && [self.delegate respondsToSelector:@selector(photoCell:didClickPhoto:)]) {
+        [self.delegate photoCell:self didClickPhoto:self.model];
+    }
+    
+}
+
 @end

+ 10 - 1
Redant Drivers/Apex And Drivers/Detail/Cell/RADetailSignatureCell.h

@@ -8,9 +8,18 @@
 
 #import <UIKit/UIKit.h>
 
-@class RADetailSignatureModel;
+@class RADetailSignatureModel,RADetailSignatureCell;
+
+@protocol RADetailSignatureCellDelegate <NSObject>
+
+- (void)signatureCell:(RADetailSignatureCell *)cell didClickSignature:(RADetailSignatureModel *)model;
+
+@end
+
 @interface RADetailSignatureCell : UITableViewCell
 
 @property (nonatomic,strong) RADetailSignatureModel *model;
 
+@property (nonatomic,weak) id<RADetailSignatureCellDelegate> delegate;
+
 @end

+ 10 - 0
Redant Drivers/Apex And Drivers/Detail/Cell/RADetailSignatureCell.m

@@ -21,6 +21,9 @@
 - (void)awakeFromNib {
     [super awakeFromNib];
     // Initialization code
+    
+    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(signatureViewClick:)];
+    [self.signatureView addGestureRecognizer:tap];
 }
 
 - (void)prepareForReuse {
@@ -53,4 +56,11 @@
     self.signatureView.image = _model.signature;
 }
 
+- (IBAction)signatureViewClick:(id)sender {
+    
+    if (self.delegate && [self.delegate respondsToSelector:@selector(signatureCell:didClickSignature:)]) {
+        [self.delegate signatureCell:self didClickSignature:self.model];
+    }
+}
+
 @end

+ 35 - 35
Redant Drivers/Apex And Drivers/Detail/Detail.storyboard

@@ -19,18 +19,18 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Xxs-Bp-xwk">
-                                <rect key="frame" x="0.0" y="20" width="600" height="580"/>
+                                <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="RADetailSingleLineCell" rowHeight="70" id="PRr-DR-Xqo" customClass="RADetailSingleLineCell">
-                                        <rect key="frame" x="0.0" y="28" width="600" height="70"/>
+                                        <rect key="frame" x="0.0" y="28" width="375" height="70"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="PRr-DR-Xqo" id="HGR-qE-k8g">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="69.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="69.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Order ID" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IcX-EB-asg">
-                                                    <rect key="frame" x="5" y="5" width="365" height="21"/>
+                                                    <rect key="frame" x="5" y="5" width="590" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="21" id="yUK-tS-gzP"/>
                                                     </constraints>
@@ -39,7 +39,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="20180530001200" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="L7s-6m-7Rs">
-                                                    <rect key="frame" x="5" y="27" width="365" height="37.5"/>
+                                                    <rect key="frame" x="5" y="27" width="590" height="37.5"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
@@ -61,14 +61,14 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="RADetailMultLineCell" rowHeight="90" id="hLY-jO-rx0" customClass="RADetailMultLineCell">
-                                        <rect key="frame" x="0.0" y="98" width="600" height="90"/>
+                                        <rect key="frame" x="0.0" y="98" width="375" height="90"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="hLY-jO-rx0" id="xPv-W6-2E0">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="89.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="89.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nxW-Ig-F5h">
-                                                    <rect key="frame" x="5" y="5" width="365" height="79.5"/>
+                                                    <rect key="frame" x="5" y="5" width="590" height="79.5"/>
                                                     <string key="text">DEMURRAGE LFD
 TERMINAL PICKUP APPT
 DELIVERY  APPT(setup wiwhse)
@@ -90,10 +90,10 @@ PICKUP ON</string>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="RADetailLocationCell" rowHeight="100" id="2RY-c8-4kR" customClass="RADetailLocationCell">
-                                        <rect key="frame" x="0.0" y="188" width="600" height="100"/>
+                                        <rect key="frame" x="0.0" y="188" width="375" height="100"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="2RY-c8-4kR" id="8uQ-ij-SSa">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="99.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="99.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ECt-q4-gbV">
@@ -106,10 +106,10 @@ OAKLAND,CA</string>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="E85-g7-fwi">
-                                                    <rect key="frame" x="520" y="28" width="70" height="70"/>
+                                                    <rect key="frame" x="325" y="43" width="40" height="40"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="height" constant="70" id="Bt5-LJ-HeT"/>
-                                                        <constraint firstAttribute="width" constant="70" id="vza-Ko-Kz7"/>
+                                                        <constraint firstAttribute="height" constant="40" id="Bt5-LJ-HeT"/>
+                                                        <constraint firstAttribute="width" constant="40" id="vza-Ko-Kz7"/>
                                                     </constraints>
                                                     <state key="normal" image="btn_navigation"/>
                                                     <connections>
@@ -117,7 +117,7 @@ OAKLAND,CA</string>
                                                     </connections>
                                                 </button>
                                                 <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="off-5x-hpV">
-                                                    <rect key="frame" x="5" y="5" width="590" height="21"/>
+                                                    <rect key="frame" x="5" y="5" width="365" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="21" id="Pn5-ru-O79"/>
                                                     </constraints>
@@ -145,14 +145,14 @@ OAKLAND,CA</string>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="RADetailActionsCell" rowHeight="100" id="22c-X4-T1m" customClass="RADetailActionsCell">
-                                        <rect key="frame" x="0.0" y="288" width="600" height="100"/>
+                                        <rect key="frame" x="0.0" y="288" width="375" height="100"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="22c-X4-T1m" id="f99-Y7-BOd">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="99.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="99.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="iKo-LB-QEE">
-                                                    <rect key="frame" x="0.0" y="0.0" width="375" height="99.5"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="600" height="99.5"/>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="p8G-wr-zEn">
                                                         <size key="itemSize" width="224" height="50"/>
@@ -162,7 +162,7 @@ OAKLAND,CA</string>
                                                     </collectionViewFlowLayout>
                                                     <cells>
                                                         <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="RADetailActionSubCell" id="NRo-Hn-zDX" customClass="RADetailActionSubCell">
-                                                            <rect key="frame" x="75.5" y="0.0" width="224" height="50"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="224" height="50"/>
                                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
                                                                 <rect key="frame" x="0.0" y="0.0" width="224" height="50"/>
@@ -214,10 +214,10 @@ OAKLAND,CA</string>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="RADetailMapCell" rowHeight="100" id="sLQ-ry-Yxv" customClass="RADetailMapCell">
-                                        <rect key="frame" x="0.0" y="388" width="600" height="100"/>
+                                        <rect key="frame" x="0.0" y="388" width="375" height="100"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="sLQ-ry-Yxv" id="3xH-7S-3HD">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="99.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="99.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PFm-sQ-c4b">
@@ -230,7 +230,7 @@ OAKLAND,CA</string>
                                                     <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="xB6-BK-ueh">
-                                                    <rect key="frame" x="5" y="5" width="590" height="21"/>
+                                                    <rect key="frame" x="5" y="5" width="365" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="21" id="fu8-8j-kB0"/>
                                                     </constraints>
@@ -239,10 +239,10 @@ OAKLAND,CA</string>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ev3-or-KB1">
-                                                    <rect key="frame" x="520" y="28" width="70" height="70"/>
+                                                    <rect key="frame" x="325" y="43" width="40" height="40"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="height" constant="70" id="7wS-i9-I5v"/>
-                                                        <constraint firstAttribute="width" constant="70" id="SOy-eZ-AVi"/>
+                                                        <constraint firstAttribute="height" constant="40" id="7wS-i9-I5v"/>
+                                                        <constraint firstAttribute="width" constant="40" id="SOy-eZ-AVi"/>
                                                     </constraints>
                                                     <state key="normal" image="btn_map"/>
                                                     <connections>
@@ -269,10 +269,10 @@ OAKLAND,CA</string>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="RADetailPhotoCell" rowHeight="100" id="44Q-BL-fjP" customClass="RADetailPhotoCell">
-                                        <rect key="frame" x="0.0" y="488" width="600" height="100"/>
+                                        <rect key="frame" x="0.0" y="488" width="375" height="100"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="44Q-BL-fjP" id="k4f-vX-hlb">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="99.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="99.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="M6V-ez-t4d">
@@ -282,7 +282,7 @@ OAKLAND,CA</string>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <imageView contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="x23-Ma-VwQ">
-                                                    <rect key="frame" x="280.5" y="5" width="89.5" height="89.5"/>
+                                                    <rect key="frame" x="505.5" y="5" width="89.5" height="89.5"/>
                                                     <gestureRecognizers/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" secondItem="x23-Ma-VwQ" secondAttribute="height" multiplier="89:89" id="Gi9-rt-ewa"/>
@@ -305,14 +305,14 @@ OAKLAND,CA</string>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="RADetailSignatureCell" rowHeight="150" id="KBG-tu-iKo" customClass="RADetailSignatureCell">
-                                        <rect key="frame" x="0.0" y="588" width="600" height="150"/>
+                                        <rect key="frame" x="0.0" y="588" width="375" height="150"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="KBG-tu-iKo" id="EcS-EV-o0B">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="149.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="149.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ErT-qT-9u6">
-                                                    <rect key="frame" x="5" y="5" width="365" height="21"/>
+                                                    <rect key="frame" x="5" y="5" width="590" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="21" id="E3n-pS-av8"/>
                                                     </constraints>
@@ -321,7 +321,7 @@ OAKLAND,CA</string>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <imageView contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="na6-0y-zBR">
-                                                    <rect key="frame" x="5" y="31" width="365" height="113.5"/>
+                                                    <rect key="frame" x="5" y="31" width="590" height="113.5"/>
                                                 </imageView>
                                             </subviews>
                                             <constraints>
@@ -372,18 +372,18 @@ OAKLAND,CA</string>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="dkO-Ta-IQf">
-                                <rect key="frame" x="0.0" y="20" width="600" height="580"/>
+                                <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="RADetailActionSelectionCell" id="8M5-Ka-QBN" customClass="RADetailActionSelectionCell">
-                                        <rect key="frame" x="0.0" y="28" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="28" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="8M5-Ka-QBN" id="CTw-dI-j8V">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DSZ-Hp-4ld">
-                                                    <rect key="frame" x="5" y="0.0" width="370" height="43.5"/>
+                                                    <rect key="frame" x="5" y="0.0" width="595" height="43.5"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>

+ 3 - 1
Redant Drivers/Apex And Drivers/Detail/RAOrderDetailViewController+TableViewDataSource.h

@@ -9,9 +9,11 @@
 #import "RAOrderDetailViewController.h"
 #import "RADetailLocationCell.h"
 #import "RADetailActionsCell.h"
+#import "RADetailPhotoCell.h"
+#import "RADetailSignatureCell.h"
 #import "RADetailActionSelectionViewController.h"
 
 
-@interface RAOrderDetailViewController (TableViewDataSource) <UITableViewDataSource,RADetailLocationCellDelegate,RAdetailActionsCellDelegate,UIPopoverPresentationControllerDelegate,RADetailActionSelectionDelegate>
+@interface RAOrderDetailViewController (TableViewDataSource) <UITableViewDataSource,RADetailLocationCellDelegate,RAdetailActionsCellDelegate,UIPopoverPresentationControllerDelegate,RADetailActionSelectionDelegate,RADetailSignatureCellDelegate,RADetailPhotoCellDelegate>
 
 @end

+ 22 - 2
Redant Drivers/Apex And Drivers/Detail/RAOrderDetailViewController+TableViewDataSource.m

@@ -19,7 +19,6 @@
 #import "RADetailSingleLineCell.h"
 #import "RADetailMultLineCell.h"
 #import "RADetailActionSubCell.h"
-#import "RADetailSignatureCell.h"
 
 #import <MapKit/MapKit.h>
 
@@ -31,10 +30,11 @@
 #import <AddressBook/AddressBook.h>
 //#import <Contacts/Contacts.h>
 #import "RADetailMapCell.h"
-#import "RADetailPhotoCell.h"
 #import "RADetailPhotoModel.h"
 #import "RADetailMapModel.h"
 
+#import "RAPhotoPreviewController.h"
+
 
 @implementation RAOrderDetailViewController (TableViewDataSource)
 
@@ -85,6 +85,7 @@
             RADetailPhotoModel *photoModel = (RADetailPhotoModel *)model;
             RADetailPhotoCell *cell = [tableView dequeueReusableCellWithIdentifier:@"RADetailPhotoCell" forIndexPath:indexPath];
             [cell setModel:photoModel];
+            cell.delegate = self;
             return cell;
         }
             break;
@@ -92,6 +93,7 @@
             RADetailSignatureModel *signatureModel = (RADetailSignatureModel *)model;
             RADetailSignatureCell *cell = [tableView dequeueReusableCellWithIdentifier:@"RADetailSignatureCell" forIndexPath:indexPath];
             [cell setModel:signatureModel];
+            cell.delegate = self;
             return cell;
         }
             break;
@@ -112,6 +114,24 @@
     return [self sectionNumber];
 }
 
+#pragma mark - Photo/Signature
+
+- (void)previewImage:(UIImage *)img {
+    
+    RAPhotoPreviewController *previewVC = [RAPhotoPreviewController viewControllerFromStoryboard];
+    previewVC.image = img;
+    previewVC.canDelete = NO;
+    [self.navigationController pushViewController:previewVC animated:YES];
+}
+
+- (void)photoCell:(RADetailPhotoCell *)cell didClickPhoto:(RADetailPhotoModel *)model {
+    [self previewImage:model.photo];
+}
+
+- (void)signatureCell:(RADetailSignatureCell *)cell didClickSignature:(RADetailSignatureModel *)model {
+    [self previewImage:model.signature];
+}
+
 #pragma mark - Location Delegate
 
 - (void)locationCell:(RADetailLocationCell *)cell didClickNavigation:(RADetailLocationModel *)model {

+ 2 - 0
Redant Drivers/Apex And Drivers/PhotoPreView/RAPhotoPreviewController.h

@@ -12,6 +12,8 @@
 
 @property (nonatomic,strong) UIImage *image;
 
+@property (nonatomic,assign) BOOL canDelete;///< default is YES
+
 @property (nonatomic,copy) void (^completion)(void);
 
 + (instancetype)viewControllerFromStoryboard;

+ 5 - 3
Redant Drivers/Apex And Drivers/PhotoPreView/RAPhotoPreviewController.m

@@ -24,6 +24,7 @@
 
 + (instancetype)viewControllerFromStoryboard {
     RAPhotoPreviewController *previewVC = [[UIStoryboard storyboardWithName:@"PhotoPreview" bundle:nil] instantiateViewControllerWithIdentifier:[self storyboardID]];
+    previewVC.canDelete = YES;
     return previewVC;
 }
 
@@ -48,9 +49,10 @@
 
 - (void)configureNavigationBar {
     
-    UIBarButtonItem *deleteItem = [[UIBarButtonItem alloc] initWithTitle:@"delete" style:UIBarButtonItemStylePlain target:self action:@selector(deleteActionClick:)];
-    self.navigationItem.rightBarButtonItem = deleteItem;
-    
+    if (self.canDelete) {
+        UIBarButtonItem *deleteItem = [[UIBarButtonItem alloc] initWithTitle:@"delete" style:UIBarButtonItemStylePlain target:self action:@selector(deleteActionClick:)];
+        self.navigationItem.rightBarButtonItem = deleteItem;
+    }
 }
 
 #pragma mark - Action

+ 3 - 0
Redant Drivers/Apex And Drivers/Setting/Cell/RASettingAboutCell.m

@@ -26,6 +26,9 @@
     [super awakeFromNib];
     // Initialization code
     
+    self.appIconView.layer.cornerRadius = 10.0f;
+    self.appIconView.layer.masksToBounds = YES;
+    
     self.model = nil;
 }
 

+ 17 - 0
Redant Drivers/Apex And Drivers/Setting/Cell/RASettingLinkCell.h

@@ -0,0 +1,17 @@
+//
+//  RASettingLinkCell.h
+//  Apex And Drivers
+//
+//  Created by Jack on 2018/10/9.
+//  Copyright © 2018年 USAI. All rights reserved.
+//
+
+#import "RASettingBaseCell.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RASettingLinkCell : RASettingBaseCell
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 37 - 0
Redant Drivers/Apex And Drivers/Setting/Cell/RASettingLinkCell.m

@@ -0,0 +1,37 @@
+//
+//  RASettingLinkCell.m
+//  Apex And Drivers
+//
+//  Created by Jack on 2018/10/9.
+//  Copyright © 2018年 USAI. All rights reserved.
+//
+
+#import "RASettingLinkCell.h"
+#import "RASettingLinkModel.h"
+
+@interface RASettingLinkCell ()
+
+@property (nonatomic,strong) IBOutlet UILabel *titleLabel;
+
+@end
+
+@implementation RASettingLinkCell
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+
+    // Configure the view for the selected state
+}
+
+- (void)refreshUI {
+    
+    RASettingLinkModel *model = (RASettingLinkModel *)self.model;
+    self.titleLabel.text = model.title;
+}
+
+@end

+ 10 - 1
Redant Drivers/Apex And Drivers/Setting/Data/setting.json

@@ -5,7 +5,7 @@
                               {
                               "type": 0,
                               "keyPath": "backgroundReportType",
-                              "title": "Background Location",
+                              "title": "Response Location Request",
                               "options": [
                                           {
                                           "option": 1,
@@ -42,6 +42,15 @@
                               ]
                  },
                  {
+                 "settings": [
+                     {
+                         "type": 4,
+                         "title": "Privacy Policy",
+                         "link": "https://www.baidu.com"
+                     }
+                 ]
+                 },
+                 {
                  "settings": [
                               {
                               "type": 3,

+ 2 - 1
Redant Drivers/Apex And Drivers/Setting/Model/RASettingBaseModel.h

@@ -13,7 +13,8 @@ typedef enum {
     RASettingTypeOption = 0,
     RASettingTypeSwitch = 1,
     RASettingTypeAction = 2,
-    RASettingTypeAbout = 3
+    RASettingTypeAbout = 3,
+    RASettingTypeLink = 4
     
 } RASettingType;
 

+ 17 - 0
Redant Drivers/Apex And Drivers/Setting/Model/RASettingLinkModel.h

@@ -0,0 +1,17 @@
+//
+//  RASettingLinkModel.h
+//  Apex And Drivers
+//
+//  Created by Jack on 2018/10/9.
+//  Copyright © 2018年 USAI. All rights reserved.
+//
+
+#import "RASettingBaseModel.h"
+
+
+
+@interface RASettingLinkModel : RASettingBaseModel
+
+@property (nonatomic,copy) NSString *link;
+
+@end

+ 17 - 0
Redant Drivers/Apex And Drivers/Setting/Model/RASettingLinkModel.m

@@ -0,0 +1,17 @@
+//
+//  RASettingLinkModel.m
+//  Apex And Drivers
+//
+//  Created by Jack on 2018/10/9.
+//  Copyright © 2018年 USAI. All rights reserved.
+//
+
+#import "RASettingLinkModel.h"
+
+@implementation RASettingLinkModel
+
+- (CGFloat)height {
+    return 60.0f;
+}
+
+@end

+ 5 - 1
Redant Drivers/Apex And Drivers/Setting/Model/RASettingSectionModel.m

@@ -11,6 +11,7 @@
 #import "RASettingSwitchModel.h"
 #import "RASettingActionModel.h"
 #import "RASettingAboutModel.h"
+#import "RASettingLinkModel.h"
 
 @implementation RASettingSectionModel
 
@@ -47,7 +48,10 @@
                 model = [RASettingAboutModel new];
             }
                 break;
-                
+            case RASettingTypeLink: {
+                model = [RASettingLinkModel new];
+            }
+                break;
             default:
                 break;
         }

+ 4 - 0
Redant Drivers/Apex And Drivers/Setting/RASettingViewController+TableDataSource.m

@@ -55,6 +55,10 @@
             cell = [tableView dequeueReusableCellWithIdentifier:@"RASettingAboutCell" forIndexPath:indexPath];
         }
             break;
+        case RASettingTypeLink: {
+            cell = [tableView dequeueReusableCellWithIdentifier:@"RASettingLinkCell" forIndexPath:indexPath];
+        }
+            break;
         default: {
             cell = [RASettingBaseCell new];
         }

+ 17 - 0
Redant Drivers/Apex And Drivers/Setting/RASettingViewController+TableDelegate.m

@@ -11,6 +11,7 @@
 #import "RASettingOptionModel.h"
 #import "RASettingSwitchModel.h"
 #import "RASettingActionModel.h"
+#import "RASettingLinkModel.h"
 #import "RAChangePasswordViewController.h"
 
 #import "RAOptionViewController.h"
@@ -52,6 +53,11 @@
             [self clickAction:actionModel];
         }
             break;
+        case RASettingTypeLink: {
+            RASettingLinkModel *linkModel = (RASettingLinkModel *)model;
+            [self clickLink:linkModel];
+        }
+            break;
         default: {
         }
             break;
@@ -152,4 +158,15 @@
     });
 }
 
+#pragma mark - Link
+
+- (void)clickLink:(RASettingLinkModel *)model {
+    
+    NSString *link = model.link;
+    NSURL *url = [NSURL URLWithString:link];
+    if ([[UIApplication sharedApplication] canOpenURL:url]) {
+        [[UIApplication sharedApplication] openURL:url];
+    }
+}
+
 @end

+ 46 - 19
Redant Drivers/Apex And Drivers/Setting/setting.storyboard

@@ -19,14 +19,14 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="bt6-9g-1Sc">
-                                <rect key="frame" x="0.0" y="20" width="600" height="580"/>
+                                <rect key="frame" x="0.0" y="20" width="375" height="647"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <view key="tableFooterView" contentMode="scaleToFill" id="JQO-83-Rit">
-                                    <rect key="frame" x="0.0" y="343" width="600" height="40"/>
+                                    <rect key="frame" x="0.0" y="403" width="375" height="40"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="© 2014 United Software Applications, Inc." textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="n2h-5Z-NBM">
-                                            <rect key="frame" x="5" y="5" width="365" height="30"/>
+                                            <rect key="frame" x="5" y="5" width="590" height="30"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                             <nil key="textColor"/>
@@ -43,10 +43,10 @@
                                 </view>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="RASettingOptionCell" rowHeight="60" id="S3b-rg-Apb" customClass="RASettingOptionCell">
-                                        <rect key="frame" x="0.0" y="28" width="600" height="60"/>
+                                        <rect key="frame" x="0.0" y="28" width="375" height="60"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="S3b-rg-Apb" id="GJS-xN-7T2">
-                                            <rect key="frame" x="0.0" y="0.0" width="567" height="59.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="342" height="59.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nn8-Yz-pgL">
@@ -56,7 +56,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Ne-f7-mNd">
-                                                    <rect key="frame" x="306.5" y="21.5" width="35.5" height="17"/>
+                                                    <rect key="frame" x="531.5" y="21.5" width="35.5" height="17"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
@@ -77,20 +77,20 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="RASettingSwitchCell" rowHeight="60" id="fw3-Ce-iMX" customClass="RASettingSwitchCell">
-                                        <rect key="frame" x="0.0" y="88" width="600" height="60"/>
+                                        <rect key="frame" x="0.0" y="88" width="375" height="60"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="fw3-Ce-iMX" id="i0k-qx-Z3s">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="59.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="59.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7mb-Gz-UK4">
-                                                    <rect key="frame" x="10" y="21" width="296" height="18"/>
+                                                    <rect key="frame" x="10" y="21" width="521" height="18"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="745-1J-0vr">
-                                                    <rect key="frame" x="316" y="14.5" width="51" height="31"/>
+                                                    <rect key="frame" x="541" y="14.5" width="51" height="31"/>
                                                     <connections>
                                                         <action selector="switchBtnClick:" destination="fw3-Ce-iMX" eventType="valueChanged" id="qlF-Jb-a7c"/>
                                                     </connections>
@@ -111,10 +111,10 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="RASettingActionCell" rowHeight="60" id="d2O-Oc-12t" customClass="RASettingActionCell">
-                                        <rect key="frame" x="0.0" y="148" width="600" height="60"/>
+                                        <rect key="frame" x="0.0" y="148" width="375" height="60"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="d2O-Oc-12t" id="NTz-8W-1bG">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="59.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="59.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rXI-of-ag8">
@@ -143,10 +143,10 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="RASettingAboutCell" rowHeight="135" id="vBr-qI-FKj" customClass="RASettingAboutCell">
-                                        <rect key="frame" x="0.0" y="208" width="600" height="135"/>
+                                        <rect key="frame" x="0.0" y="208" width="375" height="135"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="vBr-qI-FKj" id="Tm1-Oc-7El">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="134.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="134.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_50" translatesAutoresizingMaskIntoConstraints="NO" id="Fjp-Bc-dUh">
@@ -157,7 +157,7 @@
                                                     </constraints>
                                                 </imageView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Apex &amp; Drivers 1.0" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0Rt-Xa-P59">
-                                                    <rect key="frame" x="70" y="15" width="295" height="21"/>
+                                                    <rect key="frame" x="70" y="15" width="520" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="21" id="I4Z-WS-ohs"/>
                                                     </constraints>
@@ -173,7 +173,7 @@
                                                     </constraints>
                                                 </imageView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ver:1.0 build 180913" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gMo-mB-JAI">
-                                                    <rect key="frame" x="70" y="41" width="295" height="21"/>
+                                                    <rect key="frame" x="70" y="41" width="520" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="21" id="oz7-pl-nM7"/>
                                                     </constraints>
@@ -182,7 +182,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" bouncesZoom="NO" editable="NO" text="redantsupport@united-us.net" translatesAutoresizingMaskIntoConstraints="NO" id="PVK-zg-HWg">
-                                                    <rect key="frame" x="65" y="89.5" width="300" height="25"/>
+                                                    <rect key="frame" x="65" y="89.5" width="525" height="25"/>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="25" id="ccc-3X-Q0i"/>
@@ -192,7 +192,7 @@
                                                     <dataDetectorType key="dataDetectorTypes" link="YES"/>
                                                 </textView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Support:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wiy-uj-wOO">
-                                                    <rect key="frame" x="70" y="75" width="295" height="19.5"/>
+                                                    <rect key="frame" x="70" y="75" width="520" height="19.5"/>
                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
@@ -225,6 +225,33 @@
                                             <outlet property="supportLabel" destination="PVK-zg-HWg" id="tcj-pA-y90"/>
                                         </connections>
                                     </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="RASettingLinkCell" rowHeight="60" id="2dy-RZ-XkB" customClass="RASettingLinkCell">
+                                        <rect key="frame" x="0.0" y="343" width="375" height="60"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="2dy-RZ-XkB" id="2ST-An-KkX">
+                                            <rect key="frame" x="0.0" y="0.0" width="342" height="59.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VQY-CF-Usu">
+                                                    <rect key="frame" x="10" y="5" width="322" height="49.5"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="trailing" secondItem="VQY-CF-Usu" secondAttribute="trailing" constant="10" id="8qG-Hf-u7e"/>
+                                                <constraint firstAttribute="bottom" secondItem="VQY-CF-Usu" secondAttribute="bottom" constant="5" id="Czp-st-tkJ"/>
+                                                <constraint firstItem="VQY-CF-Usu" firstAttribute="centerY" secondItem="2ST-An-KkX" secondAttribute="centerY" id="MHL-3E-qFY"/>
+                                                <constraint firstItem="VQY-CF-Usu" firstAttribute="leading" secondItem="2ST-An-KkX" secondAttribute="leading" constant="10" id="bRP-pu-6O8"/>
+                                                <constraint firstItem="VQY-CF-Usu" firstAttribute="top" secondItem="2ST-An-KkX" secondAttribute="top" constant="5" id="mFP-Yt-eQx"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <connections>
+                                            <outlet property="titleLabel" destination="VQY-CF-Usu" id="vZc-JL-uFR"/>
+                                        </connections>
+                                    </tableViewCell>
                                 </prototypes>
                                 <connections>
                                     <outlet property="dataSource" destination="K1Z-ea-fUh" id="17k-2P-W4r"/>
@@ -269,7 +296,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H3V-Ud-CQM">
-                                                    <rect key="frame" x="5" y="16" width="365" height="18"/>
+                                                    <rect key="frame" x="5" y="16" width="590" height="18"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>

+ 1 - 1
Redant Drivers/Apex And Drivers/UIScrollVIew+Empty/RAEmptyDataView.m

@@ -14,7 +14,7 @@
 
 - (instancetype)init {
     if (self = [super init]) {
-        self.backgroundColor = [UIColor whiteColor];
+        self.backgroundColor = [UIColor clearColor];
 //        self.translatesAutoresizingMaskIntoConstraints = NO;
     }
     return self;