1.修改iOS Apex Drivers，使用Common中工具类替换工程中的工具类。

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

@@ -36,8 +36,6 @@
 		421C417621719EB500835447 /* RALoginNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 421C417521719EB500835447 /* RALoginNavigationController.m */; };
 		421C417921719F8100835447 /* RALoginBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = 421C417821719F8100835447 /* RALoginBackgroundView.m */; };
 		421C43ED217EEF0600D80B82 /* RAReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 421C43EC217EEF0600D80B82 /* RAReachability.m */; };
-		42248A31218C35B4002CBCC9 /* RABadgeButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 42248A30218C35B4002CBCC9 /* RABadgeButton.m */; };
-		42248A33218C35D1002CBCC9 /* badge_button.xib in Resources */ = {isa = PBXBuildFile; fileRef = 42248A32218C35D1002CBCC9 /* badge_button.xib */; };
 		422B06BC21743ABE003DA2DA /* NSData+RAImageType.m in Sources */ = {isa = PBXBuildFile; fileRef = 422B06BB21743ABE003DA2DA /* NSData+RAImageType.m */; };
 		422BD95F213CE2E600DF8E89 /* RABadgeNumberView.m in Sources */ = {isa = PBXBuildFile; fileRef = 422BD95E213CE2E600DF8E89 /* RABadgeNumberView.m */; };
 		422DA1C02134FA7D0021BD70 /* RAPresentationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 422DA1BF2134FA7D0021BD70 /* RAPresentationController.m */; };
