[6.4.2]

[添加时间戳]

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<String>,
 ) //feedback 1:成功 2:失败
 enum class EndGrayTaskFeedbackType(var type: Int) {

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 {

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<PointError>) {
+    fun submitErrorPointReasons(checkDataList: MutableList<PointError>, 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(

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
                         )
                     )
                 }

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingFragmentViewModel.kt

@@ -112,7 +112,7 @@ class TaxiRoutingFragmentViewModel : BaseViewModel<TaxiRoutingUiState, TaxiRouti
 
             is TaxiRoutingUiIntent.SubmitEndTask -> {
                 DebugView.printInfoMsg("[结束任务] 准备结束任务，grayId=${intent.grayId}, type=${intent.type.name}")
-                TaxiRoutingModel.endGrayTask(intent.grayId, intent.type)
+                TaxiRoutingModel.endGrayTask(intent.grayId, intent.type,intent.occurrenceTime)
             }
         }
     }

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,

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()
 }