react-native-gizwits-scroll-ruler 1.0.0 → 1.0.3

package/index.ios.js

@@ -7,6 +7,7 @@ type PropsType = {
     maxValue?: number;
     step?: number;
     defaultValue?: number;
+    disabled?: bool;
     num?: number;
     unit?: string;
 } & typeof
@@ -18,6 +19,7 @@ export default class RNScrollRuler extends Component {
         maxValue: PropTypes.number.isRequired,
         step: PropTypes.number.isRequired,
         defaultValue: PropTypes.number.isRequired,
+        disabled: PropTypes.bool.isRequired,
         num: PropTypes.number.isRequired,
         unit: PropTypes.string,
         onSelect: PropTypes.func,

package/ios/RCTScrollRuler/RCTScrollRuler.m

@@ -15,11 +15,11 @@
 #define RulerLineColor [UIColor grayColor]
 #define LineWidth 2.0
 
-#define RulerGap        12 //单位距离
-#define RulerLong       50
+#define RulerGap        8 //单位距离
+#define RulerLong       40
 #define RulerShort      30
 #define TrangleWidth    16
-#define CollectionHeight 70
+#define CollectionHeight 50
 
 #define TriangleColor [UIColor colorWithRed:255/255.0 green:121/255.0 blue:30/255.0 alpha:1]
 
@@ -344,9 +344,10 @@
 
 -(DYTriangleView *)triangle{
     if (!_triangle) {
-        NSArray* arr = @[@(RulerLong-25),@(RulerLong-20),@(RulerLong-15),@(RulerLong-10),@(RulerLong-15),@(RulerLong-20),@(RulerLong-25)];
-        CGFloat width = (arr.count-1)*RulerGap;
-        _triangle = [[DYTriangleView alloc]initWithFrame:CGRectMake(self.bounds.size.width/2-width/2, self.collectionView.frame.origin.y+(self.collectionView.frame.size.height-RulerLong), width, RulerLong)];
+        CGFloat height =RulerLong-10;
+        NSArray* arr = @[@(height-18),@(height-13),@(height-8),@(height-3),@(height-8),@(height-13),@(height-18)];
+        CGFloat width = (arr.count-1)*RulerGap+4;
+        _triangle = [[DYTriangleView alloc]initWithFrame:CGRectMake(self.bounds.size.width/2-width/2+2, self.collectionView.frame.origin.y+(self.collectionView.frame.size.height-height), width, height)];
         _triangle.lineHeightArray = arr;
         _triangle.backgroundColor   = _bgColor;
         _triangle.bgColor   = _bgColor;
@@ -422,7 +423,7 @@
 }
 
 +(CGFloat)rulerViewHeight{
-    return 40+20+CollectionHeight;
+    return 30+20+CollectionHeight;
 }
 
 #pragma mark UICollectionViewDataSource & Delegate

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-gizwits-scroll-ruler",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "description": "ReactNative版选择身高体重的横向刻度尺组件，兼容Android和iOS",
   "main": "index.js",
   "scripts": {

package/{react-native-scroll-ruler.podspec → react-native-gizwits-scroll-ruler.podspec}

@@ -3,7 +3,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name         = "react-native-scroll-ruler"
+  s.name         = "react-native-gizwits-scroll-ruler"
   s.version      = package['version']
   s.summary      = package['description']
   s.license      = package['license']