From 7b5adcf47080d655b0c867a8d97f28f12c0302ec Mon Sep 17 00:00:00 2001 From: EmArrow Date: Thu, 22 Aug 2024 14:08:56 +0800 Subject: [PATCH] [6.6.0] replace logger --- .../passenger/model/BusPassengerModel.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java index 20d41fbdc6..418ebab629 100644 --- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java @@ -19,7 +19,7 @@ import com.mogo.commons.module.intent.IMogoIntentListener; import com.mogo.commons.module.intent.IntentManager; import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener; import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant; import com.mogo.eagle.core.utilcode.util.GsonUtils; import com.mogo.eagle.core.utilcode.util.StringUtils; @@ -46,7 +46,6 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener; -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.NetworkUtils; import com.mogo.och.shuttle.passenger.bean.response.PassengerOperationStatusResponse; import com.mogo.och.shuttle.passenger.bean.response.PassengerRoutesResponse; @@ -254,7 +253,7 @@ public class BusPassengerModel { for (int i = 0; i< stations.size(); i++){ BusStationBean station = stations.get(i); if (station.getDrivingStatus() == STATION_STATUS_STOPPED && station.isLeaving() && i+1 < stations.size()){ - Logger.d(M_BUS_P + TAG, "order = station= leave"); + CallerLogger.d(M_BUS_P + TAG, "order = station= leave"); isGoingToNextStation = true; mRouteLineInfoCallback.updateStationsInfo(stations,i+1,false); mNextStationIndex = i+1; @@ -268,7 +267,7 @@ public class BusPassengerModel { } isGoingToNextStation = false; - Logger.d(M_BUS_P + TAG, "order = station= arrive"); + CallerLogger.d(M_BUS_P + TAG, "order = station= arrive"); mRouteLineInfoCallback.updateStationsInfo(stations,i,true); return; } @@ -377,7 +376,7 @@ public class BusPassengerModel { @Override public void onReceivedServerSn(@Nullable String sn) { - Logger.d(SceneConstant.M_BUS_P + TAG, "司机屏sn:"+sn ); + CallerLogger.d(SceneConstant.M_BUS_P + TAG, "司机屏sn:"+sn ); } @Override @@ -385,7 +384,7 @@ public class BusPassengerModel { if (OchCommonConst.BUSINESS_STRING == type) { BaseDPMsg baseMsg = GsonUtils.fromJson(new String(byteArray), BaseDPMsg.class); - Logger.d(SceneConstant.M_BUS_P + TAG, "onReceivedMsg = " + GsonUtils.toJson(baseMsg)); + CallerLogger.d(SceneConstant.M_BUS_P + TAG, "onReceivedMsg = " + GsonUtils.toJson(baseMsg)); if (baseMsg != null && baseMsg.getType() == DPMsgType.TYPE_COMMON.getType()) { AppConnectMsg msg = GsonUtils.fromJson(new String(byteArray), AppConnectMsg.class); @@ -397,7 +396,7 @@ public class BusPassengerModel { } else if (baseMsg != null && baseMsg.getType() == DPMsgType.TYPE_TASK_DETAILS.getType()) { TaskDetailsMsg msg = GsonUtils.fromJson(new String(byteArray), TaskDetailsMsg.class); - Logger.d(SceneConstant.M_BUS_P + TAG, "onReceivedMsg = " + GsonUtils.toJson(msg)); + CallerLogger.d(SceneConstant.M_BUS_P + TAG, "onReceivedMsg = " + GsonUtils.toJson(msg)); if (msg == null || msg.getMsg().isEmpty()) { clearLocalRouteResult(); return; @@ -450,7 +449,7 @@ public class BusPassengerModel { if (FunctionBuildConfig.isDemoMode && mNextStationIndex>= 0 && mNextStationIndex <= mStations.size() - 1 && isGoingToNextStation){ - Logger.d(M_BUS_P + TAG, "FunctionBuildConfig.isDemoMode is true"); + CallerLogger.d(M_BUS_P + TAG, "FunctionBuildConfig.isDemoMode is true"); return; }