Kaynağa Gözat

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

Pen Li 7 yıl önce
ebeveyn
işleme
cc83bc2fad

+ 36 - 30
Redant Drivers/Apex And Drivers.xcodeproj/project.pbxproj

@@ -272,7 +272,7 @@
 		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; name = RAPresentationController.m; path = ../../../common/PresentationController/RAPresentationController.m; sourceTree = "<group>"; };
+		422DA1BF2134FA7D0021BD70 /* RAPresentationController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = 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>"; };
@@ -301,13 +301,13 @@
 		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; 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>"; };
+		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>"; };
 		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>"; };
@@ -468,14 +468,14 @@
 		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; 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>"; };
+		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>"; };
 		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>"; };
-		42D49F8021CCC5F3004F449E /* qrcode.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = qrcode.xcassets; path = ../../../common/QRCode/qrcode.xcassets; sourceTree = "<group>"; };
+		42D49F8021CCC5F3004F449E /* qrcode.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = qrcode.xcassets; sourceTree = "<group>"; };
 		42D7B0742147945C0046FE89 /* RASettingViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RASettingViewController.h; sourceTree = "<group>"; };
 		42D7B0752147945C0046FE89 /* RASettingViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RASettingViewController.m; sourceTree = "<group>"; };
 		42D7B0772147946D0046FE89 /* RAMessageViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAMessageViewController.h; sourceTree = "<group>"; };
@@ -549,12 +549,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; 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>"; };
+		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>"; };
 		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>"; };
@@ -563,11 +563,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; name = RACameraViewController.m; path = ../../../common/Camera/RACameraViewController.m; sourceTree = "<group>"; };
+		42F0C5D620E20B3E00922442 /* RACameraViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = 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; name = RAPresentationController.h; path = ../../../common/PresentationController/RAPresentationController.h; sourceTree = "<group>"; };
+		42F3A33321829FEF00AB0D3D /* RAPresentationController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 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>"; };
@@ -733,7 +733,8 @@
 				42F3A33321829FEF00AB0D3D /* RAPresentationController.h */,
 				422DA1BF2134FA7D0021BD70 /* RAPresentationController.m */,
 			);
-			path = PresentationController;
+			name = PresentationController;
+			path = ../../common/PresentationController;
 			sourceTree = "<group>";
 		};
 		4235FAA4213E24FE000B6672 /* Signature */ = {
@@ -766,7 +767,8 @@
 				424204DB20C61561005AEED9 /* RAQRCodeScannerViewController.m */,
 				424204DD20C6156E005AEED9 /* QRCode.storyboard */,
 			);
-			path = QRCode;
+			name = QRCode;
+			path = ../../common/QRCode;
 			sourceTree = "<group>";
 		};
 		424204DF20C657EE005AEED9 /* Camera */ = {
@@ -779,7 +781,8 @@
 				424204E320C65827005AEED9 /* Camera.storyboard */,
 				42AF41B12189832D008F9124 /* camera.xcassets */,
 			);
-			path = Camera;
+			name = Camera;
+			path = ../../common/Camera;
 			sourceTree = "<group>";
 		};
 		424204EB20C66CFE005AEED9 /* PhotoPreView */ = {
@@ -1149,7 +1152,8 @@
 				42C6074A21536E59003E5379 /* RAExceptionHandler.h */,
 				42C6074B21536E59003E5379 /* RAExceptionHandler.m */,
 			);
-			path = ExceptionHandler;
+			name = ExceptionHandler;
+			path = ../../common/ExceptionHandler;
 			sourceTree = "<group>";
 		};
 		42D1877D2140BA7000C822C0 /* RequiredAlertVC */ = {
@@ -1321,7 +1325,8 @@
 				42C1B2732134F24C00637085 /* RADatePickerViewController.m */,
 				42F3A32E21829EAC00AB0D3D /* date.storyboard */,
 			);
-			path = DatePicker;
+			name = DatePicker;
+			path = ../../common/DatePicker;
 			sourceTree = "<group>";
 		};
 		42DFE260213F80AF000213C2 /* UIScrollVIew+Empty */ = {
@@ -1332,7 +1337,8 @@
 				42DFE263213F80AF000213C2 /* UIScrollView+Empty.h */,
 				42DFE264213F80AF000213C2 /* UIScrollView+Empty.m */,
 			);
-			path = "UIScrollVIew+Empty";
+			name = "UIScrollVIew+Empty";
+			path = "../../common/UIScrollVIew+Empty";
 			sourceTree = "<group>";
 		};
 		42DFE267213F81F8000213C2 /* EmptyView */ = {
@@ -1341,7 +1347,8 @@
 				42DFE268213F821E000213C2 /* RAEmptyView.h */,
 				42DFE269213F821E000213C2 /* RAEmptyView.m */,
 			);
-			path = EmptyView;
+			name = EmptyView;
+			path = ../../common/EmptyView;
 			sourceTree = "<group>";
 		};
 		42ECE186214A499A00AD8283 /* ChangePassword */ = {
@@ -1805,7 +1812,6 @@
 				42F3A33221829EAF00AB0D3D /* zh-Hans */,
 			);
 			name = date.storyboard;
-			path = ../../../common/DatePicker;
 			sourceTree = "<group>";
 		};
 		42F3A3362182A53E00AB0D3D /* setting.json */ = {