diff --git a/app/src/main/java/com/casic/detector/callback/IAddressListener.java b/app/src/main/java/com/casic/detector/callback/IAddressListener.java deleted file mode 100644 index 3c3db9c..0000000 --- a/app/src/main/java/com/casic/detector/callback/IAddressListener.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.casic.detector.callback; - -public interface IAddressListener { - void onGetAddress(String address); -} diff --git a/app/src/main/java/com/casic/detector/callback/IAddressListener.java b/app/src/main/java/com/casic/detector/callback/IAddressListener.java deleted file mode 100644 index 3c3db9c..0000000 --- a/app/src/main/java/com/casic/detector/callback/IAddressListener.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.casic.detector.callback; - -public interface IAddressListener { - void onGetAddress(String address); -} diff --git a/app/src/main/java/com/casic/detector/callback/ILocationListener.kt b/app/src/main/java/com/casic/detector/callback/ILocationListener.kt deleted file mode 100644 index dc74dc6..0000000 --- a/app/src/main/java/com/casic/detector/callback/ILocationListener.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.detector.callback - -import com.amap.api.location.AMapLocation - -interface ILocationListener { - fun onAMapLocationGet(location: AMapLocation?) //高德定位数据 -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/callback/IAddressListener.java b/app/src/main/java/com/casic/detector/callback/IAddressListener.java deleted file mode 100644 index 3c3db9c..0000000 --- a/app/src/main/java/com/casic/detector/callback/IAddressListener.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.casic.detector.callback; - -public interface IAddressListener { - void onGetAddress(String address); -} diff --git a/app/src/main/java/com/casic/detector/callback/ILocationListener.kt b/app/src/main/java/com/casic/detector/callback/ILocationListener.kt deleted file mode 100644 index dc74dc6..0000000 --- a/app/src/main/java/com/casic/detector/callback/ILocationListener.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.detector.callback - -import com.amap.api.location.AMapLocation - -interface ILocationListener { - fun onAMapLocationGet(location: AMapLocation?) //高德定位数据 -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/callback/OnGetAddressListener.java b/app/src/main/java/com/casic/detector/callback/OnGetAddressListener.java new file mode 100644 index 0000000..d131359 --- /dev/null +++ b/app/src/main/java/com/casic/detector/callback/OnGetAddressListener.java @@ -0,0 +1,5 @@ +package com.casic.detector.callback; + +public interface OnGetAddressListener { + void onGetAddress(String address); +} diff --git a/app/src/main/java/com/casic/detector/callback/IAddressListener.java b/app/src/main/java/com/casic/detector/callback/IAddressListener.java deleted file mode 100644 index 3c3db9c..0000000 --- a/app/src/main/java/com/casic/detector/callback/IAddressListener.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.casic.detector.callback; - -public interface IAddressListener { - void onGetAddress(String address); -} diff --git a/app/src/main/java/com/casic/detector/callback/ILocationListener.kt b/app/src/main/java/com/casic/detector/callback/ILocationListener.kt deleted file mode 100644 index dc74dc6..0000000 --- a/app/src/main/java/com/casic/detector/callback/ILocationListener.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.detector.callback - -import com.amap.api.location.AMapLocation - -interface ILocationListener { - fun onAMapLocationGet(location: AMapLocation?) //高德定位数据 -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/callback/OnGetAddressListener.java b/app/src/main/java/com/casic/detector/callback/OnGetAddressListener.java new file mode 100644 index 0000000..d131359 --- /dev/null +++ b/app/src/main/java/com/casic/detector/callback/OnGetAddressListener.java @@ -0,0 +1,5 @@ +package com.casic.detector.callback; + +public interface OnGetAddressListener { + void onGetAddress(String address); +} diff --git a/app/src/main/java/com/casic/detector/callback/OnGetLocationListener.kt b/app/src/main/java/com/casic/detector/callback/OnGetLocationListener.kt new file mode 100644 index 0000000..92f4d1a --- /dev/null +++ b/app/src/main/java/com/casic/detector/callback/OnGetLocationListener.kt @@ -0,0 +1,7 @@ +package com.casic.detector.callback + +import com.amap.api.location.AMapLocation + +interface OnGetLocationListener { + fun onAMapLocationGet(location: AMapLocation?) //高德定位数据 +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/callback/IAddressListener.java b/app/src/main/java/com/casic/detector/callback/IAddressListener.java deleted file mode 100644 index 3c3db9c..0000000 --- a/app/src/main/java/com/casic/detector/callback/IAddressListener.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.casic.detector.callback; - -public interface IAddressListener { - void onGetAddress(String address); -} diff --git a/app/src/main/java/com/casic/detector/callback/ILocationListener.kt b/app/src/main/java/com/casic/detector/callback/ILocationListener.kt deleted file mode 100644 index dc74dc6..0000000 --- a/app/src/main/java/com/casic/detector/callback/ILocationListener.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.detector.callback - -import com.amap.api.location.AMapLocation - -interface ILocationListener { - fun onAMapLocationGet(location: AMapLocation?) //高德定位数据 -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/callback/OnGetAddressListener.java b/app/src/main/java/com/casic/detector/callback/OnGetAddressListener.java new file mode 100644 index 0000000..d131359 --- /dev/null +++ b/app/src/main/java/com/casic/detector/callback/OnGetAddressListener.java @@ -0,0 +1,5 @@ +package com.casic.detector.callback; + +public interface OnGetAddressListener { + void onGetAddress(String address); +} diff --git a/app/src/main/java/com/casic/detector/callback/OnGetLocationListener.kt b/app/src/main/java/com/casic/detector/callback/OnGetLocationListener.kt new file mode 100644 index 0000000..92f4d1a --- /dev/null +++ b/app/src/main/java/com/casic/detector/callback/OnGetLocationListener.kt @@ -0,0 +1,7 @@ +package com.casic.detector.callback + +import com.amap.api.location.AMapLocation + +interface OnGetLocationListener { + fun onAMapLocationGet(location: AMapLocation?) //高德定位数据 +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/utils/LocationHub.kt b/app/src/main/java/com/casic/detector/utils/LocationHub.kt index 3b5d46f..8bed27a 100644 --- a/app/src/main/java/com/casic/detector/utils/LocationHub.kt +++ b/app/src/main/java/com/casic/detector/utils/LocationHub.kt @@ -11,8 +11,8 @@ import com.amap.api.services.geocoder.GeocodeSearch import com.amap.api.services.geocoder.RegeocodeQuery import com.amap.api.services.geocoder.RegeocodeResult -import com.casic.detector.callback.IAddressListener -import com.casic.detector.callback.ILocationListener +import com.casic.detector.callback.OnGetAddressListener +import com.casic.detector.callback.OnGetLocationListener class LocationHub constructor(context: Context) { @@ -20,7 +20,7 @@ private val locationClient by lazy { AMapLocationClient(context) } private val codeSearch by lazy { GeocodeSearch(context) } - fun getCurrentLocation(isOnceLocation: Boolean, listener: ILocationListener) { + fun getCurrentLocation(isOnceLocation: Boolean, listener: OnGetLocationListener) { val locationOption = AMapLocationClientOption() locationOption.locationMode = AMapLocationClientOption.AMapLocationMode.Hight_Accuracy locationOption.isOnceLocation = isOnceLocation @@ -38,7 +38,7 @@ locationClient.startLocation() } - fun antiCodingLocation(location: Location, listener: IAddressListener) { + fun antiCodingLocation(location: Location, listener: OnGetAddressListener) { try { // 第一个参数表示一个LatLonPoint，第二参数表示范围多少米，第三个参数表示是火系坐标系还是GPS原生坐标系 val query = RegeocodeQuery( diff --git a/app/src/main/java/com/casic/detector/callback/IAddressListener.java b/app/src/main/java/com/casic/detector/callback/IAddressListener.java deleted file mode 100644 index 3c3db9c..0000000 --- a/app/src/main/java/com/casic/detector/callback/IAddressListener.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.casic.detector.callback; - -public interface IAddressListener { - void onGetAddress(String address); -} diff --git a/app/src/main/java/com/casic/detector/callback/ILocationListener.kt b/app/src/main/java/com/casic/detector/callback/ILocationListener.kt deleted file mode 100644 index dc74dc6..0000000 --- a/app/src/main/java/com/casic/detector/callback/ILocationListener.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.detector.callback - -import com.amap.api.location.AMapLocation - -interface ILocationListener { - fun onAMapLocationGet(location: AMapLocation?) //高德定位数据 -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/callback/OnGetAddressListener.java b/app/src/main/java/com/casic/detector/callback/OnGetAddressListener.java new file mode 100644 index 0000000..d131359 --- /dev/null +++ b/app/src/main/java/com/casic/detector/callback/OnGetAddressListener.java @@ -0,0 +1,5 @@ +package com.casic.detector.callback; + +public interface OnGetAddressListener { + void onGetAddress(String address); +} diff --git a/app/src/main/java/com/casic/detector/callback/OnGetLocationListener.kt b/app/src/main/java/com/casic/detector/callback/OnGetLocationListener.kt new file mode 100644 index 0000000..92f4d1a --- /dev/null +++ b/app/src/main/java/com/casic/detector/callback/OnGetLocationListener.kt @@ -0,0 +1,7 @@ +package com.casic.detector.callback + +import com.amap.api.location.AMapLocation + +interface OnGetLocationListener { + fun onAMapLocationGet(location: AMapLocation?) //高德定位数据 +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/utils/LocationHub.kt b/app/src/main/java/com/casic/detector/utils/LocationHub.kt index 3b5d46f..8bed27a 100644 --- a/app/src/main/java/com/casic/detector/utils/LocationHub.kt +++ b/app/src/main/java/com/casic/detector/utils/LocationHub.kt @@ -11,8 +11,8 @@ import com.amap.api.services.geocoder.GeocodeSearch import com.amap.api.services.geocoder.RegeocodeQuery import com.amap.api.services.geocoder.RegeocodeResult -import com.casic.detector.callback.IAddressListener -import com.casic.detector.callback.ILocationListener +import com.casic.detector.callback.OnGetAddressListener +import com.casic.detector.callback.OnGetLocationListener class LocationHub constructor(context: Context) { @@ -20,7 +20,7 @@ private val locationClient by lazy { AMapLocationClient(context) } private val codeSearch by lazy { GeocodeSearch(context) } - fun getCurrentLocation(isOnceLocation: Boolean, listener: ILocationListener) { + fun getCurrentLocation(isOnceLocation: Boolean, listener: OnGetLocationListener) { val locationOption = AMapLocationClientOption() locationOption.locationMode = AMapLocationClientOption.AMapLocationMode.Hight_Accuracy locationOption.isOnceLocation = isOnceLocation @@ -38,7 +38,7 @@ locationClient.startLocation() } - fun antiCodingLocation(location: Location, listener: IAddressListener) { + fun antiCodingLocation(location: Location, listener: OnGetAddressListener) { try { // 第一个参数表示一个LatLonPoint，第二参数表示范围多少米，第三个参数表示是火系坐标系还是GPS原生坐标系 val query = RegeocodeQuery( 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 c65b164..dd2a5c8 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -36,7 +36,7 @@ import com.casic.detector.base.SerialPortActivity import com.casic.detector.bean.LabelBean import com.casic.detector.bean.TaskBean -import com.casic.detector.callback.ILocationListener +import com.casic.detector.callback.OnGetLocationListener import com.casic.detector.callback.OnImageCompressListener import com.casic.detector.cluster.ClusterItem import com.casic.detector.cluster.ClusterOverlay @@ -424,8 +424,11 @@ //自由巡检 binding.stopFreeTaskButton.setOnLongClickListener { - AlertMessageDialog.Builder().setContext(this).setTitle("温馨提示") - .setMessage("是否确定结束此次自由巡检任务？").setPositiveButton("是") + AlertMessageDialog.Builder() + .setContext(context) + .setTitle("温馨提示") + .setMessage("是否确定结束此次自由巡检任务？") + .setPositiveButton("是") .setOnDialogButtonClickListener(object : AlertMessageDialog.OnDialogButtonClickListener { override fun onConfirmClick() { @@ -440,7 +443,10 @@ "任务ID异常，无法提交任务，请联系服务器管理员".show(context) return } - taskViewModel.uploadTaskMarker(taskId, ids) + + taskId?.apply { + taskViewModel.uploadTaskMarker(this, ids) + } } }).build().show() true @@ -582,7 +588,7 @@ } private fun moveToCurrentLocation() { - locationHub.getCurrentLocation(true, object : ILocationListener { + locationHub.getCurrentLocation(true, object : OnGetLocationListener { override fun onAMapLocationGet(location: AMapLocation?) { if (location != null) { aMap.moveCamera( @@ -1237,7 +1243,7 @@ binding.identifierInclude.installTimeView.text = System.currentTimeMillis().timestampToCompleteDate() - locationHub.getCurrentLocation(true, object : ILocationListener { + locationHub.getCurrentLocation(true, object : OnGetLocationListener { override fun onAMapLocationGet(location: AMapLocation?) { if (location != null) { binding.identifierInclude.lngView.text = location.longitude.toString() diff --git a/app/src/main/java/com/casic/detector/callback/IAddressListener.java b/app/src/main/java/com/casic/detector/callback/IAddressListener.java deleted file mode 100644 index 3c3db9c..0000000 --- a/app/src/main/java/com/casic/detector/callback/IAddressListener.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.casic.detector.callback; - -public interface IAddressListener { - void onGetAddress(String address); -} diff --git a/app/src/main/java/com/casic/detector/callback/ILocationListener.kt b/app/src/main/java/com/casic/detector/callback/ILocationListener.kt deleted file mode 100644 index dc74dc6..0000000 --- a/app/src/main/java/com/casic/detector/callback/ILocationListener.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.detector.callback - -import com.amap.api.location.AMapLocation - -interface ILocationListener { - fun onAMapLocationGet(location: AMapLocation?) //高德定位数据 -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/callback/OnGetAddressListener.java b/app/src/main/java/com/casic/detector/callback/OnGetAddressListener.java new file mode 100644 index 0000000..d131359 --- /dev/null +++ b/app/src/main/java/com/casic/detector/callback/OnGetAddressListener.java @@ -0,0 +1,5 @@ +package com.casic.detector.callback; + +public interface OnGetAddressListener { + void onGetAddress(String address); +} diff --git a/app/src/main/java/com/casic/detector/callback/OnGetLocationListener.kt b/app/src/main/java/com/casic/detector/callback/OnGetLocationListener.kt new file mode 100644 index 0000000..92f4d1a --- /dev/null +++ b/app/src/main/java/com/casic/detector/callback/OnGetLocationListener.kt @@ -0,0 +1,7 @@ +package com.casic.detector.callback + +import com.amap.api.location.AMapLocation + +interface OnGetLocationListener { + fun onAMapLocationGet(location: AMapLocation?) //高德定位数据 +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/utils/LocationHub.kt b/app/src/main/java/com/casic/detector/utils/LocationHub.kt index 3b5d46f..8bed27a 100644 --- a/app/src/main/java/com/casic/detector/utils/LocationHub.kt +++ b/app/src/main/java/com/casic/detector/utils/LocationHub.kt @@ -11,8 +11,8 @@ import com.amap.api.services.geocoder.GeocodeSearch import com.amap.api.services.geocoder.RegeocodeQuery import com.amap.api.services.geocoder.RegeocodeResult -import com.casic.detector.callback.IAddressListener -import com.casic.detector.callback.ILocationListener +import com.casic.detector.callback.OnGetAddressListener +import com.casic.detector.callback.OnGetLocationListener class LocationHub constructor(context: Context) { @@ -20,7 +20,7 @@ private val locationClient by lazy { AMapLocationClient(context) } private val codeSearch by lazy { GeocodeSearch(context) } - fun getCurrentLocation(isOnceLocation: Boolean, listener: ILocationListener) { + fun getCurrentLocation(isOnceLocation: Boolean, listener: OnGetLocationListener) { val locationOption = AMapLocationClientOption() locationOption.locationMode = AMapLocationClientOption.AMapLocationMode.Hight_Accuracy locationOption.isOnceLocation = isOnceLocation @@ -38,7 +38,7 @@ locationClient.startLocation() } - fun antiCodingLocation(location: Location, listener: IAddressListener) { + fun antiCodingLocation(location: Location, listener: OnGetAddressListener) { try { // 第一个参数表示一个LatLonPoint，第二参数表示范围多少米，第三个参数表示是火系坐标系还是GPS原生坐标系 val query = RegeocodeQuery( 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 c65b164..dd2a5c8 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -36,7 +36,7 @@ import com.casic.detector.base.SerialPortActivity import com.casic.detector.bean.LabelBean import com.casic.detector.bean.TaskBean -import com.casic.detector.callback.ILocationListener +import com.casic.detector.callback.OnGetLocationListener import com.casic.detector.callback.OnImageCompressListener import com.casic.detector.cluster.ClusterItem import com.casic.detector.cluster.ClusterOverlay @@ -424,8 +424,11 @@ //自由巡检 binding.stopFreeTaskButton.setOnLongClickListener { - AlertMessageDialog.Builder().setContext(this).setTitle("温馨提示") - .setMessage("是否确定结束此次自由巡检任务？").setPositiveButton("是") + AlertMessageDialog.Builder() + .setContext(context) + .setTitle("温馨提示") + .setMessage("是否确定结束此次自由巡检任务？") + .setPositiveButton("是") .setOnDialogButtonClickListener(object : AlertMessageDialog.OnDialogButtonClickListener { override fun onConfirmClick() { @@ -440,7 +443,10 @@ "任务ID异常，无法提交任务，请联系服务器管理员".show(context) return } - taskViewModel.uploadTaskMarker(taskId, ids) + + taskId?.apply { + taskViewModel.uploadTaskMarker(this, ids) + } } }).build().show() true @@ -582,7 +588,7 @@ } private fun moveToCurrentLocation() { - locationHub.getCurrentLocation(true, object : ILocationListener { + locationHub.getCurrentLocation(true, object : OnGetLocationListener { override fun onAMapLocationGet(location: AMapLocation?) { if (location != null) { aMap.moveCamera( @@ -1237,7 +1243,7 @@ binding.identifierInclude.installTimeView.text = System.currentTimeMillis().timestampToCompleteDate() - locationHub.getCurrentLocation(true, object : ILocationListener { + locationHub.getCurrentLocation(true, object : OnGetLocationListener { override fun onAMapLocationGet(location: AMapLocation?) { if (location != null) { binding.identifierInclude.lngView.text = location.longitude.toString() diff --git a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt index e8212c7..704fb3b 100644 --- a/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/detector/view/UploadEventActivity.kt @@ -10,7 +10,7 @@ import androidx.lifecycle.ViewModelProvider import com.amap.api.location.AMapLocation import com.casic.detector.adapter.EditableImageAdapter -import com.casic.detector.callback.ILocationListener +import com.casic.detector.callback.OnGetLocationListener import com.casic.detector.callback.OnImageCompressListener import com.casic.detector.databinding.ActivityUploadEventBinding import com.casic.detector.extensions.compressImage @@ -79,7 +79,7 @@ binding.uploadTimeView.text = System.currentTimeMillis().timestampToCompleteDate() - locationHub.getCurrentLocation(true, object : ILocationListener { + locationHub.getCurrentLocation(true, object : OnGetLocationListener { override fun onAMapLocationGet(location: AMapLocation?) { if (location != null) { binding.lngView.text = "${location.longitude}"