Merge branch 'dev_robotaxi-d_230809_6.0.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_230809_6.0.0

2023-08-16 14:44:30 +08:00
parent 72057ceaef 6e9c741540
commit 8cbce5bb14
11 changed files with 112 additions and 146 deletions
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/ConsultVideoPlayer.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/ui/video/ConsultVideoPlayer.kt
@@ -148,9 +148,11 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
    override fun onWindowFocusChanged(hasWindowFocus: Boolean) {
        super.onWindowFocusChanged(hasWindowFocus)
        if(isIfCurrentIsFullscreen&&smalllPlayer!=null){
-            if(hasWindowFocus){//获取焦点
-                onVideoResume()
-            }else{
+            if (hasWindowFocus) {//获取焦点
+                if (isInPlayingState && smalllPlayer!!.mCurrentState != CURRENT_STATE_PAUSE) {
+                    onVideoResume()
+                }
+            } else {
                onVideoPause()
            }
        }
@@ -392,6 +394,8 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
                    }
                }
            }
+            // 点击视频不展示状态栏
+            gsyVideoPlayer.isHideKey = false
            gsyVideoPlayer.smalllPlayer = this
            frameLayout.setBackgroundColor(Color.BLACK)
            val lp = LayoutParams(width, height)
--- 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
@@ -13,10 +13,10 @@ data class OrderDetail(
    var orderStartSite: Site?,
    var orderEndSite: Site?,
    var planningLines: Array<Long>,
-    var phone: String,
-    var passengerNum: Int,
-    var fullMinutes: Long, //单独接口查询到
-    var mileage: Long // 单独接口查询到
+    var bookingUserPhone: String,
+    var passengerSize: Int,
+    var fullMinutes: Int, //到站后返回的总里程 /公里
+    var fullMileage: Float // 到站后返回的总用时 /分钟
 ) {
    override fun equals(other: Any?): Boolean {
        if (this === other) return true
@@ -104,7 +104,8 @@ data class ContrailListReqBean(var lineIds: Array<Long>)
 data class QueryCarOrderByNoReqBean(var sn: String, var orderNo: String)
 data class QueryCarOrderByNoRespBean(
    var sn: String, var orderNo: String, var orderStatus: Int,
-    var bookingUserPhone: String, var businessType: String
+    var bookingUserPhone: String, var businessType: String,
+    var mileage: Float,var duration: Int
 ): BaseData()

 data class ContrailListRespBean(var data: MutableList<Result>?) //轨迹路线集合
@@ -117,7 +118,3 @@ data class ContrailListRespBean(var data: MutableList<Result>?) //轨迹路线
    )
 }

-data class QueryLineInfoRespBean(
-    var id: Long, var fullMinutes: Long, var mileage: Long
-): BaseData()
-
--- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt
+++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt
@@ -626,9 +626,8 @@ object TaxiModel {
                d(SceneConstant.M_TAXI + TAG, GsonUtil.jsonFromObject(data))
                mUntruthTask = null
                if (isArriveEndSite) {
-                    //到目的站后去查询下一个任务
-                    startPrepareTask(siteId)
                    cleanStation()
+                    cancelAutopilot()
                }
            }

@@ -652,24 +651,6 @@ object TaxiModel {
        })
    }

