fixed bug

shenhuniurou · shenhuniurou · commit a990cb95c724 · 2018-12-28T10:41:15.000+08:00
diff --git a/README.md b/README.md
@@ -1,2 +1,13 @@
 # react-native-scroll-ruler
 ReactNative版滑动刻度尺,兼容Android和iOS。
+
+
+
+minValue 尺子显示的最小值
+maxValue 尺子显示的最大值
+defaultValue 尺子默认值
+step 两个大刻度之间的数值间隔
+num 两个小刻度之间的数值间隔
+unit 单位
+
+onSelect 选中值后的回调方法
diff --git a/android/src/main/java/com/shenhuniurou/scrollruler/RNScrollRuler.java b/android/src/main/java/com/shenhuniurou/scrollruler/RNScrollRuler.java
@@ -519,9 +519,15 @@ public void onAnimationEnd(Animator animation) {
                 } else {
                     //绘制刻度，绘制刻度数字
                     canvas.drawLine(0, 0, 0, midScaleHeight, midScalePaint);
-                    scaleNumPaint.getTextBounds(num1 / scaleGap + minScale + "", 0, (num1 / scaleGap + minScale + "").length(), scaleNumRect);
-                    canvas.drawText((num1 / scaleCount + minScale) * scaleLimit + "", -scaleNumRect.width() / 2, lagScaleHeight +
-                            (rulerHeight - lagScaleHeight) / 2 + scaleNumRect.height(), scaleNumPaint);
+                    if (num1 == 0 && minScale == 0) {
+                        scaleNumPaint.getTextBounds("不设", 0, "不设".length(), scaleNumRect);
+                        canvas.drawText("不设", -scaleNumRect.width() / 2, lagScaleHeight +
+                                (rulerHeight - lagScaleHeight) / 2 + scaleNumRect.height(), scaleNumPaint);
+                    } else {
+                        scaleNumPaint.getTextBounds(num1 / scaleGap + minScale + "", 0, (num1 / scaleGap + minScale + "").length(), scaleNumRect);
+                        canvas.drawText((num1 / scaleCount + minScale) * scaleLimit + "", -scaleNumRect.width() / 2, lagScaleHeight +
+                                (rulerHeight - lagScaleHeight) / 2 + scaleNumRect.height(), scaleNumPaint);
+                    }
 
                 }
 
@@ -550,11 +556,20 @@ private void drawResultText(Canvas canvas, String resultText) {
             return;
         }
         canvas.translate(0, -resultNumRect.height() - rulerToResultgap / 2);  //移动画布到正确的位置来绘制结果值
