diff --git a/iOS/DoraemonKit/Src/Core/CommonUI/Oscillogram/DoraemonOscillogramView.m b/iOS/DoraemonKit/Src/Core/CommonUI/Oscillogram/DoraemonOscillogramView.m index 6367c5ee0..a45c17b59 100644 --- a/iOS/DoraemonKit/Src/Core/CommonUI/Oscillogram/DoraemonOscillogramView.m +++ b/iOS/DoraemonKit/Src/Core/CommonUI/Oscillogram/DoraemonOscillogramView.m @@ -192,7 +192,7 @@ - (void)drawTipViewWithValue:(NSString *)tip point:(DoraemonPoint *)point time:( //self.indicatorLayer.frame = CGRectMake(point.x, 0, 1, self.bottomLine.doraemon_bottom); } -- (void)clear{ +- (void)clear { if (_pointLayerList.count>0) { for (CALayer *layer in _pointLayerList) { [layer removeFromSuperlayer]; @@ -206,4 +206,7 @@ - (void)clear{ _tipLabel.hidden = YES; } + + + @end diff --git a/iOS/DoraemonKit/Src/Core/CommonUI/Oscillogram/DoraemonOscillogramWindow.m b/iOS/DoraemonKit/Src/Core/CommonUI/Oscillogram/DoraemonOscillogramWindow.m index 73c986e5f..5a5d9e183 100644 --- a/iOS/DoraemonKit/Src/Core/CommonUI/Oscillogram/DoraemonOscillogramWindow.m +++ b/iOS/DoraemonKit/Src/Core/CommonUI/Oscillogram/DoraemonOscillogramWindow.m @@ -47,8 +47,15 @@ - (void)becomeKeyWindow{ } - (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event{ - if (point.x>DoraemonScreenWidth-kDoraemonSizeFrom750(60) && point.y DoraemonScreenWidth-kDoraemonSizeFrom750_Landscape(60) && point.y < kDoraemonSizeFrom750_Landscape(60)+IPHONE_TOPSENSOR_HEIGHT) { + return [super pointInside:point withEvent:event]; + } + } else { + if (point.x > DoraemonScreenHeight-kDoraemonSizeFrom750_Landscape(60) && point.y < kDoraemonSizeFrom750_Landscape(60)+IPHONE_TOPSENSOR_HEIGHT) { + return [super pointInside:point withEvent:event]; + } } return NO; }