|
|
@@ -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];
|
|
|
}
|
|
|
|
|
|
}
|