diff --git a/app/build.gradle b/app/build.gradle
index fa31bc0..0614b2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@
         applicationId "com.casic.smartwellapp"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 7
-        versionName "v1.1.1"
+        versionCode 8
+        versionName "v1.1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -37,6 +37,8 @@
         exclude 'META-INF/LGPL2.1'
         exclude 'META-INF/services/javax.annotation.processing.Processor'
         exclude 'META-INF/rxjava.properties'
+        exclude 'org/codehaus/jackson/impl/VERSION.txt'
+        exclude 'org/codehaus/jackson/map/VERSION.txt'
     }
 }
 
@@ -44,6 +46,7 @@
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'pub.devrel:easypermissions:1.3.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
@@ -54,12 +57,12 @@
     implementation 'com.alibaba:fastjson:1.2.68'
     implementation files('libs/guava-17.0.jar')
     implementation files('libs/androidsvg-1.2.2-beta-1.jar')
-    implementation files('libs/EzLicenseAPI4Android.jar')
-    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/EzMapServiceApiForAndroid-1.0.3.0.jar')
     implementation files('libs/EzRouterAPIForAndroid.v1.0.1.201206151022.jar')
     implementation files('libs/jts-1.13.jar')
     implementation files('libs/kxml2-2.3.0.jar')
-    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
+    implementation files('libs/EzLicenseAPI4Android.jar')
+    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/jackson-core-lgpl-1.9.5.jar')
+    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
 }

diff --git a/app/build.gradle b/app/build.gradle
index fa31bc0..0614b2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@
         applicationId "com.casic.smartwellapp"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 7
-        versionName "v1.1.1"
+        versionCode 8
+        versionName "v1.1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -37,6 +37,8 @@
         exclude 'META-INF/LGPL2.1'
         exclude 'META-INF/services/javax.annotation.processing.Processor'
         exclude 'META-INF/rxjava.properties'
+        exclude 'org/codehaus/jackson/impl/VERSION.txt'
+        exclude 'org/codehaus/jackson/map/VERSION.txt'
     }
 }
 
@@ -44,6 +46,7 @@
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'pub.devrel:easypermissions:1.3.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
@@ -54,12 +57,12 @@
     implementation 'com.alibaba:fastjson:1.2.68'
     implementation files('libs/guava-17.0.jar')
     implementation files('libs/androidsvg-1.2.2-beta-1.jar')
-    implementation files('libs/EzLicenseAPI4Android.jar')
-    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/EzMapServiceApiForAndroid-1.0.3.0.jar')
     implementation files('libs/EzRouterAPIForAndroid.v1.0.1.201206151022.jar')
     implementation files('libs/jts-1.13.jar')
     implementation files('libs/kxml2-2.3.0.jar')
-    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
+    implementation files('libs/EzLicenseAPI4Android.jar')
+    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/jackson-core-lgpl-1.9.5.jar')
+    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
 }
diff --git a/app/libs/EzLicenseAPI4Android.jar b/app/libs/EzLicenseAPI4Android.jar
index 3dc88ce..37756fa 100644
--- a/app/libs/EzLicenseAPI4Android.jar
+++ b/app/libs/EzLicenseAPI4Android.jar
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index fa31bc0..0614b2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@
         applicationId "com.casic.smartwellapp"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 7
-        versionName "v1.1.1"
+        versionCode 8
+        versionName "v1.1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -37,6 +37,8 @@
         exclude 'META-INF/LGPL2.1'
         exclude 'META-INF/services/javax.annotation.processing.Processor'
         exclude 'META-INF/rxjava.properties'
+        exclude 'org/codehaus/jackson/impl/VERSION.txt'
+        exclude 'org/codehaus/jackson/map/VERSION.txt'
     }
 }
 
@@ -44,6 +46,7 @@
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'pub.devrel:easypermissions:1.3.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
@@ -54,12 +57,12 @@
     implementation 'com.alibaba:fastjson:1.2.68'
     implementation files('libs/guava-17.0.jar')
     implementation files('libs/androidsvg-1.2.2-beta-1.jar')
-    implementation files('libs/EzLicenseAPI4Android.jar')
-    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/EzMapServiceApiForAndroid-1.0.3.0.jar')
     implementation files('libs/EzRouterAPIForAndroid.v1.0.1.201206151022.jar')
     implementation files('libs/jts-1.13.jar')
     implementation files('libs/kxml2-2.3.0.jar')
-    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
+    implementation files('libs/EzLicenseAPI4Android.jar')
+    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/jackson-core-lgpl-1.9.5.jar')
+    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
 }
diff --git a/app/libs/EzLicenseAPI4Android.jar b/app/libs/EzLicenseAPI4Android.jar
index 3dc88ce..37756fa 100644
--- a/app/libs/EzLicenseAPI4Android.jar
+++ b/app/libs/EzLicenseAPI4Android.jar
Binary files differ
diff --git a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
index 95e87e7..b826abe 100644
--- a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
+++ b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index fa31bc0..0614b2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@
         applicationId "com.casic.smartwellapp"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 7
-        versionName "v1.1.1"
+        versionCode 8
+        versionName "v1.1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -37,6 +37,8 @@
         exclude 'META-INF/LGPL2.1'
         exclude 'META-INF/services/javax.annotation.processing.Processor'
         exclude 'META-INF/rxjava.properties'
+        exclude 'org/codehaus/jackson/impl/VERSION.txt'
+        exclude 'org/codehaus/jackson/map/VERSION.txt'
     }
 }
 
@@ -44,6 +46,7 @@
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'pub.devrel:easypermissions:1.3.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
@@ -54,12 +57,12 @@
     implementation 'com.alibaba:fastjson:1.2.68'
     implementation files('libs/guava-17.0.jar')
     implementation files('libs/androidsvg-1.2.2-beta-1.jar')
-    implementation files('libs/EzLicenseAPI4Android.jar')
-    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/EzMapServiceApiForAndroid-1.0.3.0.jar')
     implementation files('libs/EzRouterAPIForAndroid.v1.0.1.201206151022.jar')
     implementation files('libs/jts-1.13.jar')
     implementation files('libs/kxml2-2.3.0.jar')
-    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
+    implementation files('libs/EzLicenseAPI4Android.jar')
+    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/jackson-core-lgpl-1.9.5.jar')
+    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
 }
diff --git a/app/libs/EzLicenseAPI4Android.jar b/app/libs/EzLicenseAPI4Android.jar
index 3dc88ce..37756fa 100644
--- a/app/libs/EzLicenseAPI4Android.jar
+++ b/app/libs/EzLicenseAPI4Android.jar
Binary files differ
diff --git a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
index 95e87e7..b826abe 100644
--- a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
+++ b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6e34b75..4eeda90 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,8 +27,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppThemeNoActionBar"
-        android:usesCleartextTraffic="true">
-        <activity android:name=".MainActivity">
+        android:usesCleartextTraffic="true"
+        tools:targetApi="m">
+        <activity android:name=".PermissionActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -37,8 +38,8 @@
 <!--                <category android:name="android.intent.category.LAUNCHER" />-->
             </intent-filter>
         </activity>
+        <activity android:name=".MainActivity" />
         <activity android:name=".MapInitActivity" />
-        <activity android:name=".MapActivity" />
 
         <provider
             android:name="androidx.core.content.FileProvider"

diff --git a/app/build.gradle b/app/build.gradle
index fa31bc0..0614b2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@
         applicationId "com.casic.smartwellapp"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 7
-        versionName "v1.1.1"
+        versionCode 8
+        versionName "v1.1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -37,6 +37,8 @@
         exclude 'META-INF/LGPL2.1'
         exclude 'META-INF/services/javax.annotation.processing.Processor'
         exclude 'META-INF/rxjava.properties'
+        exclude 'org/codehaus/jackson/impl/VERSION.txt'
+        exclude 'org/codehaus/jackson/map/VERSION.txt'
     }
 }
 
@@ -44,6 +46,7 @@
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'pub.devrel:easypermissions:1.3.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
@@ -54,12 +57,12 @@
     implementation 'com.alibaba:fastjson:1.2.68'
     implementation files('libs/guava-17.0.jar')
     implementation files('libs/androidsvg-1.2.2-beta-1.jar')
-    implementation files('libs/EzLicenseAPI4Android.jar')
-    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/EzMapServiceApiForAndroid-1.0.3.0.jar')
     implementation files('libs/EzRouterAPIForAndroid.v1.0.1.201206151022.jar')
     implementation files('libs/jts-1.13.jar')
     implementation files('libs/kxml2-2.3.0.jar')
-    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
+    implementation files('libs/EzLicenseAPI4Android.jar')
+    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/jackson-core-lgpl-1.9.5.jar')
+    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
 }
diff --git a/app/libs/EzLicenseAPI4Android.jar b/app/libs/EzLicenseAPI4Android.jar
index 3dc88ce..37756fa 100644
--- a/app/libs/EzLicenseAPI4Android.jar
+++ b/app/libs/EzLicenseAPI4Android.jar
Binary files differ
diff --git a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
index 95e87e7..b826abe 100644
--- a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
+++ b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6e34b75..4eeda90 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,8 +27,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppThemeNoActionBar"
-        android:usesCleartextTraffic="true">
-        <activity android:name=".MainActivity">
+        android:usesCleartextTraffic="true"
+        tools:targetApi="m">
+        <activity android:name=".PermissionActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -37,8 +38,8 @@
 <!--                <category android:name="android.intent.category.LAUNCHER" />-->
             </intent-filter>
         </activity>
+        <activity android:name=".MainActivity" />
         <activity android:name=".MapInitActivity" />
-        <activity android:name=".MapActivity" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java b/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
index c11913b..66d61e1 100644
--- a/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
+++ b/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
@@ -1,8 +1,11 @@
 package com.casic.smartwellapp.Entity;
 
+import android.Manifest;
 import android.os.Environment;
 
 public class Constant {
-	public static final String LICENSE_PATH = Environment.getExternalStorageDirectory() + "/PGIS/license/EzServiceClient4Android.lic";
-//	public static final String LICENSE_PATH =  "file:///android_asset/EzServiceClient4Android.lic";
+    public static final String LICENSE_PATH = Environment.getExternalStorageDirectory() + "/PGIS/license/EzServiceClient4Android.lic";
+    //	public static final String LICENSE_PATH =  "file:///android_asset/EzServiceClient4Android.lic";
+    public static final int PERMISSIONS_CODE = 11;
+    public static final String[] USER_PERMISSIONS = {Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
 }

diff --git a/app/build.gradle b/app/build.gradle
index fa31bc0..0614b2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@
         applicationId "com.casic.smartwellapp"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 7
-        versionName "v1.1.1"
+        versionCode 8
+        versionName "v1.1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -37,6 +37,8 @@
         exclude 'META-INF/LGPL2.1'
         exclude 'META-INF/services/javax.annotation.processing.Processor'
         exclude 'META-INF/rxjava.properties'
+        exclude 'org/codehaus/jackson/impl/VERSION.txt'
+        exclude 'org/codehaus/jackson/map/VERSION.txt'
     }
 }
 
@@ -44,6 +46,7 @@
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'pub.devrel:easypermissions:1.3.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
@@ -54,12 +57,12 @@
     implementation 'com.alibaba:fastjson:1.2.68'
     implementation files('libs/guava-17.0.jar')
     implementation files('libs/androidsvg-1.2.2-beta-1.jar')
-    implementation files('libs/EzLicenseAPI4Android.jar')
-    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/EzMapServiceApiForAndroid-1.0.3.0.jar')
     implementation files('libs/EzRouterAPIForAndroid.v1.0.1.201206151022.jar')
     implementation files('libs/jts-1.13.jar')
     implementation files('libs/kxml2-2.3.0.jar')
-    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
+    implementation files('libs/EzLicenseAPI4Android.jar')
+    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/jackson-core-lgpl-1.9.5.jar')
+    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
 }
diff --git a/app/libs/EzLicenseAPI4Android.jar b/app/libs/EzLicenseAPI4Android.jar
index 3dc88ce..37756fa 100644
--- a/app/libs/EzLicenseAPI4Android.jar
+++ b/app/libs/EzLicenseAPI4Android.jar
Binary files differ
diff --git a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
index 95e87e7..b826abe 100644
--- a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
+++ b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6e34b75..4eeda90 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,8 +27,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppThemeNoActionBar"
-        android:usesCleartextTraffic="true">
-        <activity android:name=".MainActivity">
+        android:usesCleartextTraffic="true"
+        tools:targetApi="m">
+        <activity android:name=".PermissionActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -37,8 +38,8 @@
 <!--                <category android:name="android.intent.category.LAUNCHER" />-->
             </intent-filter>
         </activity>
+        <activity android:name=".MainActivity" />
         <activity android:name=".MapInitActivity" />
-        <activity android:name=".MapActivity" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java b/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
index c11913b..66d61e1 100644
--- a/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
+++ b/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
@@ -1,8 +1,11 @@
 package com.casic.smartwellapp.Entity;
 
+import android.Manifest;
 import android.os.Environment;
 
 public class Constant {
-	public static final String LICENSE_PATH = Environment.getExternalStorageDirectory() + "/PGIS/license/EzServiceClient4Android.lic";
-//	public static final String LICENSE_PATH =  "file:///android_asset/EzServiceClient4Android.lic";
+    public static final String LICENSE_PATH = Environment.getExternalStorageDirectory() + "/PGIS/license/EzServiceClient4Android.lic";
+    //	public static final String LICENSE_PATH =  "file:///android_asset/EzServiceClient4Android.lic";
+    public static final int PERMISSIONS_CODE = 11;
+    public static final String[] USER_PERMISSIONS = {Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
 }
diff --git a/app/src/main/java/com/casic/smartwellapp/MainActivity.java b/app/src/main/java/com/casic/smartwellapp/MainActivity.java
index 38bef40..b88eb70 100644
--- a/app/src/main/java/com/casic/smartwellapp/MainActivity.java
+++ b/app/src/main/java/com/casic/smartwellapp/MainActivity.java
@@ -137,15 +137,11 @@
                                 }
                             }
                             //用原生sdk加载地图
-                            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O) {
-                                Intent intent = new Intent(MainActivity.this, MapInitActivity.class);
-                                intent.putExtra("lng", lng);
-                                intent.putExtra("lat", lat);
-                                intent.putExtra("pointname", pointname);
-                                startActivity(intent);
-                            } else {
-                                Toast.makeText(MainActivity.this, "系统版本过高，地图无法使用", Toast.LENGTH_SHORT).show();
-                            }
+                            Intent intent = new Intent(MainActivity.this, MapInitActivity.class);
+                            intent.putExtra("lng", lng);
+                            intent.putExtra("lat", lat);
+                            intent.putExtra("pointname", pointname);
+                            startActivity(intent);
                         } else if (url.startsWith("tel:")) {
                             final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
                             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);

