leanote/leanote-ios
1
0
Fork 0
mirror of https://github.com/leanote/leanote-ios.git synced 2025-10-14 15:11:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

添加用户后同步数据crash

Browse Source
This commit is contained in:
life
2015-11-08 22:46:33 +08:00
parent 8dbfdf9eb3
commit 2f476cefcb
6 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Leanote/Settings.bundle/Root.plist
View File

@@ -18,7 +18,7 @@
<key>AutocorrectionType</key>
<string>No</string>
<key>DefaultValue</key>
<string>1.0 (961)</string>
<string>1.3 (1090)</string>
<key>IsSecure</key>
<false/>
<key>Key</key>

1
Leanote/controller/BaseViewController.m
View File

@@ -191,6 +191,7 @@ NSString const *key = @"isSelectOnSearchKey";
}
// 为了解决分隔线左侧少15px的情况, iphone, ipad都会存在
-(void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
{
if ([cell respondsToSelector:@selector(setSeparatorInset:)]) {

17
Leanote/controller/me/MeController.m
View File

@@ -69,6 +69,15 @@ NSArray *users;
[super didReceiveMemoryWarning];
}
- (void) addUserSync
{
[Common showProgressWithStatus:NSLocalizedString(@"Add account successful and Synchronizing...", nil)];
// 同步
[SyncService incrSync:^(BOOL ok) {
[Common hideProgress];
} progress:nil];
}
- (void) notifyChangeUser:(BOOL) isAdd
{
// 取得ios系统唯一的全局的广播站 通知中心
@@ -97,11 +106,9 @@ NSArray *users;
// UITableViewRowAnimationBottom
if(isAdd) {
[Common showProgressWithStatus:NSLocalizedString(@"Add account successful and Synchronizing...", nil)];
// 同步
[SyncService incrSync:^(BOOL ok) {
[Common hideProgress];
} progress:nil];
[self addUserSync];
// 1s后同步
// [self performSelector:@selector(addUserSync) withObject:nil afterDelay:1.0f];
}
else {
[self showSuccessMsg:NSLocalizedString(@"Toggle account successful", nil)];

10
Leanote/controller/note/NoteController.m
View File

@@ -23,7 +23,7 @@
#import <SGNavigationProgress/UINavigationController+SGProgress.h>
@interface NoteController ()<SWTableViewCellDelegate>
@interface NoteController()
@property (strong, nonatomic) NSIndexPath *indexPathToBeDeleted;
@property (strong, nonatomic) NSFetchedResultsController *searchedResultsController;
@@ -157,7 +157,7 @@
// table的样式, 包括search table view
[self setTableStyle:self.tableView];
[self setTableStyle:self.searchDisplayController.searchResultsTableView];
// [self setTableStyle:self.searchDisplayController.searchResultsTableView];
// isBlog ?
if(self.isBlog) {
@@ -420,9 +420,6 @@
// configure the cell
Note *note = [fetched objectAtIndexPath:indexPath];
[self.searchDisplayController.searchResultsTableView setSeparatorInset:UIEdgeInsetsZero];
[self.searchDisplayController.searchResultsTableView setLayoutMargins:UIEdgeInsetsZero];
static NSString *cellIdentifier2 = @"NoteCell2";
NoteCell *cell2 = [tableView dequeueReusableCellWithIdentifier:cellIdentifier2];
if (cell2 == nil) {
@@ -730,9 +727,6 @@
[tableView deleteSections:[NSIndexSet indexSetWithIndex:sectionIndex]
withRowAnimation:UITableViewRowAnimationFade];
break;
case NSFetchedResultsChangeUpdate:
case NSFetchedResultsChangeMove:
break;
}
}

5
Leanote/controller/notebook/NotebookController.m
View File

@@ -112,7 +112,7 @@
// table的样式
[self setTableStyle:self.tableView];
[self setTableStyle:self.searchDisplayController.searchResultsTableView];
// [self setTableStyle:self.searchDisplayController.searchResultsTableView];
// cate
if(self.delegate) {
@@ -695,9 +695,6 @@
[tableView deleteSections:[NSIndexSet indexSetWithIndex:sectionIndex]
withRowAnimation:UITableViewRowAnimationFade];
break;
case NSFetchedResultsChangeMove:
case NSFetchedResultsChangeUpdate:
break;
}
}

7
Leanote/controller/tag/TagController.m
View File

@@ -17,7 +17,7 @@
#import "Leas.h"
#import "NoteController.h"
@interface TagController ()<SWTableViewCellDelegate>
@interface TagController ()
// 从setting过来要用
@property (nonatomic, strong) Note *note;
@@ -108,7 +108,7 @@
// table的样式
[self setTableStyle:self.tableView];
[self setTableStyle:self.searchDisplayController.searchResultsTableView];
// [self setTableStyle:self.searchDisplayController.searchResultsTableView];
// cate
if(self.delegate) {
@@ -575,9 +575,6 @@
[tableView deleteSections:[NSIndexSet indexSetWithIndex:sectionIndex]
withRowAnimation:UITableViewRowAnimationFade];
break;
case NSFetchedResultsChangeMove:
case NSFetchedResultsChangeUpdate:
break;
}
}