react-native-gizwits-scroll-ruler 2.0.0 → 2.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,13 +1,13 @@
1
1
  apply plugin: 'com.android.library'
2
2
 
3
3
  android {
4
- compileSdkVersion 23
5
- buildToolsVersion "23.0.1"
4
+ compileSdkVersion 34
5
+ buildToolsVersion "30.0.0"
6
6
 
7
7
 
8
8
  defaultConfig {
9
- minSdkVersion 16
10
- targetSdkVersion 23
9
+ minSdkVersion 24
10
+ targetSdkVersion 34
11
11
  versionCode 1
12
12
  versionName "1.0"
13
13
 
@@ -18,6 +18,7 @@
18
18
  * 当前滑动的值
19
19
  */
20
20
  -(void)dyScrollRulerView:(RCTScrollRuler *)rulerView valueChange:(float)value;
21
+ -(void)dyScrollEndRulerView:(RCTScrollRuler *)rulerView valueChange:(float)value;
21
22
 
22
23
  @end
23
24
  @interface RCTScrollRuler : UIView
@@ -661,6 +661,17 @@
661
661
  }
662
662
 
663
663
  -(void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate{//拖拽时没有滑动动画
664
+
665
+
666
+ if (scrollView.decelerating == NO) {
667
+ int value = scrollView.contentOffset.x/RulerGap;
668
+ float totalValue = value*_step +_minValue;
669
+
670
+ if (self.delegate && [self.delegate respondsToSelector:@selector(dyScrollEndRulerView:valueChange:)]) {
671
+ [self.delegate dyScrollEndRulerView:self valueChange:totalValue];
672
+ }
673
+ }
674
+
664
675
  if (!decelerate){
665
676
  [self setRealValue:round(scrollView.contentOffset.x/(RulerGap)) animated:YES];
666
677
  }
@@ -669,6 +680,14 @@
669
680
 
670
681
  -(void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView{
671
682
  int value = scrollView.contentOffset.x/RulerGap;
683
+
684
+ float totalValue = value*_step +_minValue;
685
+
686
+ if (self.delegate && [self.delegate respondsToSelector:@selector(dyScrollEndRulerView:valueChange:)]) {
687
+ [self.delegate dyScrollEndRulerView:self valueChange:totalValue];
688
+ }
689
+ // [self.delegate dyScrollEndRulerView:self valueChange:totalValue];
690
+
672
691
  [self setRealValue:round(value) animated:YES];
673
692
  _scrollByHand = NO;
674
693
  }
@@ -6,7 +6,7 @@
6
6
  // Copyright © 2018年 Daniel. All rights reserved.
7
7
  //
8
8
 
9
- #import "React/RCTViewManager.h"
9
+ #import <React/RCTViewManager.h>
10
10
 
11
11
  @interface RCTScrollRulerManager : RCTViewManager
12
12
 
@@ -55,8 +55,11 @@ RCT_EXPORT_VIEW_PROPERTY(disabled, BOOL);
55
55
  }
56
56
 
57
57
  #pragma RCTScrollRulerDelegate
58
- -(void)dyScrollRulerView:(RCTScrollRuler *)rulerView valueChange:(float)value{
58
+ -(void)dyScrollEndRulerView:(RCTScrollRuler *)rulerView valueChange:(float)value{
59
59
  rulerView.onSelect(@{@"value": @((int)value)});
60
60
  }
61
+ -(void)dyScrollRulerView:(RCTScrollRuler *)rulerView valueChange:(float)value{
62
+ // rulerView.onSelect(@{@"value": @((int)value)});
63
+ }
61
64
 
62
65
  @end
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-gizwits-scroll-ruler",
3
- "version": "2.0.0",
3
+ "version": "2.0.2",
4
4
  "description": "修正安卓滚动条影响",
5
5
  "main": "index.js",
6
6
  "scripts": {