react-native-gizwits-scroll-ruler 1.0.16 → 1.0.19

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

@@ -29,6 +29,7 @@
 
 #import "RCTScrollRuler.h"
 
+
 /**
  *  绘制三角形标示
  */
@@ -40,6 +41,13 @@
 @end
 @implementation DYTriangleView
 
++(NSString*)valueString:(double)value ByStep:(float)step{
+    if(step < 0.1){
+        return [NSString stringWithFormat:@"%.1f",value];
+    }
+    return [NSString stringWithFormat:@"%d", (int)value];
+}
+
 -(void)drawRect:(CGRect)rect{
     //设置背景颜色
     [_bgColor set];
@@ -75,21 +83,21 @@
 @interface DYRulerView : UIView
 
 @property (nonatomic,assign)NSInteger betweenNumber;
-@property (nonatomic,assign)int minValue;
-@property (nonatomic,assign)int maxValue;
+@property (nonatomic,assign)double minValue;
+@property (nonatomic,assign)double maxValue;
 @property (nonatomic,assign)float step;
 
 @end
 @implementation DYRulerView
 
--(void)setMaxValue:(int)maxValue{
+-(void)setMaxValue:(double)maxValue{
     if(_maxValue != maxValue){
         _maxValue = maxValue;
         [self setNeedsDisplay];
     }
 }
 
--(void)setMinValue:(int)minValue{
+-(void)setMinValue:(double)minValue{
     if(_minValue != minValue){
         _minValue = minValue;
         [self setNeedsDisplay];
@@ -107,9 +115,9 @@
     [super drawRect:rect];
     CGFloat startX = 0;
     CGFloat lineCenterX = RulerGap;
-    CGFloat shortLineY  = rect.size.height - RulerLong;
-    CGFloat longLineY = rect.size.height - RulerShort;
-    CGFloat topY = 0;
+//    CGFloat shortLineY  = rect.size.height - RulerLong;
+//    CGFloat longLineY = rect.size.height - RulerShort;
+//    CGFloat topY = 0;
     
     CGContextRef context = UIGraphicsGetCurrentContext();
     CGContextSetRGBStrokeColor(context, (float)0/255.0, (float)0/255.0, (float)0/255.0, 1.0);//设置线的颜色，默认是黑色
@@ -120,10 +128,7 @@
         
         if (i%_betweenNumber == 0){
             CGContextMoveToPoint(context, startX+lineCenterX*i, RulerShort);
-            NSString *num = [NSString stringWithFormat:@"%d", (int)(i * _step) + _minValue];
-            if ([num isEqualToString:@"0"]) {
-                num = @"0";
-            }
+            NSString *num = [DYTriangleView valueString:(i * _step) + _minValue ByStep:_step];
             NSDictionary *attribute = @{NSFontAttributeName:TextRulerFont, NSForegroundColorAttributeName:TextRulerFontColor};
             CGFloat width = [num boundingRectWithSize:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX) options:0 attributes:attribute context:nil].size.width;
             [num drawInRect:CGRectMake(startX+lineCenterX*i-width/2, 0, width, 16) withAttributes:attribute];
@@ -143,7 +148,9 @@
 
 @interface DYHeaderRulerView : UIView
 
-@property(nonatomic,assign)int minValue;
+@property(nonatomic,assign)double minValue;
+
+@property(nonatomic,assign)float step;
 
 @end
 
@@ -151,7 +158,7 @@
 
 -(void)drawRect:(CGRect)rect{
     
-    CGFloat longLineY = rect.size.height - RulerShort;
+//    CGFloat longLineY = rect.size.height - RulerShort;
     CGContextRef context = UIGraphicsGetCurrentContext();
     CGContextSetRGBStrokeColor(context, (float)0/255.0, (float)0/255.0,(float)0/255.0, 1.0);
     CGContextSetLineWidth(context, LineWidth);
@@ -160,13 +167,7 @@
     CGContextMoveToPoint(context, rect.size.width, RulerShort);
     CGContextAddLineToPoint(context, rect.size.width, rect.size.height-LineWidth/2);
     
-    NSString *num;
-    if (_minValue == 0) {
-        num = @"0";
-    } else {
-        num = [NSString stringWithFormat:@"%d", _minValue];
-    }
-
+    NSString *num = [DYTriangleView valueString:_minValue ByStep:_step];
     NSDictionary *attribute = @{NSFontAttributeName:TextRulerFont,NSForegroundColorAttributeName:TextRulerFontColor};
     CGFloat width = [num boundingRectWithSize:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX) options:0 attributes:attribute context:nil].size.width;
     [num drawInRect:CGRectMake(rect.size.width-width/2, 0, width, 16) withAttributes:attribute];
@@ -183,11 +184,14 @@
 @interface DYFooterRulerView : UIView
 
 @property(nonatomic,assign)int maxValue;
+
+@property(nonatomic,assign)float step;
+
 @end
 @implementation DYFooterRulerView
 
 -(void)drawRect:(CGRect)rect{
-    CGFloat longLineY = rect.size.height - RulerShort;
+//    CGFloat longLineY = rect.size.height - RulerShort;
     CGContextRef context = UIGraphicsGetCurrentContext();
     CGContextSetRGBStrokeColor(context, (float)0/255.0, (float)0/255.0, (float)0/255.0, 1.0);
     CGContextSetLineWidth(context, LineWidth);
@@ -195,7 +199,7 @@
     
     CGContextMoveToPoint(context, 0, RulerShort);//起始点
     CGContextAddLineToPoint(context, 0, rect.size.height-LineWidth/2);
-    NSString *num = [NSString stringWithFormat:@"%d",_maxValue];
+    NSString *num = [DYTriangleView valueString:_maxValue ByStep:_step];
     NSDictionary *attribute = @{NSFontAttributeName:TextRulerFont,NSForegroundColorAttributeName:TextRulerFontColor};
     CGFloat width = [num boundingRectWithSize:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX) options:0 attributes:attribute context:nil].size.width;
     [num drawInRect:CGRectMake(0-width/2, 0, width, 16) withAttributes:attribute];
@@ -298,8 +302,8 @@
 - (void)setDefaultValue:(double)defaultValue {
     NSLog(@"设置默认值");
     _defaultValue = defaultValue;
-    if (_maxValue != 0) {
-        double dv = ((defaultValue - _minValue)*10)/round(_step*10);
+    if (_maxValue != 0 && !_scrollByHand) {
+        double dv = ((defaultValue - _minValue)*100)/round(_step*100);
         int v = (int)dv;
         [self setRealValue:v animated:YES];
 //        [_collectionView setContentOffset:CGPointMake(((defaultValue-_minValue)/(float)_step)*RulerGap, 0) animated:YES];
@@ -463,7 +467,11 @@
 
 -(void)setValueToValueLabel:(float)value{
     if(_step < 1.0){
-        _valueLab.text = [NSString stringWithFormat:@"%.1f",value];
+        if(_step < 0.1){
+            _valueLab.text = [NSString stringWithFormat:@"%.2f",value];
+        } else {
+            _valueLab.text = [NSString stringWithFormat:@"%.1f",value];
+        }
     } else{
         _valueLab.text = [NSString stringWithFormat:@"%d",(int)roundf(value)];
     }
@@ -487,7 +495,8 @@
             self.headerView = headerView;
             [cell.contentView addSubview:headerView];
         }
-        
+        headerView.minValue  = _minValue;
+        headerView.step   = _step;
         return cell;
     }else if( indexPath.item == _stepNum +1){
         UICollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"footerCell" forIndexPath:indexPath];
@@ -496,11 +505,12 @@
             footerView = [[DYFooterRulerView alloc]initWithFrame:CGRectMake(0, 0, self.frame.size.width/2, CollectionHeight)];
             footerView.backgroundColor  = [UIColor clearColor];
             footerView.tag              = 1001;
-            footerView.maxValue         = _maxValue;
+            
             self.footerView = footerView;
             [cell.contentView addSubview:footerView];
         }
-        
+        footerView.maxValue = _maxValue;
+        footerView.step   = _step;
         return cell;
     }else{
         UICollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"custemCell" forIndexPath:indexPath];
@@ -513,8 +523,8 @@
         }
         rulerView.backgroundColor   =  _bgColor;
         rulerView.step              = _step;
-        rulerView.minValue = (int)(_step*(indexPath.item-1)*_betweenNum+_minValue);
-        rulerView.maxValue = (int)(_step*indexPath.item*_betweenNum);
+        rulerView.minValue = (_step*(indexPath.item-1)*_betweenNum+_minValue);
+        rulerView.maxValue = (_step*indexPath.item*_betweenNum);
 //        [rulerView setNeedsDisplay];
         
         return cell;
@@ -606,8 +616,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.16",
-  "description": "iOS更新bug修复",
+  "version": "1.0.19",
+  "description": "iOS支持 0.01",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"