yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.0.0] 服务完成返回值修改, 开始任务逻辑修改

Browse Source
This commit is contained in:
wangmingjun
2023-08-18 15:31:53 +08:00
committed by zhongchao
parent fa20d1bf7e
commit d828684427
8 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UnmannedTaskBean.kt
View File

@@ -107,7 +107,7 @@ data class QueryCarOrderByNoRespBean(var data: Result): BaseData(){
data class Result(
var sn: String, var orderNo: String, var orderStatus: Int,
var bookingUserPhone: String, var businessType: String,
var mileage: Float,var duration: Int,var passengerSize: Int
var mileage: Float,var duration: Float,var passengerSize: Int
)
}

9
OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt
View File

@@ -744,7 +744,14 @@ object TaxiModel {
ToastUtils.showShort("无任务！")
return
}
mCurrentTaskAndOrder?.lineId?.let { startTask(it) }
//当前订单状态若为20 , 则使用的lineId为订单信息的
mCurrentTaskAndOrder?.let { startTask(
if (it.order != null && it.order!!.orderStatus >= TaxiOrderStatusEnum.ArriveAtStart.code)
it.order!!.orderLine
else
it.lineId
) }
}
/**

4
OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt
View File

@@ -367,6 +367,8 @@ class TaxiUnmannedViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(){
queryCarOrderByOrderNo(mContext,orderNo,
object : OchCommonServiceCallback<QueryCarOrderByNoRespBean>{
override fun onSuccess(data: QueryCarOrderByNoRespBean?) {
d(SceneConstant.M_TAXI + TAG, "queryCurrentOrderStatusByNo data = " +
GsonUtil.jsonFromObject(data))
if (data == null || data.code != 0) return
if (data.data.orderStatus == TaxiOrderStatusEnum.Cancel.code){
VoiceNotice.showNotice("乘客已经取消")
@@ -375,7 +377,7 @@ class TaxiUnmannedViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(){
return
}
if (data.data.orderStatus == TaxiOrderStatusEnum.ArriveAtEnd.code){//到站
updateOrderMileAndDur(data.data.mileage,data.data.duration)
updateOrderMileAndDur(data.data.mileage,data.data.duration.toInt())
return
}
if (data.data.orderStatus == TaxiOrderStatusEnum.JourneyCompleted.code){//完成

2
OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/network/CarServiceManager.kt
View File

@@ -128,7 +128,7 @@ object CarServiceManager {
mOCHTaxiServiceApi.queryCarOrderByOrderNo(
data = QueryCarOrderByNoReqBean(MoGoAiCloudClientConfig.getInstance().sn, orderNo)
).transformTry()
.subscribe(OchCommonSubscribeImpl(context, callback, "jumpPassengerCheck"))
.subscribe(OchCommonSubscribeImpl(context, callback, "queryCarOrderByOrderNo"))
}
/**

2
OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt
View File

@@ -298,7 +298,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
taskTypeTv.text = resources.getString(R.string.task_order)
taskTypeTv.background = resources.getDrawable(R.drawable.task_order_type_btn_bg,null)
orderPhoneAndNum.text = Html.fromHtml("<font color=\"#FFFFFF\"> " + order.bookingUserPhone + "</font>" +
"<font color=\"#33FFFFFF\"> | </font>" +
"<font color=\"#3B4577\"> | </font>" +
"<font color=\"#FFFFFF\">" + order.passengerSize + "人" + "</font>",Html.FROM_HTML_MODE_LEGACY)
startStationName.text = order.orderStartSite?.siteName
endStationName.text = order.orderEndSite?.siteName

2
OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrderFragment.kt
View File

@@ -74,7 +74,7 @@ class TaxiReserveOrderFragment : BaseFragment() {
naviToEnd.visibility = View.GONE
orderPhoneAndNum.text = Html.fromHtml("<font color=\"#FFFFFF\"> " + order.bookingUserPhone + "</font>" +
"<font color=\"#33FFFFFF\"> | </font>" +
"<font color=\"#3B4577\"> | </font>" +
"<font color=\"#FFFFFF\">" + order.passengerSize + "人" + "</font>",Html.FROM_HTML_MODE_LEGACY)

2
OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt
View File

@@ -205,8 +205,6 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING
) {
return //远程代驾状态下不可开启自动驾驶，只能等远程代驾主动退出
} else if (!(module_mogo_och_autopilot_status.tag as Boolean)) {
ToastUtils.showShort(resources.getString(R.string.module_och_taxi_auto_disable_tip1))
} else {
startAutopilot()
}

1
OCH/taxi/mogo-och-taxi-unmanned/src/main/res/values/strings.xml
View File

@@ -30,7 +30,6 @@
<string name="module_och_taxi_auto_disable_tip">自动驾驶状态为0不可用</string>
<string name="module_och_taxi_auto_disable_tip1">司机端未确认可以开启自动驾驶</string>
<string name="network_error_tip">网络异常，请稍后重试</string>
<string name="request_error_tip">请求出现异常，请稍后重试</string>