diff --git a/app/src/main/java/com/casic/detector/view/InstallLabelActivity.kt b/app/src/main/java/com/casic/detector/view/InstallLabelActivity.kt index e419d63..2df20e2 100644 --- a/app/src/main/java/com/casic/detector/view/InstallLabelActivity.kt +++ b/app/src/main/java/com/casic/detector/view/InstallLabelActivity.kt @@ -375,7 +375,7 @@ LoadingDialogHub.show(this, "标识器读取中,请稍后...") - soundResId = soundPool.load(this, R.raw.ling, 1) + soundResId = soundPool.load(this, R.raw.ring3, 1) soundPool.setOnLoadCompleteListener { soundPool, _, _ -> soundPool.play(soundResId, 1f, 1f, 0, -1, 1f) } diff --git a/app/src/main/java/com/casic/detector/view/InstallLabelActivity.kt b/app/src/main/java/com/casic/detector/view/InstallLabelActivity.kt index e419d63..2df20e2 100644 --- a/app/src/main/java/com/casic/detector/view/InstallLabelActivity.kt +++ b/app/src/main/java/com/casic/detector/view/InstallLabelActivity.kt @@ -375,7 +375,7 @@ LoadingDialogHub.show(this, "标识器读取中,请稍后...") - soundResId = soundPool.load(this, R.raw.ling, 1) + soundResId = soundPool.load(this, R.raw.ring3, 1) soundPool.setOnLoadCompleteListener { soundPool, _, _ -> soundPool.play(soundResId, 1f, 1f, 0, -1, 1f) } 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 efeb83b..94e070b 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -20,6 +20,7 @@ import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory +import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.* import com.casic.detector.BuildConfig import com.casic.detector.R @@ -226,13 +227,22 @@ val longitudeList = ArrayList() labelBeans.forEach { - //分别缓存经、纬度 - latitudeList.add(it.lat.toDouble()) - longitudeList.add(it.lng.toDouble()) + val latitude = it.lat + val longitude = it.lng + if (latitude.isNotBlank() && longitude.isNotBlank()) { + if (CoordinateConverter.isAMapDataAvailable( + latitude.toDouble(), longitude.toDouble() + ) + ) { + //分别缓存经、纬度 + latitudeList.add(latitude.toDouble()) + longitudeList.add(longitude.toDouble()) + } + } } - //移动地图到所有labelBeans的经纬度中心点 - val center = LatLng(latitudeList.average(), longitudeList.average()) + //移动地图到所有labelBeans的第一个点 + val center = LatLng(latitudeList.first(), longitudeList.first()) //移动到指定经纬度 aMap.moveCamera(CameraUpdateFactory.newLatLngZoom(center, 16f))