diff --git a/app/build.gradle b/app/build.gradle
index fa31bc0..0614b2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@
         applicationId "com.casic.smartwellapp"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 7
-        versionName "v1.1.1"
+        versionCode 8
+        versionName "v1.1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -37,6 +37,8 @@
         exclude 'META-INF/LGPL2.1'
         exclude 'META-INF/services/javax.annotation.processing.Processor'
         exclude 'META-INF/rxjava.properties'
+        exclude 'org/codehaus/jackson/impl/VERSION.txt'
+        exclude 'org/codehaus/jackson/map/VERSION.txt'
     }
 }
 
@@ -44,6 +46,7 @@
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'pub.devrel:easypermissions:1.3.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
@@ -54,12 +57,12 @@
     implementation 'com.alibaba:fastjson:1.2.68'
     implementation files('libs/guava-17.0.jar')
     implementation files('libs/androidsvg-1.2.2-beta-1.jar')
-    implementation files('libs/EzLicenseAPI4Android.jar')
-    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/EzMapServiceApiForAndroid-1.0.3.0.jar')
     implementation files('libs/EzRouterAPIForAndroid.v1.0.1.201206151022.jar')
     implementation files('libs/jts-1.13.jar')
     implementation files('libs/kxml2-2.3.0.jar')
-    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
+    implementation files('libs/EzLicenseAPI4Android.jar')
+    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/jackson-core-lgpl-1.9.5.jar')
+    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
 }
diff --git a/app/libs/EzLicenseAPI4Android.jar b/app/libs/EzLicenseAPI4Android.jar
index 3dc88ce..37756fa 100644
--- a/app/libs/EzLicenseAPI4Android.jar
+++ b/app/libs/EzLicenseAPI4Android.jar
Binary files differ
diff --git a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
index 95e87e7..b826abe 100644
--- a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
+++ b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6e34b75..4eeda90 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,8 +27,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppThemeNoActionBar"
-        android:usesCleartextTraffic="true">
-        <activity android:name=".MainActivity">
+        android:usesCleartextTraffic="true"
+        tools:targetApi="m">
+        <activity android:name=".PermissionActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -37,8 +38,8 @@
 <!--                <category android:name="android.intent.category.LAUNCHER" />-->
             </intent-filter>
         </activity>
+        <activity android:name=".MainActivity" />
         <activity android:name=".MapInitActivity" />
-        <activity android:name=".MapActivity" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java b/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
index c11913b..66d61e1 100644
--- a/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
+++ b/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
@@ -1,8 +1,11 @@
 package com.casic.smartwellapp.Entity;
 
+import android.Manifest;
 import android.os.Environment;
 
 public class Constant {
-	public static final String LICENSE_PATH = Environment.getExternalStorageDirectory() + "/PGIS/license/EzServiceClient4Android.lic";
-//	public static final String LICENSE_PATH =  "file:///android_asset/EzServiceClient4Android.lic";
+    public static final String LICENSE_PATH = Environment.getExternalStorageDirectory() + "/PGIS/license/EzServiceClient4Android.lic";
+    //	public static final String LICENSE_PATH =  "file:///android_asset/EzServiceClient4Android.lic";
+    public static final int PERMISSIONS_CODE = 11;
+    public static final String[] USER_PERMISSIONS = {Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
 }
diff --git a/app/src/main/java/com/casic/smartwellapp/MainActivity.java b/app/src/main/java/com/casic/smartwellapp/MainActivity.java
index 38bef40..b88eb70 100644
--- a/app/src/main/java/com/casic/smartwellapp/MainActivity.java
+++ b/app/src/main/java/com/casic/smartwellapp/MainActivity.java
@@ -137,15 +137,11 @@
                                 }
                             }
                             //用原生sdk加载地图
-                            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O) {
-                                Intent intent = new Intent(MainActivity.this, MapInitActivity.class);
-                                intent.putExtra("lng", lng);
-                                intent.putExtra("lat", lat);
-                                intent.putExtra("pointname", pointname);
-                                startActivity(intent);
-                            } else {
-                                Toast.makeText(MainActivity.this, "系统版本过高，地图无法使用", Toast.LENGTH_SHORT).show();
-                            }
+                            Intent intent = new Intent(MainActivity.this, MapInitActivity.class);
+                            intent.putExtra("lng", lng);
+                            intent.putExtra("lat", lat);
+                            intent.putExtra("pointname", pointname);
+                            startActivity(intent);
                         } else if (url.startsWith("tel:")) {
                             final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
                             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);
diff --git a/app/src/main/java/com/casic/smartwellapp/MapActivity.java b/app/src/main/java/com/casic/smartwellapp/MapActivity.java
deleted file mode 100644
index c6d7f4f..0000000
--- a/app/src/main/java/com/casic/smartwellapp/MapActivity.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.casic.smartwellapp;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Environment;
-import android.util.Log;
-import android.widget.TextView;
-
-import com.casic.smartwellapp.Entity.Constant;
-import com.easymap.android.maps.v3.EzMap;
-import com.easymap.android.maps.v3.EzMap.OnStatusChangeListener;
-import com.easymap.android.maps.v3.MapView;
-import com.easymap.android.maps.v3.geometry.GeoPoint;
-import com.easymap.android.maps.v3.geometry.SpatialReference;
-import com.easymap.android.maps.v3.graphics.BitmapDescriptor;
-import com.easymap.android.maps.v3.graphics.BitmapDescriptorFactory;
-import com.easymap.android.maps.v3.graphics.Marker;
-import com.easymap.android.maps.v3.layers.GraphicsLayer;
-import com.easymap.android.maps.v3.layers.ogc.WMTSLayer;
-import com.easymap.android.maps.v3.layers.ogc.WMTSLayerInfo;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-
-public class MapActivity extends AppCompatActivity implements OnStatusChangeListener {
-    private MapView mapView;
-    private EzMap ezMap;
-    private TextView textview;
-    private WMTSLayer wmtstdt;
-    private WMTSLayerInfo wmtslayerinfo;
-    private Marker marker;
-    private String lng;
-    private String lat;
-    private String pointname;
-    private GraphicsLayer graphicslayer;
-    private BitmapDescriptor iconcircle;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_map);
-        Intent i = getIntent();
-        lng = i.getStringExtra("lng");
-        lat = i.getStringExtra("lat");
-        pointname = i.getStringExtra("pointname");
-        mapView = (MapView) findViewById(R.id.MapView);
-        if (mapView != null) {
-            // 注册地图准备就绪监听
-            mapView.setOnStatusChangeListener(this);
-            // 实例化一个File对象
-            Log.i("map", Constant.LICENSE_PATH);
-            File file = new File(Constant.LICENSE_PATH);
-            FileInputStream inStream = null;
-            try {
-                inStream = new FileInputStream(file);
-            } catch (FileNotFoundException e) {
-                // TODO Auto-generated catch block
-                Log.e("mapError", "fileNotFoundException");
-                e.printStackTrace();
-            }
-            // 初始化许可方法
-            mapView.initLicenseAsDevelopement(inStream);
-            mapView.onCreate(getApplication(), savedInstanceState);
-        }
-    }
-
-    @Override
-    public void onStatusChanged(STATUS arg0) {
-        textview = (TextView) findViewById(R.id.textview);
-        textview.setText("");
-        // 得到地图对象
-        ezMap = mapView.getMap();
-
-        // 设置地图中心点
-        ezMap.centerAt(new GeoPoint(Double.valueOf(lng), Double.valueOf(lat)), false);
-        // 设置地图级别
-        ezMap.zoomTo(16, false);
-        wmtslayerinfo = new WMTSLayerInfo();
-        wmtslayerinfo.setVersion("1.0.0");
-        wmtslayerinfo.setFormat("tiles");
-        wmtslayerinfo.setStyle("default");
-        wmtslayerinfo.setLayerName("gdsl");
-        wmtslayerinfo.setTileMatrixSet("c");
-        // 实例化WMTSLayer 地图
-        wmtstdt = new WMTSLayer("http://20.1.12.48/EzServer/Maps/gdsl",
-                wmtslayerinfo, "tdt_vec.cache", Environment.getExternalStorageDirectory()
-                + "/EzMap/st");
-        ezMap.addLayer(wmtstdt);
-
-        graphicslayer = new GraphicsLayer(SpatialReference.create(4326),
-                ezMap.getExtent());
-        iconcircle = BitmapDescriptorFactory.defaultMarker();
-        ezMap.addLayer(graphicslayer);
-        // 根据点的位置创建一个Marker的实例
-        marker = new Marker(new GeoPoint(Double.valueOf(lng), Double.valueOf(lat)), iconcircle, 0.5f, 0.5f);
-        // 将marker添加到图层中
-        graphicslayer.addGraphic(marker);
-        ezMap.refreshMap();
-    }
-
-
-}

diff --git a/app/build.gradle b/app/build.gradle
index fa31bc0..0614b2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@
         applicationId "com.casic.smartwellapp"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 7
-        versionName "v1.1.1"
+        versionCode 8
+        versionName "v1.1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -37,6 +37,8 @@
         exclude 'META-INF/LGPL2.1'
         exclude 'META-INF/services/javax.annotation.processing.Processor'
         exclude 'META-INF/rxjava.properties'
+        exclude 'org/codehaus/jackson/impl/VERSION.txt'
+        exclude 'org/codehaus/jackson/map/VERSION.txt'
     }
 }
 
@@ -44,6 +46,7 @@
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'pub.devrel:easypermissions:1.3.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
@@ -54,12 +57,12 @@
     implementation 'com.alibaba:fastjson:1.2.68'
     implementation files('libs/guava-17.0.jar')
     implementation files('libs/androidsvg-1.2.2-beta-1.jar')
-    implementation files('libs/EzLicenseAPI4Android.jar')
-    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/EzMapServiceApiForAndroid-1.0.3.0.jar')
     implementation files('libs/EzRouterAPIForAndroid.v1.0.1.201206151022.jar')
     implementation files('libs/jts-1.13.jar')
     implementation files('libs/kxml2-2.3.0.jar')
-    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
+    implementation files('libs/EzLicenseAPI4Android.jar')
+    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/jackson-core-lgpl-1.9.5.jar')
+    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
 }
diff --git a/app/libs/EzLicenseAPI4Android.jar b/app/libs/EzLicenseAPI4Android.jar
index 3dc88ce..37756fa 100644
--- a/app/libs/EzLicenseAPI4Android.jar
+++ b/app/libs/EzLicenseAPI4Android.jar
Binary files differ
diff --git a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
index 95e87e7..b826abe 100644
--- a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
+++ b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6e34b75..4eeda90 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,8 +27,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppThemeNoActionBar"
-        android:usesCleartextTraffic="true">
-        <activity android:name=".MainActivity">
+        android:usesCleartextTraffic="true"
+        tools:targetApi="m">
+        <activity android:name=".PermissionActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -37,8 +38,8 @@
 <!--                <category android:name="android.intent.category.LAUNCHER" />-->
             </intent-filter>
         </activity>
+        <activity android:name=".MainActivity" />
         <activity android:name=".MapInitActivity" />
-        <activity android:name=".MapActivity" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java b/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
index c11913b..66d61e1 100644
--- a/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
+++ b/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
@@ -1,8 +1,11 @@
 package com.casic.smartwellapp.Entity;
 
+import android.Manifest;
 import android.os.Environment;
 
 public class Constant {
-	public static final String LICENSE_PATH = Environment.getExternalStorageDirectory() + "/PGIS/license/EzServiceClient4Android.lic";
-//	public static final String LICENSE_PATH =  "file:///android_asset/EzServiceClient4Android.lic";
+    public static final String LICENSE_PATH = Environment.getExternalStorageDirectory() + "/PGIS/license/EzServiceClient4Android.lic";
+    //	public static final String LICENSE_PATH =  "file:///android_asset/EzServiceClient4Android.lic";
+    public static final int PERMISSIONS_CODE = 11;
+    public static final String[] USER_PERMISSIONS = {Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
 }
diff --git a/app/src/main/java/com/casic/smartwellapp/MainActivity.java b/app/src/main/java/com/casic/smartwellapp/MainActivity.java
index 38bef40..b88eb70 100644
--- a/app/src/main/java/com/casic/smartwellapp/MainActivity.java
+++ b/app/src/main/java/com/casic/smartwellapp/MainActivity.java
@@ -137,15 +137,11 @@
                                 }
                             }
                             //用原生sdk加载地图
-                            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O) {
-                                Intent intent = new Intent(MainActivity.this, MapInitActivity.class);
-                                intent.putExtra("lng", lng);
-                                intent.putExtra("lat", lat);
-                                intent.putExtra("pointname", pointname);
-                                startActivity(intent);
-                            } else {
-                                Toast.makeText(MainActivity.this, "系统版本过高，地图无法使用", Toast.LENGTH_SHORT).show();
-                            }
+                            Intent intent = new Intent(MainActivity.this, MapInitActivity.class);
+                            intent.putExtra("lng", lng);
+                            intent.putExtra("lat", lat);
+                            intent.putExtra("pointname", pointname);
+                            startActivity(intent);
                         } else if (url.startsWith("tel:")) {
                             final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
                             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);
