From dfe0ded4c2673c26f41173b50b354c19df8bc926 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 15 Aug 2023 11:33:27 +0800 Subject: [PATCH] =?UTF-8?q?[6.0.0]=201=E3=80=81=E5=A2=9E=E5=8A=A0lineName?= =?UTF-8?q?=202=E3=80=81=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E8=B7=AF?= =?UTF-8?q?=E7=BA=BF=E5=85=A8=E7=A8=8B=E5=92=8C=E6=80=BB=E7=94=A8=E6=97=B6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/taxi/bean/UnmannedTaskBean.kt | 10 ++++-- .../och/taxi/model/TaxiUnmannedViewModel.kt | 30 +++++++++++++++++- .../och/taxi/network/CarServiceManager.kt | 10 ++++++ .../taxi/network/UnmannedTaskServiceApi.kt | 12 +++++++ .../mogo/och/taxi/ui/TaxiBeingTaskFragment.kt | 4 +-- .../taxi_driver_circle_blue_big.png | Bin 1409 -> 3683 bytes .../taxi_driver_circle_green_big.png | Bin 1498 -> 12805 bytes .../main/res/layout/unmanned_being_order.xml | 2 +- 8 files changed, 62 insertions(+), 6 deletions(-) diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UnmannedTaskBean.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UnmannedTaskBean.kt index 28bc5b0071..a6e755832d 100644 --- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UnmannedTaskBean.kt +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UnmannedTaskBean.kt @@ -14,7 +14,9 @@ data class OrderDetail( var orderEndSite: Site?, var planningLines: Array, var phone: String, - var passengerNum: Int + var passengerNum: Int, + var fullMinutes: Long, //单独接口查询到 + var mileage: Long // 单独接口查询到 ) { override fun equals(other: Any?): Boolean { if (this === other) return true @@ -108,10 +110,14 @@ data class QueryCarOrderByNoRespBean( data class ContrailListRespBean(var data: MutableList?) //轨迹路线集合 : BaseData() { data class Result( - var lineId: Long, var csvFileUrl: String, var csvFileMd5: String, + var lineId: Long,var lineName: String, var csvFileUrl: String, var csvFileMd5: String, var txtFileUrl: String, var txtFileMd5: String, var contrailSaveTime: Long, var csvFileUrlDPQP: String, var csvFileMd5DPQP: String, var txtFileUrlDPQP: String, var txtFileMd5DPQP: String, var contrailSaveTimeDPQP: Long ) } +data class QueryLineInfoRespBean( + var id: Long, var fullMinutes: Long, var mileage: Long +): BaseData() + diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt index cc31be43a2..606173c2d6 100644 --- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt @@ -20,6 +20,7 @@ import com.mogo.och.taxi.base.IUiIntent import com.mogo.och.taxi.bean.ContrailListRespBean import com.mogo.och.taxi.bean.QueryCarOrderByNoRespBean import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.taxi.bean.QueryLineInfoRespBean import com.mogo.och.taxi.bean.StartServiceRespBean import com.mogo.och.taxi.constant.TaxiOrderStatusEnum import com.mogo.och.taxi.constant.TaxiUnmannedConst @@ -28,6 +29,7 @@ import com.mogo.och.taxi.network.CarServiceManager import com.mogo.och.taxi.network.CarServiceManager.cancelOrder import com.mogo.och.taxi.network.CarServiceManager.contrailList import com.mogo.och.taxi.network.CarServiceManager.queryCarOrderByOrderNo +import com.mogo.och.taxi.network.CarServiceManager.queryLineInfo import com.mogo.och.taxi.ui.unmanned.TaskAndOrderUiState import com.mogo.och.taxi.ui.unmanned.UnmannedIntent import com.mogo.och.taxi.ui.unmanned.UnmannedState @@ -74,7 +76,7 @@ class TaxiUnmannedViewModel : BaseViewModel(){ is UnmannedIntent.CloseOrderByDriver -> { if (mCurrentTaskAndOrder != null && mCurrentTaskAndOrder!!.order != null){ - val site = mCurrentTaskAndOrder!!.order!!.orderEndSite; + val site = mCurrentTaskAndOrder!!.order!!.orderEndSite TaxiModel.arriveSite(site!!.siteId,true) } } @@ -320,6 +322,10 @@ class TaxiUnmannedViewModel : BaseViewModel(){ if (data!!.orderStatus == TaxiOrderStatusEnum.Cancel.code){ VoiceNotice.showNotice("乘客已经取消") updateNoTaskAndOrderCancelUi() + return + } + if (data.orderStatus == TaxiOrderStatusEnum.ArriveAtEnd.code){//到站 + queryRouteInfo() } } @@ -330,6 +336,28 @@ class TaxiUnmannedViewModel : BaseViewModel(){ }) } + /** + * 到站后查询总里程和总用时 + */ + private fun queryRouteInfo() { + if (mCurrentTaskAndOrder != null && mCurrentTaskAndOrder!!.endSite != null) + queryLineInfo(mContext, mCurrentTaskAndOrder!!.lineId, + object : OchCommonServiceCallback{ + override fun onSuccess(data: QueryLineInfoRespBean?) { + if (data == null || data.code != 0) return + mCurrentTaskAndOrder?.order?.orderStatus = TaxiOrderStatusEnum.ArriveAtEnd.code + mCurrentTaskAndOrder?.order?.fullMinutes = data.fullMinutes + mCurrentTaskAndOrder?.order?.mileage = data.mileage + updateTaskAndOrderUi() + } + + override fun onFail(code: Int, msg: String?) { + TODO("Not yet implemented") + } + + }) + } + private fun startInAndWaitCurrentTaskLoop() { if (mInAndWaitServiceDisposable != null && !mInAndWaitServiceDisposable!!.isDisposed) { diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/CarServiceManager.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/CarServiceManager.kt index 6abfc6f8d9..1c42fce722 100644 --- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/CarServiceManager.kt +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/CarServiceManager.kt @@ -172,4 +172,14 @@ object CarServiceManager { ).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "contrailList")) } + + /** + * 到站查询总里程和总用时 + */ + fun queryLineInfo(context: Context,lineId: Long,callback: OchCommonServiceCallback?){ + mOCHTaxiServiceApi.queryTaxiLineInfoById(lineId = lineId) + .transformTry() + .subscribe(OchCommonSubscribeImpl(context, callback, "contrailList")) + + } } \ No newline at end of file diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/UnmannedTaskServiceApi.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/UnmannedTaskServiceApi.kt index 65f6620305..3d74cba5ba 100644 --- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/UnmannedTaskServiceApi.kt +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/UnmannedTaskServiceApi.kt @@ -13,6 +13,7 @@ import com.mogo.och.taxi.bean.PrepareTaskRespBean import com.mogo.och.taxi.bean.QueryCarOrderByNoReqBean import com.mogo.och.taxi.bean.QueryCarOrderByNoRespBean import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.taxi.bean.QueryLineInfoRespBean import com.mogo.och.taxi.bean.StartServiceReqBean import com.mogo.och.taxi.bean.StartServiceRespBean import com.mogo.och.taxi.bean.StartTaskReqBean @@ -149,4 +150,15 @@ interface UnmannedTaskServiceApi { @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, @Body data: QueryCarOrderByNoReqBean? ): Observable + + /** + * 查询总用时和里程 + */ + @Headers("Content-type:application/json;charset=UTF-8") + @GET("/och-taxi-cabin/api/business/v1/queryTaxiLineById") + fun queryTaxiLineInfoById( + @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, + @Header("ticket") ticket: String = MoGoAiCloudClientConfig.getInstance().token, + @Query("id") lineId: Long? + ): Observable } \ No newline at end of file diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt index f694fef628..4e5505ed0a 100644 --- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt @@ -125,7 +125,6 @@ class TaxiBeingTaskFragment : BaseFragment(), return@collect } - isHaveBeingOrder(true) if (taskAndOrderUiState.untruthTask != null){ updateUntruthTask(taskAndOrderUiState.untruthTask) }else{ @@ -149,6 +148,7 @@ class TaxiBeingTaskFragment : BaseFragment(), private fun updateUntruthTask(untruthTask: StartServiceRespBean.Result?) { if (untruthTask == null) return + isHaveBeingOrder(true) updateUntruthTaskView() updateUntruthTaskUIData(untruthTask.siteName) updateUntruthTaskOtherInfo() @@ -169,7 +169,7 @@ class TaxiBeingTaskFragment : BaseFragment(), private fun updateUntruthTaskView() { taskStatus.visibility = View.VISIBLE - taskTypeTv.visibility = View.VISIBLE + taskTypeTv.visibility = View.GONE orderPhoneAndNum.visibility = View.GONE startStationName.visibility = View.VISIBLE endStationName.visibility = View.VISIBLE diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_blue_big.png b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/drawable-xhdpi/taxi_driver_circle_blue_big.png index 0c73689e8eda3331fa5ed0975ff62420138bf9fb..db99b30702cff579615fb08da8373637297ec36c 100644 GIT binary patch delta 3648 zcmV-G4!`k%3*#IiiBL{Q4GJ0x0000DNk~Le0000?0000?2nGNE0LPb6E0G~ce@vhQ z00aO400961089V?000)b$KU_}4b4eJK~#7F?OI!iU1t?O`?_k=%XRT&6OCB1nse

G3)2(%Gs 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 diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/unmanned_being_order.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/unmanned_being_order.xml index 80e9dcfd34..f656b46094 100644 --- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/unmanned_being_order.xml +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/unmanned_being_order.xml @@ -140,7 +140,7 @@ android:id="@+id/greenPoint" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/green_point" + android:src="@drawable/taxi_driver_circle_green_big" app:layout_constraintTop_toTopOf="@+id/startStationName" app:layout_constraintBottom_toBottomOf="@+id/startStationName" app:layout_constraintLeft_toLeftOf="@+id/taskStatus"/>