适配 RN 0.48.1

README.md

@@ -31,7 +31,7 @@ react-native 高德地图组件，使用最新 3D SDK，支持 Android + iOS。
 
 ### 安装依赖
 ```
-$ npm i react-native-amap3d --save
+$ npm i react-native-amap3d
 ```
 
 ### 项目配置
@@ -48,7 +48,9 @@ platform :ios, '8.0'
 
 target 'Your Target' do
   pod 'Yoga', path: '../node_modules/react-native/ReactCommon/yoga/'
-  pod 'React', path: '../node_modules/react-native/'
+  pod 'React', path: '../node_modules/react-native/', :subspecs => [
+    'DevSupport',
+  ]
   pod 'react-native-amap3d', path: '../node_modules/react-native-amap3d/'
 end
 ```

example/ios/Podfile

@@ -2,6 +2,8 @@ platform :ios, '8.0'
 
 target 'RNAMap3D' do
   pod 'Yoga', path: '../node_modules/react-native/ReactCommon/yoga/'
-  pod 'React', path: '../node_modules/react-native/'
+  pod 'React', path: '../node_modules/react-native/', :subspecs => [
+    'DevSupport',
+  ]
   pod 'react-native-amap3d', path: '../../'
 end

example/ios/Podfile.lock

@@ -5,18 +5,26 @@ PODS:
   - AMapNavi (5.2.1):
     - AMap3DMap (>= 5.2.1)
     - AMapFoundation (~> 1.4)
-  - React (0.47.2):
-    - React/Core (= 0.47.2)
+  - React (0.48.1):
+    - React/Core (= 0.48.1)
   - react-native-amap3d (0.6.2):
     - AMapNavi
     - React
-  - React/Core (0.47.2):
-    - Yoga (= 0.47.2.React)
-  - Yoga (0.47.2.React)
+  - React/Core (0.48.1):
+    - Yoga (= 0.48.1.React)
+  - React/DevSupport (0.48.1):
+    - React/Core
+    - React/RCTWebSocket
+  - React/RCTBlob (0.48.1):
+    - React/Core
+  - React/RCTWebSocket (0.48.1):
+    - React/Core
+    - React/RCTBlob
+  - Yoga (0.48.1.React)
 
 DEPENDENCIES:
-  - React (from `../node_modules/react-native/`)
   - react-native-amap3d (from `../../`)
+  - React/DevSupport (from `../node_modules/react-native/`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga/`)
 
 EXTERNAL SOURCES:
@@ -31,10 +39,10 @@ SPEC CHECKSUMS:
   AMap3DMap: 0614b5b7ed7a8b69f1d9ba7bc40ce30362497dc5
   AMapFoundation: 6c0471c9a6a0ad17dad46e3d800ad56ca170f82a
   AMapNavi: bb4d65295ed0ee0ad4b5f5792e9e2ea0e5117ffa
-  React: fbe1a006550fb55871cb377ba7741f5d1cfff733
+  React: c409fc3f984bbc91da9328ace90b0851759c8111
   react-native-amap3d: 44464626a64bc948be18c335b5d54957ccf45c10
-  Yoga: ff8531e8cf9f7ec92a75dd44286a68c4a084c507
+  Yoga: 1a0ed95233aeb0ed308fc70fabeb4348234a61d5
 
-PODFILE CHECKSUM: 532b8476f224a7e69d8d5ec4a246f7ed1173a8e1
+PODFILE CHECKSUM: 1f58898cdd2f530b47ca5a2d025ad7beb07cc506
 
 COCOAPODS: 1.2.0

example/package-lock.json

@@ -906,9 +906,9 @@
       "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak="
     },
     "big-integer": {
-      "version": "1.6.24",
-      "resolved": "http://registry.npm.taobao.org/big-integer/download/big-integer-1.6.24.tgz",
-      "integrity": "sha1-HthNAYrDwccrMH5/fZQAjo7iAxE="
+      "version": "1.6.25",
+      "resolved": "http://registry.npm.taobao.org/big-integer/download/big-integer-1.6.25.tgz",
+      "integrity": "sha1-HeRan1dUKsIBIcaC+NZCIgo06CM="
     },
     "body-parser": {
       "version": "1.13.3",
@@ -968,7 +968,7 @@
       "resolved": "http://registry.npm.taobao.org/bplist-parser/download/bplist-parser-0.1.1.tgz",
       "integrity": "sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=",
       "requires": {
-        "big-integer": "1.6.24"
+        "big-integer": "1.6.25"
       }
     },
     "brace-expansion": {
@@ -1466,6 +1466,16 @@
         "iconv-lite": "0.4.18"
       }
     },