diff --git a/app/src/main/java/com/casic/smartwellapp/MapActivity.java b/app/src/main/java/com/casic/smartwellapp/MapActivity.java
deleted file mode 100644
index c6d7f4f..0000000
--- a/app/src/main/java/com/casic/smartwellapp/MapActivity.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.casic.smartwellapp;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Environment;
-import android.util.Log;
-import android.widget.TextView;
-
-import com.casic.smartwellapp.Entity.Constant;
-import com.easymap.android.maps.v3.EzMap;
-import com.easymap.android.maps.v3.EzMap.OnStatusChangeListener;
-import com.easymap.android.maps.v3.MapView;
-import com.easymap.android.maps.v3.geometry.GeoPoint;
-import com.easymap.android.maps.v3.geometry.SpatialReference;
-import com.easymap.android.maps.v3.graphics.BitmapDescriptor;
-import com.easymap.android.maps.v3.graphics.BitmapDescriptorFactory;
-import com.easymap.android.maps.v3.graphics.Marker;
-import com.easymap.android.maps.v3.layers.GraphicsLayer;
-import com.easymap.android.maps.v3.layers.ogc.WMTSLayer;
-import com.easymap.android.maps.v3.layers.ogc.WMTSLayerInfo;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-
-public class MapActivity extends AppCompatActivity implements OnStatusChangeListener {
-    private MapView mapView;
-    private EzMap ezMap;
-    private TextView textview;
-    private WMTSLayer wmtstdt;
-    private WMTSLayerInfo wmtslayerinfo;
-    private Marker marker;
-    private String lng;
-    private String lat;
-    private String pointname;
-    private GraphicsLayer graphicslayer;
-    private BitmapDescriptor iconcircle;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_map);
-        Intent i = getIntent();
-        lng = i.getStringExtra("lng");
-        lat = i.getStringExtra("lat");
-        pointname = i.getStringExtra("pointname");
-        mapView = (MapView) findViewById(R.id.MapView);
-        if (mapView != null) {
-            // 注册地图准备就绪监听
-            mapView.setOnStatusChangeListener(this);
-            // 实例化一个File对象
-            Log.i("map", Constant.LICENSE_PATH);
-            File file = new File(Constant.LICENSE_PATH);
-            FileInputStream inStream = null;
-            try {
-                inStream = new FileInputStream(file);
-            } catch (FileNotFoundException e) {
-                // TODO Auto-generated catch block
-                Log.e("mapError", "fileNotFoundException");
-                e.printStackTrace();
-            }
-            // 初始化许可方法
-            mapView.initLicenseAsDevelopement(inStream);
-            mapView.onCreate(getApplication(), savedInstanceState);
-        }
-    }
-
-    @Override
-    public void onStatusChanged(STATUS arg0) {
-        textview = (TextView) findViewById(R.id.textview);
-        textview.setText("");
-        // 得到地图对象
-        ezMap = mapView.getMap();
-
-        // 设置地图中心点
-        ezMap.centerAt(new GeoPoint(Double.valueOf(lng), Double.valueOf(lat)), false);
-        // 设置地图级别
-        ezMap.zoomTo(16, false);
-        wmtslayerinfo = new WMTSLayerInfo();
-        wmtslayerinfo.setVersion("1.0.0");
-        wmtslayerinfo.setFormat("tiles");
-        wmtslayerinfo.setStyle("default");
-        wmtslayerinfo.setLayerName("gdsl");
-        wmtslayerinfo.setTileMatrixSet("c");
-        // 实例化WMTSLayer 地图
-        wmtstdt = new WMTSLayer("http://20.1.12.48/EzServer/Maps/gdsl",
-                wmtslayerinfo, "tdt_vec.cache", Environment.getExternalStorageDirectory()
-                + "/EzMap/st");
-        ezMap.addLayer(wmtstdt);
-
-        graphicslayer = new GraphicsLayer(SpatialReference.create(4326),
-                ezMap.getExtent());
-        iconcircle = BitmapDescriptorFactory.defaultMarker();
-        ezMap.addLayer(graphicslayer);
-        // 根据点的位置创建一个Marker的实例
-        marker = new Marker(new GeoPoint(Double.valueOf(lng), Double.valueOf(lat)), iconcircle, 0.5f, 0.5f);
-        // 将marker添加到图层中
-        graphicslayer.addGraphic(marker);
-        ezMap.refreshMap();
-    }
-
-
-}
diff --git a/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java b/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java
index ffe3784..9cc84e9 100644
--- a/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java
+++ b/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java
@@ -1,19 +1,12 @@
 package com.casic.smartwellapp;
 
-import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Environment;
-import android.util.Log;
 import android.widget.TextView;
 
-import androidx.core.app.ActivityCompat;
-
-import com.casic.smartwellapp.Entity.Constant;
 import com.easymap.android.maps.v3.EzMap;
-import com.easymap.android.maps.v3.EzMap.OnStatusChangeListener;
 import com.easymap.android.maps.v3.MapView;
 import com.easymap.android.maps.v3.geometry.GeoPoint;
 import com.easymap.android.maps.v3.geometry.SpatialReference;
@@ -24,49 +17,35 @@
 import com.easymap.android.maps.v3.layers.ogc.WMTSLayer;
 import com.easymap.android.maps.v3.layers.ogc.WMTSLayerInfo;
 
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 
-public class MapInitActivity extends Activity implements OnStatusChangeListener {
+public class MapInitActivity extends Activity implements EzMap.OnStatusChangeListener {
 
-    public static final int REQUEST_PERMISSION = 11;
+    private static final String TAG = "MapInitActivity";
     private MapView mapView;
-    private String lng;
-    private String lat;
+    private String lng = "116.2631267408096";
+    private String lat = "39.91441966136631";
     private String pointname;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-//		this.requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.activity_map_init);
         Intent i = getIntent();
         lng = i.getStringExtra("lng");
         lat = i.getStringExtra("lat");
         pointname = i.getStringExtra("pointname");
-        mapView = findViewById(R.id.MapView);
+        mapView = findViewById(R.id.mapView);
         if (mapView != null) {
-            // 注册地图准备就绪监听
             mapView.setOnStatusChangeListener(this);
-            // 实例化一个File对象
-            Log.i("map", Constant.LICENSE_PATH);
-//			File file = new File(Constant.LICENSE_PATH);
-//			FileInputStream inStream = null;
-            InputStream inStream = null;
+            InputStream inputStream = null;
             try {
-                inStream = getResources().getAssets().open("EzServiceClient4Android.lic");
-//				inStream = new FileInputStream(file);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
+                inputStream = getResources().getAssets().open("EzServiceClient4Android.lic");
             } catch (IOException e) {
                 e.printStackTrace();
             }
-            // 初始化许可方法
-//            mapView.initLicenseAsDevelopement(inStream);
-            mapView.initLicense(getAssetsData("EzServiceClient4Android.lic"));//20210525 Pengxh修改
+            mapView.initLicenseAsDevelopement(inputStream);
             mapView.onCreate(getApplication(), savedInstanceState);
         }
     }
@@ -77,7 +56,6 @@
         textview.setText(pointname);
         // 得到地图对象
         EzMap ezMap = mapView.getMap();
-
         // 设置地图中心点
         ezMap.centerAt(new GeoPoint(Double.parseDouble(lng), Double.parseDouble(lat)), false);
         // 设置地图级别
@@ -89,48 +67,19 @@
         wmtslayerinfo.setLayerName("gdsl");
         wmtslayerinfo.setTileMatrixSet("c");
         // 实例化WMTSLayer 地图
-        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, REQUEST_PERMISSION);
-        }
-        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, REQUEST_PERMISSION);
-        }
-        WMTSLayer wmtstdt = new WMTSLayer("http://20.1.12.48/EzServer/Maps/gdsl", wmtslayerinfo,
-                "tdt_vec.cache",
+        WMTSLayer wmtstdt = new WMTSLayer("http://20.1.12.48/EzServer/Maps/gdsl", wmtslayerinfo, "tdt_vec.cache",
                 Environment.getExternalStorageDirectory() + "/EzMap/st");
         ezMap.addLayer(wmtstdt);
 
         GraphicsLayer graphicslayer = new GraphicsLayer(SpatialReference.create(4326), ezMap.getExtent());
-        BitmapDescriptor iconCircle = BitmapDescriptorFactory.defaultMarker();
+        BitmapDescriptor iconCircle = BitmapDescriptorFactory.fromResource(this, R.drawable.location);
         ezMap.addLayer(graphicslayer);
+
+//        Log.d(TAG, "onStatusChanged: [" + lng + "," + lat + "]");
         // 根据点的位置创建一个Marker的实例
         Marker marker = new Marker(new GeoPoint(Double.parseDouble(lng), Double.parseDouble(lat)), iconCircle, 0.5f, 0.5f);
         // 将marker添加到图层中
         graphicslayer.addGraphic(marker);
         ezMap.refreshMap();
     }
-
-    /**
-     * 获取本地Asserts文件内容
-     */
-    public String getAssetsData(String fileName) {
-        try {
-            InputStreamReader inputStreamReader = new InputStreamReader(getAssets().open(fileName));
-            BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
-            StringBuilder data = new StringBuilder();
-            String s;
-            try {
-                while ((s = bufferedReader.readLine()) != null) {
-                    data.append(s);
-                }
-                Log.d("map", "getAssetsData: " + data);
-                return data.toString();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
 }

diff --git a/app/build.gradle b/app/build.gradle
index fa31bc0..0614b2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@
         applicationId "com.casic.smartwellapp"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 7
-        versionName "v1.1.1"
+        versionCode 8
+        versionName "v1.1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -37,6 +37,8 @@
         exclude 'META-INF/LGPL2.1'
         exclude 'META-INF/services/javax.annotation.processing.Processor'
         exclude 'META-INF/rxjava.properties'
+        exclude 'org/codehaus/jackson/impl/VERSION.txt'
+        exclude 'org/codehaus/jackson/map/VERSION.txt'
     }
 }
 
@@ -44,6 +46,7 @@
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'pub.devrel:easypermissions:1.3.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
@@ -54,12 +57,12 @@
     implementation 'com.alibaba:fastjson:1.2.68'
     implementation files('libs/guava-17.0.jar')
     implementation files('libs/androidsvg-1.2.2-beta-1.jar')
-    implementation files('libs/EzLicenseAPI4Android.jar')
-    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/EzMapServiceApiForAndroid-1.0.3.0.jar')
     implementation files('libs/EzRouterAPIForAndroid.v1.0.1.201206151022.jar')
     implementation files('libs/jts-1.13.jar')
     implementation files('libs/kxml2-2.3.0.jar')
-    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
+    implementation files('libs/EzLicenseAPI4Android.jar')
+    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/jackson-core-lgpl-1.9.5.jar')
+    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
 }
diff --git a/app/libs/EzLicenseAPI4Android.jar b/app/libs/EzLicenseAPI4Android.jar
index 3dc88ce..37756fa 100644
--- a/app/libs/EzLicenseAPI4Android.jar
+++ b/app/libs/EzLicenseAPI4Android.jar
Binary files differ
diff --git a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
index 95e87e7..b826abe 100644
--- a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
+++ b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6e34b75..4eeda90 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,8 +27,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppThemeNoActionBar"
-        android:usesCleartextTraffic="true">
-        <activity android:name=".MainActivity">
+        android:usesCleartextTraffic="true"
+        tools:targetApi="m">
+        <activity android:name=".PermissionActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -37,8 +38,8 @@
 <!--                <category android:name="android.intent.category.LAUNCHER" />-->
             </intent-filter>
         </activity>
+        <activity android:name=".MainActivity" />
         <activity android:name=".MapInitActivity" />
-        <activity android:name=".MapActivity" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java b/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
index c11913b..66d61e1 100644
--- a/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
+++ b/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
@@ -1,8 +1,11 @@
 package com.casic.smartwellapp.Entity;
 
+import android.Manifest;
 import android.os.Environment;
 
 public class Constant {
-	public static final String LICENSE_PATH = Environment.getExternalStorageDirectory() + "/PGIS/license/EzServiceClient4Android.lic";
-//	public static final String LICENSE_PATH =  "file:///android_asset/EzServiceClient4Android.lic";
+    public static final String LICENSE_PATH = Environment.getExternalStorageDirectory() + "/PGIS/license/EzServiceClient4Android.lic";
+    //	public static final String LICENSE_PATH =  "file:///android_asset/EzServiceClient4Android.lic";
+    public static final int PERMISSIONS_CODE = 11;
+    public static final String[] USER_PERMISSIONS = {Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
 }
diff --git a/app/src/main/java/com/casic/smartwellapp/MainActivity.java b/app/src/main/java/com/casic/smartwellapp/MainActivity.java
index 38bef40..b88eb70 100644
--- a/app/src/main/java/com/casic/smartwellapp/MainActivity.java
+++ b/app/src/main/java/com/casic/smartwellapp/MainActivity.java
@@ -137,15 +137,11 @@
                                 }
                             }
                             //用原生sdk加载地图
-                            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O) {
-                                Intent intent = new Intent(MainActivity.this, MapInitActivity.class);
-                                intent.putExtra("lng", lng);
-                                intent.putExtra("lat", lat);
-                                intent.putExtra("pointname", pointname);
-                                startActivity(intent);
-                            } else {
-                                Toast.makeText(MainActivity.this, "系统版本过高，地图无法使用", Toast.LENGTH_SHORT).show();
-                            }
+                            Intent intent = new Intent(MainActivity.this, MapInitActivity.class);
+                            intent.putExtra("lng", lng);
+                            intent.putExtra("lat", lat);
+                            intent.putExtra("pointname", pointname);
+                            startActivity(intent);
                         } else if (url.startsWith("tel:")) {
                             final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
                             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);
diff --git a/app/src/main/java/com/casic/smartwellapp/MapActivity.java b/app/src/main/java/com/casic/smartwellapp/MapActivity.java
deleted file mode 100644
index c6d7f4f..0000000
--- a/app/src/main/java/com/casic/smartwellapp/MapActivity.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.casic.smartwellapp;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Environment;
-import android.util.Log;
-import android.widget.TextView;
-
-import com.casic.smartwellapp.Entity.Constant;
-import com.easymap.android.maps.v3.EzMap;
-import com.easymap.android.maps.v3.EzMap.OnStatusChangeListener;
-import com.easymap.android.maps.v3.MapView;
-import com.easymap.android.maps.v3.geometry.GeoPoint;
-import com.easymap.android.maps.v3.geometry.SpatialReference;
-import com.easymap.android.maps.v3.graphics.BitmapDescriptor;
-import com.easymap.android.maps.v3.graphics.BitmapDescriptorFactory;
-import com.easymap.android.maps.v3.graphics.Marker;
-import com.easymap.android.maps.v3.layers.GraphicsLayer;
-import com.easymap.android.maps.v3.layers.ogc.WMTSLayer;
-import com.easymap.android.maps.v3.layers.ogc.WMTSLayerInfo;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-
-public class MapActivity extends AppCompatActivity implements OnStatusChangeListener {
-    private MapView mapView;
-    private EzMap ezMap;
-    private TextView textview;
-    private WMTSLayer wmtstdt;
-    private WMTSLayerInfo wmtslayerinfo;
-    private Marker marker;
-    private String lng;
-    private String lat;
-    private String pointname;
-    private GraphicsLayer graphicslayer;
-    private BitmapDescriptor iconcircle;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_map);
-        Intent i = getIntent();
-        lng = i.getStringExtra("lng");
-        lat = i.getStringExtra("lat");
-        pointname = i.getStringExtra("pointname");
-        mapView = (MapView) findViewById(R.id.MapView);
-        if (mapView != null) {
-            // 注册地图准备就绪监听
-            mapView.setOnStatusChangeListener(this);
-            // 实例化一个File对象
-            Log.i("map", Constant.LICENSE_PATH);
-            File file = new File(Constant.LICENSE_PATH);
-            FileInputStream inStream = null;
-            try {
-                inStream = new FileInputStream(file);
-            } catch (FileNotFoundException e) {
-                // TODO Auto-generated catch block
-                Log.e("mapError", "fileNotFoundException");
-                e.printStackTrace();
-            }
-            // 初始化许可方法
-            mapView.initLicenseAsDevelopement(inStream);
-            mapView.onCreate(getApplication(), savedInstanceState);
-        }
-    }
-
-    @Override
-    public void onStatusChanged(STATUS arg0) {
-        textview = (TextView) findViewById(R.id.textview);
-        textview.setText("");
-        // 得到地图对象
-        ezMap = mapView.getMap();
-
-        // 设置地图中心点
-        ezMap.centerAt(new GeoPoint(Double.valueOf(lng), Double.valueOf(lat)), false);
-        // 设置地图级别
-        ezMap.zoomTo(16, false);
-        wmtslayerinfo = new WMTSLayerInfo();
-        wmtslayerinfo.setVersion("1.0.0");
-        wmtslayerinfo.setFormat("tiles");
-        wmtslayerinfo.setStyle("default");
-        wmtslayerinfo.setLayerName("gdsl");
-        wmtslayerinfo.setTileMatrixSet("c");
-        // 实例化WMTSLayer 地图
-        wmtstdt = new WMTSLayer("http://20.1.12.48/EzServer/Maps/gdsl",
-                wmtslayerinfo, "tdt_vec.cache", Environment.getExternalStorageDirectory()
-                + "/EzMap/st");
-        ezMap.addLayer(wmtstdt);
-
-        graphicslayer = new GraphicsLayer(SpatialReference.create(4326),
-                ezMap.getExtent());
-        iconcircle = BitmapDescriptorFactory.defaultMarker();
-        ezMap.addLayer(graphicslayer);
-        // 根据点的位置创建一个Marker的实例
-        marker = new Marker(new GeoPoint(Double.valueOf(lng), Double.valueOf(lat)), iconcircle, 0.5f, 0.5f);
-        // 将marker添加到图层中
-        graphicslayer.addGraphic(marker);
-        ezMap.refreshMap();
-    }
-
-
-}
diff --git a/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java b/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java
index ffe3784..9cc84e9 100644
--- a/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java
+++ b/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java
@@ -1,19 +1,12 @@
 package com.casic.smartwellapp;
 