-    private fun startPrepareTask(siteId: Long) {
-        UiThreadHandler.postDelayed({
-            prepareTask(mContext!!, siteId, object : OchCommonServiceCallback<PrepareTaskRespBean> {
-                override fun onSuccess(data: PrepareTaskRespBean?) {
-                    d(SceneConstant.M_TAXI + TAG, GsonUtil.jsonFromObject(data))
-                    if (data == null || data.code != 0) return
-                    //去下载轨迹, 下发给工控机下载
-                    queryTaskContrail(Array(1) { data.lineId })
-                }
-
-                override fun onFail(code: Int, msg: String?) {
-                    d(SceneConstant.M_TAXI + TAG, "$code $msg")
-                }
-
-            })
-        }, TIMER_PREPARE_TASK_INTERVAL)
-    }
-
    private fun judgeTaskEndSiteStation(currentLocation: MogoLocation) {
        if (!checkCurrentTask()) {
            return
--- 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
@@ -2,6 +2,7 @@ package com.mogo.och.taxi.model

 import android.annotation.SuppressLint
 import android.content.Context
+import com.elegant.network.utils.GsonUtil
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.eagle.core.data.BaseData
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
@@ -10,6 +11,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.NetworkUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.common.module.biz.constant.LoginStatusManager
 import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
 import com.mogo.och.common.module.utils.ToastUtilsOch
@@ -18,10 +20,12 @@ import com.mogo.och.taxi.R
 import com.mogo.och.taxi.base.BaseViewModel
 import com.mogo.och.taxi.base.IUiIntent
 import com.mogo.och.taxi.bean.ContrailListRespBean
+import com.mogo.och.taxi.bean.PrepareTaskRespBean
 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.TaskStatusEnum
+import com.mogo.och.taxi.constant.TaskTypeEnum
 import com.mogo.och.taxi.constant.TaxiOrderStatusEnum
 import com.mogo.och.taxi.constant.TaxiUnmannedConst
 import com.mogo.och.taxi.constant.TaxtServingStatusManager
@@ -29,7 +33,6 @@ 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
@@ -84,6 +87,10 @@ class TaxiUnmannedViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(){
            is UnmannedIntent.CancelOrder -> {// 取消订单, 暂未加取消类型和原因
                handleCancelOrder()
            }
+
+            is UnmannedIntent.StartTask -> {
+                TaxiModel.toStartTask()
+            }
        }
    }

@@ -227,15 +234,6 @@ class TaxiUnmannedViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(){
        }
    }

-    private fun updateNoTaskAndOrderCancelUi() {
-
-        sendUiState {
-            copy(
-                taskAndOrderUiState = TaskAndOrderUiState.ORDERCANCEL(true)
-            )
-        }
-    }
-
    private fun startOrStopOrderLoop(start: Boolean) {
        d(SceneConstant.M_TAXI + TAG, "startOrStopOrderLoop() $start")
        if (start) {
@@ -255,18 +253,25 @@ class TaxiUnmannedViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(){

                    val result = data.data

+                    d(TAG, "queryCurrentTaskOnce = result = ," + GsonUtil.jsonFromObject(result))
+
                    if (mCurrentTaskAndOrder != null && mCurrentTaskAndOrder!!.equals(result)) return

-                    if (result!!.endSite == null &&  result.order == null){
+                    if (result!!.endSite == null && mCurrentTaskAndOrder != null && mCurrentTaskAndOrder!!.order!= null) {
+                        //本地根据订单 orderNo 去查询下(乘客取消订单)
+                        queryCurrentOrderStatusByNo(mCurrentTaskAndOrder!!.order!!.orderNo)
+                        return
+                    }
+
+                    if (result.endSite == null &&  result.order == null){
                        mCurrentTaskAndOrder = null
                        updateNoTaskAndOrderUi()
                        TaxiModel.updateCurrentTaskAndOrder(null)
                    }

-                    if (result.order == null && mCurrentTaskAndOrder != null && mCurrentTaskAndOrder!!.order!= null) {
-                        //本地根据订单 orderNo 去查询下(乘客取消订单)
-                        queryCurrentOrderStatusByNo(mCurrentTaskAndOrder!!.order!!.orderNo)
-                        return
+                    if (result.currentStatus == TaskStatusEnum.CompleteTask.code
+                        && result.endSite != null){
+                        startPrepareTask(result.endSite!!.siteId)
                    }

                    mCurrentTaskAndOrder = result
@@ -321,11 +326,21 @@ class TaxiUnmannedViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(){
                    if (data != null && data.code != 0) return
                    if (data!!.orderStatus == TaxiOrderStatusEnum.Cancel.code){
                        VoiceNotice.showNotice("乘客已经取消")
-                        updateNoTaskAndOrderCancelUi()
+                        mCurrentTaskAndOrder?.order?.orderStatus = TaxiOrderStatusEnum.Cancel.code
+                        updateTaskAndOrderUi()
+                        mCurrentTaskAndOrder = null
                        return
                    }
                    if (data.orderStatus == TaxiOrderStatusEnum.ArriveAtEnd.code){//到站
-                        queryRouteInfo()
+                        mCurrentTaskAndOrder?.order?.fullMileage = data.mileage
+                        mCurrentTaskAndOrder?.order?.fullMinutes = data.duration
+                        updateTaskAndOrderUi()
+                        return
+                    }
+                    if (data.orderStatus == TaxiOrderStatusEnum.JourneyCompleted.code){//到站
+                        mCurrentTaskAndOrder = null
+                        updateNoTaskAndOrderUi()
+                        return
                    }
                }

@@ -336,26 +351,25 @@ class TaxiUnmannedViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(){
            })
    }

-    /**
-     * 到站后查询总里程和总用时
-     */
-    private fun queryRouteInfo() {
-        if (mCurrentTaskAndOrder != null && mCurrentTaskAndOrder!!.endSite != null)
-        queryLineInfo(mContext, mCurrentTaskAndOrder!!.lineId,
-            object : OchCommonServiceCallback<QueryLineInfoRespBean>{
-                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()
-                }
+    fun startPrepareTask(siteId: Long) {
+        UiThreadHandler.postDelayed({
+            CarServiceManager.prepareTask(
+                mContext,
+                siteId,
+                object : OchCommonServiceCallback<PrepareTaskRespBean> {
+                    override fun onSuccess(data: PrepareTaskRespBean?) {
+                        d(SceneConstant.M_TAXI + TAG, GsonUtil.jsonFromObject(data))
+                        if (data == null || data.code != 0) return
+                        //去下载轨迹, 下发给工控机下载
+                        queryOrderContrails(Array(1) { data.lineId })
+                    }

-                override fun onFail(code: Int, msg: String?) {
-                    TODO("Not yet implemented")
-                }
+                    override fun onFail(code: Int, msg: String?) {
+                        d(SceneConstant.M_TAXI + TAG, "$code $msg")
+                    }

-            })
+                })
+        }, TaxiUnmannedConst.TIMER_PREPARE_TASK_INTERVAL)
    }


--- 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,14 +172,4 @@ object CarServiceManager {
        ).transformTry()
            .subscribe(OchCommonSubscribeImpl(context, callback, "contrailList"))
    }
-
-    /**
-     * 到站查询总里程和总用时
-     */
-    fun queryLineInfo(context: Context,lineId: Long,callback: OchCommonServiceCallback<QueryLineInfoRespBean>?){
-        mOCHTaxiServiceApi.queryTaxiLineInfoById(lineId = lineId)
-            .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "contrailList"))
-
-    }
 }
