Skip to content

Commit 88eac77

Browse files
committed
fix some bugs
Signed-off-by: Zhiping Yang <XcodeYang@Gmail.com>
1 parent a74b8ea commit 88eac77

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

UUChat/UUImageAvatarBrowser.m

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#import "UUImageAvatarBrowser.h"
1010

1111
static UIImageView *orginImageView;
12-
static CGRect oldframe;
1312
@implementation UUImageAvatarBrowser
1413

1514
+(void)showImage:(UIImageView *)avatarImageView{
@@ -18,7 +17,7 @@ +(void)showImage:(UIImageView *)avatarImageView{
1817
orginImageView.alpha = 0;
1918
UIWindow *window=[UIApplication sharedApplication].keyWindow;
2019
UIView *backgroundView=[[UIView alloc]initWithFrame:CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.height)];
21-
oldframe=[avatarImageView convertRect:avatarImageView.bounds toView:window];
20+
CGRect oldframe=[avatarImageView convertRect:avatarImageView.bounds toView:window];
2221
backgroundView.backgroundColor=[[UIColor blackColor] colorWithAlphaComponent:0.7];
2322
backgroundView.alpha=1;
2423
UIImageView *imageView=[[UIImageView alloc]initWithFrame:oldframe];
@@ -42,7 +41,7 @@ +(void)hideImage:(UITapGestureRecognizer*)tap{
4241
UIView *backgroundView=tap.view;
4342
UIImageView *imageView=(UIImageView*)[tap.view viewWithTag:1];
4443
[UIView animateWithDuration:0.3 animations:^{
45-
imageView.frame=oldframe;
44+
imageView.frame=[orginImageView convertRect:orginImageView.bounds toView:[UIApplication sharedApplication].keyWindow];
4645
} completion:^(BOOL finished) {
4746
[backgroundView removeFromSuperview];
4847
orginImageView.alpha = 1;

UUChat/UUInputFunctionView.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ - (id)initWithSuperVC:(UIViewController *)superVC
8080

8181
//输入框的提示语
8282
placeHold = [[UILabel alloc]initWithFrame:CGRectMake(20, 0, 200, 30)];
83-
placeHold.text = @"Please input the content";
83+
placeHold.text = @"Input the contents here";
8484
placeHold.textColor = [[UIColor lightGrayColor] colorWithAlphaComponent:0.8];
8585
[self.TextViewInput addSubview:placeHold];
8686

UUChat/UUProgressHUD.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ - (void)show {
7676
centerLabel.text = @"60";
7777
centerLabel.textAlignment = NSTextAlignmentCenter;
7878
centerLabel.font = [UIFont systemFontOfSize:30];
79-
centerLabel.textColor = [UIColor whiteColor];
79+
centerLabel.textColor = [UIColor yellowColor];
8080

8181

8282
edgeImageView.frame = CGRectMake(0, 0, 154, 154);
@@ -117,7 +117,7 @@ -(void) startAnimation
117117
if (second <= 10.0f) {
118118
centerLabel.textColor = [UIColor redColor];
119119
}else{
120-
centerLabel.textColor = [UIColor whiteColor];
120+
centerLabel.textColor = [UIColor yellowColor];
121121
}
122122
centerLabel.text = [NSString stringWithFormat:@"%.1f",second-0.1];
123123
[UIView commitAnimations];

0 commit comments

Comments
 (0)