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

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

@@ -20,6 +20,7 @@ import android.view.animation.DecelerateInterpolator;
 
 import java.lang.ref.WeakReference;
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 
 /**
  * @author shenhuniurou
@@ -33,7 +34,7 @@ public class RNScrollRuler extends View {
   /**
    * 2个大刻度之间间距，默认为1
    */
-  private int scaleLimit = 10;
+  private float scaleLimit = 10;
   /**
    * 尺子高度
    */
@@ -202,7 +203,7 @@ public class RNScrollRuler extends View {
 
     TypedArray a = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.RulerView, defStyleAttr, 0);
 
-    scaleLimit = a.getInt(R.styleable.RulerView_scaleLimit, scaleLimit);
+    scaleLimit = a.getFloat(R.styleable.RulerView_scaleLimit, scaleLimit);
     step = a.getFloat(R.styleable.RulerView_step, step);
 
     rulerHeight = a.getDimensionPixelSize(R.styleable.RulerView_rulerHeight, (int) TypedValue.applyDimension(
@@ -529,13 +530,19 @@ public class RNScrollRuler extends View {
 
     //这里是滑动时候不断回调给使用者的结果值
     int numberLength = getNumLength(step);
-    BigDecimal bigDecimal = new WeakReference<>(new BigDecimal(((width / 2 - moveX) / (scaleGap * scaleCount) + minScale) * scaleLimit)).get().setScale(numberLength, BigDecimal.ROUND_HALF_UP);
+    String formatPattern = "0.";
+    for (int i =0; i<numberLength; i++) {
+      formatPattern += "0";
+    }
+    DecimalFormat fmt = new DecimalFormat(formatPattern);
+    float value = ((width / 2 - moveX) / (scaleGap * scaleCount) + minScale) * scaleLimit;
+
     if (numberLength > 0) {
-      currentScale = bigDecimal.floatValue();
-      resultText = String.valueOf(currentScale);
+      currentScale = Float.valueOf(resultText);
+      resultText = fmt.format(value);
     } else {
-      currentScale = bigDecimal.intValue();
-      resultText = String.valueOf((int) currentScale);
+      currentScale = (int) value;
+      resultText = (int) value + "";
     }
 
     if (onChooseResulterListener != null) {
@@ -550,7 +557,12 @@ public class RNScrollRuler extends View {
           //绘制刻度，绘制刻度数字
           canvas.drawLine(0, rulerHeight - midScaleHeight, 0, rulerHeight, midScalePaint);
           scaleNumPaint.getTextBounds(num1 / scaleGap + minScale + "", 0, (num1 / scaleGap + minScale + "").length(), scaleNumRect);
-          canvas.drawText((num1 / scaleCount + minScale) * scaleLimit + "", 0, rulerHeight - midScaleHeight - scaleNumRect.height(), scaleNumPaint);
+          float subValue = (num1 / scaleCount + minScale) * scaleLimit;
+          String valueText = (int) subValue + "";
+          if (numberLength > 0) {
+            valueText = fmt.format(subValue);
+          }
+          canvas.drawText(valueText, 0, rulerHeight - midScaleHeight - scaleNumRect.height(), scaleNumPaint);
         }
 
       } else {   //绘制小数刻度
@@ -739,7 +751,7 @@ public class RNScrollRuler extends View {
   }
 
   public void setScaleLimit(float step) {
-    this.scaleLimit = (int)(step * 10);
+    this.scaleLimit = step * 10;
     this.step = step;
 
     this.setMinScale(this.rawMinScale);

package/ios/RCTScrollRuler/RCTScrollRuler.m

@@ -298,7 +298,7 @@
 - (void)setDefaultValue:(double)defaultValue {
     NSLog(@"设置默认值");
     _defaultValue = defaultValue;
-    if (_maxValue != 0) {
+    if (_maxValue != 0 && !_scrollByHand) {
         double dv = ((defaultValue - _minValue)*10)/round(_step*10);
         int v = (int)dv;
         [self setRealValue:v animated:YES];
@@ -453,7 +453,7 @@
 -(void)setRealValue:(int)realValue animated:(BOOL)animated{
     _realValue = realValue;
     float totalValue = _realValue*_step +_minValue;
-    _valueLab.text = [NSString stringWithFormat:@"%.1f", totalValue];
+    [self setValueToValueLabel:totalValue];
     [_collectionView setContentOffset:CGPointMake(_realValue*RulerGap, 0) animated:animated];
 }
 
@@ -461,6 +461,15 @@
     return 30+20+CollectionHeight;
 }
 
+-(void)setValueToValueLabel:(float)value{
+    if(_step < 1.0){
+        _valueLab.text = [NSString stringWithFormat:@"%.1f",value];
+    } else{
+        _valueLab.text = [NSString stringWithFormat:@"%d",(int)roundf(value)];
+    }
+}
+
+
 #pragma mark UICollectionViewDataSource & Delegate
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {
@@ -532,24 +541,24 @@
 
 #pragma mark -UIScrollViewDelegate
 -(void)scrollViewDidScroll:(UIScrollView *)scrollView{
-    int value = scrollView.contentOffset.x/RulerGap;
-    float totalValue = value*_step +_minValue;
-    
-    if (self.delegate && [self.delegate respondsToSelector:@selector(dyScrollRulerView:valueChange:)]) {
-        [self.delegate dyScrollRulerView:self valueChange:totalValue];
-    }
     
     if (_scrollByHand) {
+        int value = scrollView.contentOffset.x/RulerGap;
+        float totalValue = value*_step +_minValue;
+        
+        if (self.delegate && [self.delegate respondsToSelector:@selector(dyScrollRulerView:valueChange:)]) {
+            [self.delegate dyScrollRulerView:self valueChange:totalValue];
+        }
         if (totalValue >= _maxValue) {
-            _valueLab.text = [NSString stringWithFormat:@"%.1f",(float)_maxValue];
+            [self setValueToValueLabel:(float)_maxValue];
         }else if(totalValue <= _minValue){
             if(_minValue == 0) {
-                _valueLab.text = @"0.0";
+                [self setValueToValueLabel:0.0];
             } else {
-                _valueLab.text = [NSString stringWithFormat:@"%.1f",(float)_minValue];
+                [self setValueToValueLabel:(float)_minValue];
             }
         }else{
-            _valueLab.text = [NSString stringWithFormat:@"%.1f",(value*_step) +_minValue];
+            [self setValueToValueLabel:(value*_step) +_minValue];
         }
     }
 }
@@ -597,8 +606,7 @@
         [self.collectionView reloadData];
         [self setDefaultValue:_defaultValue];
     }
-  
-    
+    [self.collectionView setContentOffset:CGPointMake(_realValue*RulerGap, 0) animated:NO];
     [super layoutSubviews];
 }
 @end

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-gizwits-scroll-ruler",
-  "version": "1.0.15",
-  "description": "iOS更新bug修复",
+  "version": "1.0.18",
+  "description": "安卓支持 0.01",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"