react-native-gizwits-scroll-ruler 1.0.12 → 1.0.15

package/android/src/main/java/com/shenhuniurou/scrollruler/RNScrollRuler.java

@@ -55,6 +55,7 @@ public class RNScrollRuler extends View {
    * 刻度最小值
    */
   private int minScale = 0;
+  private int rawMinScale = 0;
   /**
    * 第一次显示的刻度
    */
@@ -63,8 +64,9 @@ public class RNScrollRuler extends View {
    * 刻度最大值
    */
   private int maxScale = 100;
+  private int rawMaxScale = 100;
 
-  private float step = (float) 1.0;
+  private float step = (float) 0.1;
   /**
    * kg颜色
    */
@@ -658,6 +660,7 @@ public class RNScrollRuler extends View {
 
   public void setMinScale(int minScale) {
     this.minScale = (int)(minScale / step);
+    this.rawMinScale = minScale;
     invalidate();
   }
 
@@ -667,6 +670,7 @@ public class RNScrollRuler extends View {
   }
   public void setMaxScale(int maxScale) {
     this.maxScale = (int)(maxScale / step);
+    this.rawMaxScale = maxScale;
     invalidate();
   }
 
@@ -737,6 +741,9 @@ public class RNScrollRuler extends View {
   public void setScaleLimit(float step) {
     this.scaleLimit = (int)(step * 10);
     this.step = step;
+
+    this.setMinScale(this.rawMinScale);
+    this.setMaxScale(this.rawMaxScale);
     invalidate();
   }
 

package/ios/RCTScrollRuler/RCTScrollRuler.m

@@ -82,7 +82,29 @@
 @end
 @implementation DYRulerView
 
+-(void)setMaxValue:(int)maxValue{
+    if(_maxValue != maxValue){
+        _maxValue = maxValue;
+        [self setNeedsDisplay];
+    }
+}
+
+-(void)setMinValue:(int)minValue{
+    if(_minValue != minValue){
+        _minValue = minValue;
+        [self setNeedsDisplay];
+    }
+}
+
+-(void)setStep:(float)step{
+    if(_step != step){
+        _step = step;
+        [self setNeedsDisplay];
+    }
+}
+
 -(void)drawRect:(CGRect)rect{
+    [super drawRect:rect];
     CGFloat startX = 0;
     CGFloat lineCenterX = RulerGap;
     CGFloat shortLineY  = rect.size.height - RulerLong;
@@ -210,6 +232,7 @@
 - (void)setMinValue:(int)minValue {
     NSLog(@"设置最小值");
     [[self subviews]makeObjectsPerformSelector:@selector(removeFromSuperview)];
+    BOOL diff = _minValue != minValue;
     _minValue = minValue;
     _stepNum    = (_maxValue-_minValue)/_step/_betweenNum;
 //    _bgColor    = [UIColor clearColor];
@@ -223,11 +246,15 @@
 //    [self addSubview:self.grayLine];
     [self setDefaultValue:_defaultValue];
     self.unitLab.text = _unit;
+    if(diff){
+        [self.collectionView reloadData];
+    }
 }
 
 - (void)setMaxValue:(int)maxValue {
     NSLog(@"设置最大值");
     [[self subviews]makeObjectsPerformSelector:@selector(removeFromSuperview)];
+    BOOL diff = _maxValue != maxValue;
     _maxValue = maxValue;
     _stepNum    = (_maxValue-_minValue)/_step/_betweenNum;
 //    _bgColor    = [UIColor clearColor];
@@ -241,11 +268,15 @@
 //    [self addSubview:self.grayLine];
     [self setDefaultValue:_defaultValue];
     self.unitLab.text = _unit;
+    if(diff){
+        [self.collectionView reloadData];
+    }
 }
 
 - (void)setStep:(float)step {
     NSLog(@"设置步长");
     [[self subviews]makeObjectsPerformSelector:@selector(removeFromSuperview)];
+    BOOL diff = _step != step;
     _step = step;
     _stepNum    = (_maxValue-_minValue)/_step/_betweenNum;
 //    _bgColor    = [UIColor clearColor];
@@ -259,6 +290,9 @@
 //    [self addSubview:self.grayLine];
     [self setDefaultValue:_defaultValue];
     self.unitLab.text = _unit;
+    if(diff){
+        [self.collectionView reloadData];
+    }
 }
 
 - (void)setDefaultValue:(double)defaultValue {
@@ -276,8 +310,10 @@
 - (void)setNum:(int)num {
     NSLog(@"设置间隔");
     [[self subviews]makeObjectsPerformSelector:@selector(removeFromSuperview)];
+    BOOL diff = _num != num;
     _num = num;
-    _stepNum    = (_maxValue-_minValue)/_step/_betweenNum;
+    _betweenNum = _num;
+    _stepNum  = (_maxValue-_minValue)/_step/_betweenNum;
 
     [self addSubview:self.valueLab];
     [self addSubview:self.unitLab];
@@ -286,6 +322,9 @@
 //    [self addSubview:self.grayLine];
     [self setDefaultValue:_defaultValue];
     self.unitLab.text = _unit;
+    if(diff){
+        [self.collectionView reloadData];
+    }
 }
 
 - (void)setUnit:(NSString *)unit {
@@ -460,21 +499,14 @@
         if (!rulerView){
             rulerView  = [[DYRulerView alloc]initWithFrame:CGRectMake(0, 0, RulerGap*_betweenNum, CollectionHeight)];
             rulerView.tag               = 1002;
-            rulerView.step              = _step;
             rulerView.betweenNumber     = _betweenNum;
             [cell.contentView addSubview:rulerView];
         }
-        //        if(indexPath.item>=8 && indexPath.item<=12){
-        //            rulerView.backgroundColor   =  [UIColor greenColor];
-        //        }else if(indexPath.item>=13 && indexPath.item<=18){
-        //            rulerView.backgroundColor   =  [UIColor redColor];
-        //        }else{
-        //            rulerView.backgroundColor   =  [UIColor grayColor];
-        //        }
         rulerView.backgroundColor   =  _bgColor;
+        rulerView.step              = _step;
         rulerView.minValue = (int)(_step*(indexPath.item-1)*_betweenNum+_minValue);
         rulerView.maxValue = (int)(_step*indexPath.item*_betweenNum);
-        [rulerView setNeedsDisplay];
+//        [rulerView setNeedsDisplay];
         
         return cell;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-gizwits-scroll-ruler",
-  "version": "1.0.12",
-  "description": "ReactNative版选择身高体重的横向刻度尺组件，兼容Android和iOS",
+  "version": "1.0.15",
+  "description": "iOS更新bug修复",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"