From 2c9531fdb330ff72d8d2b018c37c0757431c501b Mon Sep 17 00:00:00 2001
From: xwenliang <wenliang.web@gmail.com>
Date: Tue, 20 Sep 2016 17:21:16 +0800
Subject: [PATCH] event bug

---
 README.md                   | 151 ++++++++++++++----------------------
 example/PickerTest/index.js |  15 ++--
 index.js                    |   9 +--
 3 files changed, 66 insertions(+), 109 deletions(-)

diff --git a/README.md b/README.md
index 061d891..1ef88ba 100644
--- a/README.md
+++ b/README.md
@@ -20,11 +20,11 @@ A Native Picker with high performance
 - <b>pickerConfirmBtnText</b> string, 确认按钮文字
 - <b>pickerCancelBtnText</b> string, 取消按钮文字
 - <b>pickerTitleText</b> string, 标题文字
-- <b>pickerConfirmBtnColor</b> ['255', '66', '00', 0.5],  确认按钮字体颜色
-- <b>pickerCancelBtnColor</b> ['255', '66', '00', 0.5],  取消按钮字体颜色
-- <b>pickerTitleColor</b> ['255', '66', '00', 0.5],  标题字体颜色
-- <b>pickerToolBarBg</b> ['255', '66', '00', 0.5],  工具栏背景颜色
-- <b>pickerBg</b> ['255', '66', '00', 0.5],  picker背景颜色
+- <b>pickerConfirmBtnColor</b> [1, 186, 245, 1],  确认按钮字体颜色
+- <b>pickerCancelBtnColor</b> [1, 186, 245, 1],  取消按钮字体颜色
+- <b>pickerTitleColor</b> [20, 20, 20, 1],  标题字体颜色
+- <b>pickerToolBarBg</b> [232, 232, 232, 1],  工具栏背景颜色
+- <b>pickerBg</b> [196, 199, 206, 1],  picker背景颜色
 - <b>pickerData</b> 数组或对象，picker数据
 - <b>selectedValue</b> string，默认选中数据
 - <b>onPickerConfirm</b> 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 0e7c289..df440f1 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 d5d9c27..ece6ad4 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']);
             }
-- 
2.26.2