1.修改iOS Apex & Drivers相机模块，使其不依赖于项目。

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

@@ -27,7 +27,6 @@
 		424204E220C65817005AEED9 /* RACameraViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 424204E120C65817005AEED9 /* RACameraViewController.m */; };
 		424204E420C65827005AEED9 /* Camera.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 424204E320C65827005AEED9 /* Camera.storyboard */; };
 		424204E720C668AE005AEED9 /* RATakePhotoPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 424204E620C668AE005AEED9 /* RATakePhotoPreviewController.m */; };
-		424204EA20C6698A005AEED9 /* UIImage+fixOrientation.m in Sources */ = {isa = PBXBuildFile; fileRef = 424204E920C6698A005AEED9 /* UIImage+fixOrientation.m */; };
 		424204EE20C66D20005AEED9 /* RAPhotoPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 424204ED20C66D20005AEED9 /* RAPhotoPreviewController.m */; };
 		424204F020C66D2D005AEED9 /* PhotoPreview.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 424204EF20C66D2D005AEED9 /* PhotoPreview.storyboard */; };
 		424204F320C68E02005AEED9 /* RAProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 424204F220C68E02005AEED9 /* RAProgressHUD.m */; };
@@ -139,8 +138,6 @@
 		424204E320C65827005AEED9 /* Camera.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Camera.storyboard; sourceTree = "<group>"; };
 		424204E520C668AE005AEED9 /* RATakePhotoPreviewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RATakePhotoPreviewController.h; sourceTree = "<group>"; };
 		424204E620C668AE005AEED9 /* RATakePhotoPreviewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RATakePhotoPreviewController.m; sourceTree = "<group>"; };
-		424204E820C6698A005AEED9 /* UIImage+fixOrientation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIImage+fixOrientation.h"; path = "../../common/UIImage+fixOrientation.h"; sourceTree = "<group>"; };
-		424204E920C6698A005AEED9 /* UIImage+fixOrientation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIImage+fixOrientation.m"; path = "../../common/UIImage+fixOrientation.m"; sourceTree = "<group>"; };
 		424204EC20C66D20005AEED9 /* RAPhotoPreviewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAPhotoPreviewController.h; sourceTree = "<group>"; };
 		424204ED20C66D20005AEED9 /* RAPhotoPreviewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAPhotoPreviewController.m; sourceTree = "<group>"; };
 		424204EF20C66D2D005AEED9 /* PhotoPreview.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = PhotoPreview.storyboard; sourceTree = "<group>"; };
@@ -436,8 +433,6 @@
 				4205FD5720C0F6F100DB42B4 /* RAConvertor.m */,
 				424204F120C68E02005AEED9 /* RAProgressHUD.h */,
 				424204F220C68E02005AEED9 /* RAProgressHUD.m */,
-				424204E820C6698A005AEED9 /* UIImage+fixOrientation.h */,
-				424204E920C6698A005AEED9 /* UIImage+fixOrientation.m */,
 				425B97E420C7BD3800B35713 /* UIView+Toast.h */,
 				425B97E320C7BD3800B35713 /* UIView+Toast.m */,
 			);
@@ -792,7 +787,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				424204EA20C6698A005AEED9 /* UIImage+fixOrientation.m in Sources */,
 				4255EC8720C51D4900E5DA24 /* RAEditPhotoCell.m in Sources */,
 				4280034520C0F146004D4F50 /* NSString+Base64.m in Sources */,
 				424204F320C68E02005AEED9 /* RAProgressHUD.m in Sources */,

Redant Drivers/Apex And Drivers/Camera/RACameraViewController.h

@@ -6,12 +6,14 @@
 //  Copyright © 2018年 USAI. All rights reserved.
 //
 
-#import "RABaseViewController.h"
+#import <UIKit/UIKit.h>
 
-@interface RACameraViewController : RABaseViewController
+@interface RACameraViewController : UIViewController
 
 @property (nonatomic,copy) void (^completion)(UIImage *image);
 
 @property (nonatomic,weak) UIViewController *fromVC;
 
++ (instancetype)viewControllerFromStoryboard;
+
 @end

Redant Drivers/Apex And Drivers/Camera/RACameraViewController.m

@@ -29,6 +29,10 @@
 
 @implementation RACameraViewController
 
