Skip to content

Commit 4b68931

Browse files
sumengsumeng
sumeng
authored and
sumeng
committed
添加图片
1 parent 3f698c8 commit 4b68931

7 files changed

Lines changed: 38 additions & 18 deletions

File tree

‎Coding_iOS.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,9 @@
466466
4EFE8DAF1B3960E6004B7559 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4EFE8DAE1B3960E6004B7559 /* [email protected] */; };
467467
4EFE8DB91B3A5727004B7559 /* Launch Screen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4EFE8DB81B3A5727004B7559 /* Launch Screen.xib */; };
468468
68D9A2AD062641F5BCA573C5 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B024F2227BD4152BC7C9A7A /* libPods.a */; };
469+
7E335D9D1B6F5E94003D0F3D /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 7E335D9A1B6F5E94003D0F3D /* [email protected] */; };
470+
7E335D9E1B6F5E94003D0F3D /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 7E335D9B1B6F5E94003D0F3D /* [email protected] */; };
471+
7E335D9F1B6F5E94003D0F3D /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 7E335D9C1B6F5E94003D0F3D /* [email protected] */; };
469472
7EB02FCE1B6CF5D500D2166C /* UIMessageInputView_Voice.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EB02FCD1B6CF5D500D2166C /* UIMessageInputView_Voice.m */; };
470473
7EB02FE41B6D0F3E00D2166C /* amrFileCodec.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EB02FD21B6D0F3E00D2166C /* amrFileCodec.m */; };
471474
7EB02FE51B6D0F3E00D2166C /* AudioAmrUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EB02FD41B6D0F3E00D2166C /* AudioAmrUtil.m */; };
@@ -1498,6 +1501,9 @@
14981501
4EFE8DAB1B394A0D004B7559 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
14991502
4EFE8DAE1B3960E6004B7559 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
15001503
4EFE8DB81B3A5727004B7559 /* Launch Screen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "Launch Screen.xib"; sourceTree = "<group>"; };
1504+
7E335D9A1B6F5E94003D0F3D /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
1505+
7E335D9B1B6F5E94003D0F3D /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
1506+
7E335D9C1B6F5E94003D0F3D /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
15011507
7EB02FCC1B6CF5D500D2166C /* UIMessageInputView_Voice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIMessageInputView_Voice.h; sourceTree = "<group>"; };
15021508
7EB02FCD1B6CF5D500D2166C /* UIMessageInputView_Voice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIMessageInputView_Voice.m; sourceTree = "<group>"; };
15031509
7EB02FD11B6D0F3E00D2166C /* amrFileCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = amrFileCodec.h; sourceTree = "<group>"; };
@@ -3165,6 +3171,9 @@
31653171
8E97CE5E1A0A3424006F9AD7 /* [email protected] */,
31663172
8E97CE5F1A0A3424006F9AD7 /* [email protected] */,
31673173
8E97CE601A0A3424006F9AD7 /* [email protected] */,
3174+
7E335D9A1B6F5E94003D0F3D /* [email protected] */,
3175+
7E335D9B1B6F5E94003D0F3D /* [email protected] */,
3176+
7E335D9C1B6F5E94003D0F3D /* [email protected] */,
31683177
);
31693178
path = keyboard;
31703179
sourceTree = "<group>";
@@ -4195,6 +4204,7 @@
41954204
4E4D6AC21B252CD400FD2E49 /* [email protected] in Resources */,
41964205
8E97CEB01A0C7E26006F9AD7 /* [email protected] in Resources */,
41974206
8EF643B719FF7E2900F7EEB0 /* Input_OnlyText_Cell.xib in Resources */,
4207+
7E335D9D1B6F5E94003D0F3D /* [email protected] in Resources */,
41984208
4EF17ED71B3C3112003CDD2D /* [email protected] in Resources */,
41994209
4E6384031B33C8E900D98648 /* [email protected] in Resources */,
42004210
4EACB4401A2C448F0097ABB3 /* [email protected] in Resources */,
@@ -4243,6 +4253,7 @@
42434253
4EE083DC1ADB736800CA342E /* service_terms.html in Resources */,
42444254
8E97CE541A0A3410006F9AD7 /* [email protected] in Resources */,
42454255
4E6384011B33C18700D98648 /* [email protected] in Resources */,
4256+
7E335D9F1B6F5E94003D0F3D /* [email protected] in Resources */,
42464257
4E90F89B1AF709C100B44F03 /* bubble.html in Resources */,
42474258
8E8F7B2D19EF6306006BA8BD /* [email protected] in Resources */,
42484259
4EF17EE11B3C3112003CDD2D /* [email protected] in Resources */,
@@ -4499,6 +4510,7 @@
44994510
4E217F131A70EDC700F6DF88 /* SVWebViewControllerActivitySafari-iPad.png in Resources */,
45004511
8EF6435019FF4E1600F7EEB0 /* [email protected] in Resources */,
45014512
4E94C5091B4D334B00EB668A /* [email protected] in Resources */,
4513+
7E335D9E1B6F5E94003D0F3D /* [email protected] in Resources */,
45024514
8EA6D18519E240C40076D59C /* [email protected] in Resources */,
45034515
8EA6D18219E240C40076D59C /* [email protected] in Resources */,
45044516
8EA6D18119E240C40076D59C /* [email protected] in Resources */,

