Commit 7972eb41 authored by 7c00's avatar 7c00
Browse files

Upgrade example react-native version to 0.47.1

parent 6c969de2

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

deleted100644 → 0
+0 −34
Original line number Original line Diff line number Diff line 
package cn.qiuxiang.react.amap3d;



import com.facebook.react.ReactPackage;

import com.facebook.react.bridge.JavaScriptModule;

import com.facebook.react.bridge.NativeModule;

import com.facebook.react.bridge.ReactApplicationContext;

import com.facebook.react.uimanager.ViewManager;



import java.util.Arrays;

import java.util.Collections;

import java.util.List;



public class AMap3DPackage implements ReactPackage {

    @Override

    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {

        return Collections.emptyList();

    }



    @Override

    public List<Class<? extends JavaScriptModule>> createJSModules() {

        return Collections.emptyList();

    }



    @Override

    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {

        return Arrays.<ViewManager>asList(

                new AMapViewManager(),

                new AMapMarkerManager(),

                new AMapOverlayManager(),

                new AMapPolylineManager(),

                new AMapPolygonManager(),

                new AMapCircleManager());

    }

}

android/src/main/java/cn/qiuxiang/react/amap3d/AMap3DPackage.kt

+0 −4
Original line number Original line Diff line number Diff line
@@ -7,10 +7,6 @@ import com.facebook.react.bridge.ReactApplicationContext 
import com.facebook.react.uimanager.ViewManager

import com.facebook.react.uimanager.ViewManager





class AMap3DPackage : ReactPackage {

class AMap3DPackage : ReactPackage {

    override fun createJSModules(): List<Class<out JavaScriptModule>> {

        return emptyList()

    }



    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {

    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {

        return listOf(AMapUtilsModule(reactContext))

        return listOf(AMapUtilsModule(reactContext))

    }

    }

example/.flowconfig

+3 −5
Original line number Original line Diff line number Diff line
@@ -26,8 +26,6 @@ emoji=true 




module.system=haste

module.system=haste





experimental.strict_type_args=true



munge_underscores=true

munge_underscores=true





module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'

module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
@@ -36,12 +34,12 @@ suppress_type=$FlowIssue 
suppress_type=$FlowFixMe

suppress_type=$FlowFixMe

suppress_type=$FixMe

suppress_type=$FixMe





suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-2]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)

suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-9]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)

suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-2]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+

suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-9]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+

suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy

suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy

suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError

suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError





unsafe.enable_getters_and_setters=true

unsafe.enable_getters_and_setters=true





[version]

[version]

^0.42.0
 
^0.49.1

example/android/app/build.gradle

+8 −1
Original line number Original line Diff line number Diff line
@@ -33,6 +33,13 @@ import com.android.build.OutputFile 
 *   // bundleInPaidRelease: true,

 *   // bundleInPaidRelease: true,

 *   // bundleInBeta: true,

 *   // bundleInBeta: true,

 *

 *

 *   // whether to disable dev mode in custom build variants (by default only disabled in release)

 *   // for example: to disable dev mode in the staging build type (if configured)

 *   devDisabledInStaging: true,

 *   // The configuration property can be in the following formats

 *   //         'devDisabledIn${productFlavor}${buildType}'

 *   //         'devDisabledIn${buildType}'

 *

 *   // the root of your project, i.e. where "package.json" lives

 *   // the root of your project, i.e. where "package.json" lives

 *   root: "../../",

 *   root: "../../",

 *

 *
@@ -87,7 +94,7 @@ android { 
    buildToolsVersion "23.0.1"

    buildToolsVersion "23.0.1"





    defaultConfig {

    defaultConfig {

        applicationId "cn.qiuxiang.react.amap3d.example"

        applicationId "com.rnamap3d"

        minSdkVersion 16

        minSdkVersion 16

        targetSdkVersion 22

        targetSdkVersion 22

        versionCode 1

        versionCode 1

example/android/app/src/main/AndroidManifest.xml

+22 −38
Original line number Original line Diff line number Diff line 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    package="com.rnamap3d"

    package="cn.qiuxiang.react.amap3d.example">

    android:versionCode="1"

    android:versionName="1.0">





    <uses-permission android:name="android.permission.INTERNET" />

    <uses-permission android:name="android.permission.INTERNET" />

    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>





    <!--允许程序打开网络套接字-->

    <uses-sdk

    <uses-permission android:name="android.permission.INTERNET" />

        android:minSdkVersion="16"

    <!--允许程序设置内置sd卡的写权限-->

        android:targetSdkVersion="22" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <!--允许程序获取网络状态-->

    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

    <!--允许程序访问WiFi网络信息-->

    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />

    <!--允许程序读写手机状态和身份-->

    <uses-permission android:name="android.permission.READ_PHONE_STATE" />

    <!--允许程序访问CellID或WiFi热点来获取粗略的位置-->

    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

    <!--允许程序访问GPS定位-->

    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />





    <application

    <application

      android:name=".MainApplication"

      android:name=".MainApplication"

      android:allowBackup="true"

      android:allowBackup="true"

        android:icon="@mipmap/ic_launcher"

      android:label="@string/app_name"

      android:label="@string/app_name"

        android:theme="@style/AppTheme"

      android:icon="@mipmap/ic_launcher"

        tools:ignore="GoogleAppIndexingWarning">

      android:theme="@style/AppTheme">

      <activity

      <activity

        android:name=".MainActivity"

        android:name=".MainActivity"

            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"

        android:label="@string/app_name"

        android:label="@string/app_name"

        android:configChanges="keyboard|keyboardHidden|orientation|screenSize"

        android:windowSoftInputMode="adjustResize">

        android:windowSoftInputMode="adjustResize">

        <intent-filter>

        <intent-filter>

            <action android:name="android.intent.action.MAIN" />

            <action android:name="android.intent.action.MAIN" />
@@ -39,10 +27,6 @@ 
        </intent-filter>

        </intent-filter>

      </activity>

      </activity>

      <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />

      <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />



        <meta-data

            android:name="com.amap.api.v2.apikey"

            android:value="3bb9e200c9ec35643b217957c593c214" />

    </application>

    </application>





</manifest>
 
</manifest>