diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt index 94e070b..6ddca27 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -342,7 +342,7 @@ val uiSettings = aMap.uiSettings uiSettings.isCompassEnabled = true - uiSettings.isMyLocationButtonEnabled = true + uiSettings.isMyLocationButtonEnabled = false//不显示默认定位按钮 uiSettings.isScaleControlsEnabled = true uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 @@ -364,6 +364,23 @@ } //首次移动到定位点 + moveToCurrentLocation() + + aMap.setOnMapLongClickListener { + //协程异步显示默认数据 + CoroutineScope(Dispatchers.Main).launch { + labelBeans = withContext(Dispatchers.IO) { + DataBaseManager.get.loadTaskLabels() as ArrayList + } + showLabelsOnMap() + } + } + + //自定义定位按钮 + aimButton.setOnClickListener { moveToCurrentLocation() } + } + + private fun moveToCurrentLocation() { LocationHub.getCurrentLocation(this, object : ILocationListener { override fun onAMapLocationGet(location: AMapLocation?) { if (location != null) { @@ -377,16 +394,6 @@ } } }) - - aMap.setOnMapLongClickListener { - //协程异步显示默认数据 - CoroutineScope(Dispatchers.Main).launch { - labelBeans = withContext(Dispatchers.IO) { - DataBaseManager.get.loadTaskLabels() as ArrayList - } - showLabelsOnMap() - } - } } private fun saveTaskInformation(it: TaskModel) { diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt index 94e070b..6ddca27 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -342,7 +342,7 @@ val uiSettings = aMap.uiSettings uiSettings.isCompassEnabled = true - uiSettings.isMyLocationButtonEnabled = true + uiSettings.isMyLocationButtonEnabled = false//不显示默认定位按钮 uiSettings.isScaleControlsEnabled = true uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 @@ -364,6 +364,23 @@ } //首次移动到定位点 + moveToCurrentLocation() + + aMap.setOnMapLongClickListener { + //协程异步显示默认数据 + CoroutineScope(Dispatchers.Main).launch { + labelBeans = withContext(Dispatchers.IO) { + DataBaseManager.get.loadTaskLabels() as ArrayList + } + showLabelsOnMap() + } + } + + //自定义定位按钮 + aimButton.setOnClickListener { moveToCurrentLocation() } + } + + private fun moveToCurrentLocation() { LocationHub.getCurrentLocation(this, object : ILocationListener { override fun onAMapLocationGet(location: AMapLocation?) { if (location != null) { @@ -377,16 +394,6 @@ } } }) - - aMap.setOnMapLongClickListener { - //协程异步显示默认数据 - CoroutineScope(Dispatchers.Main).launch { - labelBeans = withContext(Dispatchers.IO) { - DataBaseManager.get.loadTaskLabels() as ArrayList - } - showLabelsOnMap() - } - } } private fun saveTaskInformation(it: TaskModel) { diff --git a/app/src/main/res/drawable/ic_aim.xml b/app/src/main/res/drawable/ic_aim.xml new file mode 100644 index 0000000..ad05a1f --- /dev/null +++ b/app/src/main/res/drawable/ic_aim.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt index 94e070b..6ddca27 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -342,7 +342,7 @@ val uiSettings = aMap.uiSettings uiSettings.isCompassEnabled = true - uiSettings.isMyLocationButtonEnabled = true + uiSettings.isMyLocationButtonEnabled = false//不显示默认定位按钮 uiSettings.isScaleControlsEnabled = true uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 @@ -364,6 +364,23 @@ } //首次移动到定位点 + moveToCurrentLocation() + + aMap.setOnMapLongClickListener { + //协程异步显示默认数据 + CoroutineScope(Dispatchers.Main).launch { + labelBeans = withContext(Dispatchers.IO) { + DataBaseManager.get.loadTaskLabels() as ArrayList + } + showLabelsOnMap() + } + } + + //自定义定位按钮 + aimButton.setOnClickListener { moveToCurrentLocation() } + } + + private fun moveToCurrentLocation() { LocationHub.getCurrentLocation(this, object : ILocationListener { override fun onAMapLocationGet(location: AMapLocation?) { if (location != null) { @@ -377,16 +394,6 @@ } } }) - - aMap.setOnMapLongClickListener { - //协程异步显示默认数据 - CoroutineScope(Dispatchers.Main).launch { - labelBeans = withContext(Dispatchers.IO) { - DataBaseManager.get.loadTaskLabels() as ArrayList - } - showLabelsOnMap() - } - } } private fun saveTaskInformation(it: TaskModel) { diff --git a/app/src/main/res/drawable/ic_aim.xml b/app/src/main/res/drawable/ic_aim.xml new file mode 100644 index 0000000..ad05a1f --- /dev/null +++ b/app/src/main/res/drawable/ic_aim.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 05f74d6..79d766a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,6 @@ + + + + +