[6.0.0] 任务到站后界面清空

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<Long>?) {
+     fun queryTaskContrail(planningLines: Array<Long>?) {
         if (planningLines == null) return
         CarServiceManager.contrailList(mContext!!, planningLines,
             object : OchCommonServiceCallback<ContrailListRespBean> {
@@ -731,9 +730,9 @@ object TaxiModel {
 
             })
     }
-    fun setArriveAtVirtualStation() {
+    fun setArriveAtUntruthStation() {
         if (mUntruthTask == null) {
-            ToastUtils.showShort("订单状态不匹配该操作！")
+            ToastUtils.showShort("无虚拟站点！")
             return
         }
         arriveSite(mUntruthTask!!.siteId, false)

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

@@ -149,7 +149,9 @@ class TaxiUnmannedViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(){
                         TaxiModel.loginService!!.queryLoginStatusByNet()
                         VoiceNotice.showNotice("开始接单啦")
                         //虚拟任务要开启到站围栏
-                        updateUntruthTask(data.data)
+                        if (mCurrentTaskAndOrder == null || mCurrentTaskAndOrder!!.endSite == null){
+                            updateUntruthTask(data.data)
+                        }
                     }
 
                     override fun onFail(code: Int, msg: String?) {

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)

OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.kt

@@ -198,7 +198,7 @@ class TaxiFragment : BaseTaxiTabFragment<TaxiFragment, TaxiPresenter>(),
      */
     private fun initOrderTestBar() {
         findViewById<View>(R.id.test_bar_to_virtual)?.setOnClickListener{
-            TaxiModel.setArriveAtVirtualStation()
+            TaxiModel.setArriveAtUntruthStation()
         }
         findViewById<View>(R.id.test_bar_to_start)?.setOnClickListener {
             TaxiModel.setArriveAtStartStation()
@@ -230,10 +230,11 @@ class TaxiFragment : BaseTaxiTabFragment<TaxiFragment, TaxiPresenter>(),
 
     @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() {