-import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Environment;
-import android.util.Log;
 import android.widget.TextView;
 
-import androidx.core.app.ActivityCompat;
-
-import com.casic.smartwellapp.Entity.Constant;
 import com.easymap.android.maps.v3.EzMap;
-import com.easymap.android.maps.v3.EzMap.OnStatusChangeListener;
 import com.easymap.android.maps.v3.MapView;
 import com.easymap.android.maps.v3.geometry.GeoPoint;
 import com.easymap.android.maps.v3.geometry.SpatialReference;
@@ -24,49 +17,35 @@
 import com.easymap.android.maps.v3.layers.ogc.WMTSLayer;
 import com.easymap.android.maps.v3.layers.ogc.WMTSLayerInfo;
 
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 
-public class MapInitActivity extends Activity implements OnStatusChangeListener {
+public class MapInitActivity extends Activity implements EzMap.OnStatusChangeListener {
 
-    public static final int REQUEST_PERMISSION = 11;
+    private static final String TAG = "MapInitActivity";
     private MapView mapView;
-    private String lng;
-    private String lat;
+    private String lng = "116.2631267408096";
+    private String lat = "39.91441966136631";
     private String pointname;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-//		this.requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.activity_map_init);
         Intent i = getIntent();
         lng = i.getStringExtra("lng");
         lat = i.getStringExtra("lat");
         pointname = i.getStringExtra("pointname");
-        mapView = findViewById(R.id.MapView);
+        mapView = findViewById(R.id.mapView);
         if (mapView != null) {
-            // 注册地图准备就绪监听
             mapView.setOnStatusChangeListener(this);
-            // 实例化一个File对象
-            Log.i("map", Constant.LICENSE_PATH);
-//			File file = new File(Constant.LICENSE_PATH);
-//			FileInputStream inStream = null;
-            InputStream inStream = null;
+            InputStream inputStream = null;
             try {
-                inStream = getResources().getAssets().open("EzServiceClient4Android.lic");
-//				inStream = new FileInputStream(file);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
+                inputStream = getResources().getAssets().open("EzServiceClient4Android.lic");
             } catch (IOException e) {
                 e.printStackTrace();
             }
-            // 初始化许可方法
-//            mapView.initLicenseAsDevelopement(inStream);
-            mapView.initLicense(getAssetsData("EzServiceClient4Android.lic"));//20210525 Pengxh修改
+            mapView.initLicenseAsDevelopement(inputStream);
             mapView.onCreate(getApplication(), savedInstanceState);
         }
     }
@@ -77,7 +56,6 @@
         textview.setText(pointname);
         // 得到地图对象
         EzMap ezMap = mapView.getMap();
-
         // 设置地图中心点
         ezMap.centerAt(new GeoPoint(Double.parseDouble(lng), Double.parseDouble(lat)), false);
         // 设置地图级别
@@ -89,48 +67,19 @@
         wmtslayerinfo.setLayerName("gdsl");
         wmtslayerinfo.setTileMatrixSet("c");
         // 实例化WMTSLayer 地图
-        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, REQUEST_PERMISSION);
-        }
-        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, REQUEST_PERMISSION);
-        }
-        WMTSLayer wmtstdt = new WMTSLayer("http://20.1.12.48/EzServer/Maps/gdsl", wmtslayerinfo,
-                "tdt_vec.cache",
+        WMTSLayer wmtstdt = new WMTSLayer("http://20.1.12.48/EzServer/Maps/gdsl", wmtslayerinfo, "tdt_vec.cache",
                 Environment.getExternalStorageDirectory() + "/EzMap/st");
         ezMap.addLayer(wmtstdt);
 
         GraphicsLayer graphicslayer = new GraphicsLayer(SpatialReference.create(4326), ezMap.getExtent());
-        BitmapDescriptor iconCircle = BitmapDescriptorFactory.defaultMarker();
+        BitmapDescriptor iconCircle = BitmapDescriptorFactory.fromResource(this, R.drawable.location);
         ezMap.addLayer(graphicslayer);
+
+//        Log.d(TAG, "onStatusChanged: [" + lng + "," + lat + "]");
         // 根据点的位置创建一个Marker的实例
         Marker marker = new Marker(new GeoPoint(Double.parseDouble(lng), Double.parseDouble(lat)), iconCircle, 0.5f, 0.5f);
         // 将marker添加到图层中
         graphicslayer.addGraphic(marker);
         ezMap.refreshMap();
     }
-
-    /**
-     * 获取本地Asserts文件内容
-     */
-    public String getAssetsData(String fileName) {
-        try {
-            InputStreamReader inputStreamReader = new InputStreamReader(getAssets().open(fileName));
-            BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
-            StringBuilder data = new StringBuilder();
-            String s;
-            try {
-                while ((s = bufferedReader.readLine()) != null) {
-                    data.append(s);
-                }
-                Log.d("map", "getAssetsData: " + data);
-                return data.toString();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
 }
diff --git a/app/src/main/java/com/casic/smartwellapp/PermissionActivity.java b/app/src/main/java/com/casic/smartwellapp/PermissionActivity.java
new file mode 100644
index 0000000..93d32f1
--- /dev/null
+++ b/app/src/main/java/com/casic/smartwellapp/PermissionActivity.java
@@ -0,0 +1,58 @@
+package com.casic.smartwellapp;
+
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.casic.smartwellapp.Entity.Constant;
+
+import java.util.List;
+
+import pub.devrel.easypermissions.EasyPermissions;
+
+
+public class PermissionActivity extends AppCompatActivity implements EasyPermissions.PermissionCallbacks {
+
+    private static final String TAG = "PermissionActivity";
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (EasyPermissions.hasPermissions(this, Constant.USER_PERMISSIONS)) {
+                startMainActivity();
+            } else {
+                EasyPermissions.requestPermissions(this, "需要获取相关权限", Constant.PERMISSIONS_CODE, Constant.USER_PERMISSIONS);
+            }
+        } else {
+            startMainActivity();
+        }
+    }
+
+    private void startMainActivity() {
+        startActivity(new Intent(this, MainActivity.class));
+        finish();
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
+    }
+
+    @Override
+    public void onPermissionsGranted(int requestCode, @NonNull List<String> perms) {
+        startMainActivity();
+    }
+
+    @Override
+    public void onPermissionsDenied(int requestCode, @NonNull List<String> perms) {
+        Log.e(TAG, "onPermissionsDenied: " + perms);
+    }
+}

diff --git a/app/build.gradle b/app/build.gradle
index fa31bc0..0614b2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@
         applicationId "com.casic.smartwellapp"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 7
-        versionName "v1.1.1"
+        versionCode 8
+        versionName "v1.1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -37,6 +37,8 @@
         exclude 'META-INF/LGPL2.1'
         exclude 'META-INF/services/javax.annotation.processing.Processor'
         exclude 'META-INF/rxjava.properties'
+        exclude 'org/codehaus/jackson/impl/VERSION.txt'
+        exclude 'org/codehaus/jackson/map/VERSION.txt'
     }
 }
 
@@ -44,6 +46,7 @@
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'pub.devrel:easypermissions:1.3.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
@@ -54,12 +57,12 @@
     implementation 'com.alibaba:fastjson:1.2.68'
     implementation files('libs/guava-17.0.jar')
     implementation files('libs/androidsvg-1.2.2-beta-1.jar')
-    implementation files('libs/EzLicenseAPI4Android.jar')
-    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/EzMapServiceApiForAndroid-1.0.3.0.jar')
     implementation files('libs/EzRouterAPIForAndroid.v1.0.1.201206151022.jar')
     implementation files('libs/jts-1.13.jar')
     implementation files('libs/kxml2-2.3.0.jar')
-    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
+    implementation files('libs/EzLicenseAPI4Android.jar')
+    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/jackson-core-lgpl-1.9.5.jar')
+    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
 }
diff --git a/app/libs/EzLicenseAPI4Android.jar b/app/libs/EzLicenseAPI4Android.jar
index 3dc88ce..37756fa 100644
--- a/app/libs/EzLicenseAPI4Android.jar
+++ b/app/libs/EzLicenseAPI4Android.jar
Binary files differ
diff --git a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
index 95e87e7..b826abe 100644
--- a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
+++ b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6e34b75..4eeda90 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,8 +27,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppThemeNoActionBar"
-        android:usesCleartextTraffic="true">
-        <activity android:name=".MainActivity">
+        android:usesCleartextTraffic="true"
+        tools:targetApi="m">
+        <activity android:name=".PermissionActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -37,8 +38,8 @@
 <!--                <category android:name="android.intent.category.LAUNCHER" />-->
             </intent-filter>
         </activity>
+        <activity android:name=".MainActivity" />
         <activity android:name=".MapInitActivity" />
-        <activity android:name=".MapActivity" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java b/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
index c11913b..66d61e1 100644
--- a/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
+++ b/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
@@ -1,8 +1,11 @@
 package com.casic.smartwellapp.Entity;
 
+import android.Manifest;
 import android.os.Environment;
 
 public class Constant {
-	public static final String LICENSE_PATH = Environment.getExternalStorageDirectory() + "/PGIS/license/EzServiceClient4Android.lic";
-//	public static final String LICENSE_PATH =  "file:///android_asset/EzServiceClient4Android.lic";
+    public static final String LICENSE_PATH = Environment.getExternalStorageDirectory() + "/PGIS/license/EzServiceClient4Android.lic";
+    //	public static final String LICENSE_PATH =  "file:///android_asset/EzServiceClient4Android.lic";
+    public static final int PERMISSIONS_CODE = 11;
+    public static final String[] USER_PERMISSIONS = {Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
 }
diff --git a/app/src/main/java/com/casic/smartwellapp/MainActivity.java b/app/src/main/java/com/casic/smartwellapp/MainActivity.java
index 38bef40..b88eb70 100644
--- a/app/src/main/java/com/casic/smartwellapp/MainActivity.java
+++ b/app/src/main/java/com/casic/smartwellapp/MainActivity.java
@@ -137,15 +137,11 @@
                                 }
                             }
                             //用原生sdk加载地图
-                            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O) {
-                                Intent intent = new Intent(MainActivity.this, MapInitActivity.class);
-                                intent.putExtra("lng", lng);
-                                intent.putExtra("lat", lat);
-                                intent.putExtra("pointname", pointname);
-                                startActivity(intent);
-                            } else {
-                                Toast.makeText(MainActivity.this, "系统版本过高，地图无法使用", Toast.LENGTH_SHORT).show();
-                            }
+                            Intent intent = new Intent(MainActivity.this, MapInitActivity.class);
+                            intent.putExtra("lng", lng);
+                            intent.putExtra("lat", lat);
+                            intent.putExtra("pointname", pointname);
+                            startActivity(intent);
                         } else if (url.startsWith("tel:")) {
                             final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
                             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);
