From 53172adfae14048260e7bf114ca7a5918b00ffc9 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 14 Sep 2022 17:52:46 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"[=E7=8A=B6=E6=80=81=E6=A0=8F]?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=E8=BF=BD=E8=B8=AA=E5=BE=AA?= =?UTF-8?q?=E8=BF=B9=E7=8A=B6=E6=80=81=E5=BB=B6=E6=97=B6=E6=9B=B4=E6=96=B0?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 39593df4580790577b5b5fff0a52a4cc7fc8d1f1. --- .../java/com/mogo/och/bus/model/BusOrderModel.java | 2 -- .../main/java/com/mogo/och/taxi/model/TaxiModel.java | 1 - .../core/function/autopilot/MoGoAutopilotProvider.kt | 3 +-- .../status/flow/IFlow.kt | 12 +----------- .../status/flow/trace/TracingImpl.kt | 3 --- .../status/ui/StatusView.kt | 6 +----- .../call/autopilot/CallerAutoPilotManager.kt | 2 -- 7 files changed, 3 insertions(+), 26 deletions(-) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java index a34ae5cc83..54e2773b9e 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java @@ -488,7 +488,6 @@ public class BusOrderModel { CallerLogger.INSTANCE.d( M_BUS + TAG, "单程真的结束了====" ); isGoingToNextStation = false; backgroundCurrentStationIndex = 0; - Logger.d("TracingImpl", "BusOrderModel -- cancelAutoPilot -- 1 ---"); CallerAutoPilotManager.INSTANCE.cancelAutoPilot(); queryBusRoutes(); } @@ -925,7 +924,6 @@ public class BusOrderModel { return; } CallerLogger.INSTANCE.d( M_BUS + TAG, "单程结束====" ); - Logger.d("TracingImpl", "BusOrderModel -- cancelAutoPilot -- 2 ---"); CallerAutoPilotManager.INSTANCE.cancelAutoPilot(); AIAssist.getInstance( mContext ).speakTTSVoice( "感谢您体验'蘑菇车联'无人驾驶小巴车，请您携带好随身物品，我们下次再见" ); leaveStation(true,true); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index f375864929..873e27282b 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -956,7 +956,6 @@ public class TaxiModel { //结束自动驾驶 public void cancelAutopilot() { try { - Logger.d("TracingImpl", "TaxiModel -- cancelAutoPilot ---"); CallerAutoPilotManager.INSTANCE.cancelAutoPilot(); CallerLogger.INSTANCE.d(M_TAXI + TAG, "结束自动驾驶"); } catch (Exception e) { 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 4cf38162c1..a95120b060 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 @@ -33,7 +33,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListe import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils -import com.mogo.eagle.core.utilcode.mogo.logger.* +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ADAS_IMPL import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.util.ThreadUtils @@ -307,7 +307,6 @@ class MoGoAutopilotProvider : } override fun cancelAutoPilot() { - Logger.d("TracingImpl", "provider -- cancelAutoPilot ---") if (AdasManager.getInstance().ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.CONNECTED) { AdasManager.getInstance().sendAutoPilotModeReq(0, 1, null) } else { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/IFlow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/IFlow.kt index 18d2506227..93ed3adf10 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/IFlow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/IFlow.kt @@ -4,11 +4,7 @@ import android.content.* import android.util.* import androidx.annotation.* import com.mogo.eagle.core.utilcode.kotlin.* -import com.mogo.eagle.core.utilcode.mogo.logger.* -import com.zhjt.mogo_core_function_devatools.status.entity.* -import com.zhjt.mogo_core_function_devatools.status.flow.trace.* -import com.zhjt.mogo_core_function_devatools.status.flow.trace.TracingImpl -import com.zhjt.mogo_core_function_devatools.status.flow.trace.TracingImpl.Companion +import com.zhjt.mogo_core_function_devatools.status.entity.Status import kotlinx.coroutines.* import kotlinx.coroutines.channels.* import kotlinx.coroutines.channels.Channel.Factory.CONFLATED @@ -39,15 +35,9 @@ internal abstract class IFlow< T : Status>(val ctx: Context) : CoroutineScope { } fun send(t: T) { - if (t is TracingStatus) { - Logger.d(TracingImpl.TAG, "send -- 1 -- state: $t") - } if (old == t) { return } - if (t is TracingStatus) { - Logger.d(TracingImpl.TAG, "send -- 2 -- state: $t") - } old = t launch { chl.send(t) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/trace/TracingImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/trace/TracingImpl.kt index f36ab1dc23..e50518423c 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/trace/TracingImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/trace/TracingImpl.kt @@ -5,7 +5,6 @@ import android.util.* import com.mogo.eagle.core.data.autopilot.* import com.mogo.eagle.core.function.api.autopilot.* import com.mogo.eagle.core.function.call.autopilot.* -import com.mogo.eagle.core.utilcode.mogo.logger.* import com.zhjt.mogo_core_function_devatools.status.entity.* import com.zhjt.mogo_core_function_devatools.status.entity.TracingStatus.Tracing.* import com.zhjt.mogo_core_function_devatools.status.flow.* @@ -30,7 +29,6 @@ internal class TracingImpl(ctx: Context): IFlow(ctx), IMoGoAutopi override fun onAutopilotGuardian(guardianInfo: MogoReportMessage?) { super.onAutopilotGuardian(guardianInfo) - Logger.d(TAG, "onAutopilotGuardian -- code: ${guardianInfo?.code}") val current = guardianInfo?.code val newState = current?.toState() if (newState != null && newState != old) { @@ -48,7 +46,6 @@ internal class TracingImpl(ctx: Context): IFlow(ctx), IMoGoAutopi override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) { super.onAutopilotStatusResponse(autoPilotStatusInfo) - Logger.d(TAG, "onAutopilotStatusResponse -- state: ${autoPilotStatusInfo.state}") if (autoPilotStatusInfo.state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) { send(TracingStatus(UNKNOWN)) return diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt index de2be79162..1eebcf28e9 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt @@ -13,12 +13,9 @@ import androidx.core.content.* import androidx.lifecycle.* import androidx.recyclerview.widget.* import com.mogo.eagle.core.utilcode.kotlin.* -import com.mogo.eagle.core.utilcode.mogo.logger.* import com.mogo.eagle.core.utilcode.rv.divider.* import com.zhjt.mogo_core_function_devatools.R -import com.zhjt.mogo_core_function_devatools.status.entity.* -import com.zhjt.mogo_core_function_devatools.status.flow.trace.* -import com.zhjt.mogo_core_function_devatools.status.flow.trace.TracingImpl +import com.zhjt.mogo_core_function_devatools.status.entity.Status import com.zhjt.mogo_core_function_devatools.status.model.StatusModel import com.zhjt.mogo_core_function_devatools.status.ui.adapter.StatusAdapter import com.zhjt.mogo_core_function_devatools.status.ui.diff.StatusDiffCallback @@ -84,7 +81,6 @@ internal class StatusView(private val model: StatusModel, ctx: Context): Constra val old = adapter.data val result = DiffUtil.calculateDiff(StatusDiffCallback(old, data.second)) adapter.data = data.second - Logger.d("TracingImpl", "old: ${old.find { it is TracingStatus }} => new: ${data.second.find { it is TracingStatus }}") result.dispatchUpdatesTo(adapter) }.also { observer = it }) } diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt index 94729a94da..c2bbe23556 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt @@ -10,7 +10,6 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LO import com.mogo.eagle.core.data.trafficlight.TrafficLightResult import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotProvider import com.mogo.eagle.core.function.call.base.CallerBase -import com.mogo.eagle.core.utilcode.mogo.logger.* import com.zhjt.service.chain.ChainLog import com.zhjt.service.chain.TracingConstants import kotlin.random.Random @@ -84,7 +83,6 @@ object CallerAutoPilotManager { * 结束自动驾驶 */ fun cancelAutoPilot() { - Logger.d("TracingImpl", "manager -- cancelAutoPilot ---") providerApi?.cancelAutoPilot() }