Преглед изворни кода

1.修改iOS Apex Drivers相机拍照按钮样式。

Pen Li пре 7 година
родитељ
комит
74780efe21

+ 4 - 4
Redant Drivers/Apex And Drivers.xcodeproj/project.pbxproj

@@ -24,7 +24,6 @@
 		423C6A4E20C909FC00455E27 /* RANotificationNameCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 423C6A4D20C909FC00455E27 /* RANotificationNameCenter.m */; };
 		424204DC20C61561005AEED9 /* RAQRCodeScannerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 424204DB20C61561005AEED9 /* RAQRCodeScannerViewController.m */; };
 		424204DE20C6156E005AEED9 /* QRCode.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 424204DD20C6156E005AEED9 /* QRCode.storyboard */; };
-		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 */; };
 		424204EE20C66D20005AEED9 /* RAPhotoPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 424204ED20C66D20005AEED9 /* RAPhotoPreviewController.m */; };
@@ -97,6 +96,7 @@
 		42D8B8DB20C279AA001C125F /* RAOrderDetailViewController+TableViewDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D8B8DA20C279AA001C125F /* RAOrderDetailViewController+TableViewDataSource.m */; };
 		42D8B8DE20C279BA001C125F /* RAOrderDetailViewController+TableViewDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D8B8DD20C279BA001C125F /* RAOrderDetailViewController+TableViewDelegate.m */; };
 		42D8B8E020C28755001C125F /* fake_order_detail.json in Resources */ = {isa = PBXBuildFile; fileRef = 42D8B8DF20C28755001C125F /* fake_order_detail.json */; };
+		42F0C5D720E20B3F00922442 /* RACameraViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42F0C5D620E20B3E00922442 /* RACameraViewController.m */; };
 		71EAA33320B9571B002F003C /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 71EAA33220B9571B002F003C /* AppDelegate.m */; };
 		71EAA33920B9571B002F003C /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 71EAA33720B9571B002F003C /* Main.storyboard */; };
 		71EAA33B20B95720002F003C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 71EAA33A20B95720002F003C /* Assets.xcassets */; };
@@ -137,7 +137,6 @@
 		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>"; };
-		424204E120C65817005AEED9 /* RACameraViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RACameraViewController.m; 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>"; };
@@ -272,6 +271,7 @@
 		42D8B8DC20C279BA001C125F /* RAOrderDetailViewController+TableViewDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RAOrderDetailViewController+TableViewDelegate.h"; sourceTree = "<group>"; };
 		42D8B8DD20C279BA001C125F /* RAOrderDetailViewController+TableViewDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "RAOrderDetailViewController+TableViewDelegate.m"; sourceTree = "<group>"; };
 		42D8B8DF20C28755001C125F /* fake_order_detail.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = fake_order_detail.json; sourceTree = "<group>"; };
+		42F0C5D620E20B3E00922442 /* RACameraViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RACameraViewController.m; sourceTree = "<group>"; };
 		71EAA32E20B9571B002F003C /* Apex And Drivers.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Apex And Drivers.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>"; };
@@ -377,7 +377,7 @@
 				424204E520C668AE005AEED9 /* RATakePhotoPreviewController.h */,
 				424204E620C668AE005AEED9 /* RATakePhotoPreviewController.m */,
 				424204E020C65817005AEED9 /* RACameraViewController.h */,
-				424204E120C65817005AEED9 /* RACameraViewController.m */,
+				42F0C5D620E20B3E00922442 /* RACameraViewController.m */,
 				424204E320C65827005AEED9 /* Camera.storyboard */,
 			);
 			path = Camera;
@@ -815,8 +815,8 @@
 				4205FD6620C13BF400DB42B4 /* RAOrderCell.m in Sources */,
 				42529D2120C0E8EC000C0F4D /* NetworkUtils.m in Sources */,
 				42D8B8CF20C2657D001C125F /* RADetailBaseModel.m in Sources */,
+				42F0C5D720E20B3F00922442 /* RACameraViewController.m in Sources */,
 				4205FD5520C0F50C00DB42B4 /* JLPresentationController.m in Sources */,
