diff --git a/app/build.gradle b/app/build.gradle index e530c5e..e8e4769 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,14 +56,11 @@ implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1' //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.9.0' //图片选择框架 implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0' - //高德地图 - implementation 'com.amap.api:3dmap:7.9.1' - implementation 'com.amap.api:location:5.3.1' //返回值转换器 implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2' implementation 'com.squareup.retrofit2:converter-scalars:2.3.0' @@ -77,4 +74,6 @@ implementation 'com.google.code.gson:gson:2.8.6' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' + //高德导航 + implementation 'com.amap.api:navi-3dmap:8.1.0_3dmap8.1.0' } diff --git a/app/build.gradle b/app/build.gradle index e530c5e..e8e4769 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,14 +56,11 @@ implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1' //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.9.0' //图片选择框架 implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0' - //高德地图 - implementation 'com.amap.api:3dmap:7.9.1' - implementation 'com.amap.api:location:5.3.1' //返回值转换器 implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2' implementation 'com.squareup.retrofit2:converter-scalars:2.3.0' @@ -77,4 +74,6 @@ implementation 'com.google.code.gson:gson:2.8.6' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' + //高德导航 + implementation 'com.amap.api:navi-3dmap:8.1.0_3dmap8.1.0' } diff --git a/app/smart_well b/app/smart_well new file mode 100644 index 0000000..dc9c5f0 --- /dev/null +++ b/app/smart_well Binary files differ diff --git a/app/build.gradle b/app/build.gradle index e530c5e..e8e4769 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,14 +56,11 @@ implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1' //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.9.0' //图片选择框架 implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0' - //高德地图 - implementation 'com.amap.api:3dmap:7.9.1' - implementation 'com.amap.api:location:5.3.1' //返回值转换器 implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2' implementation 'com.squareup.retrofit2:converter-scalars:2.3.0' @@ -77,4 +74,6 @@ implementation 'com.google.code.gson:gson:2.8.6' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' + //高德导航 + implementation 'com.amap.api:navi-3dmap:8.1.0_3dmap8.1.0' } diff --git a/app/smart_well b/app/smart_well new file mode 100644 index 0000000..dc9c5f0 --- /dev/null +++ b/app/smart_well Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4711cb5..8ccffee 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -50,5 +50,15 @@ + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e530c5e..e8e4769 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,14 +56,11 @@ implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1' //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.9.0' //图片选择框架 implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0' - //高德地图 - implementation 'com.amap.api:3dmap:7.9.1' - implementation 'com.amap.api:location:5.3.1' //返回值转换器 implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2' implementation 'com.squareup.retrofit2:converter-scalars:2.3.0' @@ -77,4 +74,6 @@ implementation 'com.google.code.gson:gson:2.8.6' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' + //高德导航 + implementation 'com.amap.api:navi-3dmap:8.1.0_3dmap8.1.0' } diff --git a/app/smart_well b/app/smart_well new file mode 100644 index 0000000..dc9c5f0 --- /dev/null +++ b/app/smart_well Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4711cb5..8ccffee 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -50,5 +50,15 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/assets/svg/load_error.svg b/app/src/main/assets/svg/load_error.svg deleted file mode 100644 index d3714c7..0000000 --- a/app/src/main/assets/svg/load_error.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e530c5e..e8e4769 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,14 +56,11 @@ implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1' //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.9.0' //图片选择框架 implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0' - //高德地图 - implementation 'com.amap.api:3dmap:7.9.1' - implementation 'com.amap.api:location:5.3.1' //返回值转换器 implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2' implementation 'com.squareup.retrofit2:converter-scalars:2.3.0' @@ -77,4 +74,6 @@ implementation 'com.google.code.gson:gson:2.8.6' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' + //高德导航 + implementation 'com.amap.api:navi-3dmap:8.1.0_3dmap8.1.0' } diff --git a/app/smart_well b/app/smart_well new file mode 100644 index 0000000..dc9c5f0 --- /dev/null +++ b/app/smart_well Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4711cb5..8ccffee 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -50,5 +50,15 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/assets/svg/load_error.svg b/app/src/main/assets/svg/load_error.svg deleted file mode 100644 index d3714c7..0000000 --- a/app/src/main/assets/svg/load_error.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MapNavigatorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MapNavigatorActivity.kt index 4919677..e1d2ed3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MapNavigatorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MapNavigatorActivity.kt @@ -1,9 +1,18 @@ package com.casic.app.smartwell.view +import android.os.Bundle +import com.amap.api.maps.AMap +import com.amap.api.maps.AMapOptions +import com.amap.api.maps.CameraUpdateFactory import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity +import kotlinx.android.synthetic.main.activity_map_navigation.* +import kotlinx.coroutines.cancel class MapNavigatorActivity : BaseActivity() { + + private lateinit var aMap: AMap + override fun initLayoutView(): Int = R.layout.activity_map_navigation override fun setupTopBarLayout() { @@ -11,11 +20,38 @@ } override fun initData() { - +// mapView.onCreate() + aMap = mapView.map + val uiSettings = aMap.uiSettings + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + aMap.moveCamera(CameraUpdateFactory.zoomTo(16.toFloat())) } override fun initEvent() { } + /***以下是地图生命周期管理************************************************************************/ + + override fun onResume() { + super.onResume() + mapView.onResume() + } + + override fun onPause() { + super.onPause() + mapView.onPause() + } + + override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + mapView.onSaveInstanceState(outState) + } + + override fun onDestroy() { + cancel() + super.onDestroy() + mapView.onDestroy() + } } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e530c5e..e8e4769 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,14 +56,11 @@ implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1' //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.9.0' //图片选择框架 implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0' - //高德地图 - implementation 'com.amap.api:3dmap:7.9.1' - implementation 'com.amap.api:location:5.3.1' //返回值转换器 implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2' implementation 'com.squareup.retrofit2:converter-scalars:2.3.0' @@ -77,4 +74,6 @@ implementation 'com.google.code.gson:gson:2.8.6' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' + //高德导航 + implementation 'com.amap.api:navi-3dmap:8.1.0_3dmap8.1.0' } diff --git a/app/smart_well b/app/smart_well new file mode 100644 index 0000000..dc9c5f0 --- /dev/null +++ b/app/smart_well Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4711cb5..8ccffee 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -50,5 +50,15 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/assets/svg/load_error.svg b/app/src/main/assets/svg/load_error.svg deleted file mode 100644 index d3714c7..0000000 --- a/app/src/main/assets/svg/load_error.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MapNavigatorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MapNavigatorActivity.kt index 4919677..e1d2ed3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MapNavigatorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MapNavigatorActivity.kt @@ -1,9 +1,18 @@ package com.casic.app.smartwell.view +import android.os.Bundle +import com.amap.api.maps.AMap +import com.amap.api.maps.AMapOptions +import com.amap.api.maps.CameraUpdateFactory import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity +import kotlinx.android.synthetic.main.activity_map_navigation.* +import kotlinx.coroutines.cancel class MapNavigatorActivity : BaseActivity() { + + private lateinit var aMap: AMap + override fun initLayoutView(): Int = R.layout.activity_map_navigation override fun setupTopBarLayout() { @@ -11,11 +20,38 @@ } override fun initData() { - +// mapView.onCreate() + aMap = mapView.map + val uiSettings = aMap.uiSettings + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + aMap.moveCamera(CameraUpdateFactory.zoomTo(16.toFloat())) } override fun initEvent() { } + /***以下是地图生命周期管理************************************************************************/ + + override fun onResume() { + super.onResume() + mapView.onResume() + } + + override fun onPause() { + super.onPause() + mapView.onPause() + } + + override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + mapView.onSaveInstanceState(outState) + } + + override fun onDestroy() { + cancel() + super.onDestroy() + mapView.onDestroy() + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 2bc755b..cae5baf 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -3,6 +3,12 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.GridLayoutManager +import com.amap.api.maps.model.LatLng +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 import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.ImageRecyclerViewAdapter import com.casic.app.smartwell.base.BaseActivity @@ -95,8 +101,20 @@ }) } + navigationButton.setChangeAlphaWhenPress(true) navigationButton.setOnClickListener { - this.navigatePageTo(MapNavigatorActivity::class.java, wellId) +// this.navigatePageTo(MapNavigatorActivity::class.java, wellId) + + val lat = wellDetail.latGaode.toString() + val lng = wellDetail.lngGaode.toString() + val endPoi = Poi( + wellDetail.position, + LatLng(lat.toDouble(), lng.toDouble()), + "" + ) + val params = + AmapNaviParams(null, null, endPoi, AmapNaviType.DRIVER, AmapPageType.ROUTE) + AmapNaviPage.getInstance().showRouteActivity(this, params, null) } } }) diff --git a/app/build.gradle b/app/build.gradle index e530c5e..e8e4769 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,14 +56,11 @@ implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1' //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.9.0' //图片选择框架 implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0' - //高德地图 - implementation 'com.amap.api:3dmap:7.9.1' - implementation 'com.amap.api:location:5.3.1' //返回值转换器 implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2' implementation 'com.squareup.retrofit2:converter-scalars:2.3.0' @@ -77,4 +74,6 @@ implementation 'com.google.code.gson:gson:2.8.6' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' + //高德导航 + implementation 'com.amap.api:navi-3dmap:8.1.0_3dmap8.1.0' } diff --git a/app/smart_well b/app/smart_well new file mode 100644 index 0000000..dc9c5f0 --- /dev/null +++ b/app/smart_well Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4711cb5..8ccffee 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -50,5 +50,15 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/assets/svg/load_error.svg b/app/src/main/assets/svg/load_error.svg deleted file mode 100644 index d3714c7..0000000 --- a/app/src/main/assets/svg/load_error.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MapNavigatorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MapNavigatorActivity.kt index 4919677..e1d2ed3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MapNavigatorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MapNavigatorActivity.kt @@ -1,9 +1,18 @@ package com.casic.app.smartwell.view +import android.os.Bundle +import com.amap.api.maps.AMap +import com.amap.api.maps.AMapOptions +import com.amap.api.maps.CameraUpdateFactory import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity +import kotlinx.android.synthetic.main.activity_map_navigation.* +import kotlinx.coroutines.cancel class MapNavigatorActivity : BaseActivity() { + + private lateinit var aMap: AMap + override fun initLayoutView(): Int = R.layout.activity_map_navigation override fun setupTopBarLayout() { @@ -11,11 +20,38 @@ } override fun initData() { - +// mapView.onCreate() + aMap = mapView.map + val uiSettings = aMap.uiSettings + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + aMap.moveCamera(CameraUpdateFactory.zoomTo(16.toFloat())) } override fun initEvent() { } + /***以下是地图生命周期管理************************************************************************/ + + override fun onResume() { + super.onResume() + mapView.onResume() + } + + override fun onPause() { + super.onPause() + mapView.onPause() + } + + override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + mapView.onSaveInstanceState(outState) + } + + override fun onDestroy() { + cancel() + super.onDestroy() + mapView.onDestroy() + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 2bc755b..cae5baf 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -3,6 +3,12 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.GridLayoutManager +import com.amap.api.maps.model.LatLng +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 import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.ImageRecyclerViewAdapter import com.casic.app.smartwell.base.BaseActivity @@ -95,8 +101,20 @@ }) } + navigationButton.setChangeAlphaWhenPress(true) navigationButton.setOnClickListener { - this.navigatePageTo(MapNavigatorActivity::class.java, wellId) +// this.navigatePageTo(MapNavigatorActivity::class.java, wellId) + + val lat = wellDetail.latGaode.toString() + val lng = wellDetail.lngGaode.toString() + val endPoi = Poi( + wellDetail.position, + LatLng(lat.toDouble(), lng.toDouble()), + "" + ) + val params = + AmapNaviParams(null, null, endPoi, AmapNaviType.DRIVER, AmapPageType.ROUTE) + AmapNaviPage.getInstance().showRouteActivity(this, params, null) } } }) diff --git a/app/src/main/res/layout/activity_map_navigation.xml b/app/src/main/res/layout/activity_map_navigation.xml index c9edfbd..d9a0732 100644 --- a/app/src/main/res/layout/activity_map_navigation.xml +++ b/app/src/main/res/layout/activity_map_navigation.xml @@ -1,7 +1,16 @@ + android:background="@color/mainBackColor" + android:orientation="vertical" + tools:context=".view.MapNavigatorActivity"> + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e530c5e..e8e4769 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,14 +56,11 @@ implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //Kotlin协程 implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1' //图片加载框架 implementation 'com.github.bumptech.glide:glide:4.9.0' //图片选择框架 implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0' - //高德地图 - implementation 'com.amap.api:3dmap:7.9.1' - implementation 'com.amap.api:location:5.3.1' //返回值转换器 implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2' implementation 'com.squareup.retrofit2:converter-scalars:2.3.0' @@ -77,4 +74,6 @@ implementation 'com.google.code.gson:gson:2.8.6' //上拉加载下拉刷新 implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0' + //高德导航 + implementation 'com.amap.api:navi-3dmap:8.1.0_3dmap8.1.0' } diff --git a/app/smart_well b/app/smart_well new file mode 100644 index 0000000..dc9c5f0 --- /dev/null +++ b/app/smart_well Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4711cb5..8ccffee 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -50,5 +50,15 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/assets/svg/load_error.svg b/app/src/main/assets/svg/load_error.svg deleted file mode 100644 index d3714c7..0000000 --- a/app/src/main/assets/svg/load_error.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MapNavigatorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MapNavigatorActivity.kt index 4919677..e1d2ed3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MapNavigatorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MapNavigatorActivity.kt @@ -1,9 +1,18 @@ package com.casic.app.smartwell.view +import android.os.Bundle +import com.amap.api.maps.AMap +import com.amap.api.maps.AMapOptions +import com.amap.api.maps.CameraUpdateFactory import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity +import kotlinx.android.synthetic.main.activity_map_navigation.* +import kotlinx.coroutines.cancel class MapNavigatorActivity : BaseActivity() { + + private lateinit var aMap: AMap + override fun initLayoutView(): Int = R.layout.activity_map_navigation override fun setupTopBarLayout() { @@ -11,11 +20,38 @@ } override fun initData() { - +// mapView.onCreate() + aMap = mapView.map + val uiSettings = aMap.uiSettings + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + aMap.moveCamera(CameraUpdateFactory.zoomTo(16.toFloat())) } override fun initEvent() { } + /***以下是地图生命周期管理************************************************************************/ + + override fun onResume() { + super.onResume() + mapView.onResume() + } + + override fun onPause() { + super.onPause() + mapView.onPause() + } + + override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + mapView.onSaveInstanceState(outState) + } + + override fun onDestroy() { + cancel() + super.onDestroy() + mapView.onDestroy() + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 2bc755b..cae5baf 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -3,6 +3,12 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.GridLayoutManager +import com.amap.api.maps.model.LatLng +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 import com.casic.app.smartwell.R import com.casic.app.smartwell.adapter.ImageRecyclerViewAdapter import com.casic.app.smartwell.base.BaseActivity @@ -95,8 +101,20 @@ }) } + navigationButton.setChangeAlphaWhenPress(true) navigationButton.setOnClickListener { - this.navigatePageTo(MapNavigatorActivity::class.java, wellId) +// this.navigatePageTo(MapNavigatorActivity::class.java, wellId) + + val lat = wellDetail.latGaode.toString() + val lng = wellDetail.lngGaode.toString() + val endPoi = Poi( + wellDetail.position, + LatLng(lat.toDouble(), lng.toDouble()), + "" + ) + val params = + AmapNaviParams(null, null, endPoi, AmapNaviType.DRIVER, AmapPageType.ROUTE) + AmapNaviPage.getInstance().showRouteActivity(this, params, null) } } }) diff --git a/app/src/main/res/layout/activity_map_navigation.xml b/app/src/main/res/layout/activity_map_navigation.xml index c9edfbd..d9a0732 100644 --- a/app/src/main/res/layout/activity_map_navigation.xml +++ b/app/src/main/res/layout/activity_map_navigation.xml @@ -1,7 +1,16 @@ + android:background="@color/mainBackColor" + android:orientation="vertical" + tools:context=".view.MapNavigatorActivity"> + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 2bc8727..9c31572 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,6 @@ repositories { maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' } google() - jcenter() } dependencies { classpath 'com.android.tools.build:gradle:3.6.3' @@ -22,7 +21,6 @@ //依赖库 maven { url 'https://jitpack.io' } google() - jcenter() } }