增加录音动画

sumeng · sumeng · commit 9b33cfcc36f3 · 2015-08-03T13:12:34.000+08:00
diff --git a/Coding_iOS/Util/Audio/AudioAmrUtil.m b/Coding_iOS/Util/Audio/AudioAmrUtil.m
@@ -43,11 +43,8 @@ + (NSString *)decodeAmrToWave:(NSString *)amrFile {
     if ([[NSFileManager defaultManager] fileExistsAtPath:waveFile]) {
         [[NSFileManager defaultManager] removeItemAtPath:waveFile error:nil];
     }
-    NSTimeInterval date1 = [[NSDate date] timeIntervalSince1970];
     NSData *waveData = DecodeAMRToWAVE([NSData dataWithContentsOfFile:amrFile]);
     [waveData writeToFile:waveFile atomically:YES];
-    NSTimeInterval date2 = [[NSDate date] timeIntervalSince1970];
-    NSLog(@"decodeAmrToWave cost:%fs", date2-date1);
     return waveFile;
 }
 
diff --git a/Coding_iOS/Views/AudioView/AudioRecordView.m b/Coding_iOS/Views/AudioView/AudioRecordView.m
@@ -8,49 +8,62 @@
 
 #import "AudioRecordView.h"
 #import "AudioManager.h"
+#import <QuartzCore/QuartzCore.h>
 
 @interface AudioRecordView () <AudioManagerDelegate>
 
 @property (nonatomic, strong) UIImageView *imageView;
 @property (nonatomic, assign) AudioRecordViewTouchState touchState;
 
+@property (nonatomic, strong) UIView *recordBgView;
+@property (nonatomic, strong) UIView *spreadView;
+@property (nonatomic, strong) UIView *flashView;
+
 @end
 
 @implementation AudioRecordView
 
-- (instancetype)init {
-    self = [super init];
-    if (self) {
-        [self initAudioRecordView];
-    }
-    return self;
-}
-
-- (instancetype)initWithCoder:(NSCoder *)coder {
-    self = [super initWithCoder:coder];
-    if (self) {
-        [self initAudioRecordView];
-    }
-    return self;
-}
-
 - (instancetype)initWithFrame:(CGRect)frame {
     self = [super initWithFrame:frame];
     if (self) {
-        [self initAudioRecordView];
+        _isRecording = NO;
+        
+        _recordBgView = [[UIView alloc] initWithFrame:CGRectMake(-15, -15, self.frame.size.width+30, self.frame.size.height+30)];
+        _recordBgView.backgroundColor = [UIColor colorWithRed:0.8f green:0.8f blue:0.8f alpha:0.1f];
+        _recordBgView.layer.cornerRadius = _recordBgView.frame.size.width/2;
+        _recordBgView.layer.borderColor = [[UIColor colorWithRGBHex:0xdddddd] CGColor];
+        _recordBgView.layer.borderWidth = 1;
+        _recordBgView.hidden = YES;
+        [self addSubview:_recordBgView];
+        
+        _spreadView = [[UIView alloc] initWithFrame:_recordBgView.frame];
+        _spreadView.layer.cornerRadius = _recordBgView.frame.size.width/2;
+        _spreadView.layer.borderColor = [[UIColor colorWithRGBHex:0xdddddd] CGColor];
+        _spreadView.layer.borderWidth = 1;
+        _spreadView.alpha = 0;
+        [self addSubview:_spreadView];
+        
+        _imageView = [[UIImageView alloc] initWithFrame:self.bounds];
+        _imageView.backgroundColor = [UIColor colorWithRGBHex:0x2faeea];
+        _imageView.layer.cornerRadius = self.frame.size.width/2;
+        _imageView.contentMode = UIViewContentModeCenter;
+        [self addSubview:_imageView];
+        
+        _flashView = [[UIView alloc] initWithFrame:self.bounds];
+        _flashView.backgroundColor = [UIColor whiteColor];
+        _flashView.layer.cornerRadius = _flashView.frame.size.width/2;
+        _flashView.alpha = 0;
+        [self addSubview:_flashView];
+        
+        [self addTarget:self action:@selector(onTouchDown:) forControlEvents:UIControlEventTouchDown];
+        [self addTarget:self action:@selector(onTouchUpInside:) forControlEvents:UIControlEventTouchUpInside];
+        [self addTarget:self action:@selector(onTouchUpOutside:) forControlEvents:UIControlEventTouchUpOutside];
     }
     return self;
 }
 
