From cf5e8ebdf7ab372f580a6bb7f07dfd1450fcd714 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 10 Oct 2024 19:45:27 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0]=20[fea]=20[=E9=AA=8C=E8=AF=81=E7=AE=97?= =?UTF-8?q?=E8=B7=AF=E7=A6=81=E6=AD=A2=E9=80=80=E5=87=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxi/ui/{ => routing}/errorpoint/ErrorPointItemAdapter.kt | 2 +- .../ui/{ => routing}/errorpoint/ReportErrorPointDialog.kt | 2 +- .../taxi/ui/{ => routing}/errorpoint/ReportErrorPointView.kt | 2 +- .../ui/{ => routing}/errorpoint/ReportErrorPointViewModel.kt | 2 +- .../taxi/ui/routing/routingrunning/RoutingRunningModel.kt | 1 + .../taxi/ui/routing/routingrunning/RoutingRunningView.kt | 2 +- .../src/main/res/layout/dialog_taxt_report_error.xml | 4 ++-- 7 files changed, 8 insertions(+), 7 deletions(-) rename OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/{ => routing}/errorpoint/ErrorPointItemAdapter.kt (97%) rename OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/{ => routing}/errorpoint/ReportErrorPointDialog.kt (94%) rename OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/{ => routing}/errorpoint/ReportErrorPointView.kt (98%) rename OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/{ => routing}/errorpoint/ReportErrorPointViewModel.kt (98%) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/errorpoint/ErrorPointItemAdapter.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/errorpoint/ErrorPointItemAdapter.kt similarity index 97% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/errorpoint/ErrorPointItemAdapter.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/errorpoint/ErrorPointItemAdapter.kt index e6c65b4843..adc5ef1fc0 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/errorpoint/ErrorPointItemAdapter.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/errorpoint/ErrorPointItemAdapter.kt @@ -1,4 +1,4 @@ -package com.mogo.och.unmanned.taxi.ui.errorpoint +package com.mogo.och.unmanned.taxi.ui.routing.errorpoint import android.content.Context import android.view.LayoutInflater diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/errorpoint/ReportErrorPointDialog.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/errorpoint/ReportErrorPointDialog.kt similarity index 94% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/errorpoint/ReportErrorPointDialog.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/errorpoint/ReportErrorPointDialog.kt index 984e49a9cd..6435cf166d 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/errorpoint/ReportErrorPointDialog.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/errorpoint/ReportErrorPointDialog.kt @@ -1,4 +1,4 @@ -package com.mogo.och.unmanned.taxi.ui.errorpoint +package com.mogo.och.unmanned.taxi.ui.routing.errorpoint import android.content.Context import androidx.lifecycle.LifecycleObserver diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/errorpoint/ReportErrorPointView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/errorpoint/ReportErrorPointView.kt similarity index 98% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/errorpoint/ReportErrorPointView.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/errorpoint/ReportErrorPointView.kt index 67d54904b0..bdf995e721 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/errorpoint/ReportErrorPointView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/errorpoint/ReportErrorPointView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.unmanned.taxi.ui.errorpoint +package com.mogo.och.unmanned.taxi.ui.routing.errorpoint import android.content.Context import android.util.AttributeSet diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/errorpoint/ReportErrorPointViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/errorpoint/ReportErrorPointViewModel.kt similarity index 98% rename from OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/errorpoint/ReportErrorPointViewModel.kt rename to OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/errorpoint/ReportErrorPointViewModel.kt index fa16a3d897..1f70d50a5d 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/errorpoint/ReportErrorPointViewModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/errorpoint/ReportErrorPointViewModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.unmanned.taxi.ui.errorpoint +package com.mogo.och.unmanned.taxi.ui.routing.errorpoint import androidx.lifecycle.ViewModel import com.mogo.commons.AbsMogoApplication diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningModel.kt index 4ec295f88b..199dea382e 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningModel.kt @@ -84,6 +84,7 @@ class RoutingRunningModel : ViewModel() { this.currentGrayLineBean = data.grayLineBean this.currentContrailBean = data.contrail this.currentGrayId = data.taskId + MogoStatusManager.getInstance().setTaxiUnmanedDriverLineRoutingPerformTask(TAG, true) //添加到站监听 OchAutoPilotStatusListenerManager.addListener(TAG, mMogoAutopilotStatusListener) LineManager.addListener(TAG, lineCallback) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt index 017107da1e..992c5e7e24 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt @@ -21,7 +21,7 @@ import com.mogo.och.unmanned.taxi.R import com.mogo.och.unmanned.taxi.bean.EndGrayTaskFeedbackType import com.mogo.och.unmanned.taxi.bean.StartGrayAndQueryContrailRsp import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst -import com.mogo.och.unmanned.taxi.ui.errorpoint.ReportErrorPointDialog +import com.mogo.och.unmanned.taxi.ui.routing.errorpoint.ReportErrorPointDialog import com.mogo.och.unmanned.taxi.ui.routing.RoutingSwitchModel import com.mogo.och.unmanned.taxi.ui.routing.TaxiRoutingFeedbackDialog import com.mogo.och.unmanned.taxi.ui.routing.TaxiRoutingModel diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/dialog_taxt_report_error.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/dialog_taxt_report_error.xml index 11c0fedb02..bfdf3beb5f 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/dialog_taxt_report_error.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/dialog_taxt_report_error.xml @@ -1,8 +1,8 @@ - - \ No newline at end of file + \ No newline at end of file