diff --git a/README.md b/README.md
index 061d8914cf606e21d17a6c6c5cfe4ad9893c8fb3..1ef88baa28c0faef560f4fcb2a9654d4daafaaea 100644
--- a/README.md
+++ b/README.md
@@ -20,11 +20,11 @@ A Native Picker with high performance
- pickerConfirmBtnText string, 确认按钮文字
- pickerCancelBtnText string, 取消按钮文字
- pickerTitleText string, 标题文字
-- pickerConfirmBtnColor ['255', '66', '00', 0.5], 确认按钮字体颜色
-- pickerCancelBtnColor ['255', '66', '00', 0.5], 取消按钮字体颜色
-- pickerTitleColor ['255', '66', '00', 0.5], 标题字体颜色
-- pickerToolBarBg ['255', '66', '00', 0.5], 工具栏背景颜色
-- pickerBg ['255', '66', '00', 0.5], picker背景颜色
+- pickerConfirmBtnColor [1, 186, 245, 1], 确认按钮字体颜色
+- pickerCancelBtnColor [1, 186, 245, 1], 取消按钮字体颜色
+- pickerTitleColor [20, 20, 20, 1], 标题字体颜色
+- pickerToolBarBg [232, 232, 232, 1], 工具栏背景颜色
+- pickerBg [196, 199, 206, 1], picker背景颜色
- pickerData 数组或对象,picker数据
- selectedValue string,默认选中数据
- onPickerConfirm function,确认按钮回调
@@ -111,98 +111,61 @@ A Native Picker with high performance
- two wheel
```javascript
- pickerData = [
- {
- value: 'a',
- child: [1, 2, 3, 4]
- },
- {
- value: 'b',
- child: [5, 6, 7, 8]
- },
- ...
- ];
- selectedValue = ['a', 2];
+ pickerData = [
+ {
+ a: [1, 2, 3, 4]
+ },
+ {
+ b: [5, 6, 7, 8]
+ },
+ ...
+ ];
+ selectedValue = ['a', 2];
```
- three wheel
```javascript
- pickerData = [
- {
- value: 'a',
- child: [
- {
- value: 'a1',
- child: [1, 2, 3, 4]
- },
- {
- value: 'a2',
- child: [5, 6, 7, 8]
- },
- {
- value: 'a3',
- child: [9, 10, 11, 12]
- }
- ]
- },
- {
- value: 'b',
- child: [
- {
- value: 'b1',
- child: [11, 22, 33, 44]
- },
- {
- value: 'b2',
- child: [55, 66, 77, 88]
- },
- {
- value: 'b3',
- child: [99, 1010, 1111, 1212]
- }
- ]
- },
- {
- value: 'c',
- child: [
- {
- value: 'c1',
- child: ['a', 'b', 'c']
- },
- {
- value: 'c2',
- child: ['aa', 'bb', 'cc']
- },
- {
- value: 'c3',
- child: ['aaa', 'bbb', 'ccc']
- }
- ]
- }
- ]
-
-
-
- //以前两轮
- {
- a: [1,2,3,4],
- b: [5,6,7,8],
+ pickerData = [
+ {
+ a: [
+ {
+ a1: [1, 2, 3, 4]
+ },
+ {
+ a2: [5, 6, 7, 8]
+ },
+ {
+ a3: [9, 10, 11, 12]
+ }
+ ]
+ },
+ {
+ b: [
+ {
+ b1: [11, 22, 33, 44]
+ },
+ {
+ b2: [55, 66, 77, 88]
+ },
+ {
+ b3: [99, 1010, 1111, 1212]
+ }
+ ]
+ },
+ {
+ c: [
+ {
+ c1: ['a', 'b', 'c']
+ },
+ {
+ c2: ['aa', 'bb', 'cc']
+ },
+ {
+ c3: ['aaa', 'bbb', 'ccc']
+ }
+ ]
+ },
...
- }
- //以前三轮
- {
- a: {
- a1: [1,2,3,4],
- a2: [5,6,7,8],
- a3: [9,10,11,12]
- },
- b: {
- b1: [1,2,3,4],
- b2: [5,6,7,8],
- b3: [9,10,12,12]
- }
- ...
- };
- selectedValue = ['a', 'a1', 1];
-```
+ ]
+```
\ No newline at end of file
diff --git a/example/PickerTest/index.js b/example/PickerTest/index.js
index 0e7c28980dd9d156db7be8d0b5a24501f7366a37..df440f11f0efbdf050c610eb0f5c6d2ffb7f8156 100644
--- a/example/PickerTest/index.js
+++ b/example/PickerTest/index.js
@@ -75,16 +75,13 @@ export default class PickerTest extends Component {
pickerData: createDateData(),
selectedValue: ['2015年', '12月', '12日'],
onPickerConfirm: pickedValue => {
- alert(JSON.stringify(pickedValue));
- console.log(pickedValue);
+ console.log('date', pickedValue);
},
onPickerCancel: pickedValue => {
- alert(JSON.stringify(pickedValue));
- console.log(pickedValue);
+ console.log('date', pickedValue);
},
onPickerSelect: pickedValue => {
- alert(JSON.stringify(pickedValue));
- console.log(pickedValue);
+ console.log('date', pickedValue);
}
});
Picker.show();
@@ -96,13 +93,13 @@ export default class PickerTest extends Component {
pickerData: data,
selectedValue: ['北京', '北京', '朝阳区'],
onPickerConfirm: pickedValue => {
- console.log(pickedValue);
+ console.log('area', pickedValue);
},
onPickerCancel: pickedValue => {
- console.log(pickedValue);
+ console.log('area', pickedValue);
},
onPickerSelect: pickedValue => {
- console.log(pickedValue);
+ console.log('area', pickedValue);
}
});
Picker.show();
diff --git a/index.js b/index.js
index d5d9c279f935828129fa7d7f3c36e94eb648172b..ece6ad40b9e59a6952036d2112c9827098321874 100644
--- a/index.js
+++ b/index.js
@@ -33,12 +33,9 @@ export default {
};
Picker._init(opt);
- if(this.inited){
- return;
- }
- this.inited = true;
-
- NativeAppEventEmitter.addListener('pickerEvent', event => {
+ //there are no `removeListener` for NativeAppEventEmitter & DeviceEventEmitter
+ this.listener && this.listener.remove();
+ this.listener = NativeAppEventEmitter.addListener('pickerEvent', event => {
if(ios){
fnConf[event['type']](event['selectedValue']);
}