diff --git a/config.gradle b/config.gradle index 4fca06b628..52674386cc 100644 --- a/config.gradle +++ b/config.gradle @@ -157,7 +157,7 @@ ext { gpssimulatordebug : "com.mogo.module:module-gps-simulator-debug:${MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION}", gpssimulatornoop : "com.mogo.module:module-gps-simulator-noop:${MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION}", - adasapi : "com.zhidao.autopilot.support:adas:1.0.6.13", + adasapi : "com.zhidao.autopilot.support:adas:1.0.6.14", adasconfigapi : "com.zhidao.adasconfig:adasconfig:1.1.5.2", // 个人中心的SDK diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 3278b1c35b..80df45ac0c 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.3.0' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.3.1' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java index dee9ee8373..a1f78667bd 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java @@ -1001,6 +1001,7 @@ public class AMapViewWrapper implements IMogoMapView, double speed = data.optDouble("speed", -1); long systemTime = data.optLong("systemTime"); long receiverDataTime = data.optLong("receiverDataTime"); + long adasSatelliteTime = data.optLong("adasSatelliteTime"); if (lon == -1) { return; } @@ -1012,6 +1013,7 @@ public class AMapViewWrapper implements IMogoMapView, bean.setHeading(heading); bean.setAcceleration(acceleration); bean.setAlt(alt); + bean.setAdasSatelliteTime( adasSatelliteTime ); bean.setLon(lon); bean.setGnss_speed(((float) speed)); bean.setLat(lat); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index 162163db72..582ef910b7 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -972,17 +972,22 @@ public class MogoServices implements IMogoMapListener, data.putOpt( "acceleration", stateInfo.getValues().getAcceleration() ); data.putOpt( "yawRate", stateInfo.getValues().getYaw_rate() ); try { - data.putOpt( "systemTime", Long.valueOf( stateInfo.getValues().getSystemTime() ) ); + data.putOpt( "systemTime", Long.parseLong( stateInfo.getValues().getSystemTime() ) ); } catch ( Exception e ) { e.printStackTrace(); } try { - data.putOpt( "satelliteTime", Long.valueOf( stateInfo.getValues().getSatelliteTime() ) ); + data.putOpt( "satelliteTime", Long.parseLong( stateInfo.getValues().getSatelliteTime() ) ); } catch ( Exception e ) { e.printStackTrace(); } try { - data.putOpt( "receiverDataTime", Long.valueOf( stateInfo.getValues().getReceiverDataTime() ) ); + data.putOpt( "receiverDataTime", Long.parseLong( stateInfo.getValues().getReceiverDataTime() ) ); + } catch ( Exception e ) { + e.printStackTrace(); + } + try { + data.putOpt( "adasSatelliteTime", Long.parseLong( stateInfo.getValues().getAdasSatelliteTime() ) ); } catch ( Exception e ) { e.printStackTrace(); } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/ADASCarStateInfo.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/ADASCarStateInfo.java index df7579a01e..bf1810ba71 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/ADASCarStateInfo.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/ADASCarStateInfo.java @@ -60,6 +60,15 @@ public class ADASCarStateInfo implements Serializable { private String receiverDataTime; // udp收到数据的时间 private String startReceiverDataTime; + private String adasSatelliteTime; + + public String getAdasSatelliteTime() { + return adasSatelliteTime; + } + + public void setAdasSatelliteTime( String adasSatelliteTime ) { + this.adasSatelliteTime = adasSatelliteTime; + } public String getStartReceiverDataTime() { return startReceiverDataTime;