From a676ea93c90f9722f552b6f3ab7de2d1d297208b Mon Sep 17 00:00:00 2001 From: pangfan Date: Mon, 31 Oct 2022 14:23:20 +0800 Subject: [PATCH] =?UTF-8?q?opt:merge=20conflict=20resolved(=E6=B8=85?= =?UTF-8?q?=E6=89=AB=E8=BD=A6=E5=8F=B8=E6=9C=BA=E7=AB=AFapp=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=BC=95=E5=85=A5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/sweeper/model/SweeperOrderModel.java | 11 ----------- .../core/function/autopilot/MoGoAutopilotProvider.kt | 1 + 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java index e5c1505746..acf237e086 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java @@ -1,8 +1,5 @@ package com.mogo.och.sweeper.model; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_OCH_BUS_START_AUTOPILOT; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_ADAS; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS; import static com.mogo.och.sweeper.constant.SweeperConst.STATION_STATUS_STOPPED; @@ -440,14 +437,6 @@ public class SweeperOrderModel { * 服务端返回的OchBusRoutesResult逻辑， 离开站为当前站， 到达下一站后才会将下一站置为当前站， * 车机端展示是离开当前站，下一站设置为当前站， 所以服务端数据回来要做处理，不能直接渲染 */ - @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, - linkCode = CHAIN_LINK_ADAS, - endpoint = TracingConstants.Endpoint.PAD, - nodeAliasCode = CHAIN_ALIAS_CODE_OCH_BUS_START_AUTOPILOT, - paramIndexes = {0}, - clientPkFileName = "sn" - ) private void leaveStationSuccess(SweeperRoutesResult result, boolean isRestart) { renderBusStationsStatus(result); if (slidePannelHideCallback != null) { diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt index 5fc8dffe6f..f0105aea24 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt @@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.autopilot import android.Manifest.permission import android.content.Context +import android.util.Log import androidx.annotation.RequiresPermission import chassis.SpecialVehicleTaskCmdOuterClass import com.alibaba.android.arouter.facade.annotation.Route