--- 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,7 +13,6 @@ 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
@@ -151,14 +150,4 @@ interface UnmannedTaskServiceApi {
        @Body data: QueryCarOrderByNoReqBean?
    ): Observable<QueryCarOrderByNoRespBean>

-    /**
-     * 查询总用时和里程
-     */
-    @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<QueryLineInfoRespBean>
 }
--- 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
@@ -93,6 +93,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
        mViewModel = ViewModelProvider(this, ViewModelProvider.NewInstanceFactory())[TaxiUnmannedViewModel::class.java]
    }

+    @RequiresApi(Build.VERSION_CODES.N)
    override fun initViews() {
        initNaviView()
        isHaveBeingOrder(false)
@@ -103,6 +104,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
        initData()
    }

+    @RequiresApi(Build.VERSION_CODES.N)
    private fun initData() {

        //监听返回的数据状态
@@ -131,21 +133,11 @@ class TaxiBeingTaskFragment : BaseFragment(),
                                updateCurrentOrderStatusChanged(taskAndOrderUiState.taskAndOrder)
                            }
                        }
-
-                        is TaskAndOrderUiState.ORDERCANCEL -> {
-                            updateOrderCancelUi(taskAndOrderUiState.isCancel)
-                            onCurrentOrderCancelDone()
-                        }
                    }
                }
        }
    }

