From be3f3cc90ac779ffdaa45315738e698fb63ae990 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Mon, 14 Aug 2023 19:30:56 +0800 Subject: [PATCH] =?UTF-8?q?[6.0.0]=20=E4=BB=BB=E5=8A=A1=E5=88=B0=E7=AB=99?= =?UTF-8?q?=E5=90=8E=E7=95=8C=E9=9D=A2=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/taxi/model/TaxiModel.kt | 15 +++++++-------- .../mogo/och/taxi/model/TaxiUnmannedViewModel.kt | 4 +++- .../com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt | 8 +++++++- .../java/com/mogo/och/taxi/ui/TaxiFragment.kt | 11 ++++++----- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git 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 index 55a0ef78d6..746cb49ffe 100644 --- 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 @@ -379,7 +379,7 @@ object TaxiModel { && mCurrentTaskAndOrder!!.endSite != null } - fun checkCurrentOrder(): Boolean { + private fun checkCurrentOrder(): Boolean { return mCurrentTaskAndOrder != null && mCurrentTaskAndOrder!!.order != null } @@ -458,8 +458,8 @@ object TaxiModel { false, mCurrentTaskAndOrder!!.startSite!!.siteName, mCurrentTaskAndOrder!!.endSite!!.siteName, - mCurrentTaskAndOrder!!.lineId.toLong(), - "" // todo 这里原来传的是订单号, 现在是任务没有订单号 + mCurrentTaskAndOrder!!.lineId, + if (mCurrentTaskAndOrder!!.order != null) mCurrentTaskAndOrder!!.order!!.orderNo else "" ) if (mControllerStatusCallback != null) { mControllerStatusCallback!!.startOpenAutopilot() @@ -497,7 +497,7 @@ object TaxiModel { mCurTaskContrail!!.txtFileUrl, mCurTaskContrail!!.txtFileMd5, mCurTaskContrail!!.contrailSaveTime, - "", // todo 这里原来传的是carModel, 现在没有这个信息, 是否传businessType + "", // todo 这里原来传的是carModel, 现在没有这个信息 mCurTaskContrail!!.csvFileUrlDPQP, mCurTaskContrail!!.csvFileMd5DPQP, mCurTaskContrail!!.txtFileUrlDPQP, @@ -541,7 +541,6 @@ object TaxiModel { d(SceneConstant.M_TAXI + TAG, "onIntentReceived = %s", intentStr) if ((ConnectivityManager.CONNECTIVITY_ACTION == intentStr)) { if (NetworkUtils.isConnected(mContext)) { -// startOrStopOrderLoop(isLogin() && isOpeningOrderStatus()) loginService!!.queryLoginStatusByNet() } } @@ -716,7 +715,7 @@ object TaxiModel { /** * 查询当前任务的轨迹 */ - public fun queryTaskContrail(planningLines: Array?) { + fun queryTaskContrail(planningLines: Array?) { if (planningLines == null) return CarServiceManager.contrailList(mContext!!, planningLines, object : OchCommonServiceCallback { @@ -731,9 +730,9 @@ object TaxiModel { }) } - fun setArriveAtVirtualStation() { + fun setArriveAtUntruthStation() { if (mUntruthTask == null) { - ToastUtils.showShort("订单状态不匹配该操作！") + ToastUtils.showShort("无虚拟站点！") return } arriveSite(mUntruthTask!!.siteId, false) 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 07ae7c1258..cc31be43a2 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 @@ -149,7 +149,9 @@ class TaxiUnmannedViewModel : BaseViewModel(){ TaxiModel.loginService!!.queryLoginStatusByNet() VoiceNotice.showNotice("开始接单啦") //虚拟任务要开启到站围栏 - updateUntruthTask(data.data) + if (mCurrentTaskAndOrder == null || mCurrentTaskAndOrder!!.endSite == null){ + updateUntruthTask(data.data) + } } override fun onFail(code: Int, msg: String?) { 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 e3f8886e87..f694fef628 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 @@ -219,6 +219,12 @@ class TaxiBeingTaskFragment : BaseFragment(), isHaveBeingOrder(false) return } + + if (taskAndOrder.currentStatus == TaskStatusEnum.CompleteTask.code){ + isHaveBeingOrder(false) + return + } + isHaveBeingOrder(true) /** * 根据任务类型判断任务显示, @@ -235,7 +241,7 @@ class TaxiBeingTaskFragment : BaseFragment(), updateUIShowStatus(taskType,currentStatus,order) when (taskType) { - TaskTypeEnum.VirtualTask.code -> {// 送驾驶任务 + TaskTypeEnum.VirtualTask.code -> {// 演练任务 if (startSite == null || endSite == null) return taskStatus.text = resources.getString(R.string.task_start_end_site) taskTypeTv.background = resources.getDrawable(R.drawable.task_unreal_type_btn_bg,null) diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.kt index 9996bc77cf..a9d7af3822 100644 --- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.kt +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.kt @@ -198,7 +198,7 @@ class TaxiFragment : BaseTaxiTabFragment(), */ private fun initOrderTestBar() { findViewById(R.id.test_bar_to_virtual)?.setOnClickListener{ - TaxiModel.setArriveAtVirtualStation() + TaxiModel.setArriveAtUntruthStation() } findViewById(R.id.test_bar_to_start)?.setOnClickListener { TaxiModel.setArriveAtStartStation() @@ -230,10 +230,11 @@ class TaxiFragment : BaseTaxiTabFragment(), @Subscribe(threadMode = ThreadMode.MAIN) fun openOperationalInfoView(eventLogout: EventLogout) { - if (eventLogout.messgae == EventLogout.PERSONAL_TYPE) { - d(SceneConstant.M_TAXI + TAG, "openOperationalInfoView Event个人中心") - openOperationalInfoView() - } +// if (eventLogout.messgae == EventLogout.PERSONAL_TYPE) { + // 个人信息, 运营数据在无人化阶段暂时不展示 +// d(SceneConstant.M_TAXI + TAG, "openOperationalInfoView Event个人中心") +// openOperationalInfoView() +// } } private fun openOperationalInfoView() {