‎Coding_iOS/Images/keyboard/[email protected]‎

339 Bytes
Loading

‎Coding_iOS/Images/keyboard/[email protected]‎

1.12 KB
Loading

‎Coding_iOS/Images/keyboard/[email protected]‎

6.74 KB
Loading

‎Coding_iOS/Views/AudioView/AudioRecordView.m‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,21 @@ - (instancetype)initWithFrame:(CGRect)frame {
2828
if (self) {
2929
_isRecording = NO;
3030

31-
_recordBgView = [[UIView alloc] initWithFrame:CGRectMake(-10, -10, self.frame.size.width+20, self.frame.size.height+20)];
31+
_spreadView = [[UIView alloc] initWithFrame:CGRectMake(-8, -8, self.frame.size.width+16, self.frame.size.height+16)];
32+
_spreadView.backgroundColor = [UIColor colorWithRGBHex:0xC6ECFD];
33+
_spreadView.layer.cornerRadius = _spreadView.frame.size.width/2;
34+
_spreadView.alpha = 0;
35+
[self addSubview:_spreadView];
36+
37+
_recordBgView = [[UIView alloc] initWithFrame:CGRectMake(-8, -8, self.frame.size.width+16, self.frame.size.height+16)];
3238
_recordBgView.backgroundColor = [UIColor colorWithRGBHex:0x7ACFFB];
3339
_recordBgView.layer.cornerRadius = _recordBgView.frame.size.width/2;
3440
_recordBgView.hidden = YES;
3541
[self addSubview:_recordBgView];
3642

37-
_spreadView = [[UIView alloc] initWithFrame:_recordBgView.frame];
38-
_spreadView.backgroundColor = [UIColor colorWithRGBHex:0xC6ECFD];
39-
_spreadView.layer.cornerRadius = _recordBgView.frame.size.width/2;
40-
_spreadView.alpha = 0;
41-
[self addSubview:_spreadView];
42-
4343
_imageView = [[UIImageView alloc] initWithFrame:self.bounds];
44-
_imageView.backgroundColor = [UIColor colorWithRGBHex:0x359DE5];
45-
_imageView.layer.cornerRadius = self.frame.size.width/2;
46-
_imageView.contentMode = UIViewContentModeCenter;
44+
_imageView.contentMode = UIViewContentModeScaleAspectFill;
45+
_imageView.image = [UIImage imageNamed:@"keyboard_voice_record"];
4746
[self addSubview:_imageView];
4847

4948
_flashView = [[UIView alloc] initWithFrame:self.bounds];
@@ -122,11 +121,11 @@ - (void)startAnimation {
122121
_recordBgView.hidden = NO;
123122
_spreadView.alpha = 1.0f;
124123
_spreadView.transform = CGAffineTransformMakeScale(1.0f, 1.0f);
125-
_flashView.alpha = 0.6f;
124+
_flashView.alpha = 0.4f;
126125

127126
[UIView beginAnimations:@"RecordAnimation" context:nil];
128127
[UIView setAnimationDelegate:self];
129-
[UIView setAnimationDuration:2.0f];
128+
[UIView setAnimationDuration:1.5f];
130129
[UIView setAnimationCurve:UIViewAnimationCurveEaseOut];
131130
[UIView setAnimationRepeatCount:FLT_MAX];
132131

‎Coding_iOS/Views/UIMessageInputView/UIMessageInputView.m‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ @interface UIMessageInputView () <AGEmojiKeyboardViewDelegate, AGEmojiKeyboardVi
4646

4747
@property (strong, nonatomic) UIScrollView *contentView;
4848
@property (strong, nonatomic) UIPlaceHolderTextView *inputTextView;
49+
@property (strong, nonatomic) UIImageView *arrowKeyboardView;
4950

5051
@property (strong, nonatomic) UICustomCollectionView *mediaView;
5152
@property (strong, nonatomic) NSMutableArray *mediaList, *uploadMediaList;
@@ -88,21 +89,21 @@ - (void)setInputState:(UIMessageInputViewState)inputState{
8889
{
8990
[self.addButton setImage:[UIImage imageNamed:@"keyboard_add"] forState:UIControlStateNormal];
9091
[self.emotionButton setImage:[UIImage imageNamed:@"keyboard_emotion"] forState:UIControlStateNormal];
91-
[self.voiceButton setImage:[UIImage imageNamed:@"keyboard_add"] forState:UIControlStateNormal];
92+
[self.voiceButton setImage:[UIImage imageNamed:@"keyboard_voice"] forState:UIControlStateNormal];
9293
}
9394
break;
9495
case UIMessageInputViewStateEmotion:
9596
{
9697
[self.addButton setImage:[UIImage imageNamed:@"keyboard_add"] forState:UIControlStateNormal];
9798
[self.emotionButton setImage:[UIImage imageNamed:@"keyboard_keyboard"] forState:UIControlStateNormal];
98-
[self.voiceButton setImage:[UIImage imageNamed:@"keyboard_add"] forState:UIControlStateNormal];
99+
[self.voiceButton setImage:[UIImage imageNamed:@"keyboard_voice"] forState:UIControlStateNormal];
99100
}
100101
break;
101102
case UIMessageInputViewStateAdd:
102103
{
103104
[self.addButton setImage:[UIImage imageNamed:@"keyboard_keyboard"] forState:UIControlStateNormal];
104105
[self.emotionButton setImage:[UIImage imageNamed:@"keyboard_emotion"] forState:UIControlStateNormal];
105-
[self.voiceButton setImage:[UIImage imageNamed:@"keyboard_add"] forState:UIControlStateNormal];
106+
[self.voiceButton setImage:[UIImage imageNamed:@"keyboard_voice"] forState:UIControlStateNormal];
106107
}
107108
break;
108109
case UIMessageInputViewStateVoice:
@@ -116,6 +117,8 @@ - (void)setInputState:(UIMessageInputViewState)inputState{
116117
break;
117118
}
118119
_contentView.hidden = _inputState == UIMessageInputViewStateVoice;
120+
_arrowKeyboardView.hidden = !_contentView;
121+
_arrowKeyboardView.center = CGPointMake(self.frame.size.width/2, self.frame.size.height/2);
119122
}
120123
}
121124
- (void)setPlaceHolder:(NSString *)placeHolder{
@@ -421,7 +424,7 @@ - (void)customUIWithType:(UIMessageInputViewContentType)type{
421424
_contentView.alwaysBounceVertical = YES;
422425
[self addSubview:_contentView];
423426
[_contentView mas_makeConstraints:^(MASConstraintMaker *make) {
424-
CGFloat left = hasVoiceBtn ? (13+kMessageInputView_Width_Tool+13) : kPaddingLeftWidth;
427+
CGFloat left = hasVoiceBtn ? (7+kMessageInputView_Width_Tool+7) : kPaddingLeftWidth;
425428
make.edges.equalTo(self).insets(UIEdgeInsetsMake(kMessageInputView_PadingHeight, left, kMessageInputView_PadingHeight, kPaddingLeftWidth + toolBtnNum *kMessageInputView_Width_Tool));
426429
}];
427430
}
@@ -511,14 +514,20 @@ - (void)customUIWithType:(UIMessageInputViewContentType)type{
511514
}
512515

513516
if (hasVoiceBtn && !_voiceButton) {
514-
_voiceButton = [[UIButton alloc] initWithFrame:CGRectMake(13, (kMessageInputView_Height - kMessageInputView_Width_Tool)/2, kMessageInputView_Width_Tool, kMessageInputView_Width_Tool)];
517+
_voiceButton = [[UIButton alloc] initWithFrame:CGRectMake(7, (kMessageInputView_Height - kMessageInputView_Width_Tool)/2, kMessageInputView_Width_Tool, kMessageInputView_Width_Tool)];
515518

516519
[_voiceButton setImage:[UIImage imageNamed:@"keyboard_add"] forState:UIControlStateNormal];
517520
[_voiceButton addTarget:self action:@selector(voiceButtonClicked:) forControlEvents:UIControlEventTouchUpInside];
518521
[self addSubview:_voiceButton];
519522
}
520523
_voiceButton.hidden = !hasVoiceBtn;
521524

525+
if (hasVoiceBtn && !_arrowKeyboardView) {
526+
_arrowKeyboardView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"keyboard_arrow_down"]];
527+
[self addSubview:_arrowKeyboardView];
528+
}
529+
_arrowKeyboardView.hidden = YES;
530+
522531
if (hasVoiceBtn && !_voiceKeyboardView) {
523532
_voiceKeyboardView = [[UIMessageInputView_Voice alloc] initWithFrame:CGRectMake(0, kScreen_Height, kScreen_Width, kKeyboardView_Height)];
524533
_voiceKeyboardView.recordSuccessfully = ^(NSString *file, NSTimeInterval duration){

‎Coding_iOS/Views/UIMessageInputView/UIMessageInputView_Voice.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ - (id)initWithFrame:(CGRect)frame {
4949
_volumeRightView.hidden = YES;
5050
[self addSubview:_volumeRightView];
5151

52-
_recordView = [[AudioRecordView alloc] initWithFrame:CGRectMake((self.frame.size.width - 88) / 2, 62, 88, 88)];
52+
_recordView = [[AudioRecordView alloc] initWithFrame:CGRectMake((self.frame.size.width - 86) / 2, 62, 86, 86)];
5353
_recordView.delegate = self;
5454
[self addSubview:_recordView];
5555

0 commit comments

Comments
 (0)