-    private fun updateOrderCancelUi(isCancel: Boolean) {
-        taskTypeTv.text = resources.getString(R.string.passenger_cancel_order)
-        taskTypeTv.background = resources.getDrawable(R.drawable.task_cancel_type_btn_bg,null)
-    }
-
    private fun updateUntruthTask(untruthTask: StartServiceRespBean.Result?) {
        if (untruthTask == null) return
        isHaveBeingOrder(true)
@@ -182,6 +174,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
    private fun initOnClickListener() {
        cancelOrder.setOnClickListener(this)
        taskStatus.setOnClickListener(this)
+        taskClickBtn.setOnClickListener(this)
    }

    private fun initNaviView() {
@@ -212,6 +205,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
    /**
     * 任务和订单信息
     */
+    @RequiresApi(Build.VERSION_CODES.N)
    @SuppressLint("SetTextI18n", "UseCompatLoadingForDrawables")
    fun updateCurrentOrderStatusChanged(taskAndOrder: QueryCurrentTaskRespBean.Result?) {
        if (taskAndOrder == null) return
@@ -220,7 +214,8 @@ class TaxiBeingTaskFragment : BaseFragment(),
            return
        }

-        if (taskAndOrder.currentStatus == TaskStatusEnum.CompleteTask.code){
+        if (taskAndOrder.currentStatus == TaskStatusEnum.CompleteTask.code &&
+            taskAndOrder.startSite == null){
            isHaveBeingOrder(false)
            return
        }
@@ -253,7 +248,9 @@ class TaxiBeingTaskFragment : BaseFragment(),
                if (order == null) return
                taskTypeTv.text = resources.getString(R.string.task_order)
                taskTypeTv.background = resources.getDrawable(R.drawable.task_order_type_btn_bg,null)
-                orderPhoneAndNum.text = "${order.phone} | ${order.passengerNum}"
+                orderPhoneAndNum.text = Html.fromHtml("${order.bookingUserPhone} " +
+                        "<font color=\"#33FFFFFF\"> | </font> " +
+                        "${order.passengerSize}人",Html.FROM_HTML_MODE_LEGACY)
                startStationName.text = order.orderStartSite?.siteName
                endStationName.text = order.orderEndSite?.siteName
                updateOrderUI(order)
@@ -263,6 +260,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
        updateRemainDistanceAndTime(false)
    }

+    @RequiresApi(Build.VERSION_CODES.N)
    private fun updateOrderUI(order: OrderDetail) {

        when(order.orderStatus){
@@ -280,37 +278,18 @@ class TaxiBeingTaskFragment : BaseFragment(),
                )
                taskTypeTv.background = resources.getDrawable(R.drawable.task_cancel_type_btn_bg,null)
                taskTypeTv.text = resources.getString(R.string.passenger_cancel_order)
+                onCurrentOrderCancelDone()
+                hideNavi()
+            }

-                order.orderStartSite?.let {
-                    setOrRemoveMapMaker(
-                        false,
-                        TAXI_START_MAP_MAKER,
-                        it.gcjLat,
-                        it.gcjLon,
-                        R.raw.star_marker
-                    )
-                }
-                order.orderEndSite?.let {
-                    setOrRemoveMapMaker(
-                        false,
-                        TAXI_END_MAP_MAKER,
-                        it.gcjLat,
-                        it.gcjLon,
-                        R.raw.end_marker
-                    )
-                }
-            }
-            TaxiOrderStatusEnum.JourneyCompleted.code -> { //服务完成
-                taskStatus.text = resources.getString(R.string.task_start_end_site)
-                updateOrderBottomBtn(
-                    getString(R.string.module_och_taxi_order_server_end),
-                    Color.parseColor("#FFFFFF"),
-                    Color.parseColor("#FF1D5EF3"),
-                    true
-                )
-            }
            TaxiOrderStatusEnum.ArriveAtEnd.code -> { //到达目的地
                taskStatus.text = resources.getString(R.string.task_start_end_site)
+
+                val strHtml2 =
+                    ("<font color=\"#CAD6FF\">里程 </font>" + "<font color=\"#FFFFFF\"> ${order.fullMileage} </font>" + "<font color=\"#CAD6FF\"> 公里 </font>"
+                            + "<font color=\"#CAD6FF\">，剩余 </font>" + "<font color=\"#FFFFFF\"> ${order.fullMinutes} </font>" + "<font color=\"#CAD6FF\"> 分钟</font>")
+                taskOtherInfo.text = Html.fromHtml(strHtml2,Html.FROM_HTML_MODE_LEGACY)
+
                updateOrderBottomBtn(
                    getString(R.string.module_och_taxi_order_server_end),
                    Color.parseColor("#FFFFFF"),
@@ -336,6 +315,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
                        R.raw.end_marker
                    )
                }
+                hideNavi()
            }
            TaxiOrderStatusEnum.OnTheWayToEnd.code -> { //送驾中
                taskStatus.text = resources.getString(R.string.task_start_end_site)
@@ -399,6 +379,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
                        R.raw.end_marker
                    )
                }
