Bladeren bron

1.修改iOS RA Image拍照闪光灯按钮图标。

Pen Li 8 jaren geleden
bovenliggende
commit
aaa1a9e8b7

BIN
RA Image/RA Image.xcodeproj/project.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 23 - 0
RA Image/RA Image/Assets.xcassets/flash_auto.imageset/Contents.json

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

BIN
RA Image/RA Image/Assets.xcassets/flash_auto.imageset/flash_on.png


BIN
RA Image/RA Image/Assets.xcassets/flash_auto.imageset/flash_on@2x.png


BIN
RA Image/RA Image/Assets.xcassets/flash_auto.imageset/flash_on@3x.png


+ 23 - 0
RA Image/RA Image/Assets.xcassets/flash_off.imageset/Contents.json

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

BIN
RA Image/RA Image/Assets.xcassets/flash_off.imageset/flash_off.png


BIN
RA Image/RA Image/Assets.xcassets/flash_off.imageset/flash_off@2x.png


BIN
RA Image/RA Image/Assets.xcassets/flash_off.imageset/flash_off@3x.png


+ 23 - 0
RA Image/RA Image/Assets.xcassets/flash_on.imageset/Contents.json

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

BIN
RA Image/RA Image/Assets.xcassets/flash_on.imageset/flash_on.png


BIN
RA Image/RA Image/Assets.xcassets/flash_on.imageset/flash_on@2x.png


BIN
RA Image/RA Image/Assets.xcassets/flash_on.imageset/flash_on@3x.png


+ 13 - 7
RA Image/RA Image/BasicModeViewController.m

@@ -228,8 +228,8 @@
     
     // flash
     UIButton *flashBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-    flashBtn.frame = CGRectMake(w - 80, (150 - 40) * 0.5, 60, 40);
-    [flashBtn setTitle:@"Auto" forState:UIControlStateNormal];
+    flashBtn.frame = CGRectMake(w - 80, (150 - 60) * 0.5, 60, 60);
+    [flashBtn setImage:[UIImage imageNamed:@"flash_auto"] forState:UIControlStateNormal];
     [flashBtn addTarget:self action:@selector(flashBtnClick:) forControlEvents:UIControlEventTouchUpInside];
     [overlay addSubview:flashBtn];
     
@@ -428,21 +428,27 @@
 - (void)flashBtnClick:(UIButton *)sender {
     UIImagePickerControllerCameraDevice device = self.imgPicker.cameraDevice;
     UIImagePickerControllerCameraFlashMode flashMode = self.imgPicker.cameraFlashMode;
-    NSString *flashMordeString = @"Auto";
+    
+    NSString *flashMordeString = @"flash_auto";
+    UIImage *flash_img = [UIImage imageNamed:flashMordeString];
+    
     switch (flashMode) {
         case UIImagePickerControllerCameraFlashModeAuto: {
             flashMode = UIImagePickerControllerCameraFlashModeOn;
-            flashMordeString = @"On";
+            flashMordeString = @"flash_on";
+            flash_img = [UIImage imageNamed:flashMordeString];
         }
             break;
         case UIImagePickerControllerCameraFlashModeOn: {
             flashMode = UIImagePickerControllerCameraFlashModeOff;
-            flashMordeString = @"Off";
+            flashMordeString = @"flash_off";
+            flash_img = [UIImage imageNamed:flashMordeString];
         }
             break;
         case UIImagePickerControllerCameraFlashModeOff: {
             flashMode = UIImagePickerControllerCameraFlashModeAuto;
-            flashMordeString = @"Auto";
+            flashMordeString = @"flash_auto";
+            flash_img = [UIImage imageNamed:flashMordeString];
         }
             break;
             
@@ -452,7 +458,7 @@
     
     if ([UIImagePickerController isFlashAvailableForCameraDevice:device]) {
         self.imgPicker.cameraFlashMode = flashMode;
-        [sender setTitle:flashMordeString forState:UIControlStateNormal];
+        [sender setImage:[UIImage imageNamed:flashMordeString] forState:UIControlStateNormal];
     }
     
 }