diff --git a/app/src/main/java/com/casic/smartwellapp/MapActivity.java b/app/src/main/java/com/casic/smartwellapp/MapActivity.java
deleted file mode 100644
index c6d7f4f..0000000
--- a/app/src/main/java/com/casic/smartwellapp/MapActivity.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.casic.smartwellapp;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Environment;
-import android.util.Log;
-import android.widget.TextView;
-
-import com.casic.smartwellapp.Entity.Constant;
-import com.easymap.android.maps.v3.EzMap;
-import com.easymap.android.maps.v3.EzMap.OnStatusChangeListener;
-import com.easymap.android.maps.v3.MapView;
-import com.easymap.android.maps.v3.geometry.GeoPoint;
-import com.easymap.android.maps.v3.geometry.SpatialReference;
-import com.easymap.android.maps.v3.graphics.BitmapDescriptor;
-import com.easymap.android.maps.v3.graphics.BitmapDescriptorFactory;
-import com.easymap.android.maps.v3.graphics.Marker;
-import com.easymap.android.maps.v3.layers.GraphicsLayer;
-import com.easymap.android.maps.v3.layers.ogc.WMTSLayer;
-import com.easymap.android.maps.v3.layers.ogc.WMTSLayerInfo;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-
-public class MapActivity extends AppCompatActivity implements OnStatusChangeListener {
-    private MapView mapView;
-    private EzMap ezMap;
-    private TextView textview;
-    private WMTSLayer wmtstdt;
-    private WMTSLayerInfo wmtslayerinfo;
-    private Marker marker;
-    private String lng;
-    private String lat;
-    private String pointname;
-    private GraphicsLayer graphicslayer;
-    private BitmapDescriptor iconcircle;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_map);
-        Intent i = getIntent();
-        lng = i.getStringExtra("lng");
-        lat = i.getStringExtra("lat");
-        pointname = i.getStringExtra("pointname");
-        mapView = (MapView) findViewById(R.id.MapView);
-        if (mapView != null) {
-            // 注册地图准备就绪监听
-            mapView.setOnStatusChangeListener(this);
-            // 实例化一个File对象
-            Log.i("map", Constant.LICENSE_PATH);
-            File file = new File(Constant.LICENSE_PATH);
-            FileInputStream inStream = null;
-            try {
-                inStream = new FileInputStream(file);
-            } catch (FileNotFoundException e) {
-                // TODO Auto-generated catch block
-                Log.e("mapError", "fileNotFoundException");
-                e.printStackTrace();
-            }
-            // 初始化许可方法
-            mapView.initLicenseAsDevelopement(inStream);
-            mapView.onCreate(getApplication(), savedInstanceState);
-        }
-    }
-
-    @Override
-    public void onStatusChanged(STATUS arg0) {
-        textview = (TextView) findViewById(R.id.textview);
-        textview.setText("");
-        // 得到地图对象
-        ezMap = mapView.getMap();
-
-        // 设置地图中心点
-        ezMap.centerAt(new GeoPoint(Double.valueOf(lng), Double.valueOf(lat)), false);
-        // 设置地图级别
-        ezMap.zoomTo(16, false);
-        wmtslayerinfo = new WMTSLayerInfo();
-        wmtslayerinfo.setVersion("1.0.0");
-        wmtslayerinfo.setFormat("tiles");
-        wmtslayerinfo.setStyle("default");
-        wmtslayerinfo.setLayerName("gdsl");
-        wmtslayerinfo.setTileMatrixSet("c");
-        // 实例化WMTSLayer 地图
-        wmtstdt = new WMTSLayer("http://20.1.12.48/EzServer/Maps/gdsl",
-                wmtslayerinfo, "tdt_vec.cache", Environment.getExternalStorageDirectory()
-                + "/EzMap/st");
-        ezMap.addLayer(wmtstdt);
-
-        graphicslayer = new GraphicsLayer(SpatialReference.create(4326),
-                ezMap.getExtent());
-        iconcircle = BitmapDescriptorFactory.defaultMarker();
-        ezMap.addLayer(graphicslayer);
-        // 根据点的位置创建一个Marker的实例
-        marker = new Marker(new GeoPoint(Double.valueOf(lng), Double.valueOf(lat)), iconcircle, 0.5f, 0.5f);
-        // 将marker添加到图层中
-        graphicslayer.addGraphic(marker);
-        ezMap.refreshMap();
-    }
-
-
-}
diff --git a/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java b/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java
index ffe3784..9cc84e9 100644
--- a/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java
+++ b/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java
@@ -1,19 +1,12 @@
 package com.casic.smartwellapp;
 
-import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Environment;
-import android.util.Log;
 import android.widget.TextView;
 
-import androidx.core.app.ActivityCompat;
-
-import com.casic.smartwellapp.Entity.Constant;
 import com.easymap.android.maps.v3.EzMap;
-import com.easymap.android.maps.v3.EzMap.OnStatusChangeListener;
 import com.easymap.android.maps.v3.MapView;
 import com.easymap.android.maps.v3.geometry.GeoPoint;
 import com.easymap.android.maps.v3.geometry.SpatialReference;
@@ -24,49 +17,35 @@
 import com.easymap.android.maps.v3.layers.ogc.WMTSLayer;
 import com.easymap.android.maps.v3.layers.ogc.WMTSLayerInfo;
 
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 
-public class MapInitActivity extends Activity implements OnStatusChangeListener {
+public class MapInitActivity extends Activity implements EzMap.OnStatusChangeListener {
 
-    public static final int REQUEST_PERMISSION = 11;
+    private static final String TAG = "MapInitActivity";
     private MapView mapView;
-    private String lng;
-    private String lat;
+    private String lng = "116.2631267408096";
+    private String lat = "39.91441966136631";
     private String pointname;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-//		this.requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.activity_map_init);
         Intent i = getIntent();
         lng = i.getStringExtra("lng");
         lat = i.getStringExtra("lat");
         pointname = i.getStringExtra("pointname");
-        mapView = findViewById(R.id.MapView);
+        mapView = findViewById(R.id.mapView);
         if (mapView != null) {
-            // 注册地图准备就绪监听
             mapView.setOnStatusChangeListener(this);
-            // 实例化一个File对象
-            Log.i("map", Constant.LICENSE_PATH);
-//			File file = new File(Constant.LICENSE_PATH);
-//			FileInputStream inStream = null;
-            InputStream inStream = null;
+            InputStream inputStream = null;
             try {
-                inStream = getResources().getAssets().open("EzServiceClient4Android.lic");
-//				inStream = new FileInputStream(file);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
+                inputStream = getResources().getAssets().open("EzServiceClient4Android.lic");
             } catch (IOException e) {
                 e.printStackTrace();
             }
-            // 初始化许可方法
-//            mapView.initLicenseAsDevelopement(inStream);
-            mapView.initLicense(getAssetsData("EzServiceClient4Android.lic"));//20210525 Pengxh修改
+            mapView.initLicenseAsDevelopement(inputStream);
             mapView.onCreate(getApplication(), savedInstanceState);
         }
     }
@@ -77,7 +56,6 @@
         textview.setText(pointname);
         // 得到地图对象
         EzMap ezMap = mapView.getMap();
-
         // 设置地图中心点
         ezMap.centerAt(new GeoPoint(Double.parseDouble(lng), Double.parseDouble(lat)), false);
         // 设置地图级别
@@ -89,48 +67,19 @@
         wmtslayerinfo.setLayerName("gdsl");
         wmtslayerinfo.setTileMatrixSet("c");
         // 实例化WMTSLayer 地图
-        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, REQUEST_PERMISSION);
-        }
-        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, REQUEST_PERMISSION);
-        }
-        WMTSLayer wmtstdt = new WMTSLayer("http://20.1.12.48/EzServer/Maps/gdsl", wmtslayerinfo,
-                "tdt_vec.cache",
+        WMTSLayer wmtstdt = new WMTSLayer("http://20.1.12.48/EzServer/Maps/gdsl", wmtslayerinfo, "tdt_vec.cache",
                 Environment.getExternalStorageDirectory() + "/EzMap/st");
         ezMap.addLayer(wmtstdt);
 
         GraphicsLayer graphicslayer = new GraphicsLayer(SpatialReference.create(4326), ezMap.getExtent());
-        BitmapDescriptor iconCircle = BitmapDescriptorFactory.defaultMarker();
+        BitmapDescriptor iconCircle = BitmapDescriptorFactory.fromResource(this, R.drawable.location);
         ezMap.addLayer(graphicslayer);
+
+//        Log.d(TAG, "onStatusChanged: [" + lng + "," + lat + "]");
         // 根据点的位置创建一个Marker的实例
         Marker marker = new Marker(new GeoPoint(Double.parseDouble(lng), Double.parseDouble(lat)), iconCircle, 0.5f, 0.5f);
         // 将marker添加到图层中
         graphicslayer.addGraphic(marker);
         ezMap.refreshMap();
     }
-
-    /**
-     * 获取本地Asserts文件内容
-     */
-    public String getAssetsData(String fileName) {
-        try {
-            InputStreamReader inputStreamReader = new InputStreamReader(getAssets().open(fileName));
-            BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
-            StringBuilder data = new StringBuilder();
-            String s;
-            try {
-                while ((s = bufferedReader.readLine()) != null) {
-                    data.append(s);
-                }
-                Log.d("map", "getAssetsData: " + data);
-                return data.toString();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
 }
diff --git a/app/src/main/java/com/casic/smartwellapp/PermissionActivity.java b/app/src/main/java/com/casic/smartwellapp/PermissionActivity.java
new file mode 100644
index 0000000..93d32f1
--- /dev/null
+++ b/app/src/main/java/com/casic/smartwellapp/PermissionActivity.java
@@ -0,0 +1,58 @@
+package com.casic.smartwellapp;
+
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.casic.smartwellapp.Entity.Constant;
+
+import java.util.List;
+
+import pub.devrel.easypermissions.EasyPermissions;
+
+
+public class PermissionActivity extends AppCompatActivity implements EasyPermissions.PermissionCallbacks {
+
+    private static final String TAG = "PermissionActivity";
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (EasyPermissions.hasPermissions(this, Constant.USER_PERMISSIONS)) {
+                startMainActivity();
+            } else {
+                EasyPermissions.requestPermissions(this, "需要获取相关权限", Constant.PERMISSIONS_CODE, Constant.USER_PERMISSIONS);
+            }
+        } else {
+            startMainActivity();
+        }
+    }
+
+    private void startMainActivity() {
+        startActivity(new Intent(this, MainActivity.class));
+        finish();
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
+    }
+
+    @Override
+    public void onPermissionsGranted(int requestCode, @NonNull List<String> perms) {
+        startMainActivity();
+    }
+
+    @Override
+    public void onPermissionsDenied(int requestCode, @NonNull List<String> perms) {
+        Log.e(TAG, "onPermissionsDenied: " + perms);
+    }
+}
diff --git a/app/src/main/jniLibs/armeabi-v7a/libEzMobileRuntimeCore.so b/app/src/main/jniLibs/armeabi-v7a/libEzMobileRuntimeCore.so
new file mode 100755
index 0000000..a1de978
--- /dev/null
+++ b/app/src/main/jniLibs/armeabi-v7a/libEzMobileRuntimeCore.so
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index fa31bc0..0614b2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@
         applicationId "com.casic.smartwellapp"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 7
-        versionName "v1.1.1"
+        versionCode 8
+        versionName "v1.1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -37,6 +37,8 @@
         exclude 'META-INF/LGPL2.1'
         exclude 'META-INF/services/javax.annotation.processing.Processor'
         exclude 'META-INF/rxjava.properties'
+        exclude 'org/codehaus/jackson/impl/VERSION.txt'
+        exclude 'org/codehaus/jackson/map/VERSION.txt'
     }
 }
 
@@ -44,6 +46,7 @@
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'pub.devrel:easypermissions:1.3.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
@@ -54,12 +57,12 @@
     implementation 'com.alibaba:fastjson:1.2.68'
     implementation files('libs/guava-17.0.jar')
     implementation files('libs/androidsvg-1.2.2-beta-1.jar')
-    implementation files('libs/EzLicenseAPI4Android.jar')
-    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/EzMapServiceApiForAndroid-1.0.3.0.jar')
     implementation files('libs/EzRouterAPIForAndroid.v1.0.1.201206151022.jar')
     implementation files('libs/jts-1.13.jar')
     implementation files('libs/kxml2-2.3.0.jar')
-    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
+    implementation files('libs/EzLicenseAPI4Android.jar')
+    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/jackson-core-lgpl-1.9.5.jar')
+    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
 }
diff --git a/app/libs/EzLicenseAPI4Android.jar b/app/libs/EzLicenseAPI4Android.jar
index 3dc88ce..37756fa 100644
--- a/app/libs/EzLicenseAPI4Android.jar
+++ b/app/libs/EzLicenseAPI4Android.jar
Binary files differ
diff --git a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
index 95e87e7..b826abe 100644
--- a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
+++ b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6e34b75..4eeda90 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,8 +27,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppThemeNoActionBar"
-        android:usesCleartextTraffic="true">
-        <activity android:name=".MainActivity">
+        android:usesCleartextTraffic="true"
+        tools:targetApi="m">
+        <activity android:name=".PermissionActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -37,8 +38,8 @@
 <!--                <category android:name="android.intent.category.LAUNCHER" />-->
             </intent-filter>
         </activity>
+        <activity android:name=".MainActivity" />
         <activity android:name=".MapInitActivity" />
-        <activity android:name=".MapActivity" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java b/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
index c11913b..66d61e1 100644
--- a/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
+++ b/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
@@ -1,8 +1,11 @@
 package com.casic.smartwellapp.Entity;
 
+import android.Manifest;
 import android.os.Environment;
 
 public class Constant {
-	public static final String LICENSE_PATH = Environment.getExternalStorageDirectory() + "/PGIS/license/EzServiceClient4Android.lic";
-//	public static final String LICENSE_PATH =  "file:///android_asset/EzServiceClient4Android.lic";
+    public static final String LICENSE_PATH = Environment.getExternalStorageDirectory() + "/PGIS/license/EzServiceClient4Android.lic";
+    //	public static final String LICENSE_PATH =  "file:///android_asset/EzServiceClient4Android.lic";
+    public static final int PERMISSIONS_CODE = 11;
+    public static final String[] USER_PERMISSIONS = {Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
 }
diff --git a/app/src/main/java/com/casic/smartwellapp/MainActivity.java b/app/src/main/java/com/casic/smartwellapp/MainActivity.java
index 38bef40..b88eb70 100644
--- a/app/src/main/java/com/casic/smartwellapp/MainActivity.java
+++ b/app/src/main/java/com/casic/smartwellapp/MainActivity.java
@@ -137,15 +137,11 @@
                                 }
                             }
                             //用原生sdk加载地图
-                            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O) {
-                                Intent intent = new Intent(MainActivity.this, MapInitActivity.class);
-                                intent.putExtra("lng", lng);
-                                intent.putExtra("lat", lat);
-                                intent.putExtra("pointname", pointname);
-                                startActivity(intent);
-                            } else {
-                                Toast.makeText(MainActivity.this, "系统版本过高，地图无法使用", Toast.LENGTH_SHORT).show();
-                            }
+                            Intent intent = new Intent(MainActivity.this, MapInitActivity.class);
+                            intent.putExtra("lng", lng);
+                            intent.putExtra("lat", lat);
+                            intent.putExtra("pointname", pointname);
+                            startActivity(intent);
                         } else if (url.startsWith("tel:")) {
                             final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
                             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);