+    "envinfo": {
+      "version": "3.4.1",
+      "resolved": "http://registry.npm.taobao.org/envinfo/download/envinfo-3.4.1.tgz",
+      "integrity": "sha1-jIDp8u7CzU4q2yxdASfOB6Kqoq4=",
+      "requires": {
+        "minimist": "1.2.0",
+        "os-name": "2.0.1",
+        "which": "1.3.0"
+      }
+    },
     "errno": {
       "version": "0.1.4",
       "resolved": "http://registry.npm.taobao.org/errno/download/errno-0.1.4.tgz",
@@ -2857,9 +2867,9 @@
       "integrity": "sha1-I9hlaxaq5nQqwpcy6o8DNqR4nPI="
     },
     "image-size": {
-      "version": "0.3.5",
-      "resolved": "http://registry.npm.taobao.org/image-size/download/image-size-0.3.5.tgz",
-      "integrity": "sha1-gyQOqy+1sAsEqrjHSwRx6cunrYw="
+      "version": "0.6.1",
+      "resolved": "http://registry.npm.taobao.org/image-size/download/image-size-0.6.1.tgz",
+      "integrity": "sha1-mBIqVi1Z3MCX7xssgZGGbrj11mM="
     },
     "imurmurhash": {
       "version": "0.1.4",
@@ -3088,18 +3098,18 @@
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "jest-docblock": {
-      "version": "20.1.0-echo.1",
-      "resolved": "http://registry.npm.taobao.org/jest-docblock/download/jest-docblock-20.1.0-echo.1.tgz",
-      "integrity": "sha1-vgL0PuAZ+X5rgyZ8dGrHtA0pD+g="
+      "version": "20.1.0-delta.4",
+      "resolved": "http://registry.npm.taobao.org/jest-docblock/download/jest-docblock-20.1.0-delta.4.tgz",
+      "integrity": "sha1-Ng1PX7cCcwxBNsTnHlcGGIppRoI="
     },
     "jest-haste-map": {
-      "version": "20.1.0-alpha.3",
-      "resolved": "http://registry.npm.taobao.org/jest-haste-map/download/jest-haste-map-20.1.0-alpha.3.tgz",
-      "integrity": "sha1-N6HuomfNdwuZEUo5wEmih1Ae33I=",
+      "version": "20.1.0-delta.4",
+      "resolved": "http://registry.npm.taobao.org/jest-haste-map/download/jest-haste-map-20.1.0-delta.4.tgz",
+      "integrity": "sha1-EuMrKXpt1JcFys3pOAKfwViDQAY=",
       "requires": {
         "fb-watchman": "2.0.0",
         "graceful-fs": "4.1.11",
-        "jest-docblock": "20.1.0-echo.1",
+        "jest-docblock": "20.1.0-delta.4",
         "micromatch": "2.3.11",
         "sane": "2.0.0",
         "worker-farm": "1.5.0"
@@ -3388,6 +3398,11 @@
         "yallist": "2.1.2"
       }
     },
+    "macos-release": {
+      "version": "1.1.0",
+      "resolved": "http://registry.npm.taobao.org/macos-release/download/macos-release-1.1.0.tgz",
+      "integrity": "sha1-gxlF4pNltHCqhySwqzbI+JWdEPs="
+    },
     "makeerror": {
       "version": "1.0.11",
       "resolved": "http://registry.npm.taobao.org/makeerror/download/makeerror-1.0.11.tgz",
@@ -3438,9 +3453,9 @@
       "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
     },
     "metro-bundler": {
-      "version": "0.9.2",
-      "resolved": "http://registry.npm.taobao.org/metro-bundler/download/metro-bundler-0.9.2.tgz",
-      "integrity": "sha1-ojweDCj8kg9CgJgNx8O7VOUdAkA=",
+      "version": "0.11.0",
+      "resolved": "http://registry.npm.taobao.org/metro-bundler/download/metro-bundler-0.11.0.tgz",
+      "integrity": "sha1-ul0q40lD2iijfCCYBHrSZcFv3fQ=",
       "requires": {
         "absolute-path": "0.0.0",
         "async": "2.5.0",
@@ -3449,7 +3464,7 @@
         "babel-plugin-external-helpers": "6.22.0",
         "babel-preset-es2015-node": "6.1.1",
         "babel-preset-fbjs": "2.1.4",
-        "babel-preset-react-native": "1.9.2",
+        "babel-preset-react-native": "2.1.0",
         "babel-register": "6.26.0",
         "babylon": "6.18.0",
         "chalk": "1.1.3",
@@ -3459,8 +3474,9 @@
         "denodeify": "1.2.1",
         "fbjs": "0.8.12",
         "graceful-fs": "4.1.11",
-        "image-size": "0.3.5",
-        "jest-haste-map": "20.0.5",
+        "image-size": "0.6.1",
+        "jest-docblock": "20.1.0-chi.1",
+        "jest-haste-map": "20.1.0-chi.1",
         "json-stable-stringify": "1.0.1",
         "json5": "0.4.0",
         "left-pad": "1.1.3",
@@ -3472,56 +3488,12 @@
         "rimraf": "2.6.1",
         "source-map": "0.5.7",
         "temp": "0.8.3",
-        "throat": "3.2.0",
+        "throat": "4.1.0",
         "uglify-js": "2.7.5",
         "write-file-atomic": "1.3.4",
         "xpipe": "1.0.5"
       },
       "dependencies": {
-        "babel-preset-react-native": {
-          "version": "1.9.2",
-          "resolved": "http://registry.npm.taobao.org/babel-preset-react-native/download/babel-preset-react-native-1.9.2.tgz",
-          "integrity": "sha1-sird0uNV/zs5Zxt5voB+Ut+hRfI=",
-          "requires": {
-            "babel-plugin-check-es2015-constants": "6.22.0",
-            "babel-plugin-react-transform": "2.0.2",
-            "babel-plugin-syntax-async-functions": "6.13.0",
-            "babel-plugin-syntax-class-properties": "6.13.0",
-            "babel-plugin-syntax-flow": "6.18.0",
-            "babel-plugin-syntax-jsx": "6.18.0",
-            "babel-plugin-syntax-trailing-function-commas": "6.22.0",
-            "babel-plugin-transform-class-properties": "6.24.1",
-            "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
-            "babel-plugin-transform-es2015-block-scoping": "6.26.0",
-            "babel-plugin-transform-es2015-classes": "6.24.1",
-            "babel-plugin-transform-es2015-computed-properties": "6.24.1",
-            "babel-plugin-transform-es2015-destructuring": "6.23.0",
-            "babel-plugin-transform-es2015-for-of": "6.23.0",
-            "babel-plugin-transform-es2015-function-name": "6.24.1",
-            "babel-plugin-transform-es2015-literals": "6.22.0",
-            "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
-            "babel-plugin-transform-es2015-parameters": "6.24.1",
-            "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
-            "babel-plugin-transform-es2015-spread": "6.22.0",
-            "babel-plugin-transform-es2015-template-literals": "6.22.0",
-            "babel-plugin-transform-flow-strip-types": "6.22.0",
-            "babel-plugin-transform-object-assign": "6.22.0",
-            "babel-plugin-transform-object-rest-spread": "6.26.0",
-            "babel-plugin-transform-react-display-name": "6.25.0",
-            "babel-plugin-transform-react-jsx": "6.24.1",
-            "babel-plugin-transform-react-jsx-source": "6.22.0",
-            "babel-plugin-transform-regenerator": "6.26.0",
-            "react-transform-hmr": "1.0.4"
-          }
-        },
-        "bser": {
-          "version": "1.0.2",
-          "resolved": "http://registry.npm.taobao.org/bser/download/bser-1.0.2.tgz",
-          "integrity": "sha1-OBEWlwsqbe6lZG3RXdcnhES1YWk=",
-          "requires": {
-            "node-int64": "0.4.0"
-          }
-        },
         "core-js": {
           "version": "2.5.1",
           "resolved": "http://registry.npm.taobao.org/core-js/download/core-js-2.5.1.tgz",
@@ -3549,45 +3521,36 @@
           }
         },
         "jest-docblock": {
-          "version": "20.0.3",
-          "resolved": "http://registry.npm.taobao.org/jest-docblock/download/jest-docblock-20.0.3.tgz",
-          "integrity": "sha1-F76phDQswz2DxQ++FUXqDvqkRxI="
+          "version": "20.1.0-chi.1",
+          "resolved": "http://registry.npm.taobao.org/jest-docblock/download/jest-docblock-20.1.0-chi.1.tgz",
+          "integrity": "sha1-BpgasOWUmKJJIzOwxVAqguRgMgc="
         },
         "jest-haste-map": {
-          "version": "20.0.5",
-          "resolved": "http://registry.npm.taobao.org/jest-haste-map/download/jest-haste-map-20.0.5.tgz",
-          "integrity": "sha1-q61077GgBZdKe2UX4RAQcJyrkRI=",
+          "version": "20.1.0-chi.1",
+          "resolved": "http://registry.npm.taobao.org/jest-haste-map/download/jest-haste-map-20.1.0-chi.1.tgz",
+          "integrity": "sha1-219fMTYsduJCtA6po8z6NkcZzuM=",
           "requires": {
             "fb-watchman": "2.0.0",
             "graceful-fs": "4.1.11",
-            "jest-docblock": "20.0.3",
+            "jest-docblock": "20.1.0-chi.1",
             "micromatch": "2.3.11",
-            "sane": "1.6.0",
+            "sane": "2.0.0",
             "worker-farm": "1.5.0"
           }
         },
         "sane": {
-          "version": "1.6.0",
-          "resolved": "http://registry.npm.taobao.org/sane/download/sane-1.6.0.tgz",
-          "integrity": "sha1-lhDEUjB6E10pwf3+JUcDQYDEZ3U=",
+          "version": "2.0.0",
+          "resolved": "http://registry.npm.taobao.org/sane/download/sane-2.0.0.tgz",
+          "integrity": "sha1-mct58h9KU6adTQzZV8LbBAJLjrI=",
           "requires": {
             "anymatch": "1.3.2",
             "exec-sh": "0.2.0",
-            "fb-watchman": "1.9.2",
+            "fb-watchman": "2.0.0",
+            "fsevents": "1.1.2",
             "minimatch": "3.0.4",
             "minimist": "1.2.0",
             "walker": "1.0.7",
             "watch": "0.10.0"
-          },
-          "dependencies": {
-            "fb-watchman": {
-              "version": "1.9.2",
-              "resolved": "http://registry.npm.taobao.org/fb-watchman/download/fb-watchman-1.9.2.tgz",
-              "integrity": "sha1-okz0eCf4LTj7Waaa1wt247auc4M=",
-              "requires": {
-                "bser": "1.0.2"
-              }
-            }
           }
         }
       }
@@ -3909,6 +3872,15 @@
         "lcid": "1.0.0"
       }
     },
