一些细节修改

This commit is contained in:
wu736139669
2015-06-29 00:18:17 +08:00
parent 78639a3d99
commit e6f8761acf
7 changed files with 101 additions and 7 deletions
@@ -547,5 +547,53 @@
landmarkType = "5"> landmarkType = "5">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewModels/Message/MessageViewModel.m"
timestampString = "457197340.627612"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "83"
endingLineNumber = "83"
landmarkName = "+requireWithOrder_by:withPage:withPage_size:withType:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewControllers/My/SetUpViewController.m"
timestampString = "457198162.554138"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "121"
endingLineNumber = "121"
landmarkName = "-tableView:cellForRowAtIndexPath:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/User/PersonalTopView.m"
timestampString = "457199769.90135"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "112"
endingLineNumber = "112"
landmarkName = "-photoBrowser:photoAtIndex:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints> </Breakpoints>
</Bucket> </Bucket>
+1 -1
View File
@@ -70,7 +70,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>5</string> <string>7</string>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>
<true/> <true/>
<key>NSLocationWhenInUseUsageDescription</key> <key>NSLocationWhenInUseUsageDescription</key>
@@ -193,9 +193,15 @@
break; break;
case 1: case 1:
{ {
MyRelateViewController* myRelateViewController = [[MyRelateViewController alloc] init]; if (![AWordUser sharedInstance].isLogin)
myRelateViewController.hidesBottomBarWhenPushed = YES; {
[self.navigationController pushViewController:myRelateViewController animated:YES]; [LoginViewController presentLoginViewControllerInView:self success:nil];
}else{
MyRelateViewController* myRelateViewController = [[MyRelateViewController alloc] init];
myRelateViewController.hidesBottomBarWhenPushed = YES;
[self.navigationController pushViewController:myRelateViewController animated:YES];
}
} }
break; break;
case 2: case 2:
@@ -106,6 +106,10 @@
for (EMConversation* conversation in _dataArr) { for (EMConversation* conversation in _dataArr) {
[uidArr addObject:conversation.chatter]; [uidArr addObject:conversation.chatter];
} }
if (uidArr.count<=0) {
[self headerEndRefreshing];
return;
}
PropertyEntity* pro = [UserViewModel requireUserListWithUid:uidArr]; PropertyEntity* pro = [UserViewModel requireUserListWithUid:uidArr];
[RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) { [RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) {
@@ -114,7 +118,6 @@
_ifRefresh = NO; _ifRefresh = NO;
}else{ }else{
[_dataArr removeAllObjects]; [_dataArr removeAllObjects];
// [MBProgressHUD errorHudWithView:self.view label:[viewModel errMessage] hidesAfter:1.0];
} }
[self.tableView reloadData]; [self.tableView reloadData];
@@ -247,13 +247,17 @@
{ {
if (buttonIndex == 1 &&alertView.tag == 101) { if (buttonIndex == 1 &&alertView.tag == 101) {
[MobClick event:kUmen_logout]; [MobClick event:kUmen_logout];
[MBProgressHUD hudWithView:self.view label:@"正在退出..."];
[[EaseMob sharedInstance].chatManager asyncLogoffWithUnbindDeviceToken:YES completion:^(NSDictionary *info, EMError *error) { [[EaseMob sharedInstance].chatManager asyncLogoffWithUnbindDeviceToken:YES completion:^(NSDictionary *info, EMError *error) {
[MBProgressHUD hideHUDForView:self.view animated:YES];
if (!error && info) { if (!error && info) {
} }
[AWordUser sharedInstance].isLogin = NO; [AWordUser sharedInstance].isLogin = NO;
[AWordUser sharedInstance].uid = @""; [AWordUser sharedInstance].uid = @"";
[AWordUser sharedInstance].notReadCommentNum = 0;
[AWordUser sharedInstance].myNewFollowerCount = 0;
[[NSNotificationCenter defaultCenter] postNotificationName:kLogoutSuccessNotificationName object:nil]; [[NSNotificationCenter defaultCenter] postNotificationName:kLogoutSuccessNotificationName object:nil];
[self.navigationController popViewControllerAnimated:YES]; [self.navigationController popViewControllerAnimated:YES];
DLog(@"退出成功"); DLog(@"退出成功");
@@ -27,7 +27,7 @@
// Initialization code // Initialization code
_content.font = [UIFont appFontOfSize:14.0]; _content.font = [UIFont appFontOfSize:14.0];
_content.scrollEnabled = NO; _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.cornerRadius = _avatarImageView.frame.size.width/2;
_avatarImageView.layer.masksToBounds = YES; _avatarImageView.layer.masksToBounds = YES;
+33
View File
@@ -10,6 +10,7 @@
#import "UserViewModel.h" #import "UserViewModel.h"
#import "PraiseUserListViewController.h" #import "PraiseUserListViewController.h"
#import "AppDelegate.h" #import "AppDelegate.h"
#import "MWPhotoBrowser.h"
@implementation PersonalTopView @implementation PersonalTopView
{ {
BOOL _isSelectImage; BOOL _isSelectImage;
@@ -77,8 +78,40 @@
[_avatarBtn sd_setImageWithURL:[NSURL URLWithString:userViewModel.userInfo.figureurl] forState:UIControlStateNormal placeholderImage:DefaultUserIcon]; [_avatarBtn sd_setImageWithURL:[NSURL URLWithString:userViewModel.userInfo.figureurl] forState:UIControlStateNormal placeholderImage:DefaultUserIcon];
} }
- (IBAction)avatarBtnClick:(id)sender { - (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<MWPhoto>)photoBrowser:(MWPhotoBrowser *)photoBrowser photoAtIndex:(NSUInteger)index
{
MWPhoto *photo = [[MWPhoto alloc]initWithURL:[NSURL URLWithString:_userViewModel.userInfo.figureurl]];
return photo;
}
- (IBAction)attentionListClick:(id)sender { - (IBAction)attentionListClick:(id)sender {
PraiseUserListViewController* praiseUserListViewController = [[PraiseUserListViewController alloc] init]; PraiseUserListViewController* praiseUserListViewController = [[PraiseUserListViewController alloc] init];
praiseUserListViewController.targetId = _userViewModel.userInfo.uid; praiseUserListViewController.targetId = _userViewModel.userInfo.uid;