diff --git a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt index 8985ab5..aa69b3d 100644 --- a/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt +++ b/app/src/main/java/com/casic/birmm/inspect/fragment/QueryInspectionFragment.kt @@ -6,9 +6,13 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.lifecycle.ViewModelProvider +import com.amap.api.maps.model.LatLng import com.casic.birmm.inspect.R +import com.casic.birmm.inspect.callback.OnGeocodeSearchListener import com.casic.birmm.inspect.databinding.FragmentQueryInspectBinding +import com.casic.birmm.inspect.extensions.toChinese import com.casic.birmm.inspect.model.InspectListModel +import com.casic.birmm.inspect.utils.LoadingDialogHub import com.casic.birmm.inspect.view.InspectionRouteActivity import com.casic.birmm.inspect.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter @@ -55,12 +59,36 @@ item.deviceCode } + var startAddress = "" + if (item.startAddress.isNullOrBlank()) { + LatLng(item.startLat, item.startLng).toChinese(object : + OnGeocodeSearchListener { + override fun onRegionCodeSearched(address: String) { + startAddress = address + } + }) + } else { + startAddress = item.startAddress + } + + var endAddress = "" + if (item.endAddress.isNullOrBlank()) { + LatLng(item.endLat, item.endLng).toChinese(object : + OnGeocodeSearchListener { + override fun onRegionCodeSearched(address: String) { + endAddress = address + } + }) + } else { + endAddress = item.endAddress + } + viewHolder.setText(R.id.deviceCodeView, deviceCode) .setText(R.id.taskNameView, "任务名称:${item.name}") .setText(R.id.startTimeView, item.startTime) - .setText(R.id.startLocationView, item.startAddress) + .setText(R.id.startLocationView, startAddress) .setText(R.id.endTimeView, item.endTime) - .setText(R.id.endLocationView, item.endAddress) + .setText(R.id.endLocationView, endAddress) .setText(R.id.distanceView, item.distance.toString()) .setOnClickListener(R.id.deleteView) { AlertControlDialog.Builder() @@ -166,14 +194,16 @@ viewModel.loadState.observe(this) { when (it) { is LoadState.Success -> { + LoadingDialogHub.dismiss() dataBeans.remove(dataBeans[deletePosition]) inspectListAdapter.notifyItemRemoved(deletePosition) inspectListAdapter.notifyItemRangeChanged( deletePosition, dataBeans.size - deletePosition ) + "删除成功".show(requireContext()) } - else -> "删除失败,请重试".show(requireContext()) + else -> LoadingDialogHub.show(requireActivity(), "删除中,请稍后...") } } }