iOS:use JSDispatcher to avoid overstock too many js tasks
This commit is contained in:
parent
66afc4c4bb
commit
2b7ff95de6
@ -21,6 +21,7 @@
|
|||||||
#import "DoricFlowLayoutItemNode.h"
|
#import "DoricFlowLayoutItemNode.h"
|
||||||
#import "DoricExtensions.h"
|
#import "DoricExtensions.h"
|
||||||
#import <JavaScriptCore/JavaScriptCore.h>
|
#import <JavaScriptCore/JavaScriptCore.h>
|
||||||
|
#import "DoricJSDispatcher.h"
|
||||||
|
|
||||||
@protocol DoricFlowLayoutDelegate
|
@protocol DoricFlowLayoutDelegate
|
||||||
- (CGFloat)doricFlowLayoutItemHeightAtIndexPath:(NSIndexPath *)indexPath;
|
- (CGFloat)doricFlowLayoutItemHeightAtIndexPath:(NSIndexPath *)indexPath;
|
||||||
@ -174,6 +175,7 @@ @interface DoricFlowLayoutNode () <UICollectionViewDataSource, UICollectionViewD
|
|||||||
@property(nonatomic, strong) NSMutableSet <DoricDidScrollBlock> *didScrollBlocks;
|
@property(nonatomic, strong) NSMutableSet <DoricDidScrollBlock> *didScrollBlocks;
|
||||||
@property(nonatomic, copy) NSString *onScrollFuncId;
|
@property(nonatomic, copy) NSString *onScrollFuncId;
|
||||||
@property(nonatomic, copy) NSString *onScrollEndFuncId;
|
@property(nonatomic, copy) NSString *onScrollEndFuncId;
|
||||||
|
@property(nonatomic, strong) DoricJSDispatcher *jsDispatcher;
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@implementation DoricFlowLayoutNode
|
@implementation DoricFlowLayoutNode
|
||||||
@ -384,12 +386,19 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
|
|||||||
block(scrollView);
|
block(scrollView);
|
||||||
}
|
}
|
||||||
if (self.onScrollFuncId) {
|
if (self.onScrollFuncId) {
|
||||||
[self callJSResponse:self.onScrollFuncId,
|
if (!self.jsDispatcher) {
|
||||||
@{
|
self.jsDispatcher = [DoricJSDispatcher new];
|
||||||
@"x": @(self.view.contentOffset.x),
|
}
|
||||||
@"y": @(self.view.contentOffset.y),
|
__weak typeof(self) __self = self;
|
||||||
},
|
[self.jsDispatcher dispatch:^DoricAsyncResult * {
|
||||||
nil];
|
__strong typeof(__self) self = __self;
|
||||||
|
return [self callJSResponse:self.onScrollFuncId,
|
||||||
|
@{
|
||||||
|
@"x": @(self.view.contentOffset.x),
|
||||||
|
@"y": @(self.view.contentOffset.y),
|
||||||
|
},
|
||||||
|
nil];
|
||||||
|
}];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
#import "DoricListItemNode.h"
|
#import "DoricListItemNode.h"
|
||||||
#import "DoricLayouts.h"
|
#import "DoricLayouts.h"
|
||||||
#import "DoricRefreshableNode.h"
|
#import "DoricRefreshableNode.h"
|
||||||
|
#import "DoricJSDispatcher.h"
|
||||||
|
|
||||||
@interface DoricTableViewCell : UITableViewCell
|
@interface DoricTableViewCell : UITableViewCell
|
||||||
@property(nonatomic, strong) DoricListItemNode *doricListItemNode;
|
@property(nonatomic, strong) DoricListItemNode *doricListItemNode;
|
||||||
@ -69,6 +70,7 @@ @interface DoricListNode () <UITableViewDataSource, UITableViewDelegate>
|
|||||||
@property(nonatomic, strong) NSMutableSet <DoricDidScrollBlock> *didScrollBlocks;
|
@property(nonatomic, strong) NSMutableSet <DoricDidScrollBlock> *didScrollBlocks;
|
||||||
@property(nonatomic, copy) NSString *onScrollFuncId;
|
@property(nonatomic, copy) NSString *onScrollFuncId;
|
||||||
@property(nonatomic, copy) NSString *onScrollEndFuncId;
|
@property(nonatomic, copy) NSString *onScrollEndFuncId;
|
||||||
|
@property(nonatomic, strong) DoricJSDispatcher *jsDispatcher;
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@implementation DoricListNode
|
@implementation DoricListNode
|
||||||
@ -264,12 +266,19 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
|
|||||||
block(scrollView);
|
block(scrollView);
|
||||||
}
|
}
|
||||||
if (self.onScrollFuncId) {
|
if (self.onScrollFuncId) {
|
||||||
[self callJSResponse:self.onScrollFuncId,
|
if (!self.jsDispatcher) {
|
||||||
@{
|
self.jsDispatcher = [DoricJSDispatcher new];
|
||||||
@"x": @(self.view.contentOffset.x),
|
}
|
||||||
@"y": @(self.view.contentOffset.y),
|
__weak typeof(self) __self = self;
|
||||||
},
|
[self.jsDispatcher dispatch:^DoricAsyncResult * {
|
||||||
nil];
|
__strong typeof(__self) self = __self;
|
||||||
|
return [self callJSResponse:self.onScrollFuncId,
|
||||||
|
@{
|
||||||
|
@"x": @(self.view.contentOffset.x),
|
||||||
|
@"y": @(self.view.contentOffset.y),
|
||||||
|
},
|
||||||
|
nil];
|
||||||
|
}];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
#import "DoricExtensions.h"
|
#import "DoricExtensions.h"
|
||||||
#import "DoricRefreshableNode.h"
|
#import "DoricRefreshableNode.h"
|
||||||
#import "DoricPromise.h"
|
#import "DoricPromise.h"
|
||||||
|
#import "DoricJSDispatcher.h"
|
||||||
|
|
||||||
@implementation DoricScrollView
|
@implementation DoricScrollView
|
||||||
|
|
||||||
@ -54,6 +55,7 @@ @interface DoricScrollerNode () <UIScrollViewDelegate>
|
|||||||
@property(nonatomic, copy) NSString *onScrollFuncId;
|
@property(nonatomic, copy) NSString *onScrollFuncId;
|
||||||
@property(nonatomic, copy) NSString *onScrollEndFuncId;
|
@property(nonatomic, copy) NSString *onScrollEndFuncId;
|
||||||
@property(nonatomic, strong) NSMutableSet <DoricDidScrollBlock> *didScrollBlocks;
|
@property(nonatomic, strong) NSMutableSet <DoricDidScrollBlock> *didScrollBlocks;
|
||||||
|
@property(nonatomic, strong) DoricJSDispatcher *jsDispatcher;
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@implementation DoricScrollerNode
|
@implementation DoricScrollerNode
|
||||||
@ -144,12 +146,19 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
|
|||||||
block(scrollView);
|
block(scrollView);
|
||||||
}
|
}
|
||||||
if (self.onScrollFuncId) {
|
if (self.onScrollFuncId) {
|
||||||
[self callJSResponse:self.onScrollFuncId,
|
if (!self.jsDispatcher) {
|
||||||
@{
|
self.jsDispatcher = [DoricJSDispatcher new];
|
||||||
@"x": @(self.view.contentOffset.x),
|
}
|
||||||
@"y": @(self.view.contentOffset.y),
|
__weak typeof(self) __self = self;
|
||||||
},
|
[self.jsDispatcher dispatch:^DoricAsyncResult * {
|
||||||
nil];
|
__strong typeof(__self) self = __self;
|
||||||
|
return [self callJSResponse:self.onScrollFuncId,
|
||||||
|
@{
|
||||||
|
@"x": @(self.view.contentOffset.x),
|
||||||
|
@"y": @(self.view.contentOffset.y),
|
||||||
|
},
|
||||||
|
nil];
|
||||||
|
}];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
25
doric-iOS/Pod/Classes/Util/DoricJSDispatcher.h
Normal file
25
doric-iOS/Pod/Classes/Util/DoricJSDispatcher.h
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
/*
|
||||||
|
* Copyright [2019] [Doric.Pub]
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
//
|
||||||
|
// Created by pengfei.zhou on 2020/3/25.
|
||||||
|
//
|
||||||
|
|
||||||
|
#import <Foundation/Foundation.h>
|
||||||
|
#import "DoricViewNode.h"
|
||||||
|
|
||||||
|
@interface DoricJSDispatcher : NSObject
|
||||||
|
- (void)dispatch:(DoricAsyncResult *(^)(void))block;
|
||||||
|
@end
|
59
doric-iOS/Pod/Classes/Util/DoricJSDispatcher.m
Normal file
59
doric-iOS/Pod/Classes/Util/DoricJSDispatcher.m
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
/*
|
||||||
|
* Copyright [2019] [Doric.Pub]
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
//
|
||||||
|
// Created by pengfei.zhou on 2020/3/25.
|
||||||
|
//
|
||||||
|
|
||||||
|
#import "DoricJSDispatcher.h"
|
||||||
|
|
||||||
|
@interface DoricJSDispatcher ()
|
||||||
|
@property(nonatomic, strong) NSMutableArray <DoricAsyncResult *(^)(void)> *blocks;
|
||||||
|
@property(nonatomic, assign) BOOL consuming;
|
||||||
|
@end
|
||||||
|
|
||||||
|
@implementation DoricJSDispatcher
|
||||||
|
- (void)dispatch:(DoricAsyncResult *(^)(void))block {
|
||||||
|
if (!self.blocks) {
|
||||||
|
self.blocks = [@[block] mutableCopy];
|
||||||
|
} else {
|
||||||
|
while (self.blocks.count > 0) {
|
||||||
|
[self.blocks removeLastObject];
|
||||||
|
}
|
||||||
|
[self.blocks insertObject:block atIndex:0];
|
||||||
|
}
|
||||||
|
if (!self.consuming) {
|
||||||
|
[self consume];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)consume {
|
||||||
|
DoricAsyncResult *(^block )(void) = self.blocks.lastObject;
|
||||||
|
if (block) {
|
||||||
|
self.consuming = YES;
|
||||||
|
[self.blocks removeLastObject];
|
||||||
|
DoricAsyncResult *result = block();
|
||||||
|
__weak typeof(self) __self = self;
|
||||||
|
result.finishCallback = ^{
|
||||||
|
dispatch_async(dispatch_get_main_queue(), ^{
|
||||||
|
__strong typeof(__self) self = __self;
|
||||||
|
[self consume];
|
||||||
|
});
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
self.consuming = NO;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@end
|
Reference in New Issue
Block a user