diff --git a/app/src/main/java/com/casic/smartwellapp/MapActivity.java b/app/src/main/java/com/casic/smartwellapp/MapActivity.java
deleted file mode 100644
index c6d7f4f..0000000
--- a/app/src/main/java/com/casic/smartwellapp/MapActivity.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.casic.smartwellapp;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Environment;
-import android.util.Log;
-import android.widget.TextView;
-
-import com.casic.smartwellapp.Entity.Constant;
-import com.easymap.android.maps.v3.EzMap;
-import com.easymap.android.maps.v3.EzMap.OnStatusChangeListener;
-import com.easymap.android.maps.v3.MapView;
-import com.easymap.android.maps.v3.geometry.GeoPoint;
-import com.easymap.android.maps.v3.geometry.SpatialReference;
-import com.easymap.android.maps.v3.graphics.BitmapDescriptor;
-import com.easymap.android.maps.v3.graphics.BitmapDescriptorFactory;
-import com.easymap.android.maps.v3.graphics.Marker;
-import com.easymap.android.maps.v3.layers.GraphicsLayer;
-import com.easymap.android.maps.v3.layers.ogc.WMTSLayer;
-import com.easymap.android.maps.v3.layers.ogc.WMTSLayerInfo;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-
-public class MapActivity extends AppCompatActivity implements OnStatusChangeListener {
-    private MapView mapView;
-    private EzMap ezMap;
-    private TextView textview;
-    private WMTSLayer wmtstdt;
-    private WMTSLayerInfo wmtslayerinfo;
-    private Marker marker;
-    private String lng;
-    private String lat;
-    private String pointname;
-    private GraphicsLayer graphicslayer;
-    private BitmapDescriptor iconcircle;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_map);
-        Intent i = getIntent();
-        lng = i.getStringExtra("lng");
-        lat = i.getStringExtra("lat");
-        pointname = i.getStringExtra("pointname");
-        mapView = (MapView) findViewById(R.id.MapView);
-        if (mapView != null) {
-            // 注册地图准备就绪监听
-            mapView.setOnStatusChangeListener(this);
-            // 实例化一个File对象
-            Log.i("map", Constant.LICENSE_PATH);
-            File file = new File(Constant.LICENSE_PATH);
-            FileInputStream inStream = null;
-            try {
-                inStream = new FileInputStream(file);
-            } catch (FileNotFoundException e) {
-                // TODO Auto-generated catch block
-                Log.e("mapError", "fileNotFoundException");
-                e.printStackTrace();
-            }
-            // 初始化许可方法
-            mapView.initLicenseAsDevelopement(inStream);
-            mapView.onCreate(getApplication(), savedInstanceState);
-        }
-    }
-
-    @Override
-    public void onStatusChanged(STATUS arg0) {
-        textview = (TextView) findViewById(R.id.textview);
-        textview.setText("");
-        // 得到地图对象
-        ezMap = mapView.getMap();
-
-        // 设置地图中心点
-        ezMap.centerAt(new GeoPoint(Double.valueOf(lng), Double.valueOf(lat)), false);
-        // 设置地图级别
-        ezMap.zoomTo(16, false);
-        wmtslayerinfo = new WMTSLayerInfo();
-        wmtslayerinfo.setVersion("1.0.0");
-        wmtslayerinfo.setFormat("tiles");
-        wmtslayerinfo.setStyle("default");
-        wmtslayerinfo.setLayerName("gdsl");
-        wmtslayerinfo.setTileMatrixSet("c");
-        // 实例化WMTSLayer 地图
-        wmtstdt = new WMTSLayer("http://20.1.12.48/EzServer/Maps/gdsl",
-                wmtslayerinfo, "tdt_vec.cache", Environment.getExternalStorageDirectory()
-                + "/EzMap/st");
-        ezMap.addLayer(wmtstdt);
-
-        graphicslayer = new GraphicsLayer(SpatialReference.create(4326),
-                ezMap.getExtent());
-        iconcircle = BitmapDescriptorFactory.defaultMarker();
-        ezMap.addLayer(graphicslayer);
-        // 根据点的位置创建一个Marker的实例
-        marker = new Marker(new GeoPoint(Double.valueOf(lng), Double.valueOf(lat)), iconcircle, 0.5f, 0.5f);
-        // 将marker添加到图层中
-        graphicslayer.addGraphic(marker);
-        ezMap.refreshMap();
-    }
-
-
-}
diff --git a/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java b/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java
index ffe3784..9cc84e9 100644
--- a/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java
+++ b/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java
@@ -1,19 +1,12 @@
 package com.casic.smartwellapp;
 
-import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Environment;
-import android.util.Log;
 import android.widget.TextView;
 
-import androidx.core.app.ActivityCompat;
-
-import com.casic.smartwellapp.Entity.Constant;
 import com.easymap.android.maps.v3.EzMap;
-import com.easymap.android.maps.v3.EzMap.OnStatusChangeListener;
 import com.easymap.android.maps.v3.MapView;
 import com.easymap.android.maps.v3.geometry.GeoPoint;
 import com.easymap.android.maps.v3.geometry.SpatialReference;
@@ -24,49 +17,35 @@
 import com.easymap.android.maps.v3.layers.ogc.WMTSLayer;
 import com.easymap.android.maps.v3.layers.ogc.WMTSLayerInfo;
 
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 
-public class MapInitActivity extends Activity implements OnStatusChangeListener {
+public class MapInitActivity extends Activity implements EzMap.OnStatusChangeListener {
 
-    public static final int REQUEST_PERMISSION = 11;
+    private static final String TAG = "MapInitActivity";
     private MapView mapView;
-    private String lng;
-    private String lat;
+    private String lng = "116.2631267408096";
+    private String lat = "39.91441966136631";
     private String pointname;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-//		this.requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.activity_map_init);
         Intent i = getIntent();
         lng = i.getStringExtra("lng");
         lat = i.getStringExtra("lat");
         pointname = i.getStringExtra("pointname");
-        mapView = findViewById(R.id.MapView);
+        mapView = findViewById(R.id.mapView);
         if (mapView != null) {
-            // 注册地图准备就绪监听
             mapView.setOnStatusChangeListener(this);
-            // 实例化一个File对象
-            Log.i("map", Constant.LICENSE_PATH);
-//			File file = new File(Constant.LICENSE_PATH);
-//			FileInputStream inStream = null;
-            InputStream inStream = null;
+            InputStream inputStream = null;
             try {
-                inStream = getResources().getAssets().open("EzServiceClient4Android.lic");
-//				inStream = new FileInputStream(file);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
+                inputStream = getResources().getAssets().open("EzServiceClient4Android.lic");
             } catch (IOException e) {
                 e.printStackTrace();
             }
-            // 初始化许可方法
-//            mapView.initLicenseAsDevelopement(inStream);
-            mapView.initLicense(getAssetsData("EzServiceClient4Android.lic"));//20210525 Pengxh修改
+            mapView.initLicenseAsDevelopement(inputStream);
             mapView.onCreate(getApplication(), savedInstanceState);
         }
     }
@@ -77,7 +56,6 @@
         textview.setText(pointname);
         // 得到地图对象
         EzMap ezMap = mapView.getMap();
-
         // 设置地图中心点
         ezMap.centerAt(new GeoPoint(Double.parseDouble(lng), Double.parseDouble(lat)), false);
         // 设置地图级别
@@ -89,48 +67,19 @@
         wmtslayerinfo.setLayerName("gdsl");
         wmtslayerinfo.setTileMatrixSet("c");
         // 实例化WMTSLayer 地图
-        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, REQUEST_PERMISSION);
-        }
-        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, REQUEST_PERMISSION);
-        }
-        WMTSLayer wmtstdt = new WMTSLayer("http://20.1.12.48/EzServer/Maps/gdsl", wmtslayerinfo,
-                "tdt_vec.cache",
+        WMTSLayer wmtstdt = new WMTSLayer("http://20.1.12.48/EzServer/Maps/gdsl", wmtslayerinfo, "tdt_vec.cache",
                 Environment.getExternalStorageDirectory() + "/EzMap/st");
         ezMap.addLayer(wmtstdt);
 
         GraphicsLayer graphicslayer = new GraphicsLayer(SpatialReference.create(4326), ezMap.getExtent());
-        BitmapDescriptor iconCircle = BitmapDescriptorFactory.defaultMarker();
+        BitmapDescriptor iconCircle = BitmapDescriptorFactory.fromResource(this, R.drawable.location);
         ezMap.addLayer(graphicslayer);
+
+//        Log.d(TAG, "onStatusChanged: [" + lng + "," + lat + "]");
         // 根据点的位置创建一个Marker的实例
         Marker marker = new Marker(new GeoPoint(Double.parseDouble(lng), Double.parseDouble(lat)), iconCircle, 0.5f, 0.5f);
         // 将marker添加到图层中
         graphicslayer.addGraphic(marker);
         ezMap.refreshMap();
     }
-
-    /**
-     * 获取本地Asserts文件内容
-     */
-    public String getAssetsData(String fileName) {
-        try {
-            InputStreamReader inputStreamReader = new InputStreamReader(getAssets().open(fileName));
-            BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
-            StringBuilder data = new StringBuilder();
-            String s;
-            try {
-                while ((s = bufferedReader.readLine()) != null) {
-                    data.append(s);
-                }
-                Log.d("map", "getAssetsData: " + data);
-                return data.toString();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
 }
diff --git a/app/src/main/java/com/casic/smartwellapp/PermissionActivity.java b/app/src/main/java/com/casic/smartwellapp/PermissionActivity.java
new file mode 100644
index 0000000..93d32f1
--- /dev/null
+++ b/app/src/main/java/com/casic/smartwellapp/PermissionActivity.java
@@ -0,0 +1,58 @@
+package com.casic.smartwellapp;
+
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.casic.smartwellapp.Entity.Constant;
+
+import java.util.List;
+
+import pub.devrel.easypermissions.EasyPermissions;
+
+
+public class PermissionActivity extends AppCompatActivity implements EasyPermissions.PermissionCallbacks {
+
+    private static final String TAG = "PermissionActivity";
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (EasyPermissions.hasPermissions(this, Constant.USER_PERMISSIONS)) {
+                startMainActivity();
+            } else {
+                EasyPermissions.requestPermissions(this, "需要获取相关权限", Constant.PERMISSIONS_CODE, Constant.USER_PERMISSIONS);
+            }
+        } else {
+            startMainActivity();
+        }
+    }
+
+    private void startMainActivity() {
+        startActivity(new Intent(this, MainActivity.class));
+        finish();
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
+    }
+
+    @Override
+    public void onPermissionsGranted(int requestCode, @NonNull List<String> perms) {
+        startMainActivity();
+    }
+
+    @Override
+    public void onPermissionsDenied(int requestCode, @NonNull List<String> perms) {
+        Log.e(TAG, "onPermissionsDenied: " + perms);
+    }
+}
diff --git a/app/src/main/jniLibs/armeabi-v7a/libEzMobileRuntimeCore.so b/app/src/main/jniLibs/armeabi-v7a/libEzMobileRuntimeCore.so
new file mode 100755
index 0000000..a1de978
--- /dev/null
+++ b/app/src/main/jniLibs/armeabi-v7a/libEzMobileRuntimeCore.so
Binary files differ
diff --git a/app/src/main/jniLibs/x86/libEzMobileRuntimeCore.so b/app/src/main/jniLibs/x86/libEzMobileRuntimeCore.so
new file mode 100755
index 0000000..b3e475d
--- /dev/null
+++ b/app/src/main/jniLibs/x86/libEzMobileRuntimeCore.so
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index fa31bc0..0614b2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@
         applicationId "com.casic.smartwellapp"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 7
-        versionName "v1.1.1"
+        versionCode 8
+        versionName "v1.1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -37,6 +37,8 @@
         exclude 'META-INF/LGPL2.1'
         exclude 'META-INF/services/javax.annotation.processing.Processor'
         exclude 'META-INF/rxjava.properties'
+        exclude 'org/codehaus/jackson/impl/VERSION.txt'
+        exclude 'org/codehaus/jackson/map/VERSION.txt'
     }
 }
 
@@ -44,6 +46,7 @@
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'pub.devrel:easypermissions:1.3.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
@@ -54,12 +57,12 @@
     implementation 'com.alibaba:fastjson:1.2.68'
     implementation files('libs/guava-17.0.jar')
     implementation files('libs/androidsvg-1.2.2-beta-1.jar')
-    implementation files('libs/EzLicenseAPI4Android.jar')
-    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/EzMapServiceApiForAndroid-1.0.3.0.jar')
     implementation files('libs/EzRouterAPIForAndroid.v1.0.1.201206151022.jar')
     implementation files('libs/jts-1.13.jar')
     implementation files('libs/kxml2-2.3.0.jar')
-    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
+    implementation files('libs/EzLicenseAPI4Android.jar')
+    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/jackson-core-lgpl-1.9.5.jar')
+    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
 }
diff --git a/app/libs/EzLicenseAPI4Android.jar b/app/libs/EzLicenseAPI4Android.jar
index 3dc88ce..37756fa 100644
--- a/app/libs/EzLicenseAPI4Android.jar
+++ b/app/libs/EzLicenseAPI4Android.jar
Binary files differ
diff --git a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
index 95e87e7..b826abe 100644
--- a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
+++ b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6e34b75..4eeda90 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,8 +27,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppThemeNoActionBar"
-        android:usesCleartextTraffic="true">
-        <activity android:name=".MainActivity">
+        android:usesCleartextTraffic="true"
+        tools:targetApi="m">
+        <activity android:name=".PermissionActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -37,8 +38,8 @@
 <!--                <category android:name="android.intent.category.LAUNCHER" />-->
             </intent-filter>
         </activity>
+        <activity android:name=".MainActivity" />
         <activity android:name=".MapInitActivity" />
-        <activity android:name=".MapActivity" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java b/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
index c11913b..66d61e1 100644
--- a/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
+++ b/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
@@ -1,8 +1,11 @@
 package com.casic.smartwellapp.Entity;
 
+import android.Manifest;
 import android.os.Environment;
 
 public class Constant {
-	public static final String LICENSE_PATH = Environment.getExternalStorageDirectory() + "/PGIS/license/EzServiceClient4Android.lic";
-//	public static final String LICENSE_PATH =  "file:///android_asset/EzServiceClient4Android.lic";
+    public static final String LICENSE_PATH = Environment.getExternalStorageDirectory() + "/PGIS/license/EzServiceClient4Android.lic";
+    //	public static final String LICENSE_PATH =  "file:///android_asset/EzServiceClient4Android.lic";
+    public static final int PERMISSIONS_CODE = 11;
+    public static final String[] USER_PERMISSIONS = {Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
 }
diff --git a/app/src/main/java/com/casic/smartwellapp/MainActivity.java b/app/src/main/java/com/casic/smartwellapp/MainActivity.java
index 38bef40..b88eb70 100644
--- a/app/src/main/java/com/casic/smartwellapp/MainActivity.java
+++ b/app/src/main/java/com/casic/smartwellapp/MainActivity.java
@@ -137,15 +137,11 @@
                                 }
                             }
                             //用原生sdk加载地图
