iOS apex land 1.18，更换图标，修复bug，兼容iOS14

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

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		3CB70DB82531B28A00930FFC /* RAUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CB70DB72531B28A00930FFC /* RAUtils.m */; };
 		4205FD4820C0F33500DB42B4 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4205FD4720C0F33500DB42B4 /* LoginViewController.m */; };
 		4205FD4B20C0F4C400DB42B4 /* RetrievePasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4205FD4A20C0F4C300DB42B4 /* RetrievePasswordViewController.m */; };
 		4205FD5320C0F50C00DB42B4 /* JLCustomerAlertController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4205FD4E20C0F50C00DB42B4 /* JLCustomerAlertController.m */; };
@@ -72,7 +73,6 @@
 		424BA1E32136806C007912EC /* UIImage+RedAnt.m in Sources */ = {isa = PBXBuildFile; fileRef = 424BA1E22136806C007912EC /* UIImage+RedAnt.m */; };
 		42529D2120C0E8EC000C0F4D /* NetworkUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 42529D2020C0E8EC000C0F4D /* NetworkUtils.m */; };
 		42529D2520C0E97E000C0F4D /* RADataProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 42529D2420C0E97E000C0F4D /* RADataProvider.m */; };
-		42529D2B20C0EA0A000C0F4D /* RAUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 42529D2A20C0EA0A000C0F4D /* RAUtils.m */; };
 		42529D3920C0EA3F000C0F4D /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 42529D2F20C0EA3F000C0F4D /* ioapi.c */; };
 		42529D3A20C0EA3F000C0F4D /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = 42529D3120C0EA3F000C0F4D /* mztools.c */; };
 		42529D3B20C0EA3F000C0F4D /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 42529D3320C0EA3F000C0F4D /* unzip.c */; };
@@ -211,6 +211,8 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		3CB70DB62531B28A00930FFC /* RAUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAUtils.h; path = ../../common/RAUtils.h; sourceTree = "<group>"; };
+		3CB70DB72531B28A00930FFC /* RAUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAUtils.m; path = ../../common/RAUtils.m; sourceTree = "<group>"; };
 		4205FD4620C0F33500DB42B4 /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
 		4205FD4720C0F33500DB42B4 /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
 		4205FD4920C0F4C300DB42B4 /* RetrievePasswordViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RetrievePasswordViewController.h; sourceTree = "<group>"; };
@@ -336,8 +338,6 @@
 		42529D2320C0E97E000C0F4D /* RADataProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RADataProvider.h; sourceTree = "<group>"; };
 		42529D2420C0E97E000C0F4D /* RADataProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RADataProvider.m; sourceTree = "<group>"; };
 		42529D2720C0E99B000C0F4D /* const.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = const.h; sourceTree = "<group>"; };
-		42529D2920C0EA0A000C0F4D /* RAUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAUtils.h; path = "../../RedAnt ERP Mobile/common/RAUtils.h"; sourceTree = "<group>"; };
-		42529D2A20C0EA0A000C0F4D /* RAUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAUtils.m; path = "../../RedAnt ERP Mobile/common/RAUtils.m"; sourceTree = "<group>"; };
 		42529D2E20C0EA3F000C0F4D /* crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypt.h; sourceTree = "<group>"; };
 		42529D2F20C0EA3F000C0F4D /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ioapi.c; sourceTree = "<group>"; };
 		42529D3020C0EA3F000C0F4D /* ioapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ioapi.h; sourceTree = "<group>"; };
@@ -581,7 +581,7 @@
 		42F624EA214BA50D00B1F012 /* RAMessageCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAMessageCell.m; sourceTree = "<group>"; };
 		42F624EC214BA97F00B1F012 /* RAMessageModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAMessageModel.h; sourceTree = "<group>"; };
 		42F624ED214BA97F00B1F012 /* RAMessageModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAMessageModel.m; sourceTree = "<group>"; };
-		71EAA32E20B9571B002F003C /* Apex And Drivers.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Apex And Drivers.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		71EAA32E20B9571B002F003C /* Apex Land.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Apex Land.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		71EAA33120B9571B002F003C /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		71EAA33220B9571B002F003C /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		71EAA33820B9571B002F003C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -892,10 +892,10 @@
 			children = (
 				4280033720C0F145004D4F50 /* AES */,
 				42529D2C20C0EA3F000C0F4D /* zip */,
