tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

iOS: update with js dispatcher

Browse Source
This commit is contained in:
王劲鹏 2021-09-23 11:05:40 +08:00 committed by osborn
parent 73dd78ca05
commit 6e8c5cc8ea
2 changed files with 66 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doric-iOS/Pod/Classes/Shader/DoricGestureContainerNode.h
View File

@ -20,12 +20,15 @@
// Created by jingpeng.wang on 2021/09/17. // Created by jingpeng.wang on 2021/09/17.
// //
#import "DoricJSDispatcher.h"
#import "DoricStackNode.h" #import "DoricStackNode.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface DoricGestureContainerNode : DoricStackNode @interface DoricGestureContainerNode : DoricStackNode
@property(nonatomic, strong) DoricJSDispatcher *jsDispatcher;
@property(nonatomic, strong) NSString *onTouchDown; @property(nonatomic, strong) NSString *onTouchDown;
@property(nonatomic, strong) NSString *onTouchMove; @property(nonatomic, strong) NSString *onTouchMove;
@property(nonatomic, strong) NSString *onTouchUp; @property(nonatomic, strong) NSString *onTouchUp;

94
doric-iOS/Pod/Classes/Shader/DoricGestureContainerNode.m
View File

@ -49,7 +49,14 @@ - (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
[touches enumerateObjectsUsingBlock:^(UITouch * _Nonnull obj, BOOL * _Nonnull stop) { [touches enumerateObjectsUsingBlock:^(UITouch * _Nonnull obj, BOOL * _Nonnull stop) {
if (self.node.onTouchMove) { if (self.node.onTouchMove) {
CGPoint currentLocation = [obj locationInView:self]; CGPoint currentLocation = [obj locationInView:self];
[self.node callJSResponse: self.node.onTouchMove, @(currentLocation.x), @(currentLocation.y), nil]; if (!self.node.jsDispatcher) {
self.node.jsDispatcher = [DoricJSDispatcher new];
}
__weak typeof(self) __self = self;
[self.node.jsDispatcher dispatch:^DoricAsyncResult * {
__strong typeof(__self) self = __self;
return [self.node callJSResponse: self.node.onTouchMove, @(currentLocation.x), @(currentLocation.y), nil];
}];
*stop = YES; *stop = YES;
} }
}]; }];
@ -151,8 +158,16 @@ -(void)longPressAction:(UILongPressGestureRecognizer *)sender{
} }
-(void)pinchAction:(UIPinchGestureRecognizer *)sender{ -(void)pinchAction:(UIPinchGestureRecognizer *)sender{
if (self.onPinch) if (self.onPinch) {
[self callJSResponse:self.onPinch, @(sender.scale), nil]; if (!self.jsDispatcher) {
self.jsDispatcher = [DoricJSDispatcher new];
}
__weak typeof(self) __self = self;
[self.jsDispatcher dispatch:^DoricAsyncResult * {
__strong typeof(__self) self = __self;
return [self callJSResponse:self.onPinch, @(sender.scale), nil];
}];
}
} }
-(void)panAction:(UIPanGestureRecognizer *)sender{ -(void)panAction:(UIPanGestureRecognizer *)sender{
@ -166,33 +181,42 @@ -(void)panAction:(UIPanGestureRecognizer *)sender{
self.startPanLocation = currentLocation; self.startPanLocation = currentLocation;
if (self.onPan) if (self.onPan) {
[self callJSResponse:self.onPan, @(dx), @(dy), nil]; if (!self.jsDispatcher) {
self.jsDispatcher = [DoricJSDispatcher new];
// detect the swipe gesture
if (sender.state == UIGestureRecognizerStateEnded) {
CGPoint vel = [sender velocityInView:sender.view];
if (vel.x < SWIPE_LEFT_THRESHOLD) {
if (self.onSwipe)
[self callJSResponse:self.onSwipe, @(0), nil];
} else if (vel.x > SWIPE_RIGHT_THRESHOLD) {
if (self.onSwipe)
[self callJSResponse:self.onSwipe, @(1), nil];
} else if (vel.y < SWIPE_UP_THRESHOLD) {
if (self.onSwipe)
[self callJSResponse:self.onSwipe, @(2), nil];
} else if (vel.y > SWIPE_DOWN_THRESHOLD) {
if (self.onSwipe)
[self callJSResponse:self.onSwipe, @(3), nil];
} else {
// TODO:
// Here, the user lifted the finger/fingers but didn't swipe.
// If you need you can implement a snapping behaviour, where based on the location of your targetView,
// you focus back on the targetView or on some next view.
// It's your call
}
} }
__weak typeof(self) __self = self;
[self.jsDispatcher dispatch:^DoricAsyncResult * {
__strong typeof(__self) self = __self;
return [self callJSResponse:self.onPan, @(dx), @(dy), nil];
}];
}
// detect the swipe gesture
if (sender.state == UIGestureRecognizerStateEnded) {
CGPoint vel = [sender velocityInView:sender.view];
if (vel.x < SWIPE_LEFT_THRESHOLD) {
if (self.onSwipe)
[self callJSResponse:self.onSwipe, @(0), nil];
} else if (vel.x > SWIPE_RIGHT_THRESHOLD) {
if (self.onSwipe)
[self callJSResponse:self.onSwipe, @(1), nil];
} else if (vel.y < SWIPE_UP_THRESHOLD) {
if (self.onSwipe)
[self callJSResponse:self.onSwipe, @(2), nil];
} else if (vel.y > SWIPE_DOWN_THRESHOLD) {
if (self.onSwipe)
[self callJSResponse:self.onSwipe, @(3), nil];
} else {
// TODO:
// Here, the user lifted the finger/fingers but didn't swipe.
// If you need you can implement a snapping behaviour, where based on the location of your targetView,
// you focus back on the targetView or on some next view.
// It's your call
}
}
} }
-(void)rotationAction:(UIRotationGestureRecognizer *)sender{ -(void)rotationAction:(UIRotationGestureRecognizer *)sender{
@ -202,8 +226,16 @@ -(void)rotationAction:(UIRotationGestureRecognizer *)sender{
CGFloat diffRotation = sender.rotation - self.startRotationDegree; CGFloat diffRotation = sender.rotation - self.startRotationDegree;
self.startRotationDegree = sender.rotation; self.startRotationDegree = sender.rotation;
if (self.onRotate) if (self.onRotate) {
[self callJSResponse:self.onRotate, @(diffRotation), nil]; if (!self.jsDispatcher) {
self.jsDispatcher = [DoricJSDispatcher new];
}
__weak typeof(self) __self = self;
[self.jsDispatcher dispatch:^DoricAsyncResult * {
__strong typeof(__self) self = __self;
return [self callJSResponse:self.onRotate, @(diffRotation), nil];
}];
}
} }
- (void)blendView:(UIView *)view forPropName:(NSString *)name propValue:(id)prop { - (void)blendView:(UIView *)view forPropName:(NSString *)name propValue:(id)prop {