From e6f8761acfb697d77c69f264026f387ab5ca7288 Mon Sep 17 00:00:00 2001 From: wu736139669 Date: Mon, 29 Jun 2015 00:18:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E7=BB=86=E8=8A=82=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xcdebugger/Breakpoints_v2.xcbkptlist | 48 +++++++++++++++++++ Ash_AWord/Info.plist | 2 +- .../ViewControllers/Main/MyViewController.m | 12 +++-- .../My/MessageListViewController.m | 5 +- .../ViewControllers/My/SetUpViewController.m | 6 ++- .../Views/Message/MessageTableViewCell.m | 2 +- Ash_AWord/Views/User/PersonalTopView.m | 33 +++++++++++++ 7 files changed, 101 insertions(+), 7 deletions(-) diff --git a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 4d922bc..05de35f 100644 --- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -547,5 +547,53 @@ landmarkType = "5"> + + + + + + + + + + + + diff --git a/Ash_AWord/Info.plist b/Ash_AWord/Info.plist index 004d8bc..9e8590e 100644 --- a/Ash_AWord/Info.plist +++ b/Ash_AWord/Info.plist @@ -70,7 +70,7 @@ CFBundleVersion - 5 + 7 LSRequiresIPhoneOS NSLocationWhenInUseUsageDescription diff --git a/Ash_AWord/ViewControllers/Main/MyViewController.m b/Ash_AWord/ViewControllers/Main/MyViewController.m index c884d70..9ea1cec 100644 --- a/Ash_AWord/ViewControllers/Main/MyViewController.m +++ b/Ash_AWord/ViewControllers/Main/MyViewController.m @@ -193,9 +193,15 @@ break; case 1: { - MyRelateViewController* myRelateViewController = [[MyRelateViewController alloc] init]; - myRelateViewController.hidesBottomBarWhenPushed = YES; - [self.navigationController pushViewController:myRelateViewController animated:YES]; + if (![AWordUser sharedInstance].isLogin) + { + [LoginViewController presentLoginViewControllerInView:self success:nil]; + }else{ + MyRelateViewController* myRelateViewController = [[MyRelateViewController alloc] init]; + myRelateViewController.hidesBottomBarWhenPushed = YES; + [self.navigationController pushViewController:myRelateViewController animated:YES]; + } + } break; case 2: diff --git a/Ash_AWord/ViewControllers/My/MessageListViewController.m b/Ash_AWord/ViewControllers/My/MessageListViewController.m index 8f719c8..f313ed2 100644 --- a/Ash_AWord/ViewControllers/My/MessageListViewController.m +++ b/Ash_AWord/ViewControllers/My/MessageListViewController.m @@ -106,6 +106,10 @@ for (EMConversation* conversation in _dataArr) { [uidArr addObject:conversation.chatter]; } + if (uidArr.count<=0) { + [self headerEndRefreshing]; + return; + } PropertyEntity* pro = [UserViewModel requireUserListWithUid:uidArr]; [RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) { @@ -114,7 +118,6 @@ _ifRefresh = NO; }else{ [_dataArr removeAllObjects]; -// [MBProgressHUD errorHudWithView:self.view label:[viewModel errMessage] hidesAfter:1.0]; } [self.tableView reloadData]; diff --git a/Ash_AWord/ViewControllers/My/SetUpViewController.m b/Ash_AWord/ViewControllers/My/SetUpViewController.m index e69fdab..5b925e5 100644 --- a/Ash_AWord/ViewControllers/My/SetUpViewController.m +++ b/Ash_AWord/ViewControllers/My/SetUpViewController.m @@ -247,13 +247,17 @@ { if (buttonIndex == 1 &&alertView.tag == 101) { [MobClick event:kUmen_logout]; - + [MBProgressHUD hudWithView:self.view label:@"正在退出..."]; [[EaseMob sharedInstance].chatManager asyncLogoffWithUnbindDeviceToken:YES completion:^(NSDictionary *info, EMError *error) { + [MBProgressHUD hideHUDForView:self.view animated:YES]; + if (!error && info) { } [AWordUser sharedInstance].isLogin = NO; [AWordUser sharedInstance].uid = @""; + [AWordUser sharedInstance].notReadCommentNum = 0; + [AWordUser sharedInstance].myNewFollowerCount = 0; [[NSNotificationCenter defaultCenter] postNotificationName:kLogoutSuccessNotificationName object:nil]; [self.navigationController popViewControllerAnimated:YES]; DLog(@"退出成功"); diff --git a/Ash_AWord/Views/Message/MessageTableViewCell.m b/Ash_AWord/Views/Message/MessageTableViewCell.m index d0e3e9f..10975a7 100644 --- a/Ash_AWord/Views/Message/MessageTableViewCell.m +++ b/Ash_AWord/Views/Message/MessageTableViewCell.m @@ -27,7 +27,7 @@ // Initialization code _content.font = [UIFont appFontOfSize:14.0]; _content.scrollEnabled = NO; - _timeLabel.font = [UIFont appFontOfSize:14.0]; +// _timeLabel.font = [UIFont appFontOfSize:14.0]; _avatarImageView.layer.cornerRadius = _avatarImageView.frame.size.width/2; _avatarImageView.layer.masksToBounds = YES; diff --git a/Ash_AWord/Views/User/PersonalTopView.m b/Ash_AWord/Views/User/PersonalTopView.m index c8f1b49..ec03193 100644 --- a/Ash_AWord/Views/User/PersonalTopView.m +++ b/Ash_AWord/Views/User/PersonalTopView.m @@ -10,6 +10,7 @@ #import "UserViewModel.h" #import "PraiseUserListViewController.h" #import "AppDelegate.h" +#import "MWPhotoBrowser.h" @implementation PersonalTopView { BOOL _isSelectImage; @@ -77,8 +78,40 @@ [_avatarBtn sd_setImageWithURL:[NSURL URLWithString:userViewModel.userInfo.figureurl] forState:UIControlStateNormal placeholderImage:DefaultUserIcon]; } - (IBAction)avatarBtnClick:(id)sender { + MWPhotoBrowser *pBrowser = [[MWPhotoBrowser alloc]initWithDelegate:self]; + //是否显示分享按钮 + pBrowser.displayActionButton = YES; + //左右分页切换 + pBrowser.displayNavArrows = YES; + //是否显示选择按钮 + pBrowser.displaySelectionButtons = NO; + //是否显示条件控制控件 + pBrowser.alwaysShowControls = YES; + //是否全屏 + pBrowser.zoomPhotosToFill = YES; + + //允许使用网络查看所有图片 + pBrowser.enableGrid = YES; + //是否第一张 + pBrowser.startOnGrid = YES; + pBrowser.enableSwipeToDismiss = YES; + [pBrowser showNextPhotoAnimated:YES]; + [pBrowser showPreviousPhotoAnimated:YES]; + [pBrowser setCurrentPhotoIndex:0]; + [[AppDelegate visibleViewController].navigationController pushViewController:pBrowser animated:YES]; + +} +#pragma mark - MWPhotoBrowserDelegate +-(NSUInteger)numberOfPhotosInPhotoBrowser:(MWPhotoBrowser *)photoBrowser +{ + return 1; } +-(id)photoBrowser:(MWPhotoBrowser *)photoBrowser photoAtIndex:(NSUInteger)index +{ + MWPhoto *photo = [[MWPhoto alloc]initWithURL:[NSURL URLWithString:_userViewModel.userInfo.figureurl]]; + return photo; +} - (IBAction)attentionListClick:(id)sender { PraiseUserListViewController* praiseUserListViewController = [[PraiseUserListViewController alloc] init]; praiseUserListViewController.targetId = _userViewModel.userInfo.uid;