react-native-gizwits-scroll-ruler 1.0.10 → 1.0.13

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,6 +64,7 @@ public class RNScrollRuler extends View {
    * 刻度最大值
    */
   private int maxScale = 100;
+  private int rawMaxScale = 100;
 
   private float step = (float) 0.1;
   /**
@@ -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

@@ -550,10 +550,12 @@
     [self.unitLab setFrame:CGRectMake(halfWidth+15, 18, 40, 30)];
     
      if(self.headerView){
-         [self.footerView setFrame:CGRectMake(0, 0, halfWidth, CollectionHeight)];
+         [self.headerView setFrame:CGRectMake(0, 0, halfWidth, CollectionHeight)];
+         [self.headerView setNeedsDisplay];
      }
      if(self.footerView){
          [self.footerView setFrame:CGRectMake(0, 0, halfWidth, CollectionHeight)];
+         [self.footerView setNeedsDisplay];
      }
      
     CGFloat x = halfWidth-self.triangle.frame.size.width/2;

package/package.json

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