-- (void)initAudioRecordView {
-    self.backgroundColor = [UIColor colorWithRGBHex:0x2faeea];
-    self.layer.cornerRadius = self.frame.size.width/2;
-    
-    _isRecording = NO;
-    
-    [self addTarget:self action:@selector(onTouchDown:) forControlEvents:UIControlEventTouchDown];
-    [self addTarget:self action:@selector(onTouchUpInside:) forControlEvents:UIControlEventTouchUpInside];
-    [self addTarget:self action:@selector(onTouchUpOutside:) forControlEvents:UIControlEventTouchUpOutside];
+- (void)dealloc {
+    [self stop];
 }
 
 - (void)record {
@@ -60,26 +73,29 @@ - (void)record {
     [AudioManager shared].delegate = self;
     [[AudioManager shared] recordWithValidator:_validator];
     
+    [self startAnimation];
+    
     if (_delegate && [_delegate respondsToSelector:@selector(recordViewRecordStarted:)]) {
         [_delegate recordViewRecordStarted:self];
     }
 }
 
 - (void)stop {
     _isRecording = NO;
-    [[AudioManager shared] stopPlay];
+    [self stopAnimation];
+    [[AudioManager shared] stopRecord];
 }
 
 - (void)onTouchDown:(id)sender {
     [self record];
 }
 
 - (void)onTouchUpInside:(id)sender {
-    [[AudioManager shared] stopRecord];
+    [self stop];
 }
 
 - (void)onTouchUpOutside:(id)sender {
-    [[AudioManager shared] stopRecord];
+    [self stop];
 }
 
 #pragma mark - touch
@@ -109,6 +125,36 @@ - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
     }
 }
 
