diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/bean/RoutingBean.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/bean/RoutingBean.kt index 1a769ecbe8..8db33162d6 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/bean/RoutingBean.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/bean/RoutingBean.kt @@ -99,11 +99,6 @@ 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) - /** * 结束一个路线的灰度任务 */ @@ -113,7 +108,6 @@ data class EndGrayContrailTaskReq( var occurrenceTime: Long ) //feedback 1:成功 2:失败 - /** * 灰度任务&查询轨迹详情 */ @@ -140,6 +134,8 @@ data class SaveGrayContrailErrorReasons( var wgs84Lon: Double, var wgs84Lat: Double, var occurrenceTime: Long, + var plateNumber: String, + var driverId: Long, var noteCodes: MutableList, ) //feedback 1:成功 2:失败 diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/callback/ITaxiRoutingCallback.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/callback/ITaxiRoutingCallback.kt deleted file mode 100644 index 246ab39b51..0000000000 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/callback/ITaxiRoutingCallback.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.mogo.och.unmanned.taxi.callback - -interface ITaxiRoutingCallback { - /** - * 查询灰度路线列表--成功✅ - */ - fun onQueryRoutingGrayLineListSuccess(data: MutableList) - - /** - * 查询灰度路线列表--失败❌ - * @param errorStr 错误信息 - */ - fun onQueryRoutingGrayLineListFailed(errorStr: String) - - /** - * 灰度任务&查询轨迹详情--成功✅ - */ - fun onStartGrayTaskAndQueryContrailSuccess(data: com.mogo.och.biz.routing.bean.StartGrayAndQueryContrailRsp) - - /** - * 灰度任务&查询轨迹详情--失败❌ - * @param errorStr 错误信息 - */ - fun onStartGrayTaskAndQueryContrailFailed(errorStr: String) - - /** - * 灰度任务过程中，上报问题打点--成功✅ - */ - fun onSubmitGrayLineIssueLocationSuccess() - - /** - * 灰度任务过程中，上报问题打点--失败❌ - * @param errorStr 错误信息 - */ - fun onSubmitGrayLineIssueLocationFailed(errorStr: String) - - /** - * 结束灰度任务--成功✅ - */ - fun onSubmitEndTaskSuccess() - - /** - * 结束灰度任务--成功❌ - * @param errorStr 错误信息 - */ - fun onSubmitEndTaskFailed(errorStr: String) - - /** - * MAP到站通知 - * @param grayId 灰度路线ID - */ - fun onAutoPilotArriveAtEndStation(grayId: Long?) - - /** - * 自车定位围栏 - * @param grayId 灰度路线ID - */ - fun onGDMapArriveAtEndStation(grayId: Long?) -} diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/net/RoutingServiceApi.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/net/RoutingServiceApi.kt index da3ff6df7d..021763c49e 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/net/RoutingServiceApi.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/net/RoutingServiceApi.kt @@ -9,7 +9,6 @@ import com.mogo.och.biz.routing.bean.QueryRoutingContrailByIdRsp import com.mogo.och.biz.routing.bean.SaveGrayContrailErrorReasons import com.mogo.och.biz.routing.bean.StartGrayContrailTaskReq import com.mogo.och.biz.routing.bean.StartGrayContrailTaskRsp -import com.mogo.och.biz.routing.bean.SubmitGrayLineIssueLocationReq import io.reactivex.Observable import retrofit2.http.Body import retrofit2.http.GET @@ -53,17 +52,6 @@ interface RoutingServiceApi { @Query("contrailId") contrailId: Long ): Observable - /** - * 上报路线打点 - */ - @Headers("Content-type:application/json;charset=UTF-8") - @POST("/och-contrail/dotDetail/save") - fun submitGrayLineIssueLocation( - @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, - @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, - @Body data: SubmitGrayLineIssueLocationReq - ): Observable - /** * 结束一个路线的灰度任务 */ diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/net/RoutingServiceManager.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/net/RoutingServiceManager.kt index a8224d5e9b..f77c05f9b5 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/net/RoutingServiceManager.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/net/RoutingServiceManager.kt @@ -8,12 +8,9 @@ import com.mogo.och.biz.routing.bean.EndGrayContrailTaskReq import com.mogo.och.biz.routing.bean.GrayLineBean import com.mogo.och.biz.routing.bean.QueryGrayContrailListRsp import com.mogo.och.biz.routing.bean.QueryPointErrorReasonsRsp -import com.mogo.och.biz.routing.bean.QueryRoutingContrailByIdRsp import com.mogo.och.biz.routing.bean.SaveGrayContrailErrorReasons import com.mogo.och.biz.routing.bean.StartGrayAndQueryContrailRsp import com.mogo.och.biz.routing.bean.StartGrayContrailTaskReq -import com.mogo.och.biz.routing.bean.StartGrayContrailTaskRsp -import com.mogo.och.biz.routing.bean.SubmitGrayLineIssueLocationReq import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.network.OchCommonSubscribeImpl @@ -41,42 +38,6 @@ object RoutingServiceManager { .subscribe(OchCommonSubscribeImpl(context, callback, "queryRoutingGrayLineList")) } - /** - * 开始一个灰度任务 - */ - fun startGrayTask( - context: Context, - data: StartGrayContrailTaskReq, - callback: OchCommonServiceCallback - ) { - mRoutingServiceApi.startGrayTask(data = data).transformTry() - .subscribe(OchCommonSubscribeImpl(context, callback, "startGrayTask")) - } - - /** - * 通过id查询轨迹详情 - */ - fun queryRoutingContrailById( - context: Context, - contrailId: Long, - callback: OchCommonServiceCallback - ) { - mRoutingServiceApi.queryRoutingContrailById(contrailId = contrailId).transformTry() - .subscribe(OchCommonSubscribeImpl(context, callback, "queryRoutingContrailById")) - } - - /** - * 上报线路打点 - */ - fun submitGrayLineIssueLocation( - context: Context, - data: SubmitGrayLineIssueLocationReq, - callback: OchCommonServiceCallback - ) { - mRoutingServiceApi.submitGrayLineIssueLocation(data = data).transformTry() - .subscribe(OchCommonSubscribeImpl(context, callback, "submitGrayLineIssueLocation")) - } - /** * 结束一个灰度任务 */ diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/errorpoint/ReportErrorPointViewModel.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/errorpoint/ReportErrorPointViewModel.kt index e5b9f9069f..0b989c8a2e 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/errorpoint/ReportErrorPointViewModel.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/errorpoint/ReportErrorPointViewModel.kt @@ -10,6 +10,7 @@ import com.mogo.och.biz.routing.bean.QueryPointErrorReasonsRsp import com.mogo.och.biz.routing.bean.SaveGrayContrailErrorReasons import com.mogo.och.biz.routing.net.RoutingServiceManager import com.mogo.och.bridge.autopilot.location.OchLocationManager +import com.mogo.och.common.module.biz.login.LoginStatusManager import com.mogo.och.common.module.network.OchCommonServiceCallback class ReportErrorPointViewModel : ViewModel() { @@ -70,6 +71,7 @@ class ReportErrorPointViewModel : ViewModel() { checkDataList.forEach {pointError-> errorReasonCodes.add(pointError.code) } + val saveGrayContrailErrorReasons = SaveGrayContrailErrorReasons( it, gcj02.longitude, @@ -77,6 +79,8 @@ class ReportErrorPointViewModel : ViewModel() { wgs84.longitude, wgs84.latitude, occurrenceTime, + LoginStatusManager.getOchCarInfo()?.plateNumber?:"", + LoginStatusManager.getOchLoginInfo()?.driverId?:0L, errorReasonCodes ) RoutingServiceManager.saveDotDetail( diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectModel.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectModel.kt index af82ad5951..29018ea77a 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectModel.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectModel.kt @@ -17,7 +17,7 @@ import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.data.bean.BusStationBean import com.mogo.och.data.bean.LineInfo -import com.mogo.och.biz.routing.ui.runing.taxi.routingrunning.RoutingRunningModel +import com.mogo.och.biz.routing.ui.runing.taxi.RoutingRunningModel import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager /** diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/routingrunning/RoutingRunningModel.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/RoutingRunningModel.kt similarity index 99% rename from OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/routingrunning/RoutingRunningModel.kt rename to OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/RoutingRunningModel.kt index b582ec5169..c61abb90d1 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/routingrunning/RoutingRunningModel.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/RoutingRunningModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.biz.routing.ui.runing.taxi.routingrunning +package com.mogo.och.biz.routing.ui.runing.taxi import androidx.lifecycle.ViewModel import com.mogo.commons.AbsMogoApplication diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/routingrunning/RoutingRunningView.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/RoutingRunningView.kt similarity index 99% rename from OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/routingrunning/RoutingRunningView.kt rename to OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/RoutingRunningView.kt index 4e68e5a147..b6ed435e33 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/routingrunning/RoutingRunningView.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/RoutingRunningView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.biz.routing.ui.runing.taxi.routingrunning +package com.mogo.och.biz.routing.ui.runing.taxi import android.content.Context import android.util.AttributeSet diff --git a/OCH/common/biz/src/main/res/routing/layout/biz_taxi_switch.xml b/OCH/common/biz/src/main/res/routing/layout/biz_taxi_switch.xml index e400baada2..3585ef935e 100644 --- a/OCH/common/biz/src/main/res/routing/layout/biz_taxi_switch.xml +++ b/OCH/common/biz/src/main/res/routing/layout/biz_taxi_switch.xml @@ -15,7 +15,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> -