-                            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O) {
-                                Intent intent = new Intent(MainActivity.this, MapInitActivity.class);
-                                intent.putExtra("lng", lng);
-                                intent.putExtra("lat", lat);
-                                intent.putExtra("pointname", pointname);
-                                startActivity(intent);
-                            } else {
-                                Toast.makeText(MainActivity.this, "系统版本过高，地图无法使用", Toast.LENGTH_SHORT).show();
-                            }
+                            Intent intent = new Intent(MainActivity.this, MapInitActivity.class);
+                            intent.putExtra("lng", lng);
+                            intent.putExtra("lat", lat);
+                            intent.putExtra("pointname", pointname);
+                            startActivity(intent);
                         } else if (url.startsWith("tel:")) {
                             final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
                             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);
diff --git a/app/src/main/java/com/casic/smartwellapp/MapActivity.java b/app/src/main/java/com/casic/smartwellapp/MapActivity.java
deleted file mode 100644
index c6d7f4f..0000000
--- a/app/src/main/java/com/casic/smartwellapp/MapActivity.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.casic.smartwellapp;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Environment;
-import android.util.Log;
-import android.widget.TextView;
-
-import com.casic.smartwellapp.Entity.Constant;
-import com.easymap.android.maps.v3.EzMap;
-import com.easymap.android.maps.v3.EzMap.OnStatusChangeListener;
-import com.easymap.android.maps.v3.MapView;
-import com.easymap.android.maps.v3.geometry.GeoPoint;
-import com.easymap.android.maps.v3.geometry.SpatialReference;
-import com.easymap.android.maps.v3.graphics.BitmapDescriptor;
-import com.easymap.android.maps.v3.graphics.BitmapDescriptorFactory;
-import com.easymap.android.maps.v3.graphics.Marker;
-import com.easymap.android.maps.v3.layers.GraphicsLayer;
-import com.easymap.android.maps.v3.layers.ogc.WMTSLayer;
-import com.easymap.android.maps.v3.layers.ogc.WMTSLayerInfo;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-
-public class MapActivity extends AppCompatActivity implements OnStatusChangeListener {
-    private MapView mapView;
-    private EzMap ezMap;
-    private TextView textview;
-    private WMTSLayer wmtstdt;
-    private WMTSLayerInfo wmtslayerinfo;
-    private Marker marker;
-    private String lng;
-    private String lat;
-    private String pointname;
-    private GraphicsLayer graphicslayer;
-    private BitmapDescriptor iconcircle;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_map);
-        Intent i = getIntent();
-        lng = i.getStringExtra("lng");
-        lat = i.getStringExtra("lat");
-        pointname = i.getStringExtra("pointname");
-        mapView = (MapView) findViewById(R.id.MapView);
-        if (mapView != null) {
-            // 注册地图准备就绪监听
-            mapView.setOnStatusChangeListener(this);
-            // 实例化一个File对象
-            Log.i("map", Constant.LICENSE_PATH);
-            File file = new File(Constant.LICENSE_PATH);
-            FileInputStream inStream = null;
-            try {
-                inStream = new FileInputStream(file);
-            } catch (FileNotFoundException e) {
-                // TODO Auto-generated catch block
-                Log.e("mapError", "fileNotFoundException");
-                e.printStackTrace();
-            }
-            // 初始化许可方法
-            mapView.initLicenseAsDevelopement(inStream);
-            mapView.onCreate(getApplication(), savedInstanceState);
-        }
-    }
-
-    @Override
-    public void onStatusChanged(STATUS arg0) {
-        textview = (TextView) findViewById(R.id.textview);
-        textview.setText("");
-        // 得到地图对象
-        ezMap = mapView.getMap();
-
-        // 设置地图中心点
-        ezMap.centerAt(new GeoPoint(Double.valueOf(lng), Double.valueOf(lat)), false);
-        // 设置地图级别
-        ezMap.zoomTo(16, false);
-        wmtslayerinfo = new WMTSLayerInfo();
-        wmtslayerinfo.setVersion("1.0.0");
-        wmtslayerinfo.setFormat("tiles");
-        wmtslayerinfo.setStyle("default");
-        wmtslayerinfo.setLayerName("gdsl");
-        wmtslayerinfo.setTileMatrixSet("c");
-        // 实例化WMTSLayer 地图
-        wmtstdt = new WMTSLayer("http://20.1.12.48/EzServer/Maps/gdsl",
-                wmtslayerinfo, "tdt_vec.cache", Environment.getExternalStorageDirectory()
-                + "/EzMap/st");
-        ezMap.addLayer(wmtstdt);
-
-        graphicslayer = new GraphicsLayer(SpatialReference.create(4326),
-                ezMap.getExtent());
-        iconcircle = BitmapDescriptorFactory.defaultMarker();
-        ezMap.addLayer(graphicslayer);
-        // 根据点的位置创建一个Marker的实例
-        marker = new Marker(new GeoPoint(Double.valueOf(lng), Double.valueOf(lat)), iconcircle, 0.5f, 0.5f);
-        // 将marker添加到图层中
-        graphicslayer.addGraphic(marker);
-        ezMap.refreshMap();
-    }
-
-
-}
diff --git a/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java b/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java
index ffe3784..9cc84e9 100644
--- a/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java
+++ b/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java
@@ -1,19 +1,12 @@
 package com.casic.smartwellapp;
 
-import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Environment;
-import android.util.Log;
 import android.widget.TextView;
 
-import androidx.core.app.ActivityCompat;
-
-import com.casic.smartwellapp.Entity.Constant;
 import com.easymap.android.maps.v3.EzMap;
-import com.easymap.android.maps.v3.EzMap.OnStatusChangeListener;
 import com.easymap.android.maps.v3.MapView;
 import com.easymap.android.maps.v3.geometry.GeoPoint;
 import com.easymap.android.maps.v3.geometry.SpatialReference;
@@ -24,49 +17,35 @@
 import com.easymap.android.maps.v3.layers.ogc.WMTSLayer;
 import com.easymap.android.maps.v3.layers.ogc.WMTSLayerInfo;
 
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 
-public class MapInitActivity extends Activity implements OnStatusChangeListener {
+public class MapInitActivity extends Activity implements EzMap.OnStatusChangeListener {
 
-    public static final int REQUEST_PERMISSION = 11;
+    private static final String TAG = "MapInitActivity";
     private MapView mapView;
-    private String lng;
-    private String lat;
+    private String lng = "116.2631267408096";
+    private String lat = "39.91441966136631";
     private String pointname;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-//		this.requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.activity_map_init);
         Intent i = getIntent();
         lng = i.getStringExtra("lng");
         lat = i.getStringExtra("lat");
         pointname = i.getStringExtra("pointname");
-        mapView = findViewById(R.id.MapView);
+        mapView = findViewById(R.id.mapView);
         if (mapView != null) {
-            // 注册地图准备就绪监听
             mapView.setOnStatusChangeListener(this);
-            // 实例化一个File对象
-            Log.i("map", Constant.LICENSE_PATH);
-//			File file = new File(Constant.LICENSE_PATH);
-//			FileInputStream inStream = null;
-            InputStream inStream = null;
+            InputStream inputStream = null;
             try {
-                inStream = getResources().getAssets().open("EzServiceClient4Android.lic");
-//				inStream = new FileInputStream(file);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
+                inputStream = getResources().getAssets().open("EzServiceClient4Android.lic");
             } catch (IOException e) {
                 e.printStackTrace();
             }
-            // 初始化许可方法
-//            mapView.initLicenseAsDevelopement(inStream);
-            mapView.initLicense(getAssetsData("EzServiceClient4Android.lic"));//20210525 Pengxh修改
+            mapView.initLicenseAsDevelopement(inputStream);
             mapView.onCreate(getApplication(), savedInstanceState);
         }
     }
@@ -77,7 +56,6 @@
         textview.setText(pointname);
         // 得到地图对象
         EzMap ezMap = mapView.getMap();
-
         // 设置地图中心点
         ezMap.centerAt(new GeoPoint(Double.parseDouble(lng), Double.parseDouble(lat)), false);
         // 设置地图级别
@@ -89,48 +67,19 @@
         wmtslayerinfo.setLayerName("gdsl");
         wmtslayerinfo.setTileMatrixSet("c");
         // 实例化WMTSLayer 地图
-        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, REQUEST_PERMISSION);
-        }
-        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, REQUEST_PERMISSION);
-        }
-        WMTSLayer wmtstdt = new WMTSLayer("http://20.1.12.48/EzServer/Maps/gdsl", wmtslayerinfo,
-                "tdt_vec.cache",
+        WMTSLayer wmtstdt = new WMTSLayer("http://20.1.12.48/EzServer/Maps/gdsl", wmtslayerinfo, "tdt_vec.cache",
                 Environment.getExternalStorageDirectory() + "/EzMap/st");
         ezMap.addLayer(wmtstdt);
 
         GraphicsLayer graphicslayer = new GraphicsLayer(SpatialReference.create(4326), ezMap.getExtent());
-        BitmapDescriptor iconCircle = BitmapDescriptorFactory.defaultMarker();
+        BitmapDescriptor iconCircle = BitmapDescriptorFactory.fromResource(this, R.drawable.location);
         ezMap.addLayer(graphicslayer);
+
+//        Log.d(TAG, "onStatusChanged: [" + lng + "," + lat + "]");
         // 根据点的位置创建一个Marker的实例
         Marker marker = new Marker(new GeoPoint(Double.parseDouble(lng), Double.parseDouble(lat)), iconCircle, 0.5f, 0.5f);
         // 将marker添加到图层中
         graphicslayer.addGraphic(marker);
         ezMap.refreshMap();
     }
-
-    /**
-     * 获取本地Asserts文件内容
-     */
-    public String getAssetsData(String fileName) {
-        try {
-            InputStreamReader inputStreamReader = new InputStreamReader(getAssets().open(fileName));
-            BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
-            StringBuilder data = new StringBuilder();
-            String s;
-            try {
-                while ((s = bufferedReader.readLine()) != null) {
-                    data.append(s);
-                }
-                Log.d("map", "getAssetsData: " + data);
-                return data.toString();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
 }
diff --git a/app/src/main/java/com/casic/smartwellapp/PermissionActivity.java b/app/src/main/java/com/casic/smartwellapp/PermissionActivity.java
new file mode 100644
index 0000000..93d32f1
--- /dev/null
+++ b/app/src/main/java/com/casic/smartwellapp/PermissionActivity.java
@@ -0,0 +1,58 @@
+package com.casic.smartwellapp;
+
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.casic.smartwellapp.Entity.Constant;
+
+import java.util.List;
+
+import pub.devrel.easypermissions.EasyPermissions;
+
+
+public class PermissionActivity extends AppCompatActivity implements EasyPermissions.PermissionCallbacks {
+
+    private static final String TAG = "PermissionActivity";
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (EasyPermissions.hasPermissions(this, Constant.USER_PERMISSIONS)) {
+                startMainActivity();
+            } else {
+                EasyPermissions.requestPermissions(this, "需要获取相关权限", Constant.PERMISSIONS_CODE, Constant.USER_PERMISSIONS);
+            }
+        } else {
+            startMainActivity();
+        }
+    }
+
+    private void startMainActivity() {
+        startActivity(new Intent(this, MainActivity.class));
+        finish();
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
+    }
+
+    @Override
+    public void onPermissionsGranted(int requestCode, @NonNull List<String> perms) {
+        startMainActivity();
+    }
+
+    @Override
+    public void onPermissionsDenied(int requestCode, @NonNull List<String> perms) {
+        Log.e(TAG, "onPermissionsDenied: " + perms);
+    }
+}
diff --git a/app/src/main/jniLibs/armeabi-v7a/libEzMobileRuntimeCore.so b/app/src/main/jniLibs/armeabi-v7a/libEzMobileRuntimeCore.so
new file mode 100755
index 0000000..a1de978
--- /dev/null
+++ b/app/src/main/jniLibs/armeabi-v7a/libEzMobileRuntimeCore.so
Binary files differ
diff --git a/app/src/main/jniLibs/x86/libEzMobileRuntimeCore.so b/app/src/main/jniLibs/x86/libEzMobileRuntimeCore.so
new file mode 100755
index 0000000..b3e475d
--- /dev/null
+++ b/app/src/main/jniLibs/x86/libEzMobileRuntimeCore.so
Binary files differ
diff --git a/app/src/main/res/drawable/location.png b/app/src/main/res/drawable/location.png
new file mode 100644
index 0000000..ab1520f
--- /dev/null
+++ b/app/src/main/res/drawable/location.png
Binary files differ

diff --git a/app/build.gradle b/app/build.gradle
index fa31bc0..0614b2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@
         applicationId "com.casic.smartwellapp"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 7
-        versionName "v1.1.1"
+        versionCode 8
+        versionName "v1.1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -37,6 +37,8 @@
         exclude 'META-INF/LGPL2.1'
         exclude 'META-INF/services/javax.annotation.processing.Processor'
         exclude 'META-INF/rxjava.properties'
+        exclude 'org/codehaus/jackson/impl/VERSION.txt'
+        exclude 'org/codehaus/jackson/map/VERSION.txt'
     }
 }
 
@@ -44,6 +46,7 @@
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'pub.devrel:easypermissions:1.3.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
@@ -54,12 +57,12 @@
     implementation 'com.alibaba:fastjson:1.2.68'
     implementation files('libs/guava-17.0.jar')
     implementation files('libs/androidsvg-1.2.2-beta-1.jar')
-    implementation files('libs/EzLicenseAPI4Android.jar')
-    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/EzMapServiceApiForAndroid-1.0.3.0.jar')
     implementation files('libs/EzRouterAPIForAndroid.v1.0.1.201206151022.jar')
     implementation files('libs/jts-1.13.jar')
     implementation files('libs/kxml2-2.3.0.jar')
-    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
+    implementation files('libs/EzLicenseAPI4Android.jar')
+    implementation files('libs/EzMapApiForAndnroid.3.1.0.2.jar')
     implementation files('libs/jackson-core-lgpl-1.9.5.jar')
+    implementation files('libs/jackson-mapper-lgpl-1.9.5.jar')
 }
diff --git a/app/libs/EzLicenseAPI4Android.jar b/app/libs/EzLicenseAPI4Android.jar
index 3dc88ce..37756fa 100644
--- a/app/libs/EzLicenseAPI4Android.jar
+++ b/app/libs/EzLicenseAPI4Android.jar
Binary files differ
diff --git a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
index 95e87e7..b826abe 100644
--- a/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
+++ b/app/libs/EzMapApiForAndnroid.3.1.0.2.jar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6e34b75..4eeda90 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,8 +27,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppThemeNoActionBar"
-        android:usesCleartextTraffic="true">
-        <activity android:name=".MainActivity">
+        android:usesCleartextTraffic="true"
+        tools:targetApi="m">
+        <activity android:name=".PermissionActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -37,8 +38,8 @@
 <!--                <category android:name="android.intent.category.LAUNCHER" />-->
             </intent-filter>
         </activity>