++ (NSString *)storyboardID {
+    return NSStringFromClass([self class]);
+}
+
 + (instancetype)viewControllerFromStoryboard {
     RACameraViewController *cameraVC = [[UIStoryboard storyboardWithName:@"Camera" bundle:nil] instantiateViewControllerWithIdentifier:[self storyboardID]];
     return cameraVC;

Redant Drivers/Apex And Drivers/Camera/RATakePhotoPreviewController.h

@@ -6,9 +6,9 @@
 //  Copyright © 2017年 USAI. All rights reserved.
 //
 
-#import "RABaseViewController.h"
+#import <UIKit/UIKit.h>
 
-@interface RATakePhotoPreviewController : RABaseViewController
+@interface RATakePhotoPreviewController : UIViewController
 
 @property (nonatomic,strong) UIImage *preImage;
 
@@ -16,4 +16,6 @@
 
 @property (nonatomic,weak) UIViewController *popTo;
 
++ (instancetype)viewControllerFromStoryboard;
+
 @end

Redant Drivers/Apex And Drivers/Camera/RATakePhotoPreviewController.m

@@ -21,6 +21,10 @@
 
 @implementation RATakePhotoPreviewController
 
++ (NSString *)storyboardID {
+    return NSStringFromClass([self class]);
+}
+
 + (instancetype)viewControllerFromStoryboard {
     RATakePhotoPreviewController *previewVC = [[UIStoryboard storyboardWithName:@"Camera" bundle:nil] instantiateViewControllerWithIdentifier:[self storyboardID]];
     return previewVC;
@@ -30,6 +34,12 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     
+    if (@available(iOS 11.0, *)) {
+        self.previewScroll.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+    } else {
+        self.automaticallyAdjustsScrollViewInsets = NO;
+    }
+    
     [self.view insertSubview:[UIView new] atIndex:0];
     self.previewPhotoView.image = self.preImage;
 }

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

@@ -6,12 +6,14 @@
 //  Copyright © 2018年 USAI. All rights reserved.
 //
 
-#import "RABaseViewController.h"
+#import <UIKit/UIKit.h>
 
-@interface RAPhotoPreviewController : RABaseViewController
+@interface RAPhotoPreviewController : UIViewController
 
 @property (nonatomic,strong) UIImage *image;
 
 @property (nonatomic,copy) void (^completion)(void);
 
++ (instancetype)viewControllerFromStoryboard;
+
 @end

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

@@ -18,6 +18,10 @@
 
 @implementation RAPhotoPreviewController
 
++ (NSString *)storyboardID {
+    return NSStringFromClass([self class]);
+}
+
 + (instancetype)viewControllerFromStoryboard {
     RAPhotoPreviewController *previewVC = [[UIStoryboard storyboardWithName:@"PhotoPreview" bundle:nil] instantiateViewControllerWithIdentifier:[self storyboardID]];
     return previewVC;
@@ -27,6 +31,12 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     
+    if (@available(iOS 11.0, *)) {
+        self.photoScrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+    } else {
+        self.automaticallyAdjustsScrollViewInsets = NO;
+    }
+    
     self.photoImageView.image = self.image;
     [self configureNavigationBar];
 }

Redant Drivers/Apex And Drivers/QRCode/RAQRCodeScannerViewController.h

@@ -6,10 +6,12 @@
 //  Copyright © 2018年 USAI. All rights reserved.
 //
 
-#import "RABaseViewController.h"
+#import <UIKit/UIKit.h>
 
-@interface RAQRCodeScannerViewController : RABaseViewController
+@interface RAQRCodeScannerViewController : UIViewController
 
 @property (nonatomic,copy) void (^completion)(NSString *value);
 
++ (instancetype)viewControllerFromStoryboard;
+
 @end

Redant Drivers/Apex And Drivers/QRCode/RAQRCodeScannerViewController.m

@@ -32,6 +32,10 @@
 
 @implementation RAQRCodeScannerViewController
 
++ (NSString *)storyboardID {
+    return NSStringFromClass([self class]);
+}
+
 + (instancetype)viewControllerFromStoryboard {
     RAQRCodeScannerViewController *scannerVC = [[UIStoryboard storyboardWithName:@"QRCode" bundle:nil] instantiateViewControllerWithIdentifier:[self storyboardID]];
     return scannerVC;

Redant Drivers/Apex And Drivers/RASingleton.h

@@ -18,8 +18,8 @@
 @property (nonatomic,strong) CLLocation *currentLocation;
 
 @property (nonatomic,copy,readonly) NSString *secretKey;
-@property (nonatomic,readonly) NSString *encryptUser;
-@property (nonatomic,readonly) NSString *encryptPassword;
+@property (nonatomic,copy,readonly) NSString *encryptUser;
+@property (nonatomic,copy,readonly) NSString *encryptPassword;
 
 - (void)saveUserInfo;