-        resultNumPaint.getTextBounds(resultText, 0, resultText.length(), resultNumRect);
-        canvas.drawText(resultText, width / 2 - resultNumRect.width() / 2, resultNumRect.height(), //绘制当前刻度结果值
-                resultNumPaint);
-        resultNumRight = width / 2 + resultNumRect.width() / 2 + 5;
-        canvas.drawText(unit, resultNumRight, kgRect.height() + 8, kgPaint);            //在当前刻度结果值的又面10px的位置绘制单位
+        if (resultText.equals("0")) {
+            resultText = "不设";
+            resultNumPaint.setTextSize((int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 16, getResources().getDisplayMetrics()));
+            resultNumPaint.getTextBounds(resultText, 0, resultText.length(), resultNumRect);
+            canvas.drawText(resultText, width / 2 - resultNumRect.width() / 2, resultNumRect.height(), //绘制当前刻度结果值
+                    resultNumPaint);
+        } else {
+            resultNumPaint.setTextSize((int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 20, getResources().getDisplayMetrics()));
+            resultNumPaint.getTextBounds(resultText, 0, resultText.length(), resultNumRect);
+            canvas.drawText(resultText, width / 2 - resultNumRect.width() / 2, resultNumRect.height(), //绘制当前刻度结果值
+                    resultNumPaint);
+            resultNumRight = width / 2 + resultNumRect.width() / 2 + 5;
+            canvas.drawText(unit, resultNumRight, kgRect.height() + 8, kgPaint);            //在当前刻度结果值的又面10px的位置绘制单位
+        }
     }
 
     private void drawBg(Canvas canvas) {
diff --git a/android/src/main/java/com/shenhuniurou/scrollruler/RNScrollRulerManager.java b/android/src/main/java/com/shenhuniurou/scrollruler/RNScrollRulerManager.java
@@ -67,8 +67,8 @@ public void setUnit(RNScrollRuler ruler, @Nullable String unit) {
     }
 
     @ReactProp(name = "step")
-    public void setStep(RNScrollRuler ruler, @Nullable int step) {
-        ruler.setScaleLimit(step * 10);
+    public void setStep(RNScrollRuler ruler, @Nullable float step) {
+        ruler.setScaleLimit((int)(step * 10));
     }
 
     @ReactProp(name = "num")
diff --git a/ios/RCTScrollRuler/RCTScrollRuler.m b/ios/RCTScrollRuler/RCTScrollRuler.m
@@ -74,7 +74,7 @@ @interface DYRulerView : UIView
 @property (nonatomic,assign)NSInteger betweenNumber;
 @property (nonatomic,assign)int minValue;
 @property (nonatomic,assign)int maxValue;
-@property (nonatomic,assign)int step;
+@property (nonatomic,assign)float step;
 
 @end
 @implementation DYRulerView
@@ -94,7 +94,10 @@ -(void)drawRect:(CGRect)rect{
     for (int i = 0; i <= _betweenNumber; i ++){
         CGContextMoveToPoint(context, startX+lineCenterX*i, topY);
         if (i%_betweenNumber == 0){
-            NSString *num = [NSString stringWithFormat:@"%d", i * _step + _minValue];
+            NSString *num = [NSString stringWithFormat:@"%d", (int)(i * _step) + _minValue];
+            if ([num isEqualToString:@"0"]) {
+                num = @"不设";
+            }
             NSDictionary *attribute = @{NSFontAttributeName:TextRulerFont, NSForegroundColorAttributeName:[UIColor lightGrayColor]};
             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, longLineY+10, width, 16) withAttributes:attribute];
@@ -128,11 +131,18 @@ -(void)drawRect:(CGRect)rect{
     CGContextSetLineCap(context, kCGLineCapButt);
     
     CGContextMoveToPoint(context, rect.size.width, 0);
-    NSString *num = [NSString stringWithFormat:@"%d",_minValue];
+    
+    NSString *num;
+    if (_minValue == 0) {
+        num = @"不设";
+    } else {
+        num = [NSString stringWithFormat:@"%d", _minValue];
+    }
+    
     NSDictionary *attribute = @{NSFontAttributeName:TextRulerFont,NSForegroundColorAttributeName:[UIColor lightGrayColor]};
     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, longLineY+10, width, 16) withAttributes:attribute];
-    CGContextAddLineToPoint(context,rect.size.width, longLineY);
+    CGContextAddLineToPoint(context, rect.size.width, longLineY);
     CGContextStrokePath(context);//开始绘制
 }
 
@@ -179,7 +189,7 @@ @interface RCTScrollRuler()<UIScrollViewDelegate,UICollectionViewDelegate,UIColl
 @property(nonatomic, assign)int           stepNum;//分多少个区
 @property(nonatomic, assign)int           minValue;//游标的最小值
 @property(nonatomic, assign)int           maxValue;//游标的最大值
-@property(nonatomic, assign)int           step;//间隔值，每两条相隔多少值
+@property(nonatomic, assign)float           step;//间隔值，每两条相隔多少值
 @property(nonatomic, assign)NSInteger     betweenNum;
 @property(nonatomic, strong)NSString      *unit;//单位
 @property (nonatomic,assign)int defaultValue;
@@ -223,7 +233,7 @@ - (void)setMaxValue:(int)maxValue {
     self.unitLab.text = _unit;
 }
 
-- (void)setStep:(int)step {
+- (void)setStep:(float)step {
     NSLog(@"设置步长");
     [[self subviews]makeObjectsPerformSelector:@selector(removeFromSuperview)];
     _step = step;
@@ -244,7 +254,7 @@ - (void)setStep:(int)step {
 - (void)setDefaultValue:(int)defaultValue {
     NSLog(@"设置默认值");
     _defaultValue      = defaultValue;
-    if (_minValue != 0 && _maxValue != 0) {
+    if (_maxValue != 0) {
         [self setRealValue:defaultValue];
         [_collectionView setContentOffset:CGPointMake(((defaultValue-_minValue)/(float)_step)*RulerGap, 0) animated:YES];
     }
@@ -384,7 +394,14 @@ -(void)setRealValue:(int)realValue{
 }
 -(void)setRealValue:(float)realValue animated:(BOOL)animated{
     _realValue      = realValue;
-    _valueLab.text   = [NSString stringWithFormat:@"%d",_realValue*_step+_minValue];
+    int n = _realValue*_step+_minValue;
+    if (n == 0) {
+        _unitLab.hidden = YES;
+        _valueLab.text = @"不设";
+    } else {
+        _unitLab.hidden = NO;
+        _valueLab.text = [NSString stringWithFormat:@"%d", n];
+    }
     [_collectionView setContentOffset:CGPointMake((int)realValue*RulerGap, 0) animated:animated];
 }
 
@@ -479,9 +496,13 @@ -(void)scrollViewDidScroll:(UIScrollView *)scrollView{
         if (totalValue >= _maxValue) {
             _valueLab.text = [NSString stringWithFormat:@"%d",_maxValue];
         }else if(totalValue <= _minValue){
-            _valueLab.text = [NSString stringWithFormat:@"%d",_minValue];
+            if(_minValue == 0) {
+                _valueLab.text = @"不设";
+            } else {
+                _valueLab.text = [NSString stringWithFormat:@"%d",_minValue];
+            }
         }else{
-            _valueLab.text = [NSString stringWithFormat:@"%d",value*_step +_minValue];
+            _valueLab.text = [NSString stringWithFormat:@"%d",(int)(value*_step) +_minValue];
         }
     }
 }
diff --git a/ios/RCTScrollRuler/RCTScrollRulerManager.m b/ios/RCTScrollRuler/RCTScrollRulerManager.m
@@ -29,7 +29,7 @@ @implementation RCTScrollRulerManager
 
 RCT_EXPORT_VIEW_PROPERTY(maxValue, int);
 
-RCT_EXPORT_VIEW_PROPERTY(step, int);
+RCT_EXPORT_VIEW_PROPERTY(step, float);
 
 RCT_EXPORT_VIEW_PROPERTY(defaultValue, int);
 
@@ -43,7 +43,7 @@ - (UIView *)view
 {
     
     CGFloat rullerHeight = [RCTScrollRuler rulerViewHeight];
-    _noneZeroRullerView = [[RCTScrollRuler alloc]initWithFrame:CGRectMake(10, 0, ScreenWidth-20, rullerHeight) theMinValue:0 theMaxValue:0  theStep:1 theNum:10 theUnit:@""];
+    _noneZeroRullerView = [[RCTScrollRuler alloc]initWithFrame:CGRectMake(10, 0, ScreenWidth-20, rullerHeight) theMinValue:0 theMaxValue:0  theStep:1.0 theNum:10 theUnit:@""];
     _noneZeroRullerView.bgColor = [UIColor whiteColor];
     _noneZeroRullerView.delegate        = self;
     _noneZeroRullerView.scrollByHand    = YES;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-scroll-ruler",
-  "version": "1.1.7",
+  "version": "1.2.1",
   "description": "ReactNative版选择身高体重的横向刻度尺组件，兼容Android和iOS",
   "main": "index.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,8 @@ public void setUnit(RNScrollRuler ruler, @Nullable String unit) {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`@ReactProp(name = "step")`
`70`		`- public void setStep(RNScrollRuler ruler, @Nullable int step) {`
`71`		`- ruler.setScaleLimit(step * 10);`
	`70`	`+ public void setStep(RNScrollRuler ruler, @Nullable float step) {`
	`71`	`+ ruler.setScaleLimit((int)(step * 10));`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`@ReactProp(name = "num")`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "react-native-scroll-ruler",`
`3`		`- "version": "1.1.7",`
	`3`	`+ "version": "1.2.1",`
`4`	`4`	`"description": "ReactNative版选择身高体重的横向刻度尺组件，兼容Android和iOS",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`