diff --git a/app/build.gradle b/app/build.gradle index 2dd018e..c9f87ce 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -102,7 +102,7 @@ //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' +// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 diff --git a/app/build.gradle b/app/build.gradle index 2dd018e..c9f87ce 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -102,7 +102,7 @@ //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' +// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 diff --git a/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt b/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt index 86ebb7e..46b5da9 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt @@ -1,8 +1,6 @@ package com.casic.smart.town.sanxi.base import android.app.Application -import com.casic.smart.town.sanxi.R -import com.esri.arcgisruntime.ArcGISRuntimeEnvironment import com.pengxh.kt.lite.utils.SaveKeyValues import kotlin.properties.Delegates @@ -20,8 +18,8 @@ super.onCreate() instance = this SaveKeyValues.initSharedPreferences(this) - ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license)) //去掉开发版水印 - ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)) +// ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license)) //去掉开发版水印 +// ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)) //appKey 为保留字段，目前只需传入null或空字符串即可。 // HatomPlayerSDK.init(this, "", true) } diff --git a/app/build.gradle b/app/build.gradle index 2dd018e..c9f87ce 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -102,7 +102,7 @@ //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' +// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 diff --git a/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt b/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt index 86ebb7e..46b5da9 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt @@ -1,8 +1,6 @@ package com.casic.smart.town.sanxi.base import android.app.Application -import com.casic.smart.town.sanxi.R -import com.esri.arcgisruntime.ArcGISRuntimeEnvironment import com.pengxh.kt.lite.utils.SaveKeyValues import kotlin.properties.Delegates @@ -20,8 +18,8 @@ super.onCreate() instance = this SaveKeyValues.initSharedPreferences(this) - ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license)) //去掉开发版水印 - ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)) +// ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license)) //去掉开发版水印 +// ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)) //appKey 为保留字段，目前只需传入null或空字符串即可。 // HatomPlayerSDK.init(this, "", true) } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/MonitorPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/MonitorPageFragment.kt index c90f2e6..01288a9 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/MonitorPageFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/MonitorPageFragment.kt @@ -1,7 +1,5 @@ package com.casic.smart.town.sanxi.fragment -import android.graphics.BitmapFactory -import android.graphics.drawable.BitmapDrawable import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -11,21 +9,8 @@ import com.amap.api.location.CoordinateConverter import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.model.VideoModel -import com.casic.smart.town.sanxi.util.ArcGISHelper -import com.casic.smart.town.sanxi.util.LayerType -import com.casic.smart.town.sanxi.util.LocaleConstant -import com.casic.smart.town.sanxi.util.TianDiTuMethods import com.casic.smart.town.sanxi.view.MonitorRecordActivity import com.casic.smart.town.sanxi.vm.VideoViewModel -import com.esri.arcgisruntime.geometry.Point -import com.esri.arcgisruntime.layers.FeatureLayer -import com.esri.arcgisruntime.mapping.ArcGISMap -import com.esri.arcgisruntime.mapping.Basemap -import com.esri.arcgisruntime.mapping.Viewpoint -import com.esri.arcgisruntime.mapping.view.Graphic -import com.esri.arcgisruntime.mapping.view.GraphicsOverlay -import com.esri.arcgisruntime.symbology.PictureMarkerSymbol -import com.esri.arcgisruntime.util.ListenableList import com.pengxh.kt.lite.extensions.navigatePageTo import kotlinx.android.synthetic.main.fragment_monitor.view.* @@ -44,10 +29,10 @@ /** * 所有的marker */ - private var allMarkerOptions: MutableList = ArrayList() - - private lateinit var graphics: ListenableList - private lateinit var graphicsOverlays: ListenableList +// private var allMarkerOptions: MutableList = ArrayList() +// +// private lateinit var graphics: ListenableList +// private lateinit var graphicsOverlays: ListenableList override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? @@ -81,28 +66,28 @@ latitudeList.add(latitude) longitudeList.add(longitude) //将所有设备信息转化缓存为Marker点 - allMarkerOptions.add( - Point(longitude, latitude, TianDiTuMethods.SRID_2000) - ) +// allMarkerOptions.add( +// Point(longitude, latitude, TianDiTuMethods.SRID_2000) +// ) } } } - allMarkerOptions.forEach { p -> - val pinDrawable = BitmapDrawable( - resources, BitmapFactory.decodeResource(resources, R.mipmap.map_pin) - ) - val pictureMarker = PictureMarkerSymbol(pinDrawable) - pictureMarker.height = 24f - pictureMarker.width = 24f - pictureMarker.loadAsync() //异步加载Marker，防止阻塞 - - - val graphicsOverlay = GraphicsOverlay() - graphics = graphicsOverlay.graphics - graphics.add(Graphic(p, pictureMarker)) - graphicsOverlays.add(graphicsOverlay) - } +// allMarkerOptions.forEach { p -> +// val pinDrawable = BitmapDrawable( +// resources, BitmapFactory.decodeResource(resources, R.mipmap.map_pin) +// ) +// val pictureMarker = PictureMarkerSymbol(pinDrawable) +// pictureMarker.height = 24f +// pictureMarker.width = 24f +// pictureMarker.loadAsync() //异步加载Marker，防止阻塞 +// +// +// val graphicsOverlay = GraphicsOverlay() +// graphics = graphicsOverlay.graphics +// graphics.add(Graphic(p, pictureMarker)) +// graphicsOverlays.add(graphicsOverlay) +// } } }) @@ -141,47 +126,47 @@ } private fun initMap() { - //创建底图、并设置底图图层 - val baseMapLayer = TianDiTuMethods.createTianDiTuTiledLayer(LayerType.TIANDITU_IMAGE_2000) - val baseLayerMap = Basemap(baseMapLayer) - val chineseAnnotationLayer = TianDiTuMethods.createTianDiTuTiledLayer( - LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_2000 - ) - baseLayerMap.baseLayers.add(chineseAnnotationLayer) - - val arcGISMap = ArcGISMap(baseLayerMap) - //添加自定义arcgis图层 - val layers = ArrayList() - LocaleConstant.LAYER.forEach { - layers.add(ArcGISHelper.createFeatureLayer(it)) - } - arcGISMap.operationalLayers.addAll(layers) - monitorView.mapView.map = arcGISMap - monitorView.mapView.isAttributionTextVisible = false //去掉左下角属性标识 - monitorView.mapView.setViewpoint(Viewpoint(22.29334127, 113.4937572, 6400.0)) - - //Marker相关Layer - graphicsOverlays = monitorView.mapView.graphicsOverlays +// //创建底图、并设置底图图层 +// val baseMapLayer = TianDiTuMethods.createTianDiTuTiledLayer(LayerType.TIANDITU_IMAGE_2000) +// val baseLayerMap = Basemap(baseMapLayer) +// val chineseAnnotationLayer = TianDiTuMethods.createTianDiTuTiledLayer( +// LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_2000 +// ) +// baseLayerMap.baseLayers.add(chineseAnnotationLayer) +// +// val arcGISMap = ArcGISMap(baseLayerMap) +// //添加自定义arcgis图层 +// val layers = ArrayList() +// LocaleConstant.LAYER.forEach { +// layers.add(ArcGISHelper.createFeatureLayer(it)) +// } +// arcGISMap.operationalLayers.addAll(layers) +// monitorView.mapView.map = arcGISMap +// monitorView.mapView.isAttributionTextVisible = false //去掉左下角属性标识 +// monitorView.mapView.setViewpoint(Viewpoint(22.29334127, 113.4937572, 6400.0)) +// +// //Marker相关Layer +// graphicsOverlays = monitorView.mapView.graphicsOverlays } private fun clearPictureMarker() { - graphics.clear() - graphicsOverlays.clear() +// graphics.clear() +// graphicsOverlays.clear() } /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() - monitorView.mapView.resume() +// monitorView.mapView.resume() } override fun onPause() { super.onPause() - monitorView.mapView.pause() +// monitorView.mapView.pause() } override fun onDestroy() { super.onDestroy() - monitorView.mapView.dispose() +// monitorView.mapView.dispose() } } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2dd018e..c9f87ce 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -102,7 +102,7 @@ //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' +// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 diff --git a/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt b/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt index 86ebb7e..46b5da9 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt @@ -1,8 +1,6 @@ package com.casic.smart.town.sanxi.base import android.app.Application -import com.casic.smart.town.sanxi.R -import com.esri.arcgisruntime.ArcGISRuntimeEnvironment import com.pengxh.kt.lite.utils.SaveKeyValues import kotlin.properties.Delegates @@ -20,8 +18,8 @@ super.onCreate() instance = this SaveKeyValues.initSharedPreferences(this) - ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license)) //去掉开发版水印 - ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)) +// ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license)) //去掉开发版水印 +// ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)) //appKey 为保留字段，目前只需传入null或空字符串即可。 // HatomPlayerSDK.init(this, "", true) } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/MonitorPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/MonitorPageFragment.kt index c90f2e6..01288a9 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/MonitorPageFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/MonitorPageFragment.kt @@ -1,7 +1,5 @@ package com.casic.smart.town.sanxi.fragment -import android.graphics.BitmapFactory -import android.graphics.drawable.BitmapDrawable import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -11,21 +9,8 @@ import com.amap.api.location.CoordinateConverter import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.model.VideoModel -import com.casic.smart.town.sanxi.util.ArcGISHelper -import com.casic.smart.town.sanxi.util.LayerType -import com.casic.smart.town.sanxi.util.LocaleConstant -import com.casic.smart.town.sanxi.util.TianDiTuMethods import com.casic.smart.town.sanxi.view.MonitorRecordActivity import com.casic.smart.town.sanxi.vm.VideoViewModel -import com.esri.arcgisruntime.geometry.Point -import com.esri.arcgisruntime.layers.FeatureLayer -import com.esri.arcgisruntime.mapping.ArcGISMap -import com.esri.arcgisruntime.mapping.Basemap -import com.esri.arcgisruntime.mapping.Viewpoint -import com.esri.arcgisruntime.mapping.view.Graphic -import com.esri.arcgisruntime.mapping.view.GraphicsOverlay -import com.esri.arcgisruntime.symbology.PictureMarkerSymbol -import com.esri.arcgisruntime.util.ListenableList import com.pengxh.kt.lite.extensions.navigatePageTo import kotlinx.android.synthetic.main.fragment_monitor.view.* @@ -44,10 +29,10 @@ /** * 所有的marker */ - private var allMarkerOptions: MutableList = ArrayList() - - private lateinit var graphics: ListenableList - private lateinit var graphicsOverlays: ListenableList +// private var allMarkerOptions: MutableList = ArrayList() +// +// private lateinit var graphics: ListenableList +// private lateinit var graphicsOverlays: ListenableList override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? @@ -81,28 +66,28 @@ latitudeList.add(latitude) longitudeList.add(longitude) //将所有设备信息转化缓存为Marker点 - allMarkerOptions.add( - Point(longitude, latitude, TianDiTuMethods.SRID_2000) - ) +// allMarkerOptions.add( +// Point(longitude, latitude, TianDiTuMethods.SRID_2000) +// ) } } } - allMarkerOptions.forEach { p -> - val pinDrawable = BitmapDrawable( - resources, BitmapFactory.decodeResource(resources, R.mipmap.map_pin) - ) - val pictureMarker = PictureMarkerSymbol(pinDrawable) - pictureMarker.height = 24f - pictureMarker.width = 24f - pictureMarker.loadAsync() //异步加载Marker，防止阻塞 - - - val graphicsOverlay = GraphicsOverlay() - graphics = graphicsOverlay.graphics - graphics.add(Graphic(p, pictureMarker)) - graphicsOverlays.add(graphicsOverlay) - } +// allMarkerOptions.forEach { p -> +// val pinDrawable = BitmapDrawable( +// resources, BitmapFactory.decodeResource(resources, R.mipmap.map_pin) +// ) +// val pictureMarker = PictureMarkerSymbol(pinDrawable) +// pictureMarker.height = 24f +// pictureMarker.width = 24f +// pictureMarker.loadAsync() //异步加载Marker，防止阻塞 +// +// +// val graphicsOverlay = GraphicsOverlay() +// graphics = graphicsOverlay.graphics +// graphics.add(Graphic(p, pictureMarker)) +// graphicsOverlays.add(graphicsOverlay) +// } } }) @@ -141,47 +126,47 @@ } private fun initMap() { - //创建底图、并设置底图图层 - val baseMapLayer = TianDiTuMethods.createTianDiTuTiledLayer(LayerType.TIANDITU_IMAGE_2000) - val baseLayerMap = Basemap(baseMapLayer) - val chineseAnnotationLayer = TianDiTuMethods.createTianDiTuTiledLayer( - LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_2000 - ) - baseLayerMap.baseLayers.add(chineseAnnotationLayer) - - val arcGISMap = ArcGISMap(baseLayerMap) - //添加自定义arcgis图层 - val layers = ArrayList() - LocaleConstant.LAYER.forEach { - layers.add(ArcGISHelper.createFeatureLayer(it)) - } - arcGISMap.operationalLayers.addAll(layers) - monitorView.mapView.map = arcGISMap - monitorView.mapView.isAttributionTextVisible = false //去掉左下角属性标识 - monitorView.mapView.setViewpoint(Viewpoint(22.29334127, 113.4937572, 6400.0)) - - //Marker相关Layer - graphicsOverlays = monitorView.mapView.graphicsOverlays +// //创建底图、并设置底图图层 +// val baseMapLayer = TianDiTuMethods.createTianDiTuTiledLayer(LayerType.TIANDITU_IMAGE_2000) +// val baseLayerMap = Basemap(baseMapLayer) +// val chineseAnnotationLayer = TianDiTuMethods.createTianDiTuTiledLayer( +// LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_2000 +// ) +// baseLayerMap.baseLayers.add(chineseAnnotationLayer) +// +// val arcGISMap = ArcGISMap(baseLayerMap) +// //添加自定义arcgis图层 +// val layers = ArrayList() +// LocaleConstant.LAYER.forEach { +// layers.add(ArcGISHelper.createFeatureLayer(it)) +// } +// arcGISMap.operationalLayers.addAll(layers) +// monitorView.mapView.map = arcGISMap +// monitorView.mapView.isAttributionTextVisible = false //去掉左下角属性标识 +// monitorView.mapView.setViewpoint(Viewpoint(22.29334127, 113.4937572, 6400.0)) +// +// //Marker相关Layer +// graphicsOverlays = monitorView.mapView.graphicsOverlays } private fun clearPictureMarker() { - graphics.clear() - graphicsOverlays.clear() +// graphics.clear() +// graphicsOverlays.clear() } /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() - monitorView.mapView.resume() +// monitorView.mapView.resume() } override fun onPause() { super.onPause() - monitorView.mapView.pause() +// monitorView.mapView.pause() } override fun onDestroy() { super.onDestroy() - monitorView.mapView.dispose() +// monitorView.mapView.dispose() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/ArcGISHelper.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/ArcGISHelper.kt index 2688240..17d0bef 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/util/ArcGISHelper.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/util/ArcGISHelper.kt @@ -1,13 +1,10 @@ package com.casic.smart.town.sanxi.util -import com.esri.arcgisruntime.data.ServiceFeatureTable -import com.esri.arcgisruntime.layers.FeatureLayer - object ArcGISHelper { - fun createFeatureLayer(url: String): FeatureLayer { - val serviceFeatureTable = ServiceFeatureTable(url) - serviceFeatureTable.featureRequestMode = - ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE - return FeatureLayer(serviceFeatureTable) - } +// fun createFeatureLayer(url: String): FeatureLayer { +// val serviceFeatureTable = ServiceFeatureTable(url) +// serviceFeatureTable.featureRequestMode = +// ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE +// return FeatureLayer(serviceFeatureTable) +// } } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2dd018e..c9f87ce 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -102,7 +102,7 @@ //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' +// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 diff --git a/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt b/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt index 86ebb7e..46b5da9 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt @@ -1,8 +1,6 @@ package com.casic.smart.town.sanxi.base import android.app.Application -import com.casic.smart.town.sanxi.R -import com.esri.arcgisruntime.ArcGISRuntimeEnvironment import com.pengxh.kt.lite.utils.SaveKeyValues import kotlin.properties.Delegates @@ -20,8 +18,8 @@ super.onCreate() instance = this SaveKeyValues.initSharedPreferences(this) - ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license)) //去掉开发版水印 - ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)) +// ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license)) //去掉开发版水印 +// ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)) //appKey 为保留字段，目前只需传入null或空字符串即可。 // HatomPlayerSDK.init(this, "", true) } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/MonitorPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/MonitorPageFragment.kt index c90f2e6..01288a9 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/MonitorPageFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/MonitorPageFragment.kt @@ -1,7 +1,5 @@ package com.casic.smart.town.sanxi.fragment -import android.graphics.BitmapFactory -import android.graphics.drawable.BitmapDrawable import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -11,21 +9,8 @@ import com.amap.api.location.CoordinateConverter import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.model.VideoModel -import com.casic.smart.town.sanxi.util.ArcGISHelper -import com.casic.smart.town.sanxi.util.LayerType -import com.casic.smart.town.sanxi.util.LocaleConstant -import com.casic.smart.town.sanxi.util.TianDiTuMethods import com.casic.smart.town.sanxi.view.MonitorRecordActivity import com.casic.smart.town.sanxi.vm.VideoViewModel -import com.esri.arcgisruntime.geometry.Point -import com.esri.arcgisruntime.layers.FeatureLayer -import com.esri.arcgisruntime.mapping.ArcGISMap -import com.esri.arcgisruntime.mapping.Basemap -import com.esri.arcgisruntime.mapping.Viewpoint -import com.esri.arcgisruntime.mapping.view.Graphic -import com.esri.arcgisruntime.mapping.view.GraphicsOverlay -import com.esri.arcgisruntime.symbology.PictureMarkerSymbol -import com.esri.arcgisruntime.util.ListenableList import com.pengxh.kt.lite.extensions.navigatePageTo import kotlinx.android.synthetic.main.fragment_monitor.view.* @@ -44,10 +29,10 @@ /** * 所有的marker */ - private var allMarkerOptions: MutableList = ArrayList() - - private lateinit var graphics: ListenableList - private lateinit var graphicsOverlays: ListenableList +// private var allMarkerOptions: MutableList = ArrayList() +// +// private lateinit var graphics: ListenableList +// private lateinit var graphicsOverlays: ListenableList override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? @@ -81,28 +66,28 @@ latitudeList.add(latitude) longitudeList.add(longitude) //将所有设备信息转化缓存为Marker点 - allMarkerOptions.add( - Point(longitude, latitude, TianDiTuMethods.SRID_2000) - ) +// allMarkerOptions.add( +// Point(longitude, latitude, TianDiTuMethods.SRID_2000) +// ) } } } - allMarkerOptions.forEach { p -> - val pinDrawable = BitmapDrawable( - resources, BitmapFactory.decodeResource(resources, R.mipmap.map_pin) - ) - val pictureMarker = PictureMarkerSymbol(pinDrawable) - pictureMarker.height = 24f - pictureMarker.width = 24f - pictureMarker.loadAsync() //异步加载Marker，防止阻塞 - - - val graphicsOverlay = GraphicsOverlay() - graphics = graphicsOverlay.graphics - graphics.add(Graphic(p, pictureMarker)) - graphicsOverlays.add(graphicsOverlay) - } +// allMarkerOptions.forEach { p -> +// val pinDrawable = BitmapDrawable( +// resources, BitmapFactory.decodeResource(resources, R.mipmap.map_pin) +// ) +// val pictureMarker = PictureMarkerSymbol(pinDrawable) +// pictureMarker.height = 24f +// pictureMarker.width = 24f +// pictureMarker.loadAsync() //异步加载Marker，防止阻塞 +// +// +// val graphicsOverlay = GraphicsOverlay() +// graphics = graphicsOverlay.graphics +// graphics.add(Graphic(p, pictureMarker)) +// graphicsOverlays.add(graphicsOverlay) +// } } }) @@ -141,47 +126,47 @@ } private fun initMap() { - //创建底图、并设置底图图层 - val baseMapLayer = TianDiTuMethods.createTianDiTuTiledLayer(LayerType.TIANDITU_IMAGE_2000) - val baseLayerMap = Basemap(baseMapLayer) - val chineseAnnotationLayer = TianDiTuMethods.createTianDiTuTiledLayer( - LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_2000 - ) - baseLayerMap.baseLayers.add(chineseAnnotationLayer) - - val arcGISMap = ArcGISMap(baseLayerMap) - //添加自定义arcgis图层 - val layers = ArrayList() - LocaleConstant.LAYER.forEach { - layers.add(ArcGISHelper.createFeatureLayer(it)) - } - arcGISMap.operationalLayers.addAll(layers) - monitorView.mapView.map = arcGISMap - monitorView.mapView.isAttributionTextVisible = false //去掉左下角属性标识 - monitorView.mapView.setViewpoint(Viewpoint(22.29334127, 113.4937572, 6400.0)) - - //Marker相关Layer - graphicsOverlays = monitorView.mapView.graphicsOverlays +// //创建底图、并设置底图图层 +// val baseMapLayer = TianDiTuMethods.createTianDiTuTiledLayer(LayerType.TIANDITU_IMAGE_2000) +// val baseLayerMap = Basemap(baseMapLayer) +// val chineseAnnotationLayer = TianDiTuMethods.createTianDiTuTiledLayer( +// LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_2000 +// ) +// baseLayerMap.baseLayers.add(chineseAnnotationLayer) +// +// val arcGISMap = ArcGISMap(baseLayerMap) +// //添加自定义arcgis图层 +// val layers = ArrayList() +// LocaleConstant.LAYER.forEach { +// layers.add(ArcGISHelper.createFeatureLayer(it)) +// } +// arcGISMap.operationalLayers.addAll(layers) +// monitorView.mapView.map = arcGISMap +// monitorView.mapView.isAttributionTextVisible = false //去掉左下角属性标识 +// monitorView.mapView.setViewpoint(Viewpoint(22.29334127, 113.4937572, 6400.0)) +// +// //Marker相关Layer +// graphicsOverlays = monitorView.mapView.graphicsOverlays } private fun clearPictureMarker() { - graphics.clear() - graphicsOverlays.clear() +// graphics.clear() +// graphicsOverlays.clear() } /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() - monitorView.mapView.resume() +// monitorView.mapView.resume() } override fun onPause() { super.onPause() - monitorView.mapView.pause() +// monitorView.mapView.pause() } override fun onDestroy() { super.onDestroy() - monitorView.mapView.dispose() +// monitorView.mapView.dispose() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/ArcGISHelper.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/ArcGISHelper.kt index 2688240..17d0bef 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/util/ArcGISHelper.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/util/ArcGISHelper.kt @@ -1,13 +1,10 @@ package com.casic.smart.town.sanxi.util -import com.esri.arcgisruntime.data.ServiceFeatureTable -import com.esri.arcgisruntime.layers.FeatureLayer - object ArcGISHelper { - fun createFeatureLayer(url: String): FeatureLayer { - val serviceFeatureTable = ServiceFeatureTable(url) - serviceFeatureTable.featureRequestMode = - ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE - return FeatureLayer(serviceFeatureTable) - } +// fun createFeatureLayer(url: String): FeatureLayer { +// val serviceFeatureTable = ServiceFeatureTable(url) +// serviceFeatureTable.featureRequestMode = +// ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE +// return FeatureLayer(serviceFeatureTable) +// } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/TianDiTuMethods.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/TianDiTuMethods.kt index 976da4a..3ac6dd3 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/util/TianDiTuMethods.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/util/TianDiTuMethods.kt @@ -1,13 +1,5 @@ package com.casic.smart.town.sanxi.util -import com.esri.arcgisruntime.arcgisservices.LevelOfDetail -import com.esri.arcgisruntime.arcgisservices.TileInfo -import com.esri.arcgisruntime.geometry.Envelope -import com.esri.arcgisruntime.geometry.Point -import com.esri.arcgisruntime.geometry.SpatialReference -import com.esri.arcgisruntime.layers.WebTiledLayer -import java.util.* - object TianDiTuMethods { private val SubDomain: List = listOf("t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7") @@ -59,8 +51,8 @@ private const val LAYER_NAME_TERRAIN = "ter" private const val LAYER_NAME_TERRAIN_ANNOTATION_CHINESE = "cta" - val SRID_2000 = SpatialReference.create(4490) - private val SRID_MERCATOR = SpatialReference.create(102100) + // val SRID_2000 = SpatialReference.create(4490) +// private val SRID_MERCATOR = SpatialReference.create(102100) private const val X_MIN_2000 = -180.0 private const val Y_MIN_2000 = -90.0 private const val X_MAX_2000 = 180.0 @@ -70,12 +62,12 @@ private const val Y_MIN_MERCATOR = -20037508.3427892 private const val X_MAX_MERCATOR = 20037508.3427892 private const val Y_MAX_MERCATOR = 20037508.3427892 - private val ORIGIN_2000: Point = Point(-180.0, 90.0, SRID_2000) - private val ORIGIN_MERCATOR: Point = Point(-20037508.3427892, 20037508.3427892, SRID_MERCATOR) - private val ENVELOPE_2000: Envelope = - Envelope(X_MIN_2000, Y_MIN_2000, X_MAX_2000, Y_MAX_2000, SRID_2000) - private val ENVELOPE_MERCATOR: Envelope = - Envelope(X_MIN_MERCATOR, Y_MIN_MERCATOR, X_MAX_MERCATOR, Y_MAX_MERCATOR, SRID_MERCATOR) +// private val ORIGIN_2000: Point = Point(-180.0, 90.0, SRID_2000) +// private val ORIGIN_MERCATOR: Point = Point(-20037508.3427892, 20037508.3427892, SRID_MERCATOR) +// private val ENVELOPE_2000: Envelope = +// Envelope(X_MIN_2000, Y_MIN_2000, X_MAX_2000, Y_MAX_2000, SRID_2000) +// private val ENVELOPE_MERCATOR: Envelope = +// Envelope(X_MIN_MERCATOR, Y_MIN_MERCATOR, X_MAX_MERCATOR, Y_MAX_MERCATOR, SRID_MERCATOR) private val SCALES = doubleArrayOf( 2.958293554545656E8, 1.479146777272828E8, @@ -114,131 +106,131 @@ 0.000010728836059570307, 0.000005364418029785169 ) - fun createTianDiTuTiledLayer(layerType: String?): WebTiledLayer? { - return createTianDiTuTiledLayer(getTianDiTuLayerType(layerType)) - } +// fun createTianDiTuTiledLayer(layerType: String?): WebTiledLayer? { +// return createTianDiTuTiledLayer(getTianDiTuLayerType(layerType)) +// } - fun createTianDiTuTiledLayer(layerType: LayerType?): WebTiledLayer? { - var webTiledLayer: WebTiledLayer? = null - var mainUrl = "" - var mainName = "" - val mainTileInfo: TileInfo? - val mainEnvelope: Envelope? - var mainIs2000 = false - try { - when (layerType) { - LayerType.TIANDITU_VECTOR_2000 -> { - mainUrl = URL_VECTOR_2000 - mainName = LAYER_NAME_VECTOR - mainIs2000 = true - } - LayerType.TIANDITU_VECTOR_MERCATOR -> { - mainUrl = URL_VECTOR_MERCATOR - mainName = LAYER_NAME_VECTOR - } - LayerType.TIANDITU_IMAGE_2000 -> { - mainUrl = URL_IMAGE_2000 - mainName = LAYER_NAME_IMAGE - mainIs2000 = true - } - LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_2000 -> { - mainUrl = URL_IMAGE_ANNOTATION_CHINESE_2000 - mainName = LAYER_NAME_IMAGE_ANNOTATION_CHINESE - mainIs2000 = true - } - LayerType.TIANDITU_IMAGE_ANNOTATION_ENGLISH_2000 -> { - mainUrl = URL_IMAGE_ANNOTATION_ENGLISH_2000 - mainName = LAYER_NAME_IMAGE_ANNOTATION_ENGLISH - mainIs2000 = true - } - LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_MERCATOR -> { - mainUrl = URL_IMAGE_ANNOTATION_CHINESE_MERCATOR - mainName = LAYER_NAME_IMAGE_ANNOTATION_CHINESE - } - LayerType.TIANDITU_IMAGE_ANNOTATION_ENGLISH_MERCATOR -> { - mainUrl = URL_IMAGE_ANNOTATION_ENGLISH_MERCATOR - mainName = LAYER_NAME_IMAGE_ANNOTATION_ENGLISH - } - LayerType.TIANDITU_IMAGE_MERCATOR -> { - mainUrl = URL_IMAGE_MERCATOR - mainName = LAYER_NAME_IMAGE - } - LayerType.TIANDITU_VECTOR_ANNOTATION_CHINESE_2000 -> { - mainUrl = URL_VECTOR_ANNOTATION_CHINESE_2000 - mainName = LAYER_NAME_VECTOR_ANNOTATION_CHINESE - mainIs2000 = true - } - LayerType.TIANDITU_VECTOR_ANNOTATION_ENGLISH_2000 -> { - mainUrl = URL_VECTOR_ANNOTATION_ENGLISH_2000 - mainName = LAYER_NAME_VECTOR_ANNOTATION_ENGLISH - mainIs2000 = true - } - LayerType.TIANDITU_VECTOR_ANNOTATION_CHINESE_MERCATOR -> { - mainUrl = URL_VECTOR_ANNOTATION_CHINESE_MERCATOR - mainName = LAYER_NAME_VECTOR_ANNOTATION_CHINESE - } - LayerType.TIANDITU_VECTOR_ANNOTATION_ENGLISH_MERCATOR -> { - mainUrl = URL_VECTOR_ANNOTATION_ENGLISH_MERCATOR - mainName = LAYER_NAME_VECTOR_ANNOTATION_ENGLISH - } - LayerType.TIANDITU_TERRAIN_2000 -> { - mainUrl = URL_TERRAIN_2000 - mainName = LAYER_NAME_TERRAIN - mainIs2000 = true - } - LayerType.TIANDITU_TERRAIN_ANNOTATION_CHINESE_2000 -> { - mainUrl = URL_TERRAIN_ANNOTATION_CHINESE_2000 - mainName = LAYER_NAME_TERRAIN_ANNOTATION_CHINESE - mainIs2000 = true - } - LayerType.TIANDITU_TERRAIN_MERCATOR -> { - mainUrl = URL_TERRAIN_MERCATOR - mainName = LAYER_NAME_TERRAIN - } - LayerType.TIANDITU_TERRAIN_ANNOTATION_CHINESE_MERCATOR -> { - mainUrl = URL_TERRAIN_ANNOTATION_CHINESE_MERCATOR - mainName = LAYER_NAME_TERRAIN_ANNOTATION_CHINESE - } - } - val mainLevelOfDetail: MutableList = ArrayList() - val mainOrigin: Point? - if (mainIs2000) { - for (i in minZoomLevel..maxZoomLevel) { - val item = LevelOfDetail(i, RESOLUTIONS_2000[i - 1], SCALES[i - 1]) - mainLevelOfDetail.add(item) - } - mainEnvelope = ENVELOPE_2000 - mainOrigin = ORIGIN_2000 - } else { - for (i in minZoomLevel..maxZoomLevel) { - val item = LevelOfDetail(i, RESOLUTIONS_MERCATOR[i - 1], SCALES[i - 1]) - mainLevelOfDetail.add(item) - } - mainEnvelope = ENVELOPE_MERCATOR - mainOrigin = ORIGIN_MERCATOR - } - mainTileInfo = TileInfo( - DPI, - TileInfo.ImageFormat.PNG24, - mainLevelOfDetail, - mainOrigin, - mainOrigin.spatialReference, - tileHeight, - tileWidth - ) - webTiledLayer = WebTiledLayer( - mainUrl, - SubDomain, - mainTileInfo, - mainEnvelope - ) - webTiledLayer.name = mainName - webTiledLayer.loadAsync() - } catch (e: Exception) { - e.cause - } - return webTiledLayer - } +// fun createTianDiTuTiledLayer(layerType: LayerType?): WebTiledLayer? { +// var webTiledLayer: WebTiledLayer? = null +// var mainUrl = "" +// var mainName = "" +// val mainTileInfo: TileInfo? +// val mainEnvelope: Envelope? +// var mainIs2000 = false +// try { +// when (layerType) { +// LayerType.TIANDITU_VECTOR_2000 -> { +// mainUrl = URL_VECTOR_2000 +// mainName = LAYER_NAME_VECTOR +// mainIs2000 = true +// } +// LayerType.TIANDITU_VECTOR_MERCATOR -> { +// mainUrl = URL_VECTOR_MERCATOR +// mainName = LAYER_NAME_VECTOR +// } +// LayerType.TIANDITU_IMAGE_2000 -> { +// mainUrl = URL_IMAGE_2000 +// mainName = LAYER_NAME_IMAGE +// mainIs2000 = true +// } +// LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_2000 -> { +// mainUrl = URL_IMAGE_ANNOTATION_CHINESE_2000 +// mainName = LAYER_NAME_IMAGE_ANNOTATION_CHINESE +// mainIs2000 = true +// } +// LayerType.TIANDITU_IMAGE_ANNOTATION_ENGLISH_2000 -> { +// mainUrl = URL_IMAGE_ANNOTATION_ENGLISH_2000 +// mainName = LAYER_NAME_IMAGE_ANNOTATION_ENGLISH +// mainIs2000 = true +// } +// LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_MERCATOR -> { +// mainUrl = URL_IMAGE_ANNOTATION_CHINESE_MERCATOR +// mainName = LAYER_NAME_IMAGE_ANNOTATION_CHINESE +// } +// LayerType.TIANDITU_IMAGE_ANNOTATION_ENGLISH_MERCATOR -> { +// mainUrl = URL_IMAGE_ANNOTATION_ENGLISH_MERCATOR +// mainName = LAYER_NAME_IMAGE_ANNOTATION_ENGLISH +// } +// LayerType.TIANDITU_IMAGE_MERCATOR -> { +// mainUrl = URL_IMAGE_MERCATOR +// mainName = LAYER_NAME_IMAGE +// } +// LayerType.TIANDITU_VECTOR_ANNOTATION_CHINESE_2000 -> { +// mainUrl = URL_VECTOR_ANNOTATION_CHINESE_2000 +// mainName = LAYER_NAME_VECTOR_ANNOTATION_CHINESE +// mainIs2000 = true +// } +// LayerType.TIANDITU_VECTOR_ANNOTATION_ENGLISH_2000 -> { +// mainUrl = URL_VECTOR_ANNOTATION_ENGLISH_2000 +// mainName = LAYER_NAME_VECTOR_ANNOTATION_ENGLISH +// mainIs2000 = true +// } +// LayerType.TIANDITU_VECTOR_ANNOTATION_CHINESE_MERCATOR -> { +// mainUrl = URL_VECTOR_ANNOTATION_CHINESE_MERCATOR +// mainName = LAYER_NAME_VECTOR_ANNOTATION_CHINESE +// } +// LayerType.TIANDITU_VECTOR_ANNOTATION_ENGLISH_MERCATOR -> { +// mainUrl = URL_VECTOR_ANNOTATION_ENGLISH_MERCATOR +// mainName = LAYER_NAME_VECTOR_ANNOTATION_ENGLISH +// } +// LayerType.TIANDITU_TERRAIN_2000 -> { +// mainUrl = URL_TERRAIN_2000 +// mainName = LAYER_NAME_TERRAIN +// mainIs2000 = true +// } +// LayerType.TIANDITU_TERRAIN_ANNOTATION_CHINESE_2000 -> { +// mainUrl = URL_TERRAIN_ANNOTATION_CHINESE_2000 +// mainName = LAYER_NAME_TERRAIN_ANNOTATION_CHINESE +// mainIs2000 = true +// } +// LayerType.TIANDITU_TERRAIN_MERCATOR -> { +// mainUrl = URL_TERRAIN_MERCATOR +// mainName = LAYER_NAME_TERRAIN +// } +// LayerType.TIANDITU_TERRAIN_ANNOTATION_CHINESE_MERCATOR -> { +// mainUrl = URL_TERRAIN_ANNOTATION_CHINESE_MERCATOR +// mainName = LAYER_NAME_TERRAIN_ANNOTATION_CHINESE +// } +// } +// val mainLevelOfDetail: MutableList = ArrayList() +// val mainOrigin: Point? +// if (mainIs2000) { +// for (i in minZoomLevel..maxZoomLevel) { +// val item = LevelOfDetail(i, RESOLUTIONS_2000[i - 1], SCALES[i - 1]) +// mainLevelOfDetail.add(item) +// } +// mainEnvelope = ENVELOPE_2000 +// mainOrigin = ORIGIN_2000 +// } else { +// for (i in minZoomLevel..maxZoomLevel) { +// val item = LevelOfDetail(i, RESOLUTIONS_MERCATOR[i - 1], SCALES[i - 1]) +// mainLevelOfDetail.add(item) +// } +// mainEnvelope = ENVELOPE_MERCATOR +// mainOrigin = ORIGIN_MERCATOR +// } +// mainTileInfo = TileInfo( +// DPI, +// TileInfo.ImageFormat.PNG24, +// mainLevelOfDetail, +// mainOrigin, +// mainOrigin.spatialReference, +// tileHeight, +// tileWidth +// ) +// webTiledLayer = WebTiledLayer( +// mainUrl, +// SubDomain, +// mainTileInfo, +// mainEnvelope +// ) +// webTiledLayer.name = mainName +// webTiledLayer.loadAsync() +// } catch (e: Exception) { +// e.cause +// } +// return webTiledLayer +// } private fun getTianDiTuLayerType(layerType: String?): LayerType { var result = LayerType.TIANDITU_VECTOR_2000 diff --git a/app/build.gradle b/app/build.gradle index 2dd018e..c9f87ce 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -102,7 +102,7 @@ //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' +// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 diff --git a/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt b/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt index 86ebb7e..46b5da9 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt @@ -1,8 +1,6 @@ package com.casic.smart.town.sanxi.base import android.app.Application -import com.casic.smart.town.sanxi.R -import com.esri.arcgisruntime.ArcGISRuntimeEnvironment import com.pengxh.kt.lite.utils.SaveKeyValues import kotlin.properties.Delegates @@ -20,8 +18,8 @@ super.onCreate() instance = this SaveKeyValues.initSharedPreferences(this) - ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license)) //去掉开发版水印 - ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)) +// ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license)) //去掉开发版水印 +// ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)) //appKey 为保留字段，目前只需传入null或空字符串即可。 // HatomPlayerSDK.init(this, "", true) } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/MonitorPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/MonitorPageFragment.kt index c90f2e6..01288a9 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/MonitorPageFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/MonitorPageFragment.kt @@ -1,7 +1,5 @@ package com.casic.smart.town.sanxi.fragment -import android.graphics.BitmapFactory -import android.graphics.drawable.BitmapDrawable import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -11,21 +9,8 @@ import com.amap.api.location.CoordinateConverter import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.model.VideoModel -import com.casic.smart.town.sanxi.util.ArcGISHelper -import com.casic.smart.town.sanxi.util.LayerType -import com.casic.smart.town.sanxi.util.LocaleConstant -import com.casic.smart.town.sanxi.util.TianDiTuMethods import com.casic.smart.town.sanxi.view.MonitorRecordActivity import com.casic.smart.town.sanxi.vm.VideoViewModel -import com.esri.arcgisruntime.geometry.Point -import com.esri.arcgisruntime.layers.FeatureLayer -import com.esri.arcgisruntime.mapping.ArcGISMap -import com.esri.arcgisruntime.mapping.Basemap -import com.esri.arcgisruntime.mapping.Viewpoint -import com.esri.arcgisruntime.mapping.view.Graphic -import com.esri.arcgisruntime.mapping.view.GraphicsOverlay -import com.esri.arcgisruntime.symbology.PictureMarkerSymbol -import com.esri.arcgisruntime.util.ListenableList import com.pengxh.kt.lite.extensions.navigatePageTo import kotlinx.android.synthetic.main.fragment_monitor.view.* @@ -44,10 +29,10 @@ /** * 所有的marker */ - private var allMarkerOptions: MutableList = ArrayList() - - private lateinit var graphics: ListenableList - private lateinit var graphicsOverlays: ListenableList +// private var allMarkerOptions: MutableList = ArrayList() +// +// private lateinit var graphics: ListenableList +// private lateinit var graphicsOverlays: ListenableList override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? @@ -81,28 +66,28 @@ latitudeList.add(latitude) longitudeList.add(longitude) //将所有设备信息转化缓存为Marker点 - allMarkerOptions.add( - Point(longitude, latitude, TianDiTuMethods.SRID_2000) - ) +// allMarkerOptions.add( +// Point(longitude, latitude, TianDiTuMethods.SRID_2000) +// ) } } } - allMarkerOptions.forEach { p -> - val pinDrawable = BitmapDrawable( - resources, BitmapFactory.decodeResource(resources, R.mipmap.map_pin) - ) - val pictureMarker = PictureMarkerSymbol(pinDrawable) - pictureMarker.height = 24f - pictureMarker.width = 24f - pictureMarker.loadAsync() //异步加载Marker，防止阻塞 - - - val graphicsOverlay = GraphicsOverlay() - graphics = graphicsOverlay.graphics - graphics.add(Graphic(p, pictureMarker)) - graphicsOverlays.add(graphicsOverlay) - } +// allMarkerOptions.forEach { p -> +// val pinDrawable = BitmapDrawable( +// resources, BitmapFactory.decodeResource(resources, R.mipmap.map_pin) +// ) +// val pictureMarker = PictureMarkerSymbol(pinDrawable) +// pictureMarker.height = 24f +// pictureMarker.width = 24f +// pictureMarker.loadAsync() //异步加载Marker，防止阻塞 +// +// +// val graphicsOverlay = GraphicsOverlay() +// graphics = graphicsOverlay.graphics +// graphics.add(Graphic(p, pictureMarker)) +// graphicsOverlays.add(graphicsOverlay) +// } } }) @@ -141,47 +126,47 @@ } private fun initMap() { - //创建底图、并设置底图图层 - val baseMapLayer = TianDiTuMethods.createTianDiTuTiledLayer(LayerType.TIANDITU_IMAGE_2000) - val baseLayerMap = Basemap(baseMapLayer) - val chineseAnnotationLayer = TianDiTuMethods.createTianDiTuTiledLayer( - LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_2000 - ) - baseLayerMap.baseLayers.add(chineseAnnotationLayer) - - val arcGISMap = ArcGISMap(baseLayerMap) - //添加自定义arcgis图层 - val layers = ArrayList() - LocaleConstant.LAYER.forEach { - layers.add(ArcGISHelper.createFeatureLayer(it)) - } - arcGISMap.operationalLayers.addAll(layers) - monitorView.mapView.map = arcGISMap - monitorView.mapView.isAttributionTextVisible = false //去掉左下角属性标识 - monitorView.mapView.setViewpoint(Viewpoint(22.29334127, 113.4937572, 6400.0)) - - //Marker相关Layer - graphicsOverlays = monitorView.mapView.graphicsOverlays +// //创建底图、并设置底图图层 +// val baseMapLayer = TianDiTuMethods.createTianDiTuTiledLayer(LayerType.TIANDITU_IMAGE_2000) +// val baseLayerMap = Basemap(baseMapLayer) +// val chineseAnnotationLayer = TianDiTuMethods.createTianDiTuTiledLayer( +// LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_2000 +// ) +// baseLayerMap.baseLayers.add(chineseAnnotationLayer) +// +// val arcGISMap = ArcGISMap(baseLayerMap) +// //添加自定义arcgis图层 +// val layers = ArrayList() +// LocaleConstant.LAYER.forEach { +// layers.add(ArcGISHelper.createFeatureLayer(it)) +// } +// arcGISMap.operationalLayers.addAll(layers) +// monitorView.mapView.map = arcGISMap +// monitorView.mapView.isAttributionTextVisible = false //去掉左下角属性标识 +// monitorView.mapView.setViewpoint(Viewpoint(22.29334127, 113.4937572, 6400.0)) +// +// //Marker相关Layer +// graphicsOverlays = monitorView.mapView.graphicsOverlays } private fun clearPictureMarker() { - graphics.clear() - graphicsOverlays.clear() +// graphics.clear() +// graphicsOverlays.clear() } /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() - monitorView.mapView.resume() +// monitorView.mapView.resume() } override fun onPause() { super.onPause() - monitorView.mapView.pause() +// monitorView.mapView.pause() } override fun onDestroy() { super.onDestroy() - monitorView.mapView.dispose() +// monitorView.mapView.dispose() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/ArcGISHelper.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/ArcGISHelper.kt index 2688240..17d0bef 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/util/ArcGISHelper.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/util/ArcGISHelper.kt @@ -1,13 +1,10 @@ package com.casic.smart.town.sanxi.util -import com.esri.arcgisruntime.data.ServiceFeatureTable -import com.esri.arcgisruntime.layers.FeatureLayer - object ArcGISHelper { - fun createFeatureLayer(url: String): FeatureLayer { - val serviceFeatureTable = ServiceFeatureTable(url) - serviceFeatureTable.featureRequestMode = - ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE - return FeatureLayer(serviceFeatureTable) - } +// fun createFeatureLayer(url: String): FeatureLayer { +// val serviceFeatureTable = ServiceFeatureTable(url) +// serviceFeatureTable.featureRequestMode = +// ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE +// return FeatureLayer(serviceFeatureTable) +// } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/TianDiTuMethods.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/TianDiTuMethods.kt index 976da4a..3ac6dd3 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/util/TianDiTuMethods.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/util/TianDiTuMethods.kt @@ -1,13 +1,5 @@ package com.casic.smart.town.sanxi.util -import com.esri.arcgisruntime.arcgisservices.LevelOfDetail -import com.esri.arcgisruntime.arcgisservices.TileInfo -import com.esri.arcgisruntime.geometry.Envelope -import com.esri.arcgisruntime.geometry.Point -import com.esri.arcgisruntime.geometry.SpatialReference -import com.esri.arcgisruntime.layers.WebTiledLayer -import java.util.* - object TianDiTuMethods { private val SubDomain: List = listOf("t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7") @@ -59,8 +51,8 @@ private const val LAYER_NAME_TERRAIN = "ter" private const val LAYER_NAME_TERRAIN_ANNOTATION_CHINESE = "cta" - val SRID_2000 = SpatialReference.create(4490) - private val SRID_MERCATOR = SpatialReference.create(102100) + // val SRID_2000 = SpatialReference.create(4490) +// private val SRID_MERCATOR = SpatialReference.create(102100) private const val X_MIN_2000 = -180.0 private const val Y_MIN_2000 = -90.0 private const val X_MAX_2000 = 180.0 @@ -70,12 +62,12 @@ private const val Y_MIN_MERCATOR = -20037508.3427892 private const val X_MAX_MERCATOR = 20037508.3427892 private const val Y_MAX_MERCATOR = 20037508.3427892 - private val ORIGIN_2000: Point = Point(-180.0, 90.0, SRID_2000) - private val ORIGIN_MERCATOR: Point = Point(-20037508.3427892, 20037508.3427892, SRID_MERCATOR) - private val ENVELOPE_2000: Envelope = - Envelope(X_MIN_2000, Y_MIN_2000, X_MAX_2000, Y_MAX_2000, SRID_2000) - private val ENVELOPE_MERCATOR: Envelope = - Envelope(X_MIN_MERCATOR, Y_MIN_MERCATOR, X_MAX_MERCATOR, Y_MAX_MERCATOR, SRID_MERCATOR) +// private val ORIGIN_2000: Point = Point(-180.0, 90.0, SRID_2000) +// private val ORIGIN_MERCATOR: Point = Point(-20037508.3427892, 20037508.3427892, SRID_MERCATOR) +// private val ENVELOPE_2000: Envelope = +// Envelope(X_MIN_2000, Y_MIN_2000, X_MAX_2000, Y_MAX_2000, SRID_2000) +// private val ENVELOPE_MERCATOR: Envelope = +// Envelope(X_MIN_MERCATOR, Y_MIN_MERCATOR, X_MAX_MERCATOR, Y_MAX_MERCATOR, SRID_MERCATOR) private val SCALES = doubleArrayOf( 2.958293554545656E8, 1.479146777272828E8, @@ -114,131 +106,131 @@ 0.000010728836059570307, 0.000005364418029785169 ) - fun createTianDiTuTiledLayer(layerType: String?): WebTiledLayer? { - return createTianDiTuTiledLayer(getTianDiTuLayerType(layerType)) - } +// fun createTianDiTuTiledLayer(layerType: String?): WebTiledLayer? { +// return createTianDiTuTiledLayer(getTianDiTuLayerType(layerType)) +// } - fun createTianDiTuTiledLayer(layerType: LayerType?): WebTiledLayer? { - var webTiledLayer: WebTiledLayer? = null - var mainUrl = "" - var mainName = "" - val mainTileInfo: TileInfo? - val mainEnvelope: Envelope? - var mainIs2000 = false - try { - when (layerType) { - LayerType.TIANDITU_VECTOR_2000 -> { - mainUrl = URL_VECTOR_2000 - mainName = LAYER_NAME_VECTOR - mainIs2000 = true - } - LayerType.TIANDITU_VECTOR_MERCATOR -> { - mainUrl = URL_VECTOR_MERCATOR - mainName = LAYER_NAME_VECTOR - } - LayerType.TIANDITU_IMAGE_2000 -> { - mainUrl = URL_IMAGE_2000 - mainName = LAYER_NAME_IMAGE - mainIs2000 = true - } - LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_2000 -> { - mainUrl = URL_IMAGE_ANNOTATION_CHINESE_2000 - mainName = LAYER_NAME_IMAGE_ANNOTATION_CHINESE - mainIs2000 = true - } - LayerType.TIANDITU_IMAGE_ANNOTATION_ENGLISH_2000 -> { - mainUrl = URL_IMAGE_ANNOTATION_ENGLISH_2000 - mainName = LAYER_NAME_IMAGE_ANNOTATION_ENGLISH - mainIs2000 = true - } - LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_MERCATOR -> { - mainUrl = URL_IMAGE_ANNOTATION_CHINESE_MERCATOR - mainName = LAYER_NAME_IMAGE_ANNOTATION_CHINESE - } - LayerType.TIANDITU_IMAGE_ANNOTATION_ENGLISH_MERCATOR -> { - mainUrl = URL_IMAGE_ANNOTATION_ENGLISH_MERCATOR - mainName = LAYER_NAME_IMAGE_ANNOTATION_ENGLISH - } - LayerType.TIANDITU_IMAGE_MERCATOR -> { - mainUrl = URL_IMAGE_MERCATOR - mainName = LAYER_NAME_IMAGE - } - LayerType.TIANDITU_VECTOR_ANNOTATION_CHINESE_2000 -> { - mainUrl = URL_VECTOR_ANNOTATION_CHINESE_2000 - mainName = LAYER_NAME_VECTOR_ANNOTATION_CHINESE - mainIs2000 = true - } - LayerType.TIANDITU_VECTOR_ANNOTATION_ENGLISH_2000 -> { - mainUrl = URL_VECTOR_ANNOTATION_ENGLISH_2000 - mainName = LAYER_NAME_VECTOR_ANNOTATION_ENGLISH - mainIs2000 = true - } - LayerType.TIANDITU_VECTOR_ANNOTATION_CHINESE_MERCATOR -> { - mainUrl = URL_VECTOR_ANNOTATION_CHINESE_MERCATOR - mainName = LAYER_NAME_VECTOR_ANNOTATION_CHINESE - } - LayerType.TIANDITU_VECTOR_ANNOTATION_ENGLISH_MERCATOR -> { - mainUrl = URL_VECTOR_ANNOTATION_ENGLISH_MERCATOR - mainName = LAYER_NAME_VECTOR_ANNOTATION_ENGLISH - } - LayerType.TIANDITU_TERRAIN_2000 -> { - mainUrl = URL_TERRAIN_2000 - mainName = LAYER_NAME_TERRAIN - mainIs2000 = true - } - LayerType.TIANDITU_TERRAIN_ANNOTATION_CHINESE_2000 -> { - mainUrl = URL_TERRAIN_ANNOTATION_CHINESE_2000 - mainName = LAYER_NAME_TERRAIN_ANNOTATION_CHINESE - mainIs2000 = true - } - LayerType.TIANDITU_TERRAIN_MERCATOR -> { - mainUrl = URL_TERRAIN_MERCATOR - mainName = LAYER_NAME_TERRAIN - } - LayerType.TIANDITU_TERRAIN_ANNOTATION_CHINESE_MERCATOR -> { - mainUrl = URL_TERRAIN_ANNOTATION_CHINESE_MERCATOR - mainName = LAYER_NAME_TERRAIN_ANNOTATION_CHINESE - } - } - val mainLevelOfDetail: MutableList = ArrayList() - val mainOrigin: Point? - if (mainIs2000) { - for (i in minZoomLevel..maxZoomLevel) { - val item = LevelOfDetail(i, RESOLUTIONS_2000[i - 1], SCALES[i - 1]) - mainLevelOfDetail.add(item) - } - mainEnvelope = ENVELOPE_2000 - mainOrigin = ORIGIN_2000 - } else { - for (i in minZoomLevel..maxZoomLevel) { - val item = LevelOfDetail(i, RESOLUTIONS_MERCATOR[i - 1], SCALES[i - 1]) - mainLevelOfDetail.add(item) - } - mainEnvelope = ENVELOPE_MERCATOR - mainOrigin = ORIGIN_MERCATOR - } - mainTileInfo = TileInfo( - DPI, - TileInfo.ImageFormat.PNG24, - mainLevelOfDetail, - mainOrigin, - mainOrigin.spatialReference, - tileHeight, - tileWidth - ) - webTiledLayer = WebTiledLayer( - mainUrl, - SubDomain, - mainTileInfo, - mainEnvelope - ) - webTiledLayer.name = mainName - webTiledLayer.loadAsync() - } catch (e: Exception) { - e.cause - } - return webTiledLayer - } +// fun createTianDiTuTiledLayer(layerType: LayerType?): WebTiledLayer? { +// var webTiledLayer: WebTiledLayer? = null +// var mainUrl = "" +// var mainName = "" +// val mainTileInfo: TileInfo? +// val mainEnvelope: Envelope? +// var mainIs2000 = false +// try { +// when (layerType) { +// LayerType.TIANDITU_VECTOR_2000 -> { +// mainUrl = URL_VECTOR_2000 +// mainName = LAYER_NAME_VECTOR +// mainIs2000 = true +// } +// LayerType.TIANDITU_VECTOR_MERCATOR -> { +// mainUrl = URL_VECTOR_MERCATOR +// mainName = LAYER_NAME_VECTOR +// } +// LayerType.TIANDITU_IMAGE_2000 -> { +// mainUrl = URL_IMAGE_2000 +// mainName = LAYER_NAME_IMAGE +// mainIs2000 = true +// } +// LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_2000 -> { +// mainUrl = URL_IMAGE_ANNOTATION_CHINESE_2000 +// mainName = LAYER_NAME_IMAGE_ANNOTATION_CHINESE +// mainIs2000 = true +// } +// LayerType.TIANDITU_IMAGE_ANNOTATION_ENGLISH_2000 -> { +// mainUrl = URL_IMAGE_ANNOTATION_ENGLISH_2000 +// mainName = LAYER_NAME_IMAGE_ANNOTATION_ENGLISH +// mainIs2000 = true +// } +// LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_MERCATOR -> { +// mainUrl = URL_IMAGE_ANNOTATION_CHINESE_MERCATOR +// mainName = LAYER_NAME_IMAGE_ANNOTATION_CHINESE +// } +// LayerType.TIANDITU_IMAGE_ANNOTATION_ENGLISH_MERCATOR -> { +// mainUrl = URL_IMAGE_ANNOTATION_ENGLISH_MERCATOR +// mainName = LAYER_NAME_IMAGE_ANNOTATION_ENGLISH +// } +// LayerType.TIANDITU_IMAGE_MERCATOR -> { +// mainUrl = URL_IMAGE_MERCATOR +// mainName = LAYER_NAME_IMAGE +// } +// LayerType.TIANDITU_VECTOR_ANNOTATION_CHINESE_2000 -> { +// mainUrl = URL_VECTOR_ANNOTATION_CHINESE_2000 +// mainName = LAYER_NAME_VECTOR_ANNOTATION_CHINESE +// mainIs2000 = true +// } +// LayerType.TIANDITU_VECTOR_ANNOTATION_ENGLISH_2000 -> { +// mainUrl = URL_VECTOR_ANNOTATION_ENGLISH_2000 +// mainName = LAYER_NAME_VECTOR_ANNOTATION_ENGLISH +// mainIs2000 = true +// } +// LayerType.TIANDITU_VECTOR_ANNOTATION_CHINESE_MERCATOR -> { +// mainUrl = URL_VECTOR_ANNOTATION_CHINESE_MERCATOR +// mainName = LAYER_NAME_VECTOR_ANNOTATION_CHINESE +// } +// LayerType.TIANDITU_VECTOR_ANNOTATION_ENGLISH_MERCATOR -> { +// mainUrl = URL_VECTOR_ANNOTATION_ENGLISH_MERCATOR +// mainName = LAYER_NAME_VECTOR_ANNOTATION_ENGLISH +// } +// LayerType.TIANDITU_TERRAIN_2000 -> { +// mainUrl = URL_TERRAIN_2000 +// mainName = LAYER_NAME_TERRAIN +// mainIs2000 = true +// } +// LayerType.TIANDITU_TERRAIN_ANNOTATION_CHINESE_2000 -> { +// mainUrl = URL_TERRAIN_ANNOTATION_CHINESE_2000 +// mainName = LAYER_NAME_TERRAIN_ANNOTATION_CHINESE +// mainIs2000 = true +// } +// LayerType.TIANDITU_TERRAIN_MERCATOR -> { +// mainUrl = URL_TERRAIN_MERCATOR +// mainName = LAYER_NAME_TERRAIN +// } +// LayerType.TIANDITU_TERRAIN_ANNOTATION_CHINESE_MERCATOR -> { +// mainUrl = URL_TERRAIN_ANNOTATION_CHINESE_MERCATOR +// mainName = LAYER_NAME_TERRAIN_ANNOTATION_CHINESE +// } +// } +// val mainLevelOfDetail: MutableList = ArrayList() +// val mainOrigin: Point? +// if (mainIs2000) { +// for (i in minZoomLevel..maxZoomLevel) { +// val item = LevelOfDetail(i, RESOLUTIONS_2000[i - 1], SCALES[i - 1]) +// mainLevelOfDetail.add(item) +// } +// mainEnvelope = ENVELOPE_2000 +// mainOrigin = ORIGIN_2000 +// } else { +// for (i in minZoomLevel..maxZoomLevel) { +// val item = LevelOfDetail(i, RESOLUTIONS_MERCATOR[i - 1], SCALES[i - 1]) +// mainLevelOfDetail.add(item) +// } +// mainEnvelope = ENVELOPE_MERCATOR +// mainOrigin = ORIGIN_MERCATOR +// } +// mainTileInfo = TileInfo( +// DPI, +// TileInfo.ImageFormat.PNG24, +// mainLevelOfDetail, +// mainOrigin, +// mainOrigin.spatialReference, +// tileHeight, +// tileWidth +// ) +// webTiledLayer = WebTiledLayer( +// mainUrl, +// SubDomain, +// mainTileInfo, +// mainEnvelope +// ) +// webTiledLayer.name = mainName +// webTiledLayer.loadAsync() +// } catch (e: Exception) { +// e.cause +// } +// return webTiledLayer +// } private fun getTianDiTuLayerType(layerType: String?): LayerType { var result = LayerType.TIANDITU_VECTOR_2000 diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 3678538..c79b4b7 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -8,7 +8,6 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel -import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor @@ -26,7 +25,6 @@ private lateinit var jobId: String private lateinit var orderViewModel: OrderViewModel - private lateinit var wellViewModel: WellViewModel private lateinit var operationViewModel: OperationViewModel private val context: Context = this@NotProcessedDetailActivity @@ -45,7 +43,6 @@ jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] orderViewModel.obtainWorkOrderDetail(jobId) } @@ -136,32 +133,6 @@ } }).build().show() } - - //导航 - navigationButton.setOnClickListener { - val wellId = orderDetail.wellId.toString() - if (wellId.isBlank()) { - "点位ID异常，无法导航".show(context) - return@setOnClickListener - } - wellViewModel.obtainWellDetail(wellId) - } - wellViewModel.wellDetailModel.observe(this, { well -> - if (well.code == 200) { - val wellDetail = well.data!! - val lat = wellDetail.latGaode.toString() - val lng = wellDetail.lngGaode.toString() - if (lat.isBlank() || lng.isBlank()) { - "点位经纬度异常，无法开启导航".show(context) - } else { -// RouteOnMap.startNavigation( -// this, -// orderDetail.position, -// LatLng(lat.toDouble(), lng.toDouble()) -// ) - } - } - }) } }) } diff --git a/app/build.gradle b/app/build.gradle index 2dd018e..c9f87ce 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -102,7 +102,7 @@ //高德地图 implementation 'com.amap.api:3dmap:latest.integration' //ArcGIS - implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' +// implementation 'com.esri.arcgisruntime:arcgis-android:100.14.0' //桌面角标 implementation "me.leolin:ShortcutBadger:1.1.22@aar" //图表 diff --git a/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt b/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt index 86ebb7e..46b5da9 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/base/BaseApplication.kt @@ -1,8 +1,6 @@ package com.casic.smart.town.sanxi.base import android.app.Application -import com.casic.smart.town.sanxi.R -import com.esri.arcgisruntime.ArcGISRuntimeEnvironment import com.pengxh.kt.lite.utils.SaveKeyValues import kotlin.properties.Delegates @@ -20,8 +18,8 @@ super.onCreate() instance = this SaveKeyValues.initSharedPreferences(this) - ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license)) //去掉开发版水印 - ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)) +// ArcGISRuntimeEnvironment.setLicense(getString(R.string.arcgis_license)) //去掉开发版水印 +// ArcGISRuntimeEnvironment.setApiKey(getString(R.string.arcgis_key)) //appKey 为保留字段，目前只需传入null或空字符串即可。 // HatomPlayerSDK.init(this, "", true) } diff --git a/app/src/main/java/com/casic/smart/town/sanxi/fragment/MonitorPageFragment.kt b/app/src/main/java/com/casic/smart/town/sanxi/fragment/MonitorPageFragment.kt index c90f2e6..01288a9 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/fragment/MonitorPageFragment.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/fragment/MonitorPageFragment.kt @@ -1,7 +1,5 @@ package com.casic.smart.town.sanxi.fragment -import android.graphics.BitmapFactory -import android.graphics.drawable.BitmapDrawable import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -11,21 +9,8 @@ import com.amap.api.location.CoordinateConverter import com.casic.smart.town.sanxi.R import com.casic.smart.town.sanxi.model.VideoModel -import com.casic.smart.town.sanxi.util.ArcGISHelper -import com.casic.smart.town.sanxi.util.LayerType -import com.casic.smart.town.sanxi.util.LocaleConstant -import com.casic.smart.town.sanxi.util.TianDiTuMethods import com.casic.smart.town.sanxi.view.MonitorRecordActivity import com.casic.smart.town.sanxi.vm.VideoViewModel -import com.esri.arcgisruntime.geometry.Point -import com.esri.arcgisruntime.layers.FeatureLayer -import com.esri.arcgisruntime.mapping.ArcGISMap -import com.esri.arcgisruntime.mapping.Basemap -import com.esri.arcgisruntime.mapping.Viewpoint -import com.esri.arcgisruntime.mapping.view.Graphic -import com.esri.arcgisruntime.mapping.view.GraphicsOverlay -import com.esri.arcgisruntime.symbology.PictureMarkerSymbol -import com.esri.arcgisruntime.util.ListenableList import com.pengxh.kt.lite.extensions.navigatePageTo import kotlinx.android.synthetic.main.fragment_monitor.view.* @@ -44,10 +29,10 @@ /** * 所有的marker */ - private var allMarkerOptions: MutableList = ArrayList() - - private lateinit var graphics: ListenableList - private lateinit var graphicsOverlays: ListenableList +// private var allMarkerOptions: MutableList = ArrayList() +// +// private lateinit var graphics: ListenableList +// private lateinit var graphicsOverlays: ListenableList override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? @@ -81,28 +66,28 @@ latitudeList.add(latitude) longitudeList.add(longitude) //将所有设备信息转化缓存为Marker点 - allMarkerOptions.add( - Point(longitude, latitude, TianDiTuMethods.SRID_2000) - ) +// allMarkerOptions.add( +// Point(longitude, latitude, TianDiTuMethods.SRID_2000) +// ) } } } - allMarkerOptions.forEach { p -> - val pinDrawable = BitmapDrawable( - resources, BitmapFactory.decodeResource(resources, R.mipmap.map_pin) - ) - val pictureMarker = PictureMarkerSymbol(pinDrawable) - pictureMarker.height = 24f - pictureMarker.width = 24f - pictureMarker.loadAsync() //异步加载Marker，防止阻塞 - - - val graphicsOverlay = GraphicsOverlay() - graphics = graphicsOverlay.graphics - graphics.add(Graphic(p, pictureMarker)) - graphicsOverlays.add(graphicsOverlay) - } +// allMarkerOptions.forEach { p -> +// val pinDrawable = BitmapDrawable( +// resources, BitmapFactory.decodeResource(resources, R.mipmap.map_pin) +// ) +// val pictureMarker = PictureMarkerSymbol(pinDrawable) +// pictureMarker.height = 24f +// pictureMarker.width = 24f +// pictureMarker.loadAsync() //异步加载Marker，防止阻塞 +// +// +// val graphicsOverlay = GraphicsOverlay() +// graphics = graphicsOverlay.graphics +// graphics.add(Graphic(p, pictureMarker)) +// graphicsOverlays.add(graphicsOverlay) +// } } }) @@ -141,47 +126,47 @@ } private fun initMap() { - //创建底图、并设置底图图层 - val baseMapLayer = TianDiTuMethods.createTianDiTuTiledLayer(LayerType.TIANDITU_IMAGE_2000) - val baseLayerMap = Basemap(baseMapLayer) - val chineseAnnotationLayer = TianDiTuMethods.createTianDiTuTiledLayer( - LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_2000 - ) - baseLayerMap.baseLayers.add(chineseAnnotationLayer) - - val arcGISMap = ArcGISMap(baseLayerMap) - //添加自定义arcgis图层 - val layers = ArrayList() - LocaleConstant.LAYER.forEach { - layers.add(ArcGISHelper.createFeatureLayer(it)) - } - arcGISMap.operationalLayers.addAll(layers) - monitorView.mapView.map = arcGISMap - monitorView.mapView.isAttributionTextVisible = false //去掉左下角属性标识 - monitorView.mapView.setViewpoint(Viewpoint(22.29334127, 113.4937572, 6400.0)) - - //Marker相关Layer - graphicsOverlays = monitorView.mapView.graphicsOverlays +// //创建底图、并设置底图图层 +// val baseMapLayer = TianDiTuMethods.createTianDiTuTiledLayer(LayerType.TIANDITU_IMAGE_2000) +// val baseLayerMap = Basemap(baseMapLayer) +// val chineseAnnotationLayer = TianDiTuMethods.createTianDiTuTiledLayer( +// LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_2000 +// ) +// baseLayerMap.baseLayers.add(chineseAnnotationLayer) +// +// val arcGISMap = ArcGISMap(baseLayerMap) +// //添加自定义arcgis图层 +// val layers = ArrayList() +// LocaleConstant.LAYER.forEach { +// layers.add(ArcGISHelper.createFeatureLayer(it)) +// } +// arcGISMap.operationalLayers.addAll(layers) +// monitorView.mapView.map = arcGISMap +// monitorView.mapView.isAttributionTextVisible = false //去掉左下角属性标识 +// monitorView.mapView.setViewpoint(Viewpoint(22.29334127, 113.4937572, 6400.0)) +// +// //Marker相关Layer +// graphicsOverlays = monitorView.mapView.graphicsOverlays } private fun clearPictureMarker() { - graphics.clear() - graphicsOverlays.clear() +// graphics.clear() +// graphicsOverlays.clear() } /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() - monitorView.mapView.resume() +// monitorView.mapView.resume() } override fun onPause() { super.onPause() - monitorView.mapView.pause() +// monitorView.mapView.pause() } override fun onDestroy() { super.onDestroy() - monitorView.mapView.dispose() +// monitorView.mapView.dispose() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/ArcGISHelper.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/ArcGISHelper.kt index 2688240..17d0bef 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/util/ArcGISHelper.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/util/ArcGISHelper.kt @@ -1,13 +1,10 @@ package com.casic.smart.town.sanxi.util -import com.esri.arcgisruntime.data.ServiceFeatureTable -import com.esri.arcgisruntime.layers.FeatureLayer - object ArcGISHelper { - fun createFeatureLayer(url: String): FeatureLayer { - val serviceFeatureTable = ServiceFeatureTable(url) - serviceFeatureTable.featureRequestMode = - ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE - return FeatureLayer(serviceFeatureTable) - } +// fun createFeatureLayer(url: String): FeatureLayer { +// val serviceFeatureTable = ServiceFeatureTable(url) +// serviceFeatureTable.featureRequestMode = +// ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE +// return FeatureLayer(serviceFeatureTable) +// } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smart/town/sanxi/util/TianDiTuMethods.kt b/app/src/main/java/com/casic/smart/town/sanxi/util/TianDiTuMethods.kt index 976da4a..3ac6dd3 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/util/TianDiTuMethods.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/util/TianDiTuMethods.kt @@ -1,13 +1,5 @@ package com.casic.smart.town.sanxi.util -import com.esri.arcgisruntime.arcgisservices.LevelOfDetail -import com.esri.arcgisruntime.arcgisservices.TileInfo -import com.esri.arcgisruntime.geometry.Envelope -import com.esri.arcgisruntime.geometry.Point -import com.esri.arcgisruntime.geometry.SpatialReference -import com.esri.arcgisruntime.layers.WebTiledLayer -import java.util.* - object TianDiTuMethods { private val SubDomain: List = listOf("t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7") @@ -59,8 +51,8 @@ private const val LAYER_NAME_TERRAIN = "ter" private const val LAYER_NAME_TERRAIN_ANNOTATION_CHINESE = "cta" - val SRID_2000 = SpatialReference.create(4490) - private val SRID_MERCATOR = SpatialReference.create(102100) + // val SRID_2000 = SpatialReference.create(4490) +// private val SRID_MERCATOR = SpatialReference.create(102100) private const val X_MIN_2000 = -180.0 private const val Y_MIN_2000 = -90.0 private const val X_MAX_2000 = 180.0 @@ -70,12 +62,12 @@ private const val Y_MIN_MERCATOR = -20037508.3427892 private const val X_MAX_MERCATOR = 20037508.3427892 private const val Y_MAX_MERCATOR = 20037508.3427892 - private val ORIGIN_2000: Point = Point(-180.0, 90.0, SRID_2000) - private val ORIGIN_MERCATOR: Point = Point(-20037508.3427892, 20037508.3427892, SRID_MERCATOR) - private val ENVELOPE_2000: Envelope = - Envelope(X_MIN_2000, Y_MIN_2000, X_MAX_2000, Y_MAX_2000, SRID_2000) - private val ENVELOPE_MERCATOR: Envelope = - Envelope(X_MIN_MERCATOR, Y_MIN_MERCATOR, X_MAX_MERCATOR, Y_MAX_MERCATOR, SRID_MERCATOR) +// private val ORIGIN_2000: Point = Point(-180.0, 90.0, SRID_2000) +// private val ORIGIN_MERCATOR: Point = Point(-20037508.3427892, 20037508.3427892, SRID_MERCATOR) +// private val ENVELOPE_2000: Envelope = +// Envelope(X_MIN_2000, Y_MIN_2000, X_MAX_2000, Y_MAX_2000, SRID_2000) +// private val ENVELOPE_MERCATOR: Envelope = +// Envelope(X_MIN_MERCATOR, Y_MIN_MERCATOR, X_MAX_MERCATOR, Y_MAX_MERCATOR, SRID_MERCATOR) private val SCALES = doubleArrayOf( 2.958293554545656E8, 1.479146777272828E8, @@ -114,131 +106,131 @@ 0.000010728836059570307, 0.000005364418029785169 ) - fun createTianDiTuTiledLayer(layerType: String?): WebTiledLayer? { - return createTianDiTuTiledLayer(getTianDiTuLayerType(layerType)) - } +// fun createTianDiTuTiledLayer(layerType: String?): WebTiledLayer? { +// return createTianDiTuTiledLayer(getTianDiTuLayerType(layerType)) +// } - fun createTianDiTuTiledLayer(layerType: LayerType?): WebTiledLayer? { - var webTiledLayer: WebTiledLayer? = null - var mainUrl = "" - var mainName = "" - val mainTileInfo: TileInfo? - val mainEnvelope: Envelope? - var mainIs2000 = false - try { - when (layerType) { - LayerType.TIANDITU_VECTOR_2000 -> { - mainUrl = URL_VECTOR_2000 - mainName = LAYER_NAME_VECTOR - mainIs2000 = true - } - LayerType.TIANDITU_VECTOR_MERCATOR -> { - mainUrl = URL_VECTOR_MERCATOR - mainName = LAYER_NAME_VECTOR - } - LayerType.TIANDITU_IMAGE_2000 -> { - mainUrl = URL_IMAGE_2000 - mainName = LAYER_NAME_IMAGE - mainIs2000 = true - } - LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_2000 -> { - mainUrl = URL_IMAGE_ANNOTATION_CHINESE_2000 - mainName = LAYER_NAME_IMAGE_ANNOTATION_CHINESE - mainIs2000 = true - } - LayerType.TIANDITU_IMAGE_ANNOTATION_ENGLISH_2000 -> { - mainUrl = URL_IMAGE_ANNOTATION_ENGLISH_2000 - mainName = LAYER_NAME_IMAGE_ANNOTATION_ENGLISH - mainIs2000 = true - } - LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_MERCATOR -> { - mainUrl = URL_IMAGE_ANNOTATION_CHINESE_MERCATOR - mainName = LAYER_NAME_IMAGE_ANNOTATION_CHINESE - } - LayerType.TIANDITU_IMAGE_ANNOTATION_ENGLISH_MERCATOR -> { - mainUrl = URL_IMAGE_ANNOTATION_ENGLISH_MERCATOR - mainName = LAYER_NAME_IMAGE_ANNOTATION_ENGLISH - } - LayerType.TIANDITU_IMAGE_MERCATOR -> { - mainUrl = URL_IMAGE_MERCATOR - mainName = LAYER_NAME_IMAGE - } - LayerType.TIANDITU_VECTOR_ANNOTATION_CHINESE_2000 -> { - mainUrl = URL_VECTOR_ANNOTATION_CHINESE_2000 - mainName = LAYER_NAME_VECTOR_ANNOTATION_CHINESE - mainIs2000 = true - } - LayerType.TIANDITU_VECTOR_ANNOTATION_ENGLISH_2000 -> { - mainUrl = URL_VECTOR_ANNOTATION_ENGLISH_2000 - mainName = LAYER_NAME_VECTOR_ANNOTATION_ENGLISH - mainIs2000 = true - } - LayerType.TIANDITU_VECTOR_ANNOTATION_CHINESE_MERCATOR -> { - mainUrl = URL_VECTOR_ANNOTATION_CHINESE_MERCATOR - mainName = LAYER_NAME_VECTOR_ANNOTATION_CHINESE - } - LayerType.TIANDITU_VECTOR_ANNOTATION_ENGLISH_MERCATOR -> { - mainUrl = URL_VECTOR_ANNOTATION_ENGLISH_MERCATOR - mainName = LAYER_NAME_VECTOR_ANNOTATION_ENGLISH - } - LayerType.TIANDITU_TERRAIN_2000 -> { - mainUrl = URL_TERRAIN_2000 - mainName = LAYER_NAME_TERRAIN - mainIs2000 = true - } - LayerType.TIANDITU_TERRAIN_ANNOTATION_CHINESE_2000 -> { - mainUrl = URL_TERRAIN_ANNOTATION_CHINESE_2000 - mainName = LAYER_NAME_TERRAIN_ANNOTATION_CHINESE - mainIs2000 = true - } - LayerType.TIANDITU_TERRAIN_MERCATOR -> { - mainUrl = URL_TERRAIN_MERCATOR - mainName = LAYER_NAME_TERRAIN - } - LayerType.TIANDITU_TERRAIN_ANNOTATION_CHINESE_MERCATOR -> { - mainUrl = URL_TERRAIN_ANNOTATION_CHINESE_MERCATOR - mainName = LAYER_NAME_TERRAIN_ANNOTATION_CHINESE - } - } - val mainLevelOfDetail: MutableList = ArrayList() - val mainOrigin: Point? - if (mainIs2000) { - for (i in minZoomLevel..maxZoomLevel) { - val item = LevelOfDetail(i, RESOLUTIONS_2000[i - 1], SCALES[i - 1]) - mainLevelOfDetail.add(item) - } - mainEnvelope = ENVELOPE_2000 - mainOrigin = ORIGIN_2000 - } else { - for (i in minZoomLevel..maxZoomLevel) { - val item = LevelOfDetail(i, RESOLUTIONS_MERCATOR[i - 1], SCALES[i - 1]) - mainLevelOfDetail.add(item) - } - mainEnvelope = ENVELOPE_MERCATOR - mainOrigin = ORIGIN_MERCATOR - } - mainTileInfo = TileInfo( - DPI, - TileInfo.ImageFormat.PNG24, - mainLevelOfDetail, - mainOrigin, - mainOrigin.spatialReference, - tileHeight, - tileWidth - ) - webTiledLayer = WebTiledLayer( - mainUrl, - SubDomain, - mainTileInfo, - mainEnvelope - ) - webTiledLayer.name = mainName - webTiledLayer.loadAsync() - } catch (e: Exception) { - e.cause - } - return webTiledLayer - } +// fun createTianDiTuTiledLayer(layerType: LayerType?): WebTiledLayer? { +// var webTiledLayer: WebTiledLayer? = null +// var mainUrl = "" +// var mainName = "" +// val mainTileInfo: TileInfo? +// val mainEnvelope: Envelope? +// var mainIs2000 = false +// try { +// when (layerType) { +// LayerType.TIANDITU_VECTOR_2000 -> { +// mainUrl = URL_VECTOR_2000 +// mainName = LAYER_NAME_VECTOR +// mainIs2000 = true +// } +// LayerType.TIANDITU_VECTOR_MERCATOR -> { +// mainUrl = URL_VECTOR_MERCATOR +// mainName = LAYER_NAME_VECTOR +// } +// LayerType.TIANDITU_IMAGE_2000 -> { +// mainUrl = URL_IMAGE_2000 +// mainName = LAYER_NAME_IMAGE +// mainIs2000 = true +// } +// LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_2000 -> { +// mainUrl = URL_IMAGE_ANNOTATION_CHINESE_2000 +// mainName = LAYER_NAME_IMAGE_ANNOTATION_CHINESE +// mainIs2000 = true +// } +// LayerType.TIANDITU_IMAGE_ANNOTATION_ENGLISH_2000 -> { +// mainUrl = URL_IMAGE_ANNOTATION_ENGLISH_2000 +// mainName = LAYER_NAME_IMAGE_ANNOTATION_ENGLISH +// mainIs2000 = true +// } +// LayerType.TIANDITU_IMAGE_ANNOTATION_CHINESE_MERCATOR -> { +// mainUrl = URL_IMAGE_ANNOTATION_CHINESE_MERCATOR +// mainName = LAYER_NAME_IMAGE_ANNOTATION_CHINESE +// } +// LayerType.TIANDITU_IMAGE_ANNOTATION_ENGLISH_MERCATOR -> { +// mainUrl = URL_IMAGE_ANNOTATION_ENGLISH_MERCATOR +// mainName = LAYER_NAME_IMAGE_ANNOTATION_ENGLISH +// } +// LayerType.TIANDITU_IMAGE_MERCATOR -> { +// mainUrl = URL_IMAGE_MERCATOR +// mainName = LAYER_NAME_IMAGE +// } +// LayerType.TIANDITU_VECTOR_ANNOTATION_CHINESE_2000 -> { +// mainUrl = URL_VECTOR_ANNOTATION_CHINESE_2000 +// mainName = LAYER_NAME_VECTOR_ANNOTATION_CHINESE +// mainIs2000 = true +// } +// LayerType.TIANDITU_VECTOR_ANNOTATION_ENGLISH_2000 -> { +// mainUrl = URL_VECTOR_ANNOTATION_ENGLISH_2000 +// mainName = LAYER_NAME_VECTOR_ANNOTATION_ENGLISH +// mainIs2000 = true +// } +// LayerType.TIANDITU_VECTOR_ANNOTATION_CHINESE_MERCATOR -> { +// mainUrl = URL_VECTOR_ANNOTATION_CHINESE_MERCATOR +// mainName = LAYER_NAME_VECTOR_ANNOTATION_CHINESE +// } +// LayerType.TIANDITU_VECTOR_ANNOTATION_ENGLISH_MERCATOR -> { +// mainUrl = URL_VECTOR_ANNOTATION_ENGLISH_MERCATOR +// mainName = LAYER_NAME_VECTOR_ANNOTATION_ENGLISH +// } +// LayerType.TIANDITU_TERRAIN_2000 -> { +// mainUrl = URL_TERRAIN_2000 +// mainName = LAYER_NAME_TERRAIN +// mainIs2000 = true +// } +// LayerType.TIANDITU_TERRAIN_ANNOTATION_CHINESE_2000 -> { +// mainUrl = URL_TERRAIN_ANNOTATION_CHINESE_2000 +// mainName = LAYER_NAME_TERRAIN_ANNOTATION_CHINESE +// mainIs2000 = true +// } +// LayerType.TIANDITU_TERRAIN_MERCATOR -> { +// mainUrl = URL_TERRAIN_MERCATOR +// mainName = LAYER_NAME_TERRAIN +// } +// LayerType.TIANDITU_TERRAIN_ANNOTATION_CHINESE_MERCATOR -> { +// mainUrl = URL_TERRAIN_ANNOTATION_CHINESE_MERCATOR +// mainName = LAYER_NAME_TERRAIN_ANNOTATION_CHINESE +// } +// } +// val mainLevelOfDetail: MutableList = ArrayList() +// val mainOrigin: Point? +// if (mainIs2000) { +// for (i in minZoomLevel..maxZoomLevel) { +// val item = LevelOfDetail(i, RESOLUTIONS_2000[i - 1], SCALES[i - 1]) +// mainLevelOfDetail.add(item) +// } +// mainEnvelope = ENVELOPE_2000 +// mainOrigin = ORIGIN_2000 +// } else { +// for (i in minZoomLevel..maxZoomLevel) { +// val item = LevelOfDetail(i, RESOLUTIONS_MERCATOR[i - 1], SCALES[i - 1]) +// mainLevelOfDetail.add(item) +// } +// mainEnvelope = ENVELOPE_MERCATOR +// mainOrigin = ORIGIN_MERCATOR +// } +// mainTileInfo = TileInfo( +// DPI, +// TileInfo.ImageFormat.PNG24, +// mainLevelOfDetail, +// mainOrigin, +// mainOrigin.spatialReference, +// tileHeight, +// tileWidth +// ) +// webTiledLayer = WebTiledLayer( +// mainUrl, +// SubDomain, +// mainTileInfo, +// mainEnvelope +// ) +// webTiledLayer.name = mainName +// webTiledLayer.loadAsync() +// } catch (e: Exception) { +// e.cause +// } +// return webTiledLayer +// } private fun getTianDiTuLayerType(layerType: String?): LayerType { var result = LayerType.TIANDITU_VECTOR_2000 diff --git a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt index 3678538..c79b4b7 100644 --- a/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/smart/town/sanxi/view/order/NotProcessedDetailActivity.kt @@ -8,7 +8,6 @@ import com.casic.smart.town.sanxi.util.LoadingDialogHub import com.casic.smart.town.sanxi.vm.OperationViewModel import com.casic.smart.town.sanxi.vm.OrderViewModel -import com.casic.smart.town.sanxi.vm.WellViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor @@ -26,7 +25,6 @@ private lateinit var jobId: String private lateinit var orderViewModel: OrderViewModel - private lateinit var wellViewModel: WellViewModel private lateinit var operationViewModel: OperationViewModel private val context: Context = this@NotProcessedDetailActivity @@ -45,7 +43,6 @@ jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] orderViewModel.obtainWorkOrderDetail(jobId) } @@ -136,32 +133,6 @@ } }).build().show() } - - //导航 - navigationButton.setOnClickListener { - val wellId = orderDetail.wellId.toString() - if (wellId.isBlank()) { - "点位ID异常，无法导航".show(context) - return@setOnClickListener - } - wellViewModel.obtainWellDetail(wellId) - } - wellViewModel.wellDetailModel.observe(this, { well -> - if (well.code == 200) { - val wellDetail = well.data!! - val lat = wellDetail.latGaode.toString() - val lng = wellDetail.lngGaode.toString() - if (lat.isBlank() || lng.isBlank()) { - "点位经纬度异常，无法开启导航".show(context) - } else { -// RouteOnMap.startNavigation( -// this, -// orderDetail.position, -// LatLng(lat.toDouble(), lng.toDouble()) -// ) - } - } - }) } }) } diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml index fcc82f4..525e52e 100644 --- a/app/src/main/res/layout/activity_order_not_processed_detail.xml +++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml @@ -51,15 +51,6 @@ android:padding="@dimen/dp_20">