+                hideNavi()
            }

            TaxiOrderStatusEnum.OnTheWayToStart.code -> { //前往上车地点
@@ -432,6 +413,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
        }
    }

+    @RequiresApi(Build.VERSION_CODES.N)
    private fun updateOtherInfo() {
        val currentCale = DateTimeUtils.getCurrentDateTime()
        val currentDay =
@@ -455,7 +437,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
                DateTimeUtil.MM_dd_HH_mm
            ) + "</big></font>")
        }
-        taskOtherInfo.text = strHtml13
+        taskOtherInfo.text = Html.fromHtml(strHtml13,Html.FROM_HTML_MODE_LEGACY)
    }

    private fun updateUIShowStatus(taskType: Int, currentStatus: Int, order: OrderDetail?) {
@@ -487,6 +469,15 @@ class TaxiBeingTaskFragment : BaseFragment(),
        }
    }

+
+    private fun hideNavi() {
+        naviToStart.visibility = View.GONE
+        naviToEnd.visibility = View.GONE
+        AmapNaviToDestinationModel.getInstance(context).destroyAmaNavi()
+        mTaxiFragment?.showAmapNaviToStationFragment(false)
+        mTaxiFragment?.showRottingToStationFragment(false)
+    }
+
    private fun startNaviToStation(isVoicePlay: Boolean, stationLat: Double, stationLng: Double) {
        AmapNaviToDestinationModel.getInstance(context).destroyAmaNavi()
        val mCurLatitude = getChassisLocationGCJ02().latitude
@@ -506,8 +497,8 @@ class TaxiBeingTaskFragment : BaseFragment(),
        naviToStart.visibility = View.GONE
        naviToEnd.visibility = View.GONE
        AmapNaviToDestinationModel.getInstance(context).destroyAmaNavi()
-        mTaxiFragment!!.showAmapNaviToStationFragment(false)
-        mTaxiFragment!!.showRottingToStationFragment(false)
+        mTaxiFragment?.showAmapNaviToStationFragment(false)
+        mTaxiFragment?.showRottingToStationFragment(false)
    }

    /**
@@ -518,7 +509,8 @@ class TaxiBeingTaskFragment : BaseFragment(),
    @RequiresApi(Build.VERSION_CODES.N)
    fun updateDistanceAndTime(meters: Long, timeInSecond: Long) {
 //        CallerLogger.INSTANCE.d(M_TAXI + TAG,"meters = "+meters+"timeInSecond ="+timeInSecond);
-        if (mCurrentTaskAndOrder == null || mCurrentTaskAndOrder!!.endSite == null) return
+        if (mCurrentTaskAndOrder!!.endSite == null && mCurrentUntruthTask == null) return
+
        var dis = "0"
        var disUnit = "公里"
        if (meters > 0) {
@@ -572,7 +564,9 @@ class TaxiBeingTaskFragment : BaseFragment(),
        val order = mCurrentTaskAndOrder!!.order
        if (TaxiOrderStatusEnum.ArriveAtStart.code == order!!.orderStatus) { //到达乘客上车点，司机可跳过乘客屏认证
            mViewModel.sendUiIntent(UnmannedIntent.JumpPassengerCheckDone)
-        } else if (TaxiOrderStatusEnum.ArriveAtEnd.code == order.orderStatus) { //点击了完成服务，结束订单并更新订单信息
+        } else if (TaxiOrderStatusEnum.UserArriveAtStart.code == order.orderStatus){
+            mViewModel.sendUiIntent(UnmannedIntent.StartTask)
+        }else if (TaxiOrderStatusEnum.ArriveAtEnd.code == order.orderStatus) { //点击了完成服务，结束订单并更新订单信息
            mViewModel.sendUiIntent(UnmannedIntent.JourneyCompleted)
        } else if (TaxiOrderStatusEnum.OnTheWayToEnd.code == order.orderStatus) { //前往目的地过程中可提前结束行程
            //自驾中提示，接管后才能结束
@@ -635,7 +629,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
    }

    override fun onClick(v: View) {
-        if (v.id == taskStatus.id) {
+        if (v.id == taskClickBtn.id) {
            d(SceneConstant.M_TAXI + TAG, taskStatus.text.toString())
            startOrEndService()
        } else if (v.id == cancelOrder.id) {
@@ -657,7 +651,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
     * @param isShow
     */
    private fun showNaviToEndStationFragment(isShow: Boolean) {
-        mTaxiFragment!!.startNaviToEndStation(isShow)
+        mTaxiFragment?.startNaviToEndStation(isShow)
    }

    private fun onCurrentOrderCancelDone() {
@@ -680,7 +674,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
            )
        }
        //提交取消订单后的回调
