wushenghua/Ash_AWord
1
0
Fork 0
mirror of https://github.com/wu736139669/Ash_AWord.git synced 2026-08-05 05:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

已读效果修改

Browse Source
This commit is contained in:
wu736139669
2015-06-29 09:44:52 +08:00
parent e6f8761acf
commit 274fc6c3ff
6 changed files with 43 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+10 -26
View File
@@ -170,11 +170,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewControllers/My/MyRelateViewController.m" filePath = "Ash_AWord/ViewControllers/My/MyRelateViewController.m"
timestampString = "457159946.984524" timestampString = "457235046.920164"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "152" startingLineNumber = "153"
endingLineNumber = "152" endingLineNumber = "153"
landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkName = "-tableView:didSelectRowAtIndexPath:"
landmarkType = "5"> landmarkType = "5">
<Locations> <Locations>
@@ -218,11 +218,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewControllers/My/MyRelateViewController.m" filePath = "Ash_AWord/ViewControllers/My/MyRelateViewController.m"
timestampString = "457159946.984524" timestampString = "457235046.920164"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "153" startingLineNumber = "154"
endingLineNumber = "153" endingLineNumber = "154"
landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkName = "-tableView:didSelectRowAtIndexPath:"
landmarkType = "5"> landmarkType = "5">
</BreakpointContent> </BreakpointContent>
@@ -490,27 +490,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewControllers/My/BlackListViewController.m" filePath = "Ash_AWord/ViewControllers/My/BlackListViewController.m"
timestampString = "457185217.350383" timestampString = "457234100.985171"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "59" startingLineNumber = "80"
endingLineNumber = "59" endingLineNumber = "80"
landmarkName = "-loadData"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewControllers/My/BlackListViewController.m"
timestampString = "457185217.350383"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "62"
endingLineNumber = "62"
landmarkName = "-loadData" landmarkName = "-loadData"
landmarkType = "5"> landmarkType = "5">
</BreakpointContent> </BreakpointContent>
@@ -566,7 +550,7 @@
<BreakpointProxy <BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
shouldBeEnabled = "Yes" shouldBeEnabled = "No"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewControllers/My/SetUpViewController.m" filePath = "Ash_AWord/ViewControllers/My/SetUpViewController.m"
Ash_AWord/ViewControllers/Login/LoginViewController.m
+1 -1
View File
@@ -91,7 +91,7 @@
if (response.responseCode == UMSResponseCodeSuccess) { if (response.responseCode == UMSResponseCodeSuccess) {
UMSocialAccountEntity *snsAccount = [[UMSocialAccountManager socialAccountDictionary] valueForKey:UMShareToSina]; // UMSocialAccountEntity *snsAccount = [[UMSocialAccountManager socialAccountDictionary] valueForKey:UMShareToSina];
[[UMSocialDataService defaultDataService] requestSnsInformation:UMShareToSina completion:^(UMSocialResponseEntity *response){ [[UMSocialDataService defaultDataService] requestSnsInformation:UMShareToSina completion:^(UMSocialResponseEntity *response){
if (response.data) { if (response.data) {
Ash_AWord/ViewControllers/Main/MainViewController.m
+2 -2
View File
@@ -507,7 +507,7 @@ static NSString *kMessageType = @"MessageType";
- (void)jumpToChatList - (void)jumpToChatList
{ {
if ([self.navigationController.topViewController isKindOfClass:[ChatMainViewController class]]) { if ([self.navigationController.topViewController isKindOfClass:[ChatMainViewController class]]) {
ChatMainViewController *chatController = (ChatMainViewController *)self.navigationController.topViewController; // ChatMainViewController *chatController = (ChatMainViewController *)self.navigationController.topViewController;
// [chatController hideImagePicker]; // [chatController hideImagePicker];
} }
else if(_myNav) else if(_myNav)
@@ -542,7 +542,7 @@ static NSString *kMessageType = @"MessageType";
if (userInfo) if (userInfo)
{ {
if ([self.navigationController.topViewController isKindOfClass:[ChatMainViewController class]]) { if ([self.navigationController.topViewController isKindOfClass:[ChatMainViewController class]]) {
ChatMainViewController *chatController = (ChatMainViewController *)self.navigationController.topViewController; // ChatMainViewController *chatController = (ChatMainViewController *)self.navigationController.topViewController;
// [chatController hideImagePicker]; // [chatController hideImagePicker];
} }
Ash_AWord/ViewControllers/My/BlackListViewController.m
+17 -11
View File
@@ -56,21 +56,27 @@
for (NSString* userid in dataArr) { for (NSString* userid in dataArr) {
[uidArr addObject:userid]; [uidArr addObject:userid];
} }
PropertyEntity* pro = [UserViewModel requireUserListWithUid:uidArr]; if(uidArr.count > 0){
[RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) { PropertyEntity* pro = [UserViewModel requireUserListWithUid:uidArr];
[RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) {
if ([viewModel success]) { if ([viewModel success]) {
_userArr = [NSMutableArray arrayWithArray:[(UserViewModel*)viewModel userBaseInfoArr]]; _userArr = [NSMutableArray arrayWithArray:[(UserViewModel*)viewModel userBaseInfoArr]];
} }
[self.tableView reloadData];
[self headerEndRefreshing];
} failedBlock:^(NSError *error) {
[MBProgressHUD errorHudWithView:self.view label:kNetworkErrorTips hidesAfter:1.0];
[self.tableView reloadData];
[self headerEndRefreshing];
}];
}else{
[self.tableView reloadData]; [self.tableView reloadData];
[self headerEndRefreshing]; [self headerEndRefreshing];
} failedBlock:^(NSError *error) { }
[MBProgressHUD errorHudWithView:self.view label:kNetworkErrorTips hidesAfter:1.0];
[self.tableView reloadData];
[self headerEndRefreshing];
}];
} }
Ash_AWord/ViewControllers/My/MyRelateViewController.m
+1
View File
@@ -41,6 +41,7 @@
#pragma mark 标记已读 #pragma mark 标记已读
-(void)readAll -(void)readAll
{ {
[self.tableView.header beginRefreshing];
[RequireEngine requireWithProperty:[CommentViewModel requireReadAllComment] completionBlock:^(id viewModel) { [RequireEngine requireWithProperty:[CommentViewModel requireReadAllComment] completionBlock:^(id viewModel) {
if ([viewModel success]) { if ([viewModel success]) {
[self headerBeginRefreshing]; [self headerBeginRefreshing];
Ash_AWord/ViewControllers/My/SetUpViewController.m
+9 -3
View File
@@ -205,9 +205,15 @@
#pragma mark 跳到App Store评价 #pragma mark 跳到App Store评价
-(void)goBlackList -(void)goBlackList
{ {
BlackListViewController* blackListViewController = [[BlackListViewController alloc] init]; if (![AWordUser sharedInstance].isLogin)
blackListViewController.hidesBottomBarWhenPushed = YES; {
[self.navigationController pushViewController:blackListViewController animated:YES]; [LoginViewController presentLoginViewControllerInView:self success:nil];
}else{
BlackListViewController* blackListViewController = [[BlackListViewController alloc] init];
blackListViewController.hidesBottomBarWhenPushed = YES;
[self.navigationController pushViewController:blackListViewController animated:YES];
}
} }
-(void)goMessageSet -(void)goMessageSet
{ {