From 30e4c5a6b9f62fbe77d44548cfc30028b65082e0 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 23 Mar 2022 18:19:24 +0800 Subject: [PATCH] fix problem of logger tag and fix bug of delay which chain log cause --- app/build.gradle | 12 +++--- .../java/com/mogo/map/AMapViewWrapper.java | 16 ++++---- .../SnapshotLocationDataCenter.java | 39 ++++++++++--------- 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 441eafb4a9..050d2d0e2c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,12 +15,12 @@ if (!isAndroidTestBuild()) { logLevel "DEBUG" } } -if (!isAndroidTestBuild()) { - apply plugin: 'chain.log.hook' - hooklog{ - enableLoggerToServer true - } -} +//if (!isAndroidTestBuild()) { +// apply plugin: 'chain.log.hook' +// hooklog{ +// enableLoggerToServer true +// } +//} //if (!isAndroidTestBuild()) { // apply plugin: 'apm-plugin' diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index d1418ba2e1..83f40c4775 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -177,10 +177,10 @@ public class AMapViewWrapper implements IMogoMapView, public void onRoadIdInfo(@androidx.annotation.Nullable String roadId) { if (roadId != null && !TextUtils.isEmpty(roadId)) { - CallerLogger.INSTANCE.d(M_DEVA + TAG, "onRoadIdInfo::" + roadId); + CallerLogger.INSTANCE.d(TAG, "onRoadIdInfo::" + roadId); CallerMapRoadListenerManager.INSTANCE.invokeListenersOnRoadIdGet(roadId); } else { - CallerLogger.INSTANCE.d("${M_DEVA}${TAG}", "onRoadIdInfo::null"); + CallerLogger.INSTANCE.d(TAG, "onRoadIdInfo::null"); } } @@ -198,27 +198,27 @@ public class AMapViewWrapper implements IMogoMapView, * } */ String provider = carLoc.getProvider(); - CallerLogger.INSTANCE.d(M_DEVA + TAG, "car_loc: " + carLoc + ""); + CallerLogger.INSTANCE.d(TAG, "car_loc: " + carLoc + ""); if (!MapAutoApi.GPS_FLAG.equals(provider)) { - CallerLogger.INSTANCE.d(M_DEVA + TAG, "convert before: car_loc: {lon: " + carLoc.getLongitude() + ", lat: " + carLoc.getLatitude() + "}"); + CallerLogger.INSTANCE.d(TAG, "convert before: car_loc: {lon: " + carLoc.getLongitude() + ", lat: " + carLoc.getLatitude() + "}"); LonLatPoint p = new LonLatPoint(carLoc.getLongitude(), carLoc.getLatitude()); p = MapTools.INSTANCE.switchLonLatWGS84(p); carLoc.setLongitude(p.longitude); carLoc.setLatitude(p.latitude); - CallerLogger.INSTANCE.d(M_DEVA + TAG, "convert after: car_loc: {lon: " + carLoc.getLongitude() + ", lat: " + carLoc.getLatitude() + "}"); + CallerLogger.INSTANCE.d(TAG, "convert after: car_loc: {lon: " + carLoc.getLongitude() + ", lat: " + carLoc.getLatitude() + "}"); } - CallerLogger.INSTANCE.d(M_DEVA + TAG, "onStopLineInfo:stop_line" + stopLine + ", car_loc:{lon: " + carLoc.getLatitude() + ", lat: " + carLoc.getLongitude() + "}"); + CallerLogger.INSTANCE.d(TAG, "onStopLineInfo:stop_line" + stopLine + ", car_loc:{lon: " + carLoc.getLatitude() + ", lat: " + carLoc.getLongitude() + "}"); MapRoadInfo.StopLine stopInfo = convert(stopLine); LonLatPoint p1 = points.get(0); LonLatPoint p2 = points.get(points.size() - 1); double distanceOfCarToStopLine = MapDataApi.INSTANCE.getNearstFromPointToSegment(carLoc.getLongitude(), carLoc.getLatitude(), p1.longitude, p1.latitude, p2.longitude, p2.latitude) * 10_0000; stopInfo.setDistanceOfCarToStopLine(distanceOfCarToStopLine); - CallerLogger.INSTANCE.d(M_DEVA + TAG, "onStopLineInfo: --- distance: "+ distanceOfCarToStopLine); + CallerLogger.INSTANCE.d(TAG, "onStopLineInfo: --- distance: "+ distanceOfCarToStopLine); CallerMapRoadListenerManager.INSTANCE.invokeListenersOnStopLineGet(stopInfo); } } else { if (carLoc != null) { - CallerLogger.INSTANCE.d(M_DEVA + TAG, "onStopLineInfo::null, car_loc:{lon: " + carLoc.getLatitude() + ", lat: " + carLoc.getLongitude() + "}"); + CallerLogger.INSTANCE.d(TAG, "onStopLineInfo::null, car_loc:{lon: " + carLoc.getLatitude() + ", lat: " + carLoc.getLongitude() + "}"); } } } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java index 73872605f5..82d10e590d 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java @@ -87,6 +87,10 @@ public class SnapshotLocationDataCenter { } private void realSync(double lon, double lat, double alt, double heading, double speed, long satelliteTime, long systemTime) { + + DebugConfig.setStatusData(DebugConfig.sLon, lon); + DebugConfig.setStatusData(DebugConfig.sLat, lat); + // 使用与渠道配置一样的gps提供者提供的数据,app/productFlavors/fPadLenovo.gradle GPS_PROVIDER 0-Android系统，1-工控机，2-OBU AutopilotStatusInfo autopilotStatusInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo(); autopilotStatusInfo.setLocationLat(lat); @@ -95,26 +99,23 @@ public class SnapshotLocationDataCenter { autopilotStatusInfo.setLocationStatus(true); CallerAutoPilotStatusListenerManager.INSTANCE.invokeAutoPilotStatus(); - DebugConfig.setStatusData(DebugConfig.sLon, lon); - DebugConfig.setStatusData(DebugConfig.sLat, lat); - // 使用与渠道配置一样的gps提供者提供的数据 - if (gpsProvider == FunctionBuildConfig.gpsProvider) { - CloudLocationInfo cloudLocationInfo = new CloudLocationInfo(); - cloudLocationInfo.setAlt(alt); - cloudLocationInfo.setHeading(heading); - cloudLocationInfo.setLat(lat); - cloudLocationInfo.setLon(lon); - cloudLocationInfo.setSpeed(speed); - cloudLocationInfo.setSatelliteTime(satelliteTime); - cloudLocationInfo.setSystemTime(systemTime); - cloudLocationInfo.setTileId(String.valueOf(MogoMapUIController.getInstance().getTileId(lon, lat))); - mMachineCacheList.add(cloudLocationInfo); - - mCurLon = cloudLocationInfo.getLon(); - mCurLat = cloudLocationInfo.getLat(); - mSatelliteTime = cloudLocationInfo.getSatelliteTime(); - } +// if (gpsProvider == FunctionBuildConfig.gpsProvider) { +// CloudLocationInfo cloudLocationInfo = new CloudLocationInfo(); +// cloudLocationInfo.setAlt(alt); +// cloudLocationInfo.setHeading(heading); +// cloudLocationInfo.setLat(lat); +// cloudLocationInfo.setLon(lon); +// cloudLocationInfo.setSpeed(speed); +// cloudLocationInfo.setSatelliteTime(satelliteTime); +// cloudLocationInfo.setSystemTime(systemTime); +// cloudLocationInfo.setTileId(String.valueOf(MogoMapUIController.getInstance().getTileId(lon, lat))); +// mMachineCacheList.add(cloudLocationInfo); +// +// mCurLon = cloudLocationInfo.getLon(); +// mCurLat = cloudLocationInfo.getLat(); +// mSatelliteTime = cloudLocationInfo.getSatelliteTime(); +// } } public double getCurLon() {