From a84b135deff1f3cda55d98921311f0c70eee35d9 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 22 May 2024 13:56:53 +0800 Subject: [PATCH] =?UTF-8?q?[6.4.2]=20[=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=88=B3]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/taxi/bean/TaxiRoutingBean.kt | 3 ++- .../mogo/och/taxi/ui/errorpoint/ReportErrorPointView.kt | 9 +++++---- .../och/taxi/ui/errorpoint/ReportErrorPointViewModel.kt | 4 ++-- .../com/mogo/och/taxi/ui/routing/TaxiRoutingFragment.kt | 7 +++++-- .../och/taxi/ui/routing/TaxiRoutingFragmentViewModel.kt | 2 +- .../com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt | 4 ++-- .../com/mogo/och/taxi/ui/routing/TaxiRoutingUiIntent.kt | 2 +- 7 files changed, 18 insertions(+), 13 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiRoutingBean.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiRoutingBean.kt index 53b4bf85ad..aa5fd325a5 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiRoutingBean.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiRoutingBean.kt @@ -45,7 +45,7 @@ data class StartGrayContrailTaskReq(var sn: String, var contrailId: Long) data class StartGrayContrailTaskRsp(var data: Long?) : BaseData() data class QueryRoutingContrailByIdRsp(var data: ContrailBean?) : BaseData() data class SubmitGrayLineIssueLocationReq(var grayId: Long, var gcjLon: Double, var gcjLat: Double) -data class EndGrayContrailTaskReq(var grayId: Long, var feedback: Int) //feedback 1:成功 2:失败 +data class EndGrayContrailTaskReq(var grayId: Long, var feedback: Int,var occurrenceTime:Long) //feedback 1:成功 2:失败 data class StartGrayAndQueryContrailRsp( var taskId: Long?, var contrail: ContrailBean?, @@ -60,6 +60,7 @@ data class SaveGrayContrailErrorReasons( var gcjLat: Double, var wgs84Lon: Double, var wgs84Lat: Double, + var occurrenceTime:Long, var noteCodes: MutableList, ) //feedback 1:成功 2:失败 enum class EndGrayTaskFeedbackType(var type: Int) { diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/errorpoint/ReportErrorPointView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/errorpoint/ReportErrorPointView.kt index 4ded849301..2360de2777 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/errorpoint/ReportErrorPointView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/errorpoint/ReportErrorPointView.kt @@ -3,9 +3,7 @@ package com.mogo.och.taxi.ui.errorpoint import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater -import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.ViewModelProvider -import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.google.android.flexbox.AlignItems import com.google.android.flexbox.FlexDirection import com.google.android.flexbox.FlexWrap @@ -58,6 +56,8 @@ class ReportErrorPointView : WindowRelativeLayout, private var grayId: Long?=-1L + private var occurrenceTime:Long = System.currentTimeMillis() + private val mLoadingDialog: TaxiRoutingLoadingDialog by lazy { TaxiRoutingLoadingDialog( context @@ -92,7 +92,7 @@ class ReportErrorPointView : WindowRelativeLayout, return@onClick } mLoadingDialog.showLoading() - this.viewModel?.submitErrorPointReasons(checkDataList) + this.viewModel?.submitErrorPointReasons(checkDataList,occurrenceTime) } } @@ -100,7 +100,8 @@ class ReportErrorPointView : WindowRelativeLayout, super.onVisibilityAggregated(isVisible) d(SceneConstant.M_TAXI_P + TAG, "展示---:${isVisible}") if (isVisible) { - tv_work_order_time.text = "时间:${TimeUtils.millis2String(System.currentTimeMillis(), TimeUtils.getHourMinSecondFormat())}" + occurrenceTime = System.currentTimeMillis() + tv_work_order_time.text = "时间:${TimeUtils.millis2String(occurrenceTime, TimeUtils.getHourMinSecondFormat())}" viewModel?.getPointErrorReasons() mLoadingDialog.showLoading() } else { diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/errorpoint/ReportErrorPointViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/errorpoint/ReportErrorPointViewModel.kt index e5e98c8992..6d0cd5baa8 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/errorpoint/ReportErrorPointViewModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/errorpoint/ReportErrorPointViewModel.kt @@ -12,7 +12,6 @@ import com.mogo.och.taxi.bean.PointError import com.mogo.och.taxi.bean.QueryPointErrorReasonsRsp import com.mogo.och.taxi.bean.SaveGrayContrailErrorReasons import com.mogo.och.taxi.network.TaxiRoutingServiceManager -import com.mogo.och.taxi.ui.routing.TaxiRoutingModel class ReportErrorPointViewModel : ViewModel() { @@ -59,7 +58,7 @@ class ReportErrorPointViewModel : ViewModel() { this.viewCallback = null } - fun submitErrorPointReasons(checkDataList: MutableList) { + fun submitErrorPointReasons(checkDataList: MutableList, occurrenceTime: Long) { CallerLogger.d(TAG,checkDataList,grayId) if (grayId == null || grayId!! < 0L) { viewCallback?.hideLoadingWithMessage("未找到规划Id") @@ -78,6 +77,7 @@ class ReportErrorPointViewModel : ViewModel() { gcj02.latitude, wgs84.longitude, wgs84.latitude, + occurrenceTime, errorReasonCodes ) TaxiRoutingServiceManager.saveDotDetail( diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragment.kt index f7231d0f69..da83878c81 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragment.kt @@ -254,6 +254,7 @@ class TaxiRoutingFragment : BaseFragment(), ICommonNaviChangedCallback { } private fun showFeedbackDialog(grayId: Long) { + val occurrenceTime = System.currentTimeMillis() val builder: TaxiRoutingFeedbackDialog.Builder = TaxiRoutingFeedbackDialog.Builder() builder.cancelStr( MainMoGoApplication.getApp() @@ -268,7 +269,8 @@ class TaxiRoutingFragment : BaseFragment(), ICommonNaviChangedCallback { mViewModel.sendUiIntent( TaxiRoutingUiIntent.SubmitEndTask( grayId, - EndGrayTaskFeedbackType.USABLE_YES + EndGrayTaskFeedbackType.USABLE_YES, + occurrenceTime ) ) } @@ -277,7 +279,8 @@ class TaxiRoutingFragment : BaseFragment(), ICommonNaviChangedCallback { mViewModel.sendUiIntent( TaxiRoutingUiIntent.SubmitEndTask( grayId, - EndGrayTaskFeedbackType.USABLE_NO + EndGrayTaskFeedbackType.USABLE_NO, + occurrenceTime ) ) } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragmentViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragmentViewModel.kt index 839d5a5bb6..b8436acf82 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragmentViewModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragmentViewModel.kt @@ -112,7 +112,7 @@ class TaxiRoutingFragmentViewModel : BaseViewModel { DebugView.printInfoMsg("[结束任务] 准备结束任务，grayId=${intent.grayId}, type=${intent.type.name}") - TaxiRoutingModel.endGrayTask(intent.grayId, intent.type) + TaxiRoutingModel.endGrayTask(intent.grayId, intent.type,intent.occurrenceTime) } } } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt index b4a02d84c4..2392b26090 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt @@ -374,9 +374,9 @@ object TaxiRoutingModel { ) } - fun endGrayTask(grayId: Long, type: EndGrayTaskFeedbackType) { + fun endGrayTask(grayId: Long, type: EndGrayTaskFeedbackType, occurrenceTime:Long,) { DebugView.printInfoMsg("[结束灰度任务] 准备发送请求，grayId=$grayId， type=${type.type}, typeName=${type.name}") - val submit = EndGrayContrailTaskReq(grayId, type.type) + val submit = EndGrayContrailTaskReq(grayId, type.type,occurrenceTime) TaxiRoutingServiceManager.endGrayTask( mContext, submit, diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingUiIntent.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingUiIntent.kt index 6a39b3f763..801c4db4d1 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingUiIntent.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingUiIntent.kt @@ -29,6 +29,6 @@ sealed class TaxiRoutingUiIntent : IUiIntent { data class ShowFeedbackDialog(val grayId: Long) : TaxiRoutingUiIntent() //结束任务 - data class SubmitEndTask(val grayId: Long, val type: EndGrayTaskFeedbackType) : + data class SubmitEndTask(val grayId: Long, val type: EndGrayTaskFeedbackType,val occurrenceTime:Long) : TaxiRoutingUiIntent() } \ No newline at end of file