-				42529D2920C0EA0A000C0F4D /* RAUtils.h */,
-				42529D2A20C0EA0A000C0F4D /* RAUtils.m */,
 				4205FD5620C0F6F100DB42B4 /* RAConvertor.h */,
 				4205FD5720C0F6F100DB42B4 /* RAConvertor.m */,
+				3CB70DB62531B28A00930FFC /* RAUtils.h */,
+				3CB70DB72531B28A00930FFC /* RAUtils.m */,
 				424204F120C68E02005AEED9 /* RAProgressHUD.h */,
 				424204F220C68E02005AEED9 /* RAProgressHUD.m */,
 				425B97E420C7BD3800B35713 /* UIView+Toast.h */,
@@ -1389,7 +1389,7 @@
 		71EAA32F20B9571B002F003C /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				71EAA32E20B9571B002F003C /* Apex And Drivers.app */,
+				71EAA32E20B9571B002F003C /* Apex Land.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1458,7 +1458,7 @@
 			);
 			name = "Apex And Drivers";
 			productName = "Apex And Drivers";
-			productReference = 71EAA32E20B9571B002F003C /* Apex And Drivers.app */;
+			productReference = 71EAA32E20B9571B002F003C /* Apex Land.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -1467,7 +1467,7 @@
 		71EAA32620B9571B002F003C /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = USAI;
 				TargetAttributes = {
 					71EAA32D20B9571B002F003C = {
@@ -1578,7 +1578,6 @@
 				42DFE26A213F821E000213C2 /* RAEmptyView.m in Sources */,
 				42DFE265213F80AF000213C2 /* RAEmptyDataView.m in Sources */,
 				42AF41B0218951B0008F9124 /* RADetailMultPhotoModel.m in Sources */,
-				42529D2B20C0EA0A000C0F4D /* RAUtils.m in Sources */,
 				4281100420E4D47000315156 /* UIScrollView+JLRefresh.m in Sources */,
 				4205FD6620C13BF400DB42B4 /* RAOrderCell.m in Sources */,
 				42529D2120C0E8EC000C0F4D /* NetworkUtils.m in Sources */,
@@ -1595,6 +1594,7 @@
 				42D8B8C820C24B0B001C125F /* RADetailActionCollectionModel.m in Sources */,
 				4255EC7C20C511F000E5DA24 /* RAOrderEditViewController+TableDelegate.m in Sources */,
 				42D8B8DB20C279AA001C125F /* RAOrderDetailViewController+TableViewDataSource.m in Sources */,
+				3CB70DB82531B28A00930FFC /* RAUtils.m in Sources */,
 				4255EC8020C518E300E5DA24 /* RAEditScanInputCell.m in Sources */,
 				4255EC8D20C5232C00E5DA24 /* RAEditLabelCell.m in Sources */,
 				42D8B8CC20C24B27001C125F /* RADetailActionModel.m in Sources */,
@@ -1881,6 +1881,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1906,7 +1907,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -1940,6 +1941,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1959,7 +1961,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
@@ -1976,13 +1978,14 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/Apex And Drivers/PrefixHeader.pch";
 				INFOPLIST_FILE = "Apex And Drivers/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.18;
 				PRODUCT_BUNDLE_IDENTIFIER = "usai.redant.Apex-And-Drivers";
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = "Apex Land";
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
@@ -1997,13 +2000,14 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/Apex And Drivers/PrefixHeader.pch";
 				INFOPLIST_FILE = "Apex And Drivers/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.18;
 				PRODUCT_BUNDLE_IDENTIFIER = "usai.redant.Apex-And-Drivers";
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = "Apex Land";
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;

