Update dependencies

.travis.yml

@@ -1,8 +1,8 @@
 aliases:
  - &android
  components:
- - build-tools-27.0.3
- - android-27
+ - build-tools-28.0.3
+ - android-28
  - extra-android-m2repository
  - extra-android-support
 
@@ -22,9 +22,9 @@ aliases:
  |
  nvm install node
  yarn global add react-native-cli
- react-native init App --version="0.52.3"
+ react-native init App --version="0.58.4"
  cd App
- yarn add react-native-amap3d
+ yarn add react-native-amap3d@beta
 
 jobs:
  include:
@@ -48,11 +48,11 @@ jobs:
  - yarn
  - cd android
  - ./gradlew build
- - ls -l app/build/outputs/apk
+ - ls -lh app/build/outputs/apk
 
  - stage: "build test for example"
  language: objective-c
- osx_image: xcode9.3
+ osx_image: xcode10.1
  cache: *ios-cache
  before_install:
  script:
@@ -75,19 +75,19 @@ jobs:
  - react-native link
  - cd android
  - ./gradlew build
- - ls -l app/build/outputs/apk/
+ - ls -lh app/build/outputs/apk/
 
  - stage: "build test for new project"
  language: objective-c
- osx_image: xcode9.3
+ osx_image: xcode10.1
  cache: *ios-cache
  script:
  - brew install yarn
  - *init-new-project
  - cd ios
  - |
  cat << EOF > Podfile
- platform :ios, '8.0'
+ platform :ios, '9.0'
  target 'App' do
  pod 'React', :path => '../node_modules/react-native', :subspecs => [
  'Core',
@@ -99,7 +99,7 @@ jobs:
  ]
  pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
  pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
- pod 'GLog', :podspec => '../node_modules/react-native/third-party-podspecs/GLog.podspec'
+ pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
  pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
  pod 'react-native-amap3d', path: '../node_modules/react-native-amap3d/lib/ios'
  end

android/app/build.gradle

@@ -146,6 +146,9 @@ android {
  }
  }
  }