+#pragma mark - Animation
+
+- (void)startAnimation {
+    _recordBgView.hidden = NO;
+    _spreadView.alpha = 1.0f;
+    _spreadView.transform = CGAffineTransformMakeScale(1.0f, 1.0f);
+    _flashView.alpha = 0.6f;
+    
+    [UIView beginAnimations:@"RecordAnimation" context:nil];
+    [UIView setAnimationDelegate:self];
+    [UIView setAnimationDuration:2.0f];
+    [UIView setAnimationCurve:UIViewAnimationCurveEaseOut];
+    [UIView setAnimationRepeatCount:FLT_MAX];
+    
+    _flashView.alpha = 0;
+    _spreadView.transform = CGAffineTransformMakeScale(1.5f, 1.5f);
+    _spreadView.alpha = 0;
+    
+    [UIView commitAnimations];
+}
+
+- (void)stopAnimation {
+    [_flashView.layer removeAllAnimations];
+    [_spreadView.layer removeAllAnimations];
+    
+    _recordBgView.hidden = YES;
+    _spreadView.alpha = 0;
+    _flashView.alpha = 0;
+}
+
 #pragma mark - AudioManagerDelegate
 
 - (void)didAudioRecordStarted:(AudioManager *)am {
@@ -122,7 +168,7 @@ - (void)didAudioRecording:(AudioManager *)am volume:(double)volume {
 }
 
 - (void)didAudioRecordStoped:(AudioManager *)am file:(NSString *)file duration:(NSTimeInterval)duration successfully:(BOOL)successfully {
-    _isRecording = NO;
+    NSLog(@"didAudioRecordStoped");
     if (_delegate && [_delegate respondsToSelector:@selector(recordViewRecordFinished:file:duration:)]) {
         [_delegate recordViewRecordFinished:self file:file duration:duration];
     }
diff --git a/Coding_iOS/Views/AudioView/AudioVolumeView.h b/Coding_iOS/Views/AudioView/AudioVolumeView.h
@@ -10,7 +10,7 @@
 
 #define kAudioVolumeViewVolumeWidth 2.0f
 #define kAudioVolumeViewVolumeMinHeight 3.0f
-#define kAudioVolumeViewVolumeMaxHeight 12.0f
+#define kAudioVolumeViewVolumeMaxHeight 16.0f
 #define kAudioVolumeViewVolumePadding 2.0f
 #define kAudioVolumeViewVolumeNumber 10
 
diff --git a/Coding_iOS/Views/UIMessageInputView/UIMessageInputView_Voice.m b/Coding_iOS/Views/UIMessageInputView/UIMessageInputView_Voice.m
@@ -8,7 +8,6 @@
 
 #import "UIMessageInputView_Voice.h"
 #import "AudioRecordView.h"
-#import "AudioPlayView.h"
 #import "AudioVolumeView.h"
 
 typedef NS_ENUM(NSInteger, UIMessageInputView_VoiceState) {
@@ -26,7 +25,6 @@ @interface UIMessageInputView_Voice () <AudioRecordViewDelegate>
 @property (assign, nonatomic) UIMessageInputView_VoiceState state;
 @property (assign, nonatomic) int duration;
 @property (strong, nonatomic) NSTimer *timer;
-@property (strong, nonatomic) AudioPlayView *playView;
 
 @end
 
@@ -55,10 +53,6 @@ - (id)initWithFrame:(CGRect)frame {
         _recordView.delegate = self;
         [self addSubview:_recordView];
         
-        _playView = [[AudioPlayView alloc] initWithFrame:CGRectMake(10, 10, 50, 50)];
-        _playView.backgroundColor = [UIColor greenColor];
-        [self addSubview:_playView];
-        
         UILabel *tipLabel = [[UILabel alloc] init];
         tipLabel.font = [UIFont systemFontOfSize:12];
         tipLabel.textColor = [UIColor colorWithRGBHex:0x999999];
@@ -103,9 +97,9 @@ - (void)setState:(UIMessageInputView_VoiceState)state {
     _recordTipsLabel.center = CGPointMake(self.frame.size.width/2, 20);
     
     if (state == UIMessageInputView_VoiceStateRecording) {
-        _volumeLeftView.center = CGPointMake(_recordTipsLabel.frame.origin.x - _volumeLeftView.frame.size.width/2 - 10, _recordTipsLabel.center.y);
+        _volumeLeftView.center = CGPointMake(_recordTipsLabel.frame.origin.x - _volumeLeftView.frame.size.width/2 - 12, _recordTipsLabel.center.y);
         _volumeLeftView.hidden = NO;
-        _volumeRightView.center = CGPointMake(_recordTipsLabel.frame.origin.x + _recordTipsLabel.frame.size.width + _recordTipsLabel.frame.size.width/2 + 10, _recordTipsLabel.center.y);
+        _volumeRightView.center = CGPointMake(_recordTipsLabel.frame.origin.x + _recordTipsLabel.frame.size.width + _recordTipsLabel.frame.size.width/2 + 12, _recordTipsLabel.center.y);
         _volumeRightView.hidden = NO;
     }
 }
@@ -154,8 +148,6 @@ - (void)recordViewRecordFinished:(AudioRecordView *)recordView file:(NSString *)
     }
     self.state = UIMessageInputView_VoiceStateReady;
     _duration = 0;
-    
-    _playView.url = [NSURL fileURLWithPath:file];
 }
 
 - (void)recordView:(AudioRecordView *)recordView touchStateChanged:(AudioRecordViewTouchState)touchState {

Original file line number	Diff line number	Diff line change
`@@ -43,11 +43,8 @@ + (NSString )decodeAmrToWave:(NSString )amrFile {`
`43`	`43`	`if ([[NSFileManager defaultManager] fileExistsAtPath:waveFile]) {`
`44`	`44`	`[[NSFileManager defaultManager] removeItemAtPath:waveFile error:nil];`
`45`	`45`	`}`
`46`		`- NSTimeInterval date1 = [[NSDate date] timeIntervalSince1970];`
`47`	`46`	`NSData *waveData = DecodeAMRToWAVE([NSData dataWithContentsOfFile:amrFile]);`
`48`	`47`	`[waveData writeToFile:waveFile atomically:YES];`
`49`		`- NSTimeInterval date2 = [[NSDate date] timeIntervalSince1970];`
`50`		`- NSLog(@"decodeAmrToWave cost:%fs", date2-date1);`
`51`	`48`	`return waveFile;`
`52`	`49`	`}`
`53`	`50`