From edbcdfccc4ffbdc7e8313597124af7cdcf21d8df Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 10 Jun 2025 17:00:00 +0800 Subject: [PATCH] =?UTF-8?q?[8.0.0]=20[fea]=20[=E6=B7=BB=E5=8A=A0=E8=B7=9D?= =?UTF-8?q?=E7=A6=BB=E6=8E=92=E5=BA=8F=E3=80=81=E5=88=B7=E6=96=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/biz/routing/bean/RoutingBean.kt | 3 ++- .../ui/routingselect/RoutingSelectModel.kt | 9 ++++++-- .../ui/routingselect/RoutingSelectView.kt | 7 ++++++ .../res/routing/layout/biz_other_running.xml | 1 - .../res/routing/layout/biz_taxi_select.xml | 22 +++++++++++++++++++ .../taxi/ui/bizswitch/SwitchBizView.kt | 7 ++++++ 6 files changed, 45 insertions(+), 4 deletions(-) diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/bean/RoutingBean.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/bean/RoutingBean.kt index b2dcbd8beb..1fd8a057d4 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/bean/RoutingBean.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/bean/RoutingBean.kt @@ -17,7 +17,8 @@ data class GrayLineBean( var lineFailCount: Int?, //线路累计反馈不可用次数 var isChoosed: Boolean = false, //当前是否选中 var startSite: RoutingSite?, - var endSite: RoutingSite? + var endSite: RoutingSite?, + var distance:Float, ) /** diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectModel.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectModel.kt index 7df80f1579..a80bd4fc60 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectModel.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectModel.kt @@ -16,9 +16,8 @@ import com.mogo.och.biz.routing.bean.StartGrayAndQueryContrailRsp import com.mogo.och.biz.routing.net.RoutingServiceManager import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.common.module.network.OchCommonServiceCallback -import com.mogo.och.data.bean.BusStationBean import com.mogo.och.data.bean.LineInfo -import com.mogo.och.biz.routing.ui.runing.taxi.TaxiRunningModel +import com.mogo.och.common.module.biz.birdge.BridgeManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager /** @@ -58,6 +57,12 @@ class RoutingSelectModel : ViewModel() { data.data?.also { result.addAll(it) } + result.forEach { + it.startSite?.let { startSite-> + it.distance = BridgeManager.distance2Point( startSite.gcjLon, startSite.gcjLat,) + } + } + result.sortBy { it.distance } viewCallback?.onQueryRoutingGrayLineListSuccess(result) } diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectView.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectView.kt index af078aa8c2..be7c5e1319 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectView.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectView.kt @@ -7,6 +7,7 @@ import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner +import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.view.SpacesItemDecoration import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.biz.R @@ -16,6 +17,7 @@ import com.mogo.och.common.module.wigets.WrapContentLinearLayoutManager import com.mogo.och.biz.routing.ui.RoutingSwitchModel import com.mogo.och.biz.routing.ui.routingselect.RoutingSelectModel.SwtichRoutingViewCallback import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager +import kotlinx.android.synthetic.main.biz_taxi_select.view.actv_refresh import kotlinx.android.synthetic.main.biz_taxi_select.view.include_empty import kotlinx.android.synthetic.main.biz_taxi_select.view.include_error import kotlinx.android.synthetic.main.biz_taxi_select.view.switch_routing_rv @@ -72,6 +74,10 @@ class RoutingSelectView: ConstraintLayout, SwtichRoutingViewCallback { viewModel?.startGrayTaskAndQueryRoutingContrail(data.contrailId!!,data) } }) + + actv_refresh.onClick { + viewModel?.queryRoutingGrayLineList() + } } private fun showEmptyView() { @@ -99,6 +105,7 @@ class RoutingSelectView: ConstraintLayout, SwtichRoutingViewCallback { mRoutingLineList.clear() mRoutingLineList.addAll(data) mChooseLineListAdapter.notifyDataSetChanged() + ToastUtils.showShort("刷新成功") } else { showEmptyView() } diff --git a/OCH/common/biz/src/main/res/routing/layout/biz_other_running.xml b/OCH/common/biz/src/main/res/routing/layout/biz_other_running.xml index 78f9577445..f608659bf8 100644 --- a/OCH/common/biz/src/main/res/routing/layout/biz_other_running.xml +++ b/OCH/common/biz/src/main/res/routing/layout/biz_other_running.xml @@ -41,7 +41,6 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toEndOf="parent" android:layout_marginTop="@dimen/dp_2" - tools:text="往新街口方向" android:layout_width="wrap_content" android:layout_height="@dimen/dp_100"> + + + + +