重命名：Marker.image => Marker.icon

android/src/main/java/cn/qiuxiang/react/amap3d/AMapMarker.java

@@ -149,15 +149,15 @@ public class AMapMarker extends ReactViewGroup {
         }
     }
 
-    public void setImage(String image) {
-        if (image.startsWith("HUE_")) {
-            bitmapDescriptor = BitmapDescriptorFactory.defaultMarker(COLORS.get(image));
+    public void setIcon(String icon) {
+        if (icon.startsWith("HUE_")) {
+            bitmapDescriptor = BitmapDescriptorFactory.defaultMarker(COLORS.get(icon));
             if (marker != null) {
                 marker.setIcon(bitmapDescriptor);
             }
         } else {
             DataSource<CloseableReference<CloseableImage>> dataSource = Fresco
-                    .getImagePipeline().fetchDecodedImage(ImageRequest.fromUri(image), this);
+                    .getImagePipeline().fetchDecodedImage(ImageRequest.fromUri(icon), this);
             dataSource.subscribe(dataSubscriber, CallerThreadExecutor.getInstance());
         }
     }

android/src/main/java/cn/qiuxiang/react/amap3d/AMapMarkerManager.java

@@ -74,9 +74,9 @@ class AMapMarkerManager extends ViewGroupManager<AMapMarker> {
         marker.setSelected(selected);
     }
 
-    @ReactProp(name = "image")
-    public void setImage(AMapMarker marker, String image) {
-        marker.setImage(image);
+    @ReactProp(name = "icon")
+    public void setIcon(AMapMarker marker, String icon) {
+        marker.setIcon(icon);
     }
 
     // 对于 infoWindow，必须手动设置 layoutParams 才能正确显示，

components/Marker.js

@@ -23,12 +23,13 @@ class Marker extends Component {
     description: PropTypes.string,
 
     /**
-     * 自定义图片
+     * 自定义图标
      * 可以是 uri 或者 require 引用的资源图片
      */
-    image: PropTypes.oneOfType([
+    icon: PropTypes.oneOfType([
       PropTypes.number,
       PropTypes.string,
+      PropTypes.func,
     ]),
 
     /**
@@ -90,8 +91,8 @@ class Marker extends Component {
       onMarkerDragEnd: this._handle('onDragEnd'),
     }
 
-    if (typeof props.image === 'number') {
-      props.image = resolveAssetSource(this.props.image).uri
+    if (typeof props.icon === 'number') {
+      props.icon = resolveAssetSource(this.props.icon).uri
     }
 
     if (props.children) {

example/src/marker.js

@@ -22,7 +22,7 @@ export default class MarkerComponent extends Component {
       />
       <Marker
         selected
-        image='HUE_RED'
+        icon='HUE_RED'
         title='一个红色的 Marker'
         infoWindowWidth={100}
         coordinate={{
@@ -34,7 +34,7 @@ export default class MarkerComponent extends Component {
         </View>
       </Marker>
       <Marker
-        image={require('../images/marker.png')}
+        icon={require('../images/marker.png')}
         title='自定义图片'
         coordinate={{
           latitude: 39.906901,