-				424204E220C65817005AEED9 /* RACameraViewController.m in Sources */,
 				424204EE20C66D20005AEED9 /* RAPhotoPreviewController.m in Sources */,
 				42529D3D20C0EA3F000C0F4D /* ZipArchive.mm in Sources */,
 				4280034320C0F146004D4F50 /* NSData+Base64.m in Sources */,

+ 9 - 4
Redant Drivers/Apex And Drivers/Camera/Camera.storyboard

@@ -6,6 +6,7 @@
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -25,9 +26,12 @@
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2cM-nE-ueF">
                                 <rect key="frame" x="0.0" y="20" width="375" height="647"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zmb-bI-WjK">
-                                        <rect key="frame" x="144.5" y="517" width="85" height="30"/>
-                                        <state key="normal" title="Take Picture"/>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zmb-bI-WjK">
+                                        <rect key="frame" x="157.5" y="527" width="60" height="60"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="60" id="Jgr-Dk-QIx"/>
+                                            <constraint firstAttribute="width" secondItem="Zmb-bI-WjK" secondAttribute="height" multiplier="1:1" id="MQN-fF-lQY"/>
+                                        </constraints>
                                         <connections>
                                             <action selector="takePictureBtnClick:" destination="u3G-8E-Sj8" eventType="touchUpInside" id="1LX-1e-klr"/>
                                         </connections>
@@ -35,7 +39,7 @@
                                 </subviews>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
-                                    <constraint firstAttribute="bottom" secondItem="Zmb-bI-WjK" secondAttribute="bottom" constant="100" id="f8Y-IT-5Vo"/>
+                                    <constraint firstAttribute="bottom" secondItem="Zmb-bI-WjK" secondAttribute="bottom" constant="60" id="f8Y-IT-5Vo"/>
                                     <constraint firstItem="Zmb-bI-WjK" firstAttribute="centerX" secondItem="2cM-nE-ueF" secondAttribute="centerX" id="wR7-zz-eVK"/>
                                 </constraints>
                             </view>
@@ -56,6 +60,7 @@
                     <connections>
                         <outlet property="controlContanier" destination="2cM-nE-ueF" id="8g4-KY-DMK"/>
                         <outlet property="previewContainer" destination="aIR-II-sqh" id="Xhl-yB-wfI"/>
+                        <outlet property="takePhotoBtn" destination="Zmb-bI-WjK" id="4ND-ng-dvs"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="65S-tr-YKy" userLabel="First Responder" sceneMemberID="firstResponder"/>

+ 24 - 0
Redant Drivers/Apex And Drivers/Camera/RACameraViewController.m

@@ -14,6 +14,7 @@
 
 @property (nonatomic,strong) IBOutlet UIView *previewContainer;
 @property (nonatomic,strong) IBOutlet UIView *controlContanier;
+@property (strong, nonatomic) IBOutlet UIButton *takePhotoBtn;
 
 #pragma mark - Camera
 
@@ -42,6 +43,12 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     
+    UIImage *normal_img = [self.class imageWithColor:[UIColor redColor] Size:CGSizeMake(60, 60)];
+    UIImage *highlight_img = [self.class imageWithColor:[UIColor whiteColor] Size:CGSizeMake(60, 60)];
+    
+    [self.takePhotoBtn setImage:normal_img forState:UIControlStateNormal];
+    [self.takePhotoBtn setImage:highlight_img forState:UIControlStateHighlighted];
+    
     [self initCapture];
     [self initTakePicture];
 }
@@ -232,4 +239,21 @@
     }];
 }
 
+#pragma mark - Utils
+
++ (UIImage *)imageWithColor:(UIColor *)color Size:(CGSize)size {
+    
+    UIGraphicsBeginImageContextWithOptions(size, NO, [UIScreen mainScreen].scale);
+    CGContextRef ctx = UIGraphicsGetCurrentContext();
+    CGContextAddEllipseInRect(ctx, CGRectMake(5, 5, size.width - 10, size.height - 10));
+    CGContextSetFillColorWithColor(ctx, color.CGColor);
+    CGContextSetStrokeColorWithColor(ctx, [UIColor whiteColor].CGColor);
+    CGContextSetLineWidth(ctx, 3.0f);
+    CGContextDrawPath(ctx, kCGPathFillStroke);
+    UIImage *img = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+    
+    return img;
+}
+
 @end