ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 14:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add asyncDataFetchingEnabled as parameter of initializer of ASTableView & ASCollectionView

Browse Source 
Conflicts:
	AsyncDisplayKit/ASCollectionView.mm
	AsyncDisplayKit/Details/ASDataController.mm
This commit is contained in:
Li Tan
2015-02-09 17:32:25 -08:00
parent 2f88ce56a2
commit 6a2c472910
6 changed files with 52 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AsyncDisplayKit/ASCollectionView.h
View File

@@ -34,6 +34,11 @@
*/
@property (nonatomic, assign) ASRangeTuningParameters rangeTuningParameters;
/**
* Initializer.
*/
- (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout asyncDataFetching:(BOOL)asyncDataFetchingEnabled;
/**
* Reload everything from scratch, destroying the working range and all cached nodes.
*

10
AsyncDisplayKit/ASCollectionView.mm
View File

@@ -101,6 +101,8 @@ static BOOL _isInterceptedSelector(SEL sel)
BOOL _performingBatchUpdates;
NSMutableArray *_batchUpdateBlocks;
BOOL _asyncDataFetchingEnabled;
}
@property (atomic, assign) BOOL asyncDataSourceLocked;
@@ -113,6 +115,11 @@ static BOOL _isInterceptedSelector(SEL sel)
#pragma mark Lifecycle.
- (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout
{
return [self initWithFrame:frame collectionViewLayout:layout asyncDataFetching:NO];
}
- (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout asyncDataFetching:(BOOL)asyncDataFetchingEnabled
{
if (!(self = [super initWithFrame:frame collectionViewLayout:layout]))
return nil;
@@ -126,13 +133,14 @@ static BOOL _isInterceptedSelector(SEL sel)
_rangeController.delegate = self;
_rangeController.layoutController = _layoutController;
_dataController = [[ASDataController alloc] init];
_dataController = [[ASDataController alloc] initWithAsyncDataFetching:asyncDataFetchingEnabled];
_dataController.delegate = _rangeController;
_dataController.dataSource = self;
_proxyDelegate = [[_ASCollectionViewProxy alloc] initWithTarget:nil interceptor:self];
super.delegate = (id<UICollectionViewDelegate>)_proxyDelegate;
_asyncDataFetchingEnabled = asyncDataFetchingEnabled;
_asyncDataSourceLocked = NO;
_performingBatchUpdates = NO;

5
AsyncDisplayKit/ASTableView.h
View File

@@ -34,6 +34,11 @@
*/
@property (nonatomic, assign) ASRangeTuningParameters rangeTuningParameters;
/**
* initializer.
*/
- (instancetype)initWithFrame:(CGRect)frame style:(UITableViewStyle)style asyncDataFetching:(BOOL)asyncDataFetchingEnabled;
/**
* Reload everything from scratch, destroying the working range and all cached nodes.
*

14
AsyncDisplayKit/ASTableView.mm
View File

@@ -110,6 +110,8 @@ static BOOL _isInterceptedSelector(SEL sel)
ASFlowLayoutController *_layoutController;
ASRangeController *_rangeController;
BOOL _asyncDataFetchingEnabled;
}
@property (atomic, assign) BOOL asyncDataSouceLocked;
@@ -123,6 +125,12 @@ static BOOL _isInterceptedSelector(SEL sel)
- (instancetype)initWithFrame:(CGRect)frame style:(UITableViewStyle)style
{
return [self initWithFrame:frame style:style asyncDataFetching:NO];
}
- (instancetype)initWithFrame:(CGRect)frame style:(UITableViewStyle)style asyncDataFetching:(BOOL)asyncDataFetchingEnabled
{
if (!(self = [super initWithFrame:frame style:style]))
return nil;
@@ -132,13 +140,14 @@ static BOOL _isInterceptedSelector(SEL sel)
_rangeController.layoutController = _layoutController;
_rangeController.delegate = self;
_dataController = [[ASDataController alloc] init];
_dataController = [[ASDataController alloc] initWithAsyncDataFetching:asyncDataFetchingEnabled];
_dataController.dataSource = self;
_dataController.delegate = _rangeController;
_proxyDelegate = [[_ASTableViewProxy alloc] initWithTarget:nil interceptor:self];
super.delegate = (id<UITableViewDelegate>)_proxyDelegate;
_asyncDataFetchingEnabled = asyncDataFetchingEnabled;
_asyncDataSouceLocked = NO;
return self;
@@ -168,6 +177,9 @@ static BOOL _isInterceptedSelector(SEL sel)
_proxyDataSource = nil;
super.dataSource = nil;
} else {
ASDisplayNodeAssert(!_asyncDataFetchingEnabled || ([asyncDataSource respondsToSelector:@selector(tableViewLockDataSourceForDataUpdating:)] &&
[asyncDataSource respondsToSelector:@selector(tableViewUnlockDataSourceForDataUpdating:)]),
@"The asyncDataSource need to implements \"tableViewLockDataSourceForDataUpdating\" and \"tableViewUnlockDataSourceForDataUpdating\" to handle data fetching in async mode.");
_asyncDataSource = asyncDataSource;
_proxyDataSource = [[_ASTableViewProxy alloc] initWithTarget:_asyncDataSource interceptor:self];
super.dataSource = (id<UITableViewDataSource>)_proxyDataSource;

5
AsyncDisplayKit/Details/ASDataController.h
View File

@@ -119,6 +119,11 @@ typedef NSUInteger ASDataControllerAnimationOptions;
*/
@property (nonatomic, weak) id<ASDataControllerDelegate> delegate;
/**
Designated iniailizer.
*/
- (instancetype)initWithAsyncDataFetching:(BOOL)asyncDataFetchingEnabled;
/** @name Initial loading */
- (void)initialDataLoadingWithAnimationOption:(ASDataControllerAnimationOptions)animationOption;

20
AsyncDisplayKit/Details/ASDataController.mm
View File

@@ -12,11 +12,18 @@
#ifdef ENABLE_ASYNC_DATA_FETCHING
#define BEGIN_DATA_FETCHING \
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ \
[_dataSource dataControllerLockDataSourceForDataUpdating];
dispatch_block_t block = ^{
#define END_DATA_FETCHING \
}; \
if (_asyncDataFetchingEnabled) { \
[_dataSource dataControllerLockDataSourceForDataUpdating]; \
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ \
block(); \
[_dataSource dataControllerUnlockDataSourceForDataUpdating]; \
});
}); \
} else { \
block(); \
}
#else
#define BEGIN_DATA_FETCHING
#define END_DATA_FETCHING
@@ -73,6 +80,7 @@ static void *kASSizingQueueContext = &kASSizingQueueContext;
@interface ASDataController () {
NSMutableArray *_nodes;
NSMutableArray *_pendingBlocks;
BOOL _asyncDataFetchingEnabled;
}
@property (atomic, assign) NSUInteger batchUpdateCounter;
@@ -81,11 +89,12 @@ static void *kASSizingQueueContext = &kASSizingQueueContext;
@implementation ASDataController
- (instancetype)init {
- (instancetype)initWithAsyncDataFetching:(BOOL)asyncDataFetchingEnabled {
if (self = [super init]) {
_nodes = [NSMutableArray array];
_pendingBlocks = [NSMutableArray array];
_batchUpdateCounter = 0;
_asyncDataFetchingEnabled = asyncDataFetchingEnabled;
}
return self;
@@ -143,8 +152,7 @@ static void *kASSizingQueueContext = &kASSizingQueueContext;
#pragma mark - Initial Data Loading
- (void)initialDataLoadingWithAnimationOption:(ASDataControllerAnimationOptions)animationOption
{
- (void)initialDataLoadingWithAnimationOption:(ASDataControllerAnimationOptions)animationOption {
BEGIN_DATA_FETCHING
NSMutableArray *indexPaths = [NSMutableArray array];