Redant Drivers/Apex And Drivers/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,107 +1,116 @@
 {
   "images" : [
     {
-      "size" : "20x20",
+      "filename" : "appicon-1.png",
       "idiom" : "iphone",
-      "filename" : "AppIcon@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "size" : "20x20",
+      "filename" : "appicon-2.png",
       "idiom" : "iphone",
-      "filename" : "AppIcon@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
-      "size" : "29x29",
+      "filename" : "appicon-3.png",
       "idiom" : "iphone",
-      "filename" : "AppIcon@2x-1.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "size" : "29x29",
+      "filename" : "appicon-4.png",
       "idiom" : "iphone",
-      "filename" : "AppIcon@3x-1.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
-      "size" : "40x40",
+      "filename" : "appicon-5.png",
       "idiom" : "iphone",
-      "filename" : "AppIcon@2x-2.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size" : "40x40",
+      "filename" : "appicon-6.png",
       "idiom" : "iphone",
-      "filename" : "AppIcon@3x-2.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "40x40"
     },
     {
-      "size" : "60x60",
+      "filename" : "appicon-7.png",
       "idiom" : "iphone",
-      "filename" : "AppIcon@2x-3.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "60x60"
     },
     {
-      "size" : "60x60",
+      "filename" : "appicon-8.png",
       "idiom" : "iphone",
-      "filename" : "AppIcon@3x-3.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "60x60"
     },
     {
+      "filename" : "appicon-9.png",
       "idiom" : "ipad",
-      "size" : "20x20",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "20x20"
     },
     {
+      "filename" : "appicon-10.png",
       "idiom" : "ipad",
-      "size" : "20x20",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
+      "filename" : "appicon-11.png",
       "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
+      "filename" : "appicon-12.png",
       "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
+      "filename" : "appicon-13.png",
       "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "40x40"
     },
     {
+      "filename" : "appicon-14.png",
       "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
+      "filename" : "appicon-15.png",
       "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "76x76"
     },
     {
+      "filename" : "appicon-16.png",
       "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "76x76"
     },
     {
+      "filename" : "appicon-17.png",
       "idiom" : "ipad",
-      "size" : "83.5x83.5",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "83.5x83.5"
     },
     {
-      "size" : "1024x1024",
+      "filename" : "appicon.png",
       "idiom" : "ios-marketing",
-      "filename" : "AppIcon.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

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

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

Redant Drivers/Apex And Drivers/Detail/RAOrderDetailViewController+TableViewDataSource.m

@@ -27,8 +27,8 @@
 
 #import "RAProgressHUD.h"
 
-#import <AddressBook/AddressBook.h>
-//#import <Contacts/Contacts.h>
+//#import <AddressBook/AddressBook.h>
+#import <Contacts/Contacts.h>
 
 #import "RADetailPhotoModel.h"
 #import "RADetailMapModel.h"
@@ -210,7 +210,7 @@
         
         MKMapItem *toLocation = [[MKMapItem alloc] initWithPlacemark:[[MKPlacemark alloc] initWithCoordinate:kCLLocationCoordinate2DInvalid
                                                                                            addressDictionary:@{
-                                                                                                               (__bridge id)kABPersonAddressStreetKey : model.street
+                                                                                                              CNPostalAddressStreetKey : model.street
                                                                                                                }]];
         [MKMapItem openMapsWithItems:@[currentLocation, toLocation] launchOptions:@{
                                                                     MKLaunchOptionsDirectionsModeKey: MKLaunchOptionsDirectionsModeDriving,

Redant Drivers/Apex And Drivers/Detail/RAOrderDetailViewController.m

@@ -186,9 +186,10 @@
     
     if (@available(iOS 11.0, *)) {
         self.detailTableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
-    } else {
-        self.automaticallyAdjustsScrollViewInsets = NO;
     }
+//    else {
+//        self.automaticallyAdjustsScrollViewInsets = NO;
+//    }
     
     self.detailTableView.tableFooterView = [UIView new];
     self.detailTableView.separatorInset = UIEdgeInsetsMake(0, 0, 0, 0);

Redant Drivers/Apex And Drivers/Filter/RAOrderFilterViewController.m

@@ -89,9 +89,10 @@
     
     if (@available(iOS 11,*)) {
         self.filterTable.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
-    } else {
-        self.automaticallyAdjustsScrollViewInsets = NO;
     }
+//    else {
+//        self.automaticallyAdjustsScrollViewInsets = NO;
+//    }
     self.searchBtn.layer.borderColor = ApexDriverGrayColor.CGColor;
 }
 

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

@@ -83,9 +83,10 @@ typedef enum {
     
     if (@available(iOS 11.0, *)) {
         self.homeMoreTableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
-    } else{
-        self.automaticallyAdjustsScrollViewInsets = NO;
     }
+//    else{
+//        self.automaticallyAdjustsScrollViewInsets = NO;
+//    }
     
     self.homeMoreTableView.tableFooterView = [UIView new];
     self.homeMoreTableView.separatorInset = UIEdgeInsetsMake(0, 0, 0, 0);

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

@@ -153,9 +153,10 @@
     
     if (@available(iOS 11, *)) {
         self.homeOrderTableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
-    } else {
-        self.automaticallyAdjustsScrollViewInsets = NO;
     }
+//    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);
@@ -301,7 +302,9 @@
                     
                     NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
                     if ([[UIApplication sharedApplication] canOpenURL:url]) {
-                        [[UIApplication sharedApplication] openURL:url];
+//                        [[UIApplication sharedApplication] openURL:url];
+                        
+                        [[UIApplication sharedApplication] openURL:url options:@{UIApplicationOpenURLOptionUniversalLinksOnly : @NO} completionHandler:nil];
                     }
                 }];
                 

Redant Drivers/Apex And Drivers/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.16</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>41420</string>
 	<key>LSApplicationQueriesSchemes</key>

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

@@ -80,9 +80,11 @@ typedef enum {
     
     if (@available(iOS 11,*)) {
         self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
-    } else {
-        self.automaticallyAdjustsScrollViewInsets = NO;
     }
+    
+//    else {
+//        self.automaticallyAdjustsScrollViewInsets = NO;
+//    }
     self.tableView.tableFooterView = [UIView new];
     self.tableView.backgroundColor = [UIColor colorWithRed:0.9 green:0.9 blue:0.9 alpha:1];
     

Redant Drivers/Apex And Drivers/PhotoPreView/RAPhotoPreviewController.m

@@ -34,9 +34,10 @@
     
     if (@available(iOS 11.0, *)) {
         self.photoScrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
-    } else {
-        self.automaticallyAdjustsScrollViewInsets = NO;
     }
+//    else {
+//        self.automaticallyAdjustsScrollViewInsets = NO;
+//    }
     
     self.photoImageView.image = self.image;
     [self configureNavigationBar];

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

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -19,10 +17,10 @@
                         <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="375" height="647"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                 <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="403" width="375" height="40"/>
+                                    <rect key="frame" x="0.0" y="431" 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">
@@ -46,7 +44,7 @@
                                         <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="342" height="59.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="348" height="60"/>
                                             <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 +54,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="312.5" y="21.5" width="35.5" height="17"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
@@ -80,7 +78,7 @@
                                         <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="375" height="59.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
                                             <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">
@@ -114,7 +112,7 @@
                                         <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="375" height="59.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
                                             <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">
@@ -156,7 +154,7 @@
                                         <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="375" height="134.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="135"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_50" translatesAutoresizingMaskIntoConstraints="NO" id="Fjp-Bc-dUh">
@@ -166,7 +164,7 @@
                                                         <constraint firstAttribute="height" constant="50" id="qQc-UR-Wdf"/>
                                                     </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">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Apex Land" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0Rt-Xa-P59">
                                                     <rect key="frame" x="70" y="15" width="295" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="21" id="I4Z-WS-ohs"/>
@@ -239,11 +237,11 @@
                                         <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"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="348" height="60"/>
                                             <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"/>
+                                                    <rect key="frame" x="10" y="5" width="328" height="50"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
@@ -269,6 +267,7 @@
                                 </connections>
                             </tableView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="oTy-yr-RHK"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="bt6-9g-1Sc" firstAttribute="top" secondItem="oTy-yr-RHK" secondAttribute="top" id="3do-tf-2x8"/>
@@ -276,7 +275,6 @@
                             <constraint firstItem="bt6-9g-1Sc" firstAttribute="leading" secondItem="oTy-yr-RHK" secondAttribute="leading" id="fDd-SR-kyZ"/>
                             <constraint firstItem="oTy-yr-RHK" firstAttribute="bottom" secondItem="bt6-9g-1Sc" secondAttribute="bottom" id="ny6-IT-Teu"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="oTy-yr-RHK"/>
                     </view>
                     <connections>
                         <outlet property="settingTableView" destination="bt6-9g-1Sc" id="nMT-hv-aC5"/>
@@ -295,14 +293,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="Tfn-3m-nS4">
-                                <rect key="frame" x="0.0" y="20" width="375" height="647"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="RAOptionCell" rowHeight="50" id="vtS-6b-ZlL" customClass="RAOptionCell">
                                         <rect key="frame" x="0.0" y="28" width="375" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="vtS-6b-ZlL" id="0Gc-fu-jG7">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="49.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
                                             <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">
@@ -329,6 +327,7 @@
                                 </connections>
                             </tableView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="Glx-5I-7JL"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="Tfn-3m-nS4" firstAttribute="leading" secondItem="Glx-5I-7JL" secondAttribute="leading" id="6FQ-cE-kUg"/>
@@ -336,7 +335,6 @@
                             <constraint firstItem="Glx-5I-7JL" firstAttribute="trailing" secondItem="Tfn-3m-nS4" secondAttribute="trailing" id="fgt-UT-eCV"/>
                             <constraint firstItem="Glx-5I-7JL" firstAttribute="bottom" secondItem="Tfn-3m-nS4" secondAttribute="bottom" id="u9D-aj-Pg8"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="Glx-5I-7JL"/>
                     </view>
                     <connections>
                         <outlet property="optionTable" destination="Tfn-3m-nS4" id="xls-RJ-I2h"/>
@@ -355,11 +353,10 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Old password *required" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="AGg-Is-zfV">
-                                <rect key="frame" x="5" y="61" width="365" height="30"/>
+                                <rect key="frame" x="5" y="41" width="365" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="tdG-fz-DUH"/>
                                 </constraints>
-                                <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
                                 <connections>
@@ -367,14 +364,13 @@
                                 </connections>
                             </textField>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Change Password" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XYO-s8-g1R">
-                                <rect key="frame" x="5" y="30" width="365" height="21"/>
+                                <rect key="frame" x="5" y="10" width="365" height="21"/>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="New password *required" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="one-j7-LgU">
-                                <rect key="frame" x="5" y="101" width="365" height="30"/>
-                                <nil key="textColor"/>
+                                <rect key="frame" x="5" y="81" width="365" height="30"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
                                 <connections>
@@ -382,8 +378,7 @@
                                 </connections>
                             </textField>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Confirm new password *required" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="dQK-Xb-iG2">
-                                <rect key="frame" x="5" y="141" width="365" height="30"/>
-                                <nil key="textColor"/>
+                                <rect key="frame" x="5" y="121" width="365" height="30"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
                                 <connections>
@@ -391,12 +386,12 @@
                                 </connections>
                             </textField>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mZu-0K-iio">
-                                <rect key="frame" x="0.0" y="181" width="375" height="40"/>
+                                <rect key="frame" x="0.0" y="161" width="375" height="40"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gkw-yN-ovJ">
                                         <rect key="frame" x="10" y="0.0" width="172.5" height="40"/>
                                         <subviews>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="i90-wQ-C0t">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="i90-wQ-C0t">
                                                 <rect key="frame" x="62.5" y="5" width="48" height="30"/>
                                                 <state key="normal" title="Cancel"/>
                                                 <connections>
@@ -412,7 +407,7 @@
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xb4-bE-BCi">
                                         <rect key="frame" x="192.5" y="0.0" width="172.5" height="40"/>
                                         <subviews>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NV0-3K-Irh">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NV0-3K-Irh">
                                                 <rect key="frame" x="60" y="5" width="53" height="30"/>
                                                 <state key="normal" title="Change"/>
                                                 <connections>
@@ -440,6 +435,7 @@
                                 </constraints>
                             </view>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="wbS-Du-ewM"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="XYO-s8-g1R" firstAttribute="leading" secondItem="wbS-Du-ewM" secondAttribute="leading" constant="5" id="1Wv-CX-Hbg"/>
@@ -460,7 +456,6 @@
                             <constraint firstItem="one-j7-LgU" firstAttribute="trailing" secondItem="AGg-Is-zfV" secondAttribute="trailing" id="veq-oU-lur"/>
                             <constraint firstItem="XYO-s8-g1R" firstAttribute="top" secondItem="wbS-Du-ewM" secondAttribute="top" constant="10" id="ztq-Pn-u66"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="wbS-Du-ewM"/>
                     </view>
                     <connections>
                         <outlet property="cancelBtn" destination="i90-wQ-C0t" id="e53-2c-oAC"/>

Redant Drivers/Apex And Drivers/Setting/Option/RAOptionViewController.m

@@ -51,9 +51,10 @@
     
     if (@available(iOS 11,*)) {
         self.optionTable.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
-    } else {
-        self.automaticallyAdjustsScrollViewInsets = NO;
     }
+//    else {
+//        self.automaticallyAdjustsScrollViewInsets = NO;
+//    }
     
     self.optionTable.tableFooterView = [UIView new];
     self.optionTable.backgroundColor = [UIColor colorWithRed:0.9 green:0.9 blue:0.9 alpha:1];

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

@@ -166,7 +166,10 @@
     NSString *link = model.link;
     NSURL *url = [NSURL URLWithString:link];
     if ([[UIApplication sharedApplication] canOpenURL:url]) {
-        [[UIApplication sharedApplication] openURL:url];
+        
+//        ;
+        [[UIApplication sharedApplication] openURL:url options:@{UIApplicationOpenURLOptionUniversalLinksOnly : @NO} completionHandler:nil];
+//        [[UIApplication sharedApplication] openURL:url];
     }
 }
 

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

@@ -43,10 +43,11 @@
     
     if (@available(iOS 11,*)) {
         self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
-    } else {
-        self.automaticallyAdjustsScrollViewInsets = NO;
     }
-    
+//    else {
+//        self.automaticallyAdjustsScrollViewInsets = NO;
+//    }
+//
     self.tableView.backgroundColor = [UIColor colorWithRed:0.9 green:0.9 blue:0.9 alpha:1];
 }
 

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

@@ -199,9 +199,10 @@
     
     if (@available(iOS 11.0, *)) {
         self.orderEditTableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
-    } else {
-        self.automaticallyAdjustsScrollViewInsets = NO;
     }
+//    else {
+//        self.automaticallyAdjustsScrollViewInsets = NO;
+//    }
     
     self.orderEditTableView.tableFooterView = [UIView new];
     self.orderEditTableView.separatorInset = UIEdgeInsetsMake(0, 0, 0, 0);

Redant Drivers/Apex And Drivers/config.h

@@ -49,17 +49,17 @@
 
 //完成修改的接口
 
-//#define URL_DETAIL              APPENDING_STR(@"/mobile/orderDetails.mo/")
-//#define URL_UPDATE              APPENDING_STR(@"/mobile/actionDetails.mo/")
-//#define URL_MORE_ORDER          APPENDING_STR(@"/mobile/morePickupOrders.mo/")
-//#define URL_HOME                APPENDING_STR(@"/mobile/truckPage.mo/")
-//#define URL_SUBMIT              APPENDING_STR(@"/mobile/updateContainerData.mo/")
-
-#define URL_DETAIL              APPENDING_STR(@"/mobile/orderDetails2.mo/")
-#define URL_UPDATE              APPENDING_STR(@"/mobile/checkInDetails.mo/")
-#define URL_MORE_ORDER          APPENDING_STR(@"/mobile/fullOrderList.mo/")
-#define URL_HOME                APPENDING_STR(@"/mobile/homePage.mo/")
-#define URL_SUBMIT              APPENDING_STR(@"/mobile/CheckIn.mo/")
+#define URL_DETAIL              APPENDING_STR(@"/mobile/orderDetails.mo/")
+#define URL_UPDATE              APPENDING_STR(@"/mobile/actionDetails.mo/")
+#define URL_MORE_ORDER          APPENDING_STR(@"/mobile/morePickupOrders.mo/")
+#define URL_HOME                APPENDING_STR(@"/mobile/truckPage.mo/")
+#define URL_SUBMIT              APPENDING_STR(@"/mobile/updateContainerData.mo/")
+
+//#define URL_DETAIL              APPENDING_STR(@"/mobile/orderDetails2.mo/")
+//#define URL_UPDATE              APPENDING_STR(@"/mobile/checkInDetails.mo/")
+//#define URL_MORE_ORDER          APPENDING_STR(@"/mobile/fullOrderList.mo/")
+//#define URL_HOME                APPENDING_STR(@"/mobile/homePage.mo/")
+//#define URL_SUBMIT              APPENDING_STR(@"/mobile/CheckIn.mo/")
 
 
 //#define URL_HOME                @"http://192.168.0.130:8080/MyWeb/Test"

Redant Drivers/Apex And Drivers/const.h

@@ -10,6 +10,7 @@
 #define const_h
 
 #define DEBUGLOG 1
+
 #ifdef DEBUGLOG
 #ifdef DEBUG
 //     #define DebugLog( s, ... ) fprintf(stderr,"%s\n",[[NSString stringWithFormat:s, ##__VA_ARGS__] UTF8String])//
@@ -28,6 +29,25 @@
 #define blockDebugLog( s, ... )
 #endif
 
+//
+//#ifdef DEBUGLOG
+//#ifdef DEBUG
+////     #define DebugLog( s, ... ) fprintf(stderr,"%s\n",[[NSString stringWithFormat:s, ##__VA_ARGS__] UTF8String])//
+//#define DebugLog( s, ... ) fprintf(stderr, "<%p T%p %s:(%d)> %s \n", self,[NSThread currentThread], [[[NSString stringWithUTF8String:__FILE__] lastPathComponent]UTF8String], __LINE__, [[NSString stringWithFormat:(s), ##__VA_ARGS__]UTF8String] )
+//
+//#define blockDebugLog( s, ... ) fprintf(stderr, "<%p %s:(%d)> %s \n",weakself, [[[NSString stringWithUTF8String:__FILE__] lastPathComponent]UTF8String], __LINE__, [[NSString stringWithFormat:(s), ##__VA_ARGS__]UTF8String] )
+//
+//#else
+//#define DebugLog( s, ... )
+//
+//#define blockDebugLog( s, ... )
+//#endif
+//#else
+//#define DebugLog( s, ... )
+//
+//#define blockDebugLog( s, ... )
+//#endif
+
 #define UIColorFromRGB(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
 #define UIColorFromRGBAlpha(rgbValue,alp) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:(alp)]
 

Redant Drivers/Apex And Drivers/en.lproj/InfoPlist.strings

@@ -6,7 +6,7 @@
   Copyright © 2018年 USAI. All rights reserved.
 */
 
-CFBundleDisplayName = "Apex & Drivers";
+CFBundleDisplayName = "Apex Land";
 NSCameraUsageDescription = "Take process evidence";
 NSLocationAlwaysAndWhenInUseUsageDescription = "Display location on map and navigation, report cargo location";
 NSLocationAlwaysUsageDescription = "Report cargo location";

Redant Drivers/Apex And Drivers/zh-Hans.lproj/InfoPlist.strings

@@ -6,7 +6,7 @@
   Copyright © 2018年 USAI. All rights reserved.
 */
 
-CFBundleDisplayName = "Apex & Drivers";
+CFBundleDisplayName = "Apex Land";
 NSCameraUsageDescription = "采取过程证据";
 NSLocationAlwaysAndWhenInUseUsageDescription = "在地图和导航上显示位置，报告货物位置";
 NSLocationAlwaysUsageDescription = "报告货物位置";