+    "os-name": {
+      "version": "2.0.1",
+      "resolved": "http://registry.npm.taobao.org/os-name/download/os-name-2.0.1.tgz",
+      "integrity": "sha1-uaOGNhwXrjohc27wWZQFyajF3F4=",
+      "requires": {
+        "macos-release": "1.1.0",
+        "win-release": "1.1.1"
+      }
+    },
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "http://registry.npm.taobao.org/os-tmpdir/download/os-tmpdir-1.0.2.tgz",
@@ -4181,9 +4153,9 @@
       "integrity": "sha1-vNMUeAJ7ZLMznxCJIatSC0MT3Cw="
     },
     "react-devtools-core": {
-      "version": "2.3.1",
-      "resolved": "http://registry.npm.taobao.org/react-devtools-core/download/react-devtools-core-2.3.1.tgz",
-      "integrity": "sha1-3IOrqFc17/5eHcOGoWFMtejQBH0=",
+      "version": "2.5.0",
+      "resolved": "http://registry.npm.taobao.org/react-devtools-core/download/react-devtools-core-2.5.0.tgz",
+      "integrity": "sha1-WtF5+I8i0gWUByHjjk7MOi01vwM=",
       "requires": {
         "shell-quote": "1.6.1",
         "ws": "2.3.1"
@@ -4206,9 +4178,9 @@
       }
     },
     "react-native": {
-      "version": "0.47.2",
-      "resolved": "http://registry.npm.taobao.org/react-native/download/react-native-0.47.2.tgz",
-      "integrity": "sha1-XlXNhOSUcSPIbTbqb5WrntLQyxk=",
+      "version": "0.48.1",
+      "resolved": "http://registry.npm.taobao.org/react-native/download/react-native-0.48.1.tgz",
+      "integrity": "sha1-BSulqG0723SMKIEkJIcn0CscCTk=",
       "requires": {
         "absolute-path": "0.0.0",
         "art": "0.10.1",
@@ -4240,6 +4212,7 @@
         "create-react-class": "15.6.0",
         "debug": "2.6.8",
         "denodeify": "1.2.1",
+        "envinfo": "3.4.1",
         "errno": "0.1.4",
         "event-target-shim": "1.1.1",
         "fbjs": "0.8.12",
@@ -4249,13 +4222,13 @@
         "glob": "7.1.2",
         "graceful-fs": "4.1.11",
         "inquirer": "3.2.3",
-        "jest-haste-map": "20.1.0-alpha.3",
+        "jest-haste-map": "20.1.0-delta.4",
         "json-stable-stringify": "1.0.1",
         "json5": "0.4.0",
         "left-pad": "1.1.3",
         "lodash": "4.17.4",
         "merge-stream": "1.0.1",
-        "metro-bundler": "0.9.2",
+        "metro-bundler": "0.11.0",
         "mime": "1.4.0",
         "mime-types": "2.1.11",
         "minimist": "1.2.0",
@@ -4269,7 +4242,7 @@
         "promise": "7.3.1",
         "prop-types": "15.5.10",
         "react-clone-referenced-element": "1.0.1",
-        "react-devtools-core": "2.3.1",
+        "react-devtools-core": "2.5.0",
         "react-timer-mixin": "0.13.3",
         "react-transform-hmr": "1.0.4",
         "rebound": "0.0.13",
@@ -4282,7 +4255,7 @@
         "source-map": "0.5.7",
         "stacktrace-parser": "0.1.4",
         "temp": "0.8.3",
-        "throat": "3.2.0",
+        "throat": "4.1.0",
         "whatwg-fetch": "1.1.1",
         "wordwrap": "1.0.0",
         "write-file-atomic": "1.3.4",
@@ -5061,9 +5034,9 @@
       }
     },
     "throat": {
-      "version": "3.2.0",
-      "resolved": "http://registry.npm.taobao.org/throat/download/throat-3.2.0.tgz",
-      "integrity": "sha1-UMsGcO28QCN7njR9fh+I5GIK+DY="
+      "version": "4.1.0",
+      "resolved": "http://registry.npm.taobao.org/throat/download/throat-4.1.0.tgz",
+      "integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo="
     },
     "through": {
       "version": "2.3.8",
@@ -5307,6 +5280,14 @@
       "resolved": "http://registry.npm.taobao.org/which-module/download/which-module-1.0.0.tgz",
       "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
     },
+    "win-release": {
+      "version": "1.1.1",
+      "resolved": "http://registry.npm.taobao.org/win-release/download/win-release-1.1.1.tgz",
+      "integrity": "sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=",
+      "requires": {
+        "semver": "5.4.1"
+      }
+    },
     "window-size": {
       "version": "0.1.0",
       "resolved": "http://registry.npm.taobao.org/window-size/download/window-size-0.1.0.tgz",

example/package.json

@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "react": "16.0.0-alpha.12",
-    "react-native": "^0.47.2",
+    "react-native": "^0.48.1",
     "react-native-amap3d": "^0.6.2",
     "react-navigation": "^1.0.0-beta.12"
   },