commit index

commit index

Author: zzyyppqq

README.md

@@ -25,7 +25,7 @@ var deviceHeight = Dimensions.get('window').height;
 var ReactNativeSegmentedExample = React.createClass({
   onSelectPosition:function(event){
     console.log(event);
-    ToastAndroid.show('segment '+event.value, ToastAndroid.SHORT)
+    ToastAndroid.show('segment '+event.selected, ToastAndroid.SHORT)
   },
   render: function() {
     return (

react-native-segmented-android.iml

@@ -62,20 +62,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />

src/main/java/com/higo/zhangyp/segmented/AndroidSegmentedEvent.java

@@ -41,7 +41,7 @@ public short getCoalescingKey() {
     private WritableMap serializeEventData() {
         WritableMap eventData = Arguments.createMap();
         eventData.putInt("target", getViewTag());
-        eventData.putInt("value", getPosition());
+        eventData.putInt("selected", getPosition());
         Log.e("AAA","position="+getPosition());
 
         return eventData;

src/main/java/com/higo/zhangyp/segmented/AndroidSegmentedManager.java

@@ -38,20 +38,26 @@ protected AndroidSegmented createViewInstance(ThemedReactContext reactContext) {
     }
 
 
+    private int position;
 
     @Override
     protected void addEventEmitters(final ThemedReactContext reactContext, final AndroidSegmented view) {
+
         view.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(RadioGroup group, int checkedId) {
-
-
+                int childCount = view.getChildCount();
+                for (int i=0;i<childCount;i++){
+                    if(view.getChildAt(i).getId()==checkedId){
+                        position = i;
+                    }
+                }
                 reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher()
                         .dispatchEvent(
                                 new AndroidSegmentedEvent(
                                         view.getId(),
                                         SystemClock.uptimeMillis(),
-                                        checkedId));
+                                        position));
 
 
             }
@@ -71,6 +77,7 @@ public void setChildText(AndroidSegmented view, ReadableArray data) {
 
             child.setText(data.getString(i));
             view.addView(child);
+
         }
     }