diff --git a/app/build.gradle b/app/build.gradle index 803935d..db2f821 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,7 +23,7 @@ versionName "1.0.0.0" ndk { - abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a' + abiFilters 'armeabi-v7a', "arm64-v8a" } } @@ -111,8 +111,8 @@ implementation 'com.google.code.gson:gson:2.9.0' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' - //高德导航、定位、地图三合一 - implementation 'com.amap.api:navi-3dmap:latest.integration' + //高德地图 + implementation 'com.amap.api:3dmap:latest.integration' //高德地图搜索 implementation 'com.amap.api:search:8.1.0' //CameraX diff --git a/app/build.gradle b/app/build.gradle index 803935d..db2f821 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,7 +23,7 @@ versionName "1.0.0.0" ndk { - abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a' + abiFilters 'armeabi-v7a', "arm64-v8a" } } @@ -111,8 +111,8 @@ implementation 'com.google.code.gson:gson:2.9.0' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' - //高德导航、定位、地图三合一 - implementation 'com.amap.api:navi-3dmap:latest.integration' + //高德地图 + implementation 'com.amap.api:3dmap:latest.integration' //高德地图搜索 implementation 'com.amap.api:search:8.1.0' //CameraX diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/Poi.kt b/app/src/main/java/com/casic/br/operationsite/extensions/Poi.kt deleted file mode 100644 index 80029cd..0000000 --- a/app/src/main/java/com/casic/br/operationsite/extensions/Poi.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.br.operationsite.extensions - -import android.content.Context -import com.amap.api.maps.model.Poi -import com.amap.api.navi.AmapNaviPage -import com.amap.api.navi.AmapNaviParams -import com.amap.api.navi.AmapNaviType -import com.amap.api.navi.AmapPageType - -/** - * 导航扩展函数 - * */ -fun Poi.showRouteOnMap(context: Context) { - val params = AmapNaviParams( - null, null, this, - AmapNaviType.WALK, - AmapPageType.ROUTE - ) - AmapNaviPage.getInstance().showRouteActivity(context, params, null) -} - -fun Poi.showBusRouteOnMap(context: Context) { - val params = AmapNaviParams( - null, null, this, - AmapNaviType.DRIVER, - AmapPageType.ROUTE - ) - AmapNaviPage.getInstance().showRouteActivity(context, params, null) -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 803935d..db2f821 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,7 +23,7 @@ versionName "1.0.0.0" ndk { - abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a' + abiFilters 'armeabi-v7a', "arm64-v8a" } } @@ -111,8 +111,8 @@ implementation 'com.google.code.gson:gson:2.9.0' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' - //高德导航、定位、地图三合一 - implementation 'com.amap.api:navi-3dmap:latest.integration' + //高德地图 + implementation 'com.amap.api:3dmap:latest.integration' //高德地图搜索 implementation 'com.amap.api:search:8.1.0' //CameraX diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/Poi.kt b/app/src/main/java/com/casic/br/operationsite/extensions/Poi.kt deleted file mode 100644 index 80029cd..0000000 --- a/app/src/main/java/com/casic/br/operationsite/extensions/Poi.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.br.operationsite.extensions - -import android.content.Context -import com.amap.api.maps.model.Poi -import com.amap.api.navi.AmapNaviPage -import com.amap.api.navi.AmapNaviParams -import com.amap.api.navi.AmapNaviType -import com.amap.api.navi.AmapPageType - -/** - * 导航扩展函数 - * */ -fun Poi.showRouteOnMap(context: Context) { - val params = AmapNaviParams( - null, null, this, - AmapNaviType.WALK, - AmapPageType.ROUTE - ) - AmapNaviPage.getInstance().showRouteActivity(context, params, null) -} - -fun Poi.showBusRouteOnMap(context: Context) { - val params = AmapNaviParams( - null, null, this, - AmapNaviType.DRIVER, - AmapPageType.ROUTE - ) - AmapNaviPage.getInstance().showRouteActivity(context, params, null) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/PermissionActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/PermissionActivity.kt index 0287298..67c9f78 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/PermissionActivity.kt @@ -2,7 +2,7 @@ import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.amap.api.navi.NaviSetting +import com.amap.api.maps.MapsInitializer import com.casic.br.operationsite.R import com.casic.br.operationsite.utils.LocaleConstant import com.pengxh.kt.lite.extensions.navigatePageTo @@ -28,8 +28,8 @@ private fun startSplashScreenActivity() { //先把导航隐私政策声明,后面导航会用到 - NaviSetting.updatePrivacyShow(this, true, true) - NaviSetting.updatePrivacyAgree(this, true) + MapsInitializer.updatePrivacyShow(this, true, true) + MapsInitializer.updatePrivacyAgree(this, true) navigatePageTo() finish() }