-        ToastUtils.showShort("订单取消成功")
+//        ToastUtils.showShort("订单取消成功")
        //更新界面
        isHaveBeingOrder(false)
        showOrHideNavi()
@@ -692,7 +686,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
     */
    private fun initOrderTestBar() {
        taskStatus.setOnLongClickListener {
-            mTaxiFragment!!.clickTestBar()
+            mTaxiFragment?.clickTestBar()
            false
        }
    }
@@ -708,7 +702,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
            "isPlay = $isPlay, isRestart=$isRestart"
        )
        if (!isRestart) {
-            mTaxiFragment!!.showAmapNaviToStationFragment(false)
+            mTaxiFragment?.showAmapNaviToStationFragment(false)
            return
        }
        UiThreadHandler.postDelayed({
@@ -735,7 +729,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
    fun onNaviToEndAmap(isShow: Boolean) {
        if (mCurrentTaskAndOrder == null) return

-        mTaxiFragment!!.showAmapNaviToStationFragment(
+        mTaxiFragment?.showAmapNaviToStationFragment(
            if (mCurrentTaskAndOrder!!.currentStatus == TaskStatusEnum.StartTask.code)
                isShow else true
        )
--- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrderFragment.kt
+++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrderFragment.kt
@@ -94,7 +94,7 @@ class TaxiReserveOrderFragment : BaseFragment() {
        naviToStart.visibility = View.GONE
        naviToEnd.visibility = View.GONE

-        orderPhoneAndNum.text = "${order.phone} | ${order.passengerNum}"
+        orderPhoneAndNum.text = "${order.bookingUserPhone} | ${order.passengerSize}人"

        order.orderStartSite?.let {
            startStationName.text = it.siteName
--- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/unmanned/UnmannedIntent.kt
+++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/unmanned/UnmannedIntent.kt
@@ -14,6 +14,8 @@ sealed class UnmannedIntent: IUiIntent{
    //取消订单
    class CancelOrder(type: Int, reason: String) : UnmannedIntent()

+    object StartTask: UnmannedIntent()
+
    //订单服务完成
    object JourneyCompleted: UnmannedIntent()

--- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/unmanned/UnmannedState.kt
+++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/unmanned/UnmannedState.kt
@@ -10,6 +10,4 @@ data class UnmannedState(val taskAndOrderUiState: TaskAndOrderUiState) : IUiStat
 sealed class TaskAndOrderUiState {
    object INIT : TaskAndOrderUiState()
    data class TASKANDORDER(val taskAndOrder: QueryCurrentTaskRespBean.Result?, val untruthTask: StartServiceRespBean.Result?) : TaskAndOrderUiState()//演练任务、接驾、送驾任务
-
-    data class ORDERCANCEL(var isCancel: Boolean) : TaskAndOrderUiState()//取消订单
 }
--- 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
@@ -56,7 +56,6 @@
        app:layout_constraintLeft_toLeftOf="@+id/taskStatus"
        app:layout_constraintTop_toBottomOf="@+id/taskStatus"
        android:layout_marginTop="@dimen/dp_20"
-        android:textStyle="bold"
        android:textColor="@android:color/white"
        android:textSize="@dimen/dp_28"
        android:text="183XXXX5400 | -人"/>
@@ -85,7 +84,6 @@
        android:singleLine="true"
        android:ellipsize="marquee"
        android:marqueeRepeatLimit="marquee_forever"
-        android:textStyle="bold"
        android:textSize="@dimen/dp_44"
        android:text="始发站"/>

@@ -131,7 +129,6 @@
        android:singleLine="true"
        android:ellipsize="marquee"
        android:marqueeRepeatLimit="marquee_forever"
-        android:textStyle="bold"
        android:textSize="@dimen/dp_44"
        android:text="终点站"/>