+ lintOptions {
+ abortOnError false
+ }
 }
 
 dependencies {

android/build.gradle

@@ -2,18 +2,18 @@
 
 buildscript {
  ext {
- buildToolsVersion = "27.0.3"
+ buildToolsVersion = "28.0.3"
  minSdkVersion = 16
- compileSdkVersion = 27
- targetSdkVersion = 26
- supportLibVersion = "27.1.1"
+ compileSdkVersion = 28
+ targetSdkVersion = 27
+ supportLibVersion = "28.0.0"
  }
  repositories {
  google()
  jcenter()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:3.1.4'
+ classpath 'com.android.tools.build:gradle:3.2.1'
 
  // NOTE: Do not place your application dependencies here; they belong
  // in the individual module build.gradle files
@@ -34,6 +34,6 @@ allprojects {
 
 
 task wrapper(type: Wrapper) {
- gradleVersion = '4.4'
+ gradleVersion = '4.7'
  distributionUrl = distributionUrl.replace("bin", "all")
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.7-all.zip

android/settings.gradle

@@ -1,4 +1,4 @@
-rootProject.name = 'RNAMap3D'
+rootProject.name = 'rn-amap3d'
 include ':react-native-amap3d'
 project(':react-native-amap3d').projectDir = new File(rootProject.projectDir, '../lib/android')
 

example/examples/controls.js

@@ -1,6 +1,7 @@
 import React, { Component } from 'react'
 import { StyleSheet, Switch, Text, View } from 'react-native'
 import { MapView } from 'react-native-amap3d'
+import { requestLocationPermission } from '../utils'
 import styles from '../styles'
 
 export default class ControlsExample extends Component {
@@ -15,6 +16,10 @@ export default class ControlsExample extends Component {
  showsLocationButton: false,
  }
 
+ componentDidMount() {
+ requestLocationPermission()
+ }
+
  render() {
  return (
  <View style={StyleSheet.absoluteFill}>

example/examples/events.js

@@ -1,13 +1,15 @@
 import React, { Component } from 'react'
 import { FlatList, StyleSheet, Text, View } from 'react-native'
 import { MapView } from 'react-native-amap3d'
+import { requestLocationPermission } from '../utils'
 
 const styles = StyleSheet.create({
  body: {
  flex: 1,
  },
  logs: {
  elevation: 8,
+ flex: 1,
  backgroundColor: '#fff',
  },
  logText: {
@@ -27,11 +29,15 @@ export default class EventsExample extends Component {
  logs: [],
  }
 
+ componentDidMount() {
+ requestLocationPermission()
+ }
+
  _log(event, data) {
  this.setState({
  logs: [
  {
- key: Date.now(),
+ key: Date.now().toString(),
  time: new Date().toLocaleString(),
  event,
  data: JSON.stringify(data, null, 2),

example/utils.js

@@ -0,0 +1,23 @@
+import { PermissionsAndroid } from "react-native";
+
+export async function requestLocationPermission() {
+ try {
+ const granted = await PermissionsAndroid.request(
+ PermissionsAndroid.PERMISSIONS.ACCESS_COARSE_LOCATION,
+ {
+ title: "Location Permission",
+ message: "location test.",
+ buttonNeutral: "Ask Me Later",
+ buttonNegative: "Cancel",
+ buttonPositive: "OK"
+ }
+ );
+ if (granted === PermissionsAndroid.RESULTS.ACCESS_COARSE_LOCATION) {
+ console.log("You can use the camera");
+ } else {
+ console.log("Camera permission denied");
+ }
+ } catch (err) {
+ console.warn(err);
+ }
+}

ios/Podfile

@@ -1,4 +1,4 @@
-platform :ios, '8.0'
+platform :ios, '9.0'
 
 # The target name is most likely the name of your project.
 target 'RNAMap3D' do
@@ -18,7 +18,7 @@ target 'RNAMap3D' do
 
  # Third party deps podspec link
  pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
- pod 'GLog', :podspec => '../node_modules/react-native/third-party-podspecs/GLog.podspec'
+ pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
  pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
 
  pod 'react-native-amap3d', path: '../lib/ios/'

lib/android/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 buildscript {
- ext.kotlin_version = '1.2.41'
+ ext.kotlin_version = '1.3.10'
 
  repositories {
  jcenter()
@@ -14,17 +14,17 @@ buildscript {
 }
 
 android {
- compileSdkVersion 27
- buildToolsVersion "27.0.3"
+ compileSdkVersion 28
+ buildToolsVersion "28.0.3"
 
  defaultConfig {
  minSdkVersion 16
- targetSdkVersion 26
+ targetSdkVersion 27
  }
 }
 
 dependencies {
  compile 'com.facebook.react:react-native:+'
- compile 'com.amap.api:3dmap:6.5.0'
+ compile 'com.amap.api:3dmap:6.6.0'
  compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

package.json

@@ -1,6 +1,6 @@
 {
  "name": "react-native-amap3d",
- "version": "1.0.2",
+ "version": "1.0.3-0",
  "description": "react-native 高德地图组件，支持 Android + iOS",
  "author": "Qiu Xiang <[email protected]>",
  "license": "MIT",
@@ -29,13 +29,10 @@
  "reload": "adb reverse tcp:8081 tcp:8081 && adb shell input text rr",
  "run-ios": "node node_modules/react-native/local-cli/cli.js run-ios"
  },
- "peerDependencies": {
- "react-native": ">=0.47"
- },
  "devDependencies": {
- "metro-react-native-babel-preset": "0.51.0",
+ "metro-react-native-babel-preset": "0.51.1",
  "react": "16.6.3",
- "react-native": "0.57.8",
+ "react-native": "0.58.4",
  "react-navigation": "^1.5.11"
  },
  "rnpm": {