diff --git a/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt b/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt index 657c766..fcc9a15 100644 --- a/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt +++ b/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt @@ -6,18 +6,15 @@ import android.view.ViewGroup import android.widget.LinearLayout import androidx.recyclerview.widget.RecyclerView -import com.amap.api.services.core.LatLonPoint -import com.amap.api.services.geocoder.GeocodeResult -import com.amap.api.services.geocoder.GeocodeSearch -import com.amap.api.services.geocoder.RegeocodeQuery -import com.amap.api.services.geocoder.RegeocodeResult import com.casic.br.ktd.R import com.casic.br.ktd.holder.SwipeViewHolder import com.casic.br.ktd.model.TaskDetailModel +import com.casic.br.ktd.utils.LocaleConstant import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.convertDrawable import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.recyclerView.QMUISwipeAction class TaskDetailAdapter( @@ -27,7 +24,6 @@ private val TYPE_TOP_TITLE = 0 private val TYPE_ITEM_DATA = 1 private var inflater: LayoutInflater = LayoutInflater.from(ctx) - private val geoSearch by lazy { GeocodeSearch(ctx) } private var handleAction = QMUISwipeAction.ActionBuilder() .icon(R.mipmap.handle_task.convertDrawable(ctx)) @@ -82,26 +78,8 @@ linearLayout.setBackgroundColor(Color.parseColor("#FFFFFF")) } - if (item.lagitude.isNotEmpty() && item.longitude.isNotEmpty()) { - val queryParam = RegeocodeQuery( - LatLonPoint(item.lagitude.toDouble(), item.longitude.toDouble()), - 200f, GeocodeSearch.AMAP - ) - geoSearch.getFromLocationAsyn(queryParam) - geoSearch.setOnGeocodeSearchListener(object : - GeocodeSearch.OnGeocodeSearchListener { - override fun onRegeocodeSearched(regeocodeResult: RegeocodeResult, code: Int) { - if (code == 1000) { - val address = regeocodeResult.regeocodeAddress.formatAddress - holder.setText(R.id.locationView, address) - } - } - - override fun onGeocodeSearched(geocodeResult: GeocodeResult?, i: Int) {} - }) - } - - val isAlarm = if (item.isAlarm == "1") { + val gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000) as Int + val isAlarm = if (item.gas.toInt() >= gasAlarmRule) { "是" } else { "否" @@ -112,6 +90,7 @@ .setText(R.id.verticalAngleView, item.pitch) .setText(R.id.isAlarmView, isAlarm) .setText(R.id.speedView, item.speed) + .setText(R.id.locationView, item.position) .setOnClickListener(R.id.operationView) { clickedListener?.onShowTextClicked(item) } } } diff --git a/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt b/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt index 657c766..fcc9a15 100644 --- a/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt +++ b/app/src/main/java/com/casic/br/ktd/adapter/TaskDetailAdapter.kt @@ -6,18 +6,15 @@ import android.view.ViewGroup import android.widget.LinearLayout import androidx.recyclerview.widget.RecyclerView -import com.amap.api.services.core.LatLonPoint -import com.amap.api.services.geocoder.GeocodeResult -import com.amap.api.services.geocoder.GeocodeSearch -import com.amap.api.services.geocoder.RegeocodeQuery -import com.amap.api.services.geocoder.RegeocodeResult import com.casic.br.ktd.R import com.casic.br.ktd.holder.SwipeViewHolder import com.casic.br.ktd.model.TaskDetailModel +import com.casic.br.ktd.utils.LocaleConstant import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.convertDrawable import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.recyclerView.QMUISwipeAction class TaskDetailAdapter( @@ -27,7 +24,6 @@ private val TYPE_TOP_TITLE = 0 private val TYPE_ITEM_DATA = 1 private var inflater: LayoutInflater = LayoutInflater.from(ctx) - private val geoSearch by lazy { GeocodeSearch(ctx) } private var handleAction = QMUISwipeAction.ActionBuilder() .icon(R.mipmap.handle_task.convertDrawable(ctx)) @@ -82,26 +78,8 @@ linearLayout.setBackgroundColor(Color.parseColor("#FFFFFF")) } - if (item.lagitude.isNotEmpty() && item.longitude.isNotEmpty()) { - val queryParam = RegeocodeQuery( - LatLonPoint(item.lagitude.toDouble(), item.longitude.toDouble()), - 200f, GeocodeSearch.AMAP - ) - geoSearch.getFromLocationAsyn(queryParam) - geoSearch.setOnGeocodeSearchListener(object : - GeocodeSearch.OnGeocodeSearchListener { - override fun onRegeocodeSearched(regeocodeResult: RegeocodeResult, code: Int) { - if (code == 1000) { - val address = regeocodeResult.regeocodeAddress.formatAddress - holder.setText(R.id.locationView, address) - } - } - - override fun onGeocodeSearched(geocodeResult: GeocodeResult?, i: Int) {} - }) - } - - val isAlarm = if (item.isAlarm == "1") { + val gasAlarmRule = SaveKeyValues.getValue(LocaleConstant.ALARM_RULE, 1000) as Int + val isAlarm = if (item.gas.toInt() >= gasAlarmRule) { "是" } else { "否" @@ -112,6 +90,7 @@ .setText(R.id.verticalAngleView, item.pitch) .setText(R.id.isAlarmView, isAlarm) .setText(R.id.speedView, item.speed) + .setText(R.id.locationView, item.position) .setOnClickListener(R.id.operationView) { clickedListener?.onShowTextClicked(item) } } } diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index bc6203c..f5b052c 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -64,7 +64,7 @@ /** * 结束任务 */ - @POST("/system/busPatrolTask/getDistance") + @POST("/system/busPatrolTask/endTask") suspend fun endTask( @Header("token") token: String, @Body requestBody: RequestBody