@@ -269,14 +267,11 @@
 		421C417821719F8100835447 /* RALoginBackgroundView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RALoginBackgroundView.m; sourceTree = "<group>"; };
 		421C43EB217EEF0600D80B82 /* RAReachability.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RAReachability.h; path = ../../common/RAReachability.h; sourceTree = "<group>"; };
 		421C43EC217EEF0600D80B82 /* RAReachability.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RAReachability.m; path = ../../common/RAReachability.m; sourceTree = "<group>"; };
-		42248A2F218C35B4002CBCC9 /* RABadgeButton.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RABadgeButton.h; sourceTree = "<group>"; };
-		42248A30218C35B4002CBCC9 /* RABadgeButton.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RABadgeButton.m; sourceTree = "<group>"; };
-		42248A32218C35D1002CBCC9 /* badge_button.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = badge_button.xib; sourceTree = "<group>"; };
-		422B06BA21743ABE003DA2DA /* NSData+RAImageType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSData+RAImageType.h"; sourceTree = "<group>"; };
-		422B06BB21743ABE003DA2DA /* NSData+RAImageType.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSData+RAImageType.m"; sourceTree = "<group>"; };
+		422B06BA21743ABE003DA2DA /* NSData+RAImageType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "NSData+RAImageType.h"; path = "../../common/NSData/NSData+RAImageType.h"; sourceTree = "<group>"; };
+		422B06BB21743ABE003DA2DA /* NSData+RAImageType.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "NSData+RAImageType.m"; path = "../../common/NSData/NSData+RAImageType.m"; sourceTree = "<group>"; };
 		422BD95D213CE2E600DF8E89 /* RABadgeNumberView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RABadgeNumberView.h; sourceTree = "<group>"; };
 		422BD95E213CE2E600DF8E89 /* RABadgeNumberView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RABadgeNumberView.m; sourceTree = "<group>"; };
-		422DA1BF2134FA7D0021BD70 /* RAPresentationController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAPresentationController.m; sourceTree = "<group>"; };
+		422DA1BF2134FA7D0021BD70 /* RAPresentationController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RAPresentationController.m; path = ../../../common/PresentationController/RAPresentationController.m; sourceTree = "<group>"; };
 		4235FA98213E0CE9000B6672 /* RADetailMapCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RADetailMapCell.h; sourceTree = "<group>"; };
 		4235FA99213E0CE9000B6672 /* RADetailMapCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RADetailMapCell.m; sourceTree = "<group>"; };
 		4235FA9B213E0F3A000B6672 /* RADetailPhotoCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RADetailPhotoCell.h; sourceTree = "<group>"; };
@@ -305,18 +300,18 @@
 		423C6A4D20C909FC00455E27 /* RANotificationNameCenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RANotificationNameCenter.m; sourceTree = "<group>"; };
 		423EFD1C21465BE00091BAEB /* RAHomeHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAHomeHeaderView.h; sourceTree = "<group>"; };
 		423EFD1D21465BE00091BAEB /* RAHomeHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAHomeHeaderView.m; sourceTree = "<group>"; };
-		424204DA20C61561005AEED9 /* RAQRCodeScannerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAQRCodeScannerViewController.h; sourceTree = "<group>"; };
-		424204DB20C61561005AEED9 /* RAQRCodeScannerViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAQRCodeScannerViewController.m; sourceTree = "<group>"; };
-		424204DD20C6156E005AEED9 /* QRCode.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = QRCode.storyboard; sourceTree = "<group>"; };
-		424204E020C65817005AEED9 /* RACameraViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RACameraViewController.h; sourceTree = "<group>"; };
-		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>"; };
+		424204DA20C61561005AEED9 /* RAQRCodeScannerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RAQRCodeScannerViewController.h; path = ../../../common/QRCode/RAQRCodeScannerViewController.h; sourceTree = "<group>"; };
+		424204DB20C61561005AEED9 /* RAQRCodeScannerViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RAQRCodeScannerViewController.m; path = ../../../common/QRCode/RAQRCodeScannerViewController.m; sourceTree = "<group>"; };
+		424204DD20C6156E005AEED9 /* QRCode.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = QRCode.storyboard; path = ../../../common/QRCode/QRCode.storyboard; sourceTree = "<group>"; };
+		424204E020C65817005AEED9 /* RACameraViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RACameraViewController.h; path = ../../../common/Camera/RACameraViewController.h; sourceTree = "<group>"; };
+		424204E320C65827005AEED9 /* Camera.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Camera.storyboard; path = ../../../common/Camera/Camera.storyboard; sourceTree = "<group>"; };
+		424204E520C668AE005AEED9 /* RATakePhotoPreviewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RATakePhotoPreviewController.h; path = ../../../common/Camera/RATakePhotoPreviewController.h; sourceTree = "<group>"; };
+		424204E620C668AE005AEED9 /* RATakePhotoPreviewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RATakePhotoPreviewController.m; path = ../../../common/Camera/RATakePhotoPreviewController.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>"; };
-		424204F120C68E02005AEED9 /* RAProgressHUD.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAProgressHUD.h; sourceTree = "<group>"; };
-		424204F220C68E02005AEED9 /* RAProgressHUD.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAProgressHUD.m; sourceTree = "<group>"; };
+		424204F120C68E02005AEED9 /* RAProgressHUD.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RAProgressHUD.h; path = ../../common/HUD/RAProgressHUD.h; sourceTree = "<group>"; };
+		424204F220C68E02005AEED9 /* RAProgressHUD.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RAProgressHUD.m; path = ../../common/HUD/RAProgressHUD.m; sourceTree = "<group>"; };
 		4243C8BF218829C40019A070 /* RAPhotoCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAPhotoCell.h; sourceTree = "<group>"; };
 		4243C8C0218829C40019A070 /* RAPhotoCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAPhotoCell.m; sourceTree = "<group>"; };
 		4243C8C1218829C40019A070 /* RAPhotoCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RAPhotoCell.xib; sourceTree = "<group>"; };
@@ -333,8 +328,8 @@
 		4243C8D8218852E40019A070 /* RAEditMultPhotoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAEditMultPhotoModel.h; sourceTree = "<group>"; };
 		4243C8D9218852E40019A070 /* RAEditMultPhotoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAEditMultPhotoModel.m; sourceTree = "<group>"; };
 		4243C8DB218858570019A070 /* RAPhotoLayoutDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAPhotoLayoutDelegate.h; sourceTree = "<group>"; };
-		424BA1E12136806C007912EC /* UIImage+RedAnt.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIImage+RedAnt.h"; sourceTree = "<group>"; };
-		424BA1E22136806C007912EC /* UIImage+RedAnt.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIImage+RedAnt.m"; sourceTree = "<group>"; };
+		424BA1E12136806C007912EC /* UIImage+RedAnt.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "UIImage+RedAnt.h"; path = "../../common/UIImage/UIImage+RedAnt.h"; sourceTree = "<group>"; };
+		424BA1E22136806C007912EC /* UIImage+RedAnt.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "UIImage+RedAnt.m"; path = "../../common/UIImage/UIImage+RedAnt.m"; sourceTree = "<group>"; };
 		42529D1F20C0E8EB000C0F4D /* NetworkUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkUtils.h; path = ../../common/NetworkUtils.h; sourceTree = "<group>"; };
 		42529D2020C0E8EC000C0F4D /* NetworkUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NetworkUtils.m; path = ../../common/NetworkUtils.m; sourceTree = "<group>"; };
 		42529D2320C0E97E000C0F4D /* RADataProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RADataProvider.h; sourceTree = "<group>"; };
@@ -472,11 +467,11 @@
 		42AF41AD218935C1008F9124 /* RAPhotoCellDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAPhotoCellDelegate.h; sourceTree = "<group>"; };
 		42AF41AE218951B0008F9124 /* RADetailMultPhotoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RADetailMultPhotoModel.h; sourceTree = "<group>"; };
 		42AF41AF218951B0008F9124 /* RADetailMultPhotoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RADetailMultPhotoModel.m; sourceTree = "<group>"; };
-		42AF41B12189832D008F9124 /* camera.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = camera.xcassets; 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>"; };
-		42C6074A21536E59003E5379 /* RAExceptionHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAExceptionHandler.h; sourceTree = "<group>"; };
-		42C6074B21536E59003E5379 /* RAExceptionHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAExceptionHandler.m; sourceTree = "<group>"; };
+		42AF41B12189832D008F9124 /* camera.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = camera.xcassets; path = ../../../common/Camera/camera.xcassets; sourceTree = "<group>"; };
+		42C1B2722134F24C00637085 /* RADatePickerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RADatePickerViewController.h; path = ../../../common/DatePicker/RADatePickerViewController.h; sourceTree = "<group>"; };
+		42C1B2732134F24C00637085 /* RADatePickerViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RADatePickerViewController.m; path = ../../../common/DatePicker/RADatePickerViewController.m; sourceTree = "<group>"; };
+		42C6074A21536E59003E5379 /* RAExceptionHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAExceptionHandler.h; path = ../../../common/ExceptionHandler/RAExceptionHandler.h; sourceTree = "<group>"; };
+		42C6074B21536E59003E5379 /* RAExceptionHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAExceptionHandler.m; path = ../../../common/ExceptionHandler/RAExceptionHandler.m; sourceTree = "<group>"; };
 		42D1877E2140BACC00C822C0 /* RAEditRequiredAlert.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAEditRequiredAlert.h; sourceTree = "<group>"; };
 		42D1877F2140BACC00C822C0 /* RAEditRequiredAlert.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAEditRequiredAlert.m; sourceTree = "<group>"; };
 		42D7B0742147945C0046FE89 /* RASettingViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RASettingViewController.h; sourceTree = "<group>"; };
@@ -552,12 +547,12 @@
 		42DCCC842181B1D90027A5BB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Edit.strings; sourceTree = "<group>"; };
 		42DCCC862181B1DB0027A5BB /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Edit.strings"; sourceTree = "<group>"; };
 		42DCCC8F2181B2F10027A5BB /* Upload.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Upload.storyboard; sourceTree = "<group>"; };
-		42DFE261213F80AF000213C2 /* RAEmptyDataView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAEmptyDataView.h; sourceTree = "<group>"; };
-		42DFE262213F80AF000213C2 /* RAEmptyDataView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAEmptyDataView.m; sourceTree = "<group>"; };
-		42DFE263213F80AF000213C2 /* UIScrollView+Empty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIScrollView+Empty.h"; sourceTree = "<group>"; };
-		42DFE264213F80AF000213C2 /* UIScrollView+Empty.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIScrollView+Empty.m"; sourceTree = "<group>"; };
-		42DFE268213F821E000213C2 /* RAEmptyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAEmptyView.h; sourceTree = "<group>"; };
-		42DFE269213F821E000213C2 /* RAEmptyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAEmptyView.m; sourceTree = "<group>"; };
+		42DFE261213F80AF000213C2 /* RAEmptyDataView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAEmptyDataView.h; path = "../../../common/UIScrollVIew+Empty/RAEmptyDataView.h"; sourceTree = "<group>"; };
+		42DFE262213F80AF000213C2 /* RAEmptyDataView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAEmptyDataView.m; path = "../../../common/UIScrollVIew+Empty/RAEmptyDataView.m"; sourceTree = "<group>"; };
+		42DFE263213F80AF000213C2 /* UIScrollView+Empty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIScrollView+Empty.h"; path = "../../../common/UIScrollVIew+Empty/UIScrollView+Empty.h"; sourceTree = "<group>"; };
+		42DFE264213F80AF000213C2 /* UIScrollView+Empty.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIScrollView+Empty.m"; path = "../../../common/UIScrollVIew+Empty/UIScrollView+Empty.m"; sourceTree = "<group>"; };
+		42DFE268213F821E000213C2 /* RAEmptyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RAEmptyView.h; path = ../../../common/EmptyView/RAEmptyView.h; sourceTree = "<group>"; };
+		42DFE269213F821E000213C2 /* RAEmptyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RAEmptyView.m; path = ../../../common/EmptyView/RAEmptyView.m; sourceTree = "<group>"; };
 		42DFE26D213FC1B7000213C2 /* RAHomeSectionHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAHomeSectionHeaderView.h; sourceTree = "<group>"; };
 		42DFE26E213FC1B7000213C2 /* RAHomeSectionHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAHomeSectionHeaderView.m; sourceTree = "<group>"; };
 		42ECE180214A04BE00AD8283 /* RASettingAboutModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RASettingAboutModel.h; sourceTree = "<group>"; };
@@ -566,11 +561,11 @@
 		42ECE184214A08A900AD8283 /* RASettingAboutCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RASettingAboutCell.m; sourceTree = "<group>"; };
 		42ECE187214A49B600AD8283 /* RAChangePasswordViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAChangePasswordViewController.h; sourceTree = "<group>"; };
 		42ECE188214A49B600AD8283 /* RAChangePasswordViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAChangePasswordViewController.m; sourceTree = "<group>"; };
-		42F0C5D620E20B3E00922442 /* RACameraViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RACameraViewController.m; sourceTree = "<group>"; };
+		42F0C5D620E20B3E00922442 /* RACameraViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RACameraViewController.m; path = ../../../common/Camera/RACameraViewController.m; sourceTree = "<group>"; };
 		42F3A32D21829EAC00AB0D3D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/date.storyboard; sourceTree = "<group>"; };
 		42F3A33021829EAE00AB0D3D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/date.strings; sourceTree = "<group>"; };
 		42F3A33221829EAF00AB0D3D /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/date.strings"; sourceTree = "<group>"; };
-		42F3A33321829FEF00AB0D3D /* RAPresentationController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAPresentationController.h; sourceTree = "<group>"; };
+		42F3A33321829FEF00AB0D3D /* RAPresentationController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RAPresentationController.h; path = ../../../common/PresentationController/RAPresentationController.h; sourceTree = "<group>"; };
 		42F3A3352182A53E00AB0D3D /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = Base; path = Base.lproj/setting.json; sourceTree = "<group>"; };
 		42F3A3372182A54100AB0D3D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = en; path = en.lproj/setting.json; sourceTree = "<group>"; };
 		42F3A3382182A54200AB0D3D /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = "zh-Hans"; path = "zh-Hans.lproj/setting.json"; sourceTree = "<group>"; };
@@ -730,16 +725,6 @@
 			path = Cell;
 			sourceTree = "<group>";
 		};
-		42248A2E218C3586002CBCC9 /* BadgeButton */ = {
-			isa = PBXGroup;
-			children = (
-				42248A2F218C35B4002CBCC9 /* RABadgeButton.h */,
-				42248A30218C35B4002CBCC9 /* RABadgeButton.m */,
-				42248A32218C35D1002CBCC9 /* badge_button.xib */,
-			);
-			path = BadgeButton;
-			sourceTree = "<group>";
-		};
 		422DA1BD2134FA510021BD70 /* PresentationController */ = {
 			isa = PBXGroup;
 			children = (
@@ -1402,7 +1387,6 @@
 		71EAA33020B9571B002F003C /* Apex And Drivers */ = {
 			isa = PBXGroup;
 			children = (
-				42248A2E218C3586002CBCC9 /* BadgeButton */,
 				42DCCC4821818CF90027A5BB /* DatePicker */,
 				42C6074921536E59003E5379 /* ExceptionHandler */,
 				42DFE267213F81F8000213C2 /* EmptyView */,
@@ -1545,7 +1529,6 @@
 				42F3A3342182A53E00AB0D3D /* setting.json in Resources */,
 				4235FAB8213E581E000B6672 /* Signature.xcassets in Resources */,
 				42F3A32C21829EAC00AB0D3D /* date.storyboard in Resources */,
-				42248A33218C35D1002CBCC9 /* badge_button.xib in Resources */,
 				71EAA33920B9571B002F003C /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1564,7 +1547,6 @@
 				4280034520C0F146004D4F50 /* NSString+Base64.m in Sources */,
 				424204F320C68E02005AEED9 /* RAProgressHUD.m in Sources */,
 				42D8B8BF20C24A92001C125F /* RADetailSingleLineModel.m in Sources */,
-				42248A31218C35B4002CBCC9 /* RABadgeButton.m in Sources */,
 				42D8B8D820C273AC001C125F /* RADetailActionsCell+CollectionViewDataSource.m in Sources */,
 				42C1B2742134F24C00637085 /* RADatePickerViewController.m in Sources */,
 				4243C8C2218829C40019A070 /* RAPhotoCell.m in Sources */,
@@ -1819,6 +1801,7 @@
 				42F3A33221829EAF00AB0D3D /* zh-Hans */,
 			);
 			name = date.storyboard;
+			path = ../../../common/DatePicker;
 			sourceTree = "<group>";
 		};
 		42F3A3362182A53E00AB0D3D /* setting.json */ = {

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

@@ -18,7 +18,7 @@
 #import "RAMessageViewController.h"
 #import "RASettingViewController.h"
 #import <CoreLocation/CoreLocation.h>
-#import "RABadgeButton.h"
+//#import "RABadgeButton.h"
 
 @implementation RAHomeSectionModel
 

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

@@ -166,9 +166,15 @@
 - (void)scanInputCell:(RAEditScanInputCell *)cell clickScanButton:(UIButton *)sender {
     
     RAQRCodeScannerViewController *scanVC = [RAQRCodeScannerViewController viewControllerFromStoryboard];
-    
-    scanVC.completion = ^(NSString *value) {
+
+    scanVC.QRCodeViewControllerDidCompletion = ^(RAQRCodeScannerViewController *qrcodeViewController, NSString *value) {
+        
         cell.model.value = value;
+        [qrcodeViewController.navigationController popViewControllerAnimated:YES];
+    };
+    
+    scanVC.QRCodeViewControllerDidCanceled = ^(RAQRCodeScannerViewController *qrcodeViewController) {
+        [qrcodeViewController.navigationController popViewControllerAnimated:YES];
     };
     
     [self.navigationController pushViewController:scanVC animated:YES];

Redant Drivers/Apex And Drivers/config.h

@@ -17,7 +17,7 @@
 #define ApexDriverWhiteColor UIColorFromRGB(0xffffff)
 #define ApexDriverRedColor UIColorFromRGB(0xAE2838)
 
-#define URL_HOST                @"http://192.168.0.124:8080/t"
+#define URL_HOST                @"http://192.168.1.108:8080/t"
 //#define URL_HOST                @"https://ra.apexshipping.com/t"