+        <activity android:name=".MainActivity" />
         <activity android:name=".MapInitActivity" />
-        <activity android:name=".MapActivity" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java b/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
index c11913b..66d61e1 100644
--- a/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
+++ b/app/src/main/java/com/casic/smartwellapp/Entity/Constant.java
@@ -1,8 +1,11 @@
 package com.casic.smartwellapp.Entity;
 
+import android.Manifest;
 import android.os.Environment;
 
 public class Constant {
-	public static final String LICENSE_PATH = Environment.getExternalStorageDirectory() + "/PGIS/license/EzServiceClient4Android.lic";
-//	public static final String LICENSE_PATH =  "file:///android_asset/EzServiceClient4Android.lic";
+    public static final String LICENSE_PATH = Environment.getExternalStorageDirectory() + "/PGIS/license/EzServiceClient4Android.lic";
+    //	public static final String LICENSE_PATH =  "file:///android_asset/EzServiceClient4Android.lic";
+    public static final int PERMISSIONS_CODE = 11;
+    public static final String[] USER_PERMISSIONS = {Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
 }
diff --git a/app/src/main/java/com/casic/smartwellapp/MainActivity.java b/app/src/main/java/com/casic/smartwellapp/MainActivity.java
index 38bef40..b88eb70 100644
--- a/app/src/main/java/com/casic/smartwellapp/MainActivity.java
+++ b/app/src/main/java/com/casic/smartwellapp/MainActivity.java
@@ -137,15 +137,11 @@
                                 }
                             }
                             //用原生sdk加载地图
-                            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O) {
-                                Intent intent = new Intent(MainActivity.this, MapInitActivity.class);
-                                intent.putExtra("lng", lng);
-                                intent.putExtra("lat", lat);
-                                intent.putExtra("pointname", pointname);
-                                startActivity(intent);
-                            } else {
-                                Toast.makeText(MainActivity.this, "系统版本过高，地图无法使用", Toast.LENGTH_SHORT).show();
-                            }
+                            Intent intent = new Intent(MainActivity.this, MapInitActivity.class);
+                            intent.putExtra("lng", lng);
+                            intent.putExtra("lat", lat);
+                            intent.putExtra("pointname", pointname);
+                            startActivity(intent);
                         } else if (url.startsWith("tel:")) {
                             final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
                             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);
diff --git a/app/src/main/java/com/casic/smartwellapp/MapActivity.java b/app/src/main/java/com/casic/smartwellapp/MapActivity.java
deleted file mode 100644
index c6d7f4f..0000000
--- a/app/src/main/java/com/casic/smartwellapp/MapActivity.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.casic.smartwellapp;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Environment;
-import android.util.Log;
-import android.widget.TextView;
-
-import com.casic.smartwellapp.Entity.Constant;
-import com.easymap.android.maps.v3.EzMap;
-import com.easymap.android.maps.v3.EzMap.OnStatusChangeListener;
-import com.easymap.android.maps.v3.MapView;
-import com.easymap.android.maps.v3.geometry.GeoPoint;
-import com.easymap.android.maps.v3.geometry.SpatialReference;
-import com.easymap.android.maps.v3.graphics.BitmapDescriptor;
-import com.easymap.android.maps.v3.graphics.BitmapDescriptorFactory;
-import com.easymap.android.maps.v3.graphics.Marker;
-import com.easymap.android.maps.v3.layers.GraphicsLayer;
-import com.easymap.android.maps.v3.layers.ogc.WMTSLayer;
-import com.easymap.android.maps.v3.layers.ogc.WMTSLayerInfo;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-
-public class MapActivity extends AppCompatActivity implements OnStatusChangeListener {
-    private MapView mapView;
-    private EzMap ezMap;
-    private TextView textview;
-    private WMTSLayer wmtstdt;
-    private WMTSLayerInfo wmtslayerinfo;
-    private Marker marker;
-    private String lng;
-    private String lat;
-    private String pointname;
-    private GraphicsLayer graphicslayer;
-    private BitmapDescriptor iconcircle;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_map);
-        Intent i = getIntent();
-        lng = i.getStringExtra("lng");
-        lat = i.getStringExtra("lat");
-        pointname = i.getStringExtra("pointname");
-        mapView = (MapView) findViewById(R.id.MapView);
-        if (mapView != null) {
-            // 注册地图准备就绪监听
-            mapView.setOnStatusChangeListener(this);
-            // 实例化一个File对象
-            Log.i("map", Constant.LICENSE_PATH);
-            File file = new File(Constant.LICENSE_PATH);
-            FileInputStream inStream = null;
-            try {
-                inStream = new FileInputStream(file);
-            } catch (FileNotFoundException e) {
-                // TODO Auto-generated catch block
-                Log.e("mapError", "fileNotFoundException");
-                e.printStackTrace();
-            }
-            // 初始化许可方法
-            mapView.initLicenseAsDevelopement(inStream);
-            mapView.onCreate(getApplication(), savedInstanceState);
-        }
-    }
-
-    @Override
-    public void onStatusChanged(STATUS arg0) {
-        textview = (TextView) findViewById(R.id.textview);
-        textview.setText("");
-        // 得到地图对象
-        ezMap = mapView.getMap();
-
-        // 设置地图中心点
-        ezMap.centerAt(new GeoPoint(Double.valueOf(lng), Double.valueOf(lat)), false);
-        // 设置地图级别
-        ezMap.zoomTo(16, false);
-        wmtslayerinfo = new WMTSLayerInfo();
-        wmtslayerinfo.setVersion("1.0.0");
-        wmtslayerinfo.setFormat("tiles");
-        wmtslayerinfo.setStyle("default");
-        wmtslayerinfo.setLayerName("gdsl");
-        wmtslayerinfo.setTileMatrixSet("c");
-        // 实例化WMTSLayer 地图
-        wmtstdt = new WMTSLayer("http://20.1.12.48/EzServer/Maps/gdsl",
-                wmtslayerinfo, "tdt_vec.cache", Environment.getExternalStorageDirectory()
-                + "/EzMap/st");
-        ezMap.addLayer(wmtstdt);
-
-        graphicslayer = new GraphicsLayer(SpatialReference.create(4326),
-                ezMap.getExtent());
-        iconcircle = BitmapDescriptorFactory.defaultMarker();
-        ezMap.addLayer(graphicslayer);
-        // 根据点的位置创建一个Marker的实例
-        marker = new Marker(new GeoPoint(Double.valueOf(lng), Double.valueOf(lat)), iconcircle, 0.5f, 0.5f);
-        // 将marker添加到图层中
-        graphicslayer.addGraphic(marker);
-        ezMap.refreshMap();
-    }
-
-
-}
diff --git a/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java b/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java
index ffe3784..9cc84e9 100644
--- a/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java
+++ b/app/src/main/java/com/casic/smartwellapp/MapInitActivity.java
@@ -1,19 +1,12 @@
 package com.casic.smartwellapp;
 
-import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Environment;
-import android.util.Log;
 import android.widget.TextView;
 
-import androidx.core.app.ActivityCompat;
-
-import com.casic.smartwellapp.Entity.Constant;
 import com.easymap.android.maps.v3.EzMap;
-import com.easymap.android.maps.v3.EzMap.OnStatusChangeListener;
 import com.easymap.android.maps.v3.MapView;
 import com.easymap.android.maps.v3.geometry.GeoPoint;
 import com.easymap.android.maps.v3.geometry.SpatialReference;
@@ -24,49 +17,35 @@
 import com.easymap.android.maps.v3.layers.ogc.WMTSLayer;
 import com.easymap.android.maps.v3.layers.ogc.WMTSLayerInfo;
 
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 
-public class MapInitActivity extends Activity implements OnStatusChangeListener {
+public class MapInitActivity extends Activity implements EzMap.OnStatusChangeListener {
 
-    public static final int REQUEST_PERMISSION = 11;
+    private static final String TAG = "MapInitActivity";
     private MapView mapView;
-    private String lng;
-    private String lat;
+    private String lng = "116.2631267408096";
+    private String lat = "39.91441966136631";
     private String pointname;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-//		this.requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.activity_map_init);
         Intent i = getIntent();
         lng = i.getStringExtra("lng");
         lat = i.getStringExtra("lat");
         pointname = i.getStringExtra("pointname");
-        mapView = findViewById(R.id.MapView);
+        mapView = findViewById(R.id.mapView);
         if (mapView != null) {
-            // 注册地图准备就绪监听
             mapView.setOnStatusChangeListener(this);
-            // 实例化一个File对象
-            Log.i("map", Constant.LICENSE_PATH);
-//			File file = new File(Constant.LICENSE_PATH);
-//			FileInputStream inStream = null;
-            InputStream inStream = null;
+            InputStream inputStream = null;
             try {
-                inStream = getResources().getAssets().open("EzServiceClient4Android.lic");
-//				inStream = new FileInputStream(file);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
+                inputStream = getResources().getAssets().open("EzServiceClient4Android.lic");
             } catch (IOException e) {
                 e.printStackTrace();
             }
-            // 初始化许可方法
-//            mapView.initLicenseAsDevelopement(inStream);
-            mapView.initLicense(getAssetsData("EzServiceClient4Android.lic"));//20210525 Pengxh修改
+            mapView.initLicenseAsDevelopement(inputStream);
             mapView.onCreate(getApplication(), savedInstanceState);
         }
     }
@@ -77,7 +56,6 @@
         textview.setText(pointname);
         // 得到地图对象
         EzMap ezMap = mapView.getMap();
-
         // 设置地图中心点
         ezMap.centerAt(new GeoPoint(Double.parseDouble(lng), Double.parseDouble(lat)), false);
         // 设置地图级别
@@ -89,48 +67,19 @@
         wmtslayerinfo.setLayerName("gdsl");
         wmtslayerinfo.setTileMatrixSet("c");
         // 实例化WMTSLayer 地图
-        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, REQUEST_PERMISSION);
-        }
-        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, REQUEST_PERMISSION);
-        }
-        WMTSLayer wmtstdt = new WMTSLayer("http://20.1.12.48/EzServer/Maps/gdsl", wmtslayerinfo,
-                "tdt_vec.cache",
+        WMTSLayer wmtstdt = new WMTSLayer("http://20.1.12.48/EzServer/Maps/gdsl", wmtslayerinfo, "tdt_vec.cache",
                 Environment.getExternalStorageDirectory() + "/EzMap/st");
         ezMap.addLayer(wmtstdt);
 
         GraphicsLayer graphicslayer = new GraphicsLayer(SpatialReference.create(4326), ezMap.getExtent());
-        BitmapDescriptor iconCircle = BitmapDescriptorFactory.defaultMarker();
+        BitmapDescriptor iconCircle = BitmapDescriptorFactory.fromResource(this, R.drawable.location);
         ezMap.addLayer(graphicslayer);
+
+//        Log.d(TAG, "onStatusChanged: [" + lng + "," + lat + "]");
         // 根据点的位置创建一个Marker的实例
         Marker marker = new Marker(new GeoPoint(Double.parseDouble(lng), Double.parseDouble(lat)), iconCircle, 0.5f, 0.5f);
         // 将marker添加到图层中
         graphicslayer.addGraphic(marker);
         ezMap.refreshMap();
     }
-
-    /**
-     * 获取本地Asserts文件内容
-     */
-    public String getAssetsData(String fileName) {
-        try {
-            InputStreamReader inputStreamReader = new InputStreamReader(getAssets().open(fileName));
-            BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
-            StringBuilder data = new StringBuilder();
-            String s;
-            try {
-                while ((s = bufferedReader.readLine()) != null) {
-                    data.append(s);
-                }
-                Log.d("map", "getAssetsData: " + data);
-                return data.toString();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
 }
diff --git a/app/src/main/java/com/casic/smartwellapp/PermissionActivity.java b/app/src/main/java/com/casic/smartwellapp/PermissionActivity.java
new file mode 100644
index 0000000..93d32f1
--- /dev/null
+++ b/app/src/main/java/com/casic/smartwellapp/PermissionActivity.java
@@ -0,0 +1,58 @@
+package com.casic.smartwellapp;
+
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.casic.smartwellapp.Entity.Constant;
+
+import java.util.List;
+
+import pub.devrel.easypermissions.EasyPermissions;
+
+
+public class PermissionActivity extends AppCompatActivity implements EasyPermissions.PermissionCallbacks {
+
+    private static final String TAG = "PermissionActivity";
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (EasyPermissions.hasPermissions(this, Constant.USER_PERMISSIONS)) {
+                startMainActivity();
+            } else {
+                EasyPermissions.requestPermissions(this, "需要获取相关权限", Constant.PERMISSIONS_CODE, Constant.USER_PERMISSIONS);
+            }
+        } else {
+            startMainActivity();
+        }
+    }
+
+    private void startMainActivity() {
+        startActivity(new Intent(this, MainActivity.class));
+        finish();
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
+    }
+
+    @Override
+    public void onPermissionsGranted(int requestCode, @NonNull List<String> perms) {
+        startMainActivity();
+    }
+
+    @Override
+    public void onPermissionsDenied(int requestCode, @NonNull List<String> perms) {
+        Log.e(TAG, "onPermissionsDenied: " + perms);
+    }
+}
diff --git a/app/src/main/jniLibs/armeabi-v7a/libEzMobileRuntimeCore.so b/app/src/main/jniLibs/armeabi-v7a/libEzMobileRuntimeCore.so
new file mode 100755
index 0000000..a1de978
--- /dev/null
+++ b/app/src/main/jniLibs/armeabi-v7a/libEzMobileRuntimeCore.so
Binary files differ
diff --git a/app/src/main/jniLibs/x86/libEzMobileRuntimeCore.so b/app/src/main/jniLibs/x86/libEzMobileRuntimeCore.so
new file mode 100755
index 0000000..b3e475d
--- /dev/null
+++ b/app/src/main/jniLibs/x86/libEzMobileRuntimeCore.so
Binary files differ
diff --git a/app/src/main/res/drawable/location.png b/app/src/main/res/drawable/location.png
new file mode 100644
index 0000000..ab1520f
--- /dev/null
+++ b/app/src/main/res/drawable/location.png
Binary files differ
diff --git a/app/src/main/res/layout/activity_map_init.xml b/app/src/main/res/layout/activity_map_init.xml
index 622144f..5d52633 100644
--- a/app/src/main/res/layout/activity_map_init.xml
+++ b/app/src/main/res/layout/activity_map_init.xml
@@ -1,12 +1,11 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
     <com.easymap.android.maps.v3.MapView
-        android:id="@+id/MapView"
+        android:id="@+id/mapView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent" />
 
     <TextView
         android:id="@+id/textview"