diff --git a/.idea/misc.xml b/.idea/misc.xml index 733acb1920..09cc32c567 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 316ead6831..c696662939 100644 --- a/gradle.properties +++ b/gradle.properties @@ -189,3 +189,4 @@ applicationId=com.mogo.launcer applicationName=IntelligentPilot versionCode=80007 versionName=8.0.7 +MAP_SDK_VERSION=1.0.0-vr-8.5.50 diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java index 4078d928d4..2949366344 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java @@ -1,5 +1,7 @@ package com.mogo.module.adas; +import android.os.RemoteException; + import com.google.gson.Gson; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.data.BaseData; @@ -318,4 +320,6 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL } return adasAIDLAutopilotStateModel; } + + } diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AutonomousDriveStatusBean.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AutonomousDriveStatusBean.java new file mode 100644 index 0000000000..686ae78eb0 --- /dev/null +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AutonomousDriveStatusBean.java @@ -0,0 +1,41 @@ +package com.mogo.module.adas; + +/** + * Created by XuYong on 2021/5/28 16:12 + */ +public class AutonomousDriveStatusBean { + + private String sn; + private int status; + private float vehicleSpeed; + + public AutonomousDriveStatusBean(String sn, int status, float vehicleSpeed) { + this.sn = sn; + this.status = status; + this.vehicleSpeed = vehicleSpeed; + } + + public String getSn() { + return sn; + } + + public void setSn(String sn) { + this.sn = sn; + } + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + public float getVehicleSpeed() { + return vehicleSpeed; + } + + public void setVehicleSpeed(float vehicleSpeed) { + this.vehicleSpeed = vehicleSpeed; + } +} diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/ReportSiteBean.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/ReportSiteBean.java new file mode 100644 index 0000000000..76677e00ba --- /dev/null +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/ReportSiteBean.java @@ -0,0 +1,40 @@ +package com.mogo.module.adas; + +/** + * Created by XuYong on 2021/5/31 16:24 + */ +public class ReportSiteBean { + private String sn; + private double lon; + private double lat; + + public ReportSiteBean(String sn, double lon, double lat) { + this.sn = sn; + this.lon = lon; + this.lat = lat; + } + + public String getSn() { + return sn; + } + + public void setSn(String sn) { + this.sn = sn; + } + + public double getLon() { + return lon; + } + + public void setLon(double lon) { + this.lon = lon; + } + + public double getLat() { + return lat; + } + + public void setLat(double lat) { + this.lat = lat; + } +} diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_daolujiebing.n3d b/modules/mogo-module-common/src/main/res/raw/v2x_daolujiebing.n3d index 83c372fbb7..28ec706964 100644 Binary files a/modules/mogo-module-common/src/main/res/raw/v2x_daolujiebing.n3d and b/modules/mogo-module-common/src/main/res/raw/v2x_daolujiebing.n3d differ diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_daolujishui.n3d b/modules/mogo-module-common/src/main/res/raw/v2x_daolujishui.n3d index f862aea7f9..b3ea96ca56 100644 Binary files a/modules/mogo-module-common/src/main/res/raw/v2x_daolujishui.n3d and b/modules/mogo-module-common/src/main/res/raw/v2x_daolujishui.n3d differ diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_daolushigong.n3d b/modules/mogo-module-common/src/main/res/raw/v2x_daolushigong.n3d index b170c54e13..c0d184a796 100644 Binary files a/modules/mogo-module-common/src/main/res/raw/v2x_daolushigong.n3d and b/modules/mogo-module-common/src/main/res/raw/v2x_daolushigong.n3d differ diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_guzhangqiuzhu.n3d b/modules/mogo-module-common/src/main/res/raw/v2x_guzhangqiuzhu.n3d index 1b6ba3b1bf..c4eb8adc11 100644 Binary files a/modules/mogo-module-common/src/main/res/raw/v2x_guzhangqiuzhu.n3d and b/modules/mogo-module-common/src/main/res/raw/v2x_guzhangqiuzhu.n3d differ diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_jiaotongjiancha.n3d b/modules/mogo-module-common/src/main/res/raw/v2x_jiaotongjiancha.n3d index 0e87e83424..c6d86bd772 100644 Binary files a/modules/mogo-module-common/src/main/res/raw/v2x_jiaotongjiancha.n3d and b/modules/mogo-module-common/src/main/res/raw/v2x_jiaotongjiancha.n3d differ diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_nongwu.n3d b/modules/mogo-module-common/src/main/res/raw/v2x_nongwu.n3d index 1203a0bdb6..5cce461ce7 100644 Binary files a/modules/mogo-module-common/src/main/res/raw/v2x_nongwu.n3d and b/modules/mogo-module-common/src/main/res/raw/v2x_nongwu.n3d differ diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_shigu.n3d b/modules/mogo-module-common/src/main/res/raw/v2x_shigu.n3d index 4c3dc1d3ef..26aea8f852 100644 Binary files a/modules/mogo-module-common/src/main/res/raw/v2x_shigu.n3d and b/modules/mogo-module-common/src/main/res/raw/v2x_shigu.n3d differ diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_shishilukuang.n3d b/modules/mogo-module-common/src/main/res/raw/v2x_shishilukuang.n3d index fe98148426..b6dc6a1143 100644 Binary files a/modules/mogo-module-common/src/main/res/raw/v2x_shishilukuang.n3d and b/modules/mogo-module-common/src/main/res/raw/v2x_shishilukuang.n3d differ diff --git a/modules/mogo-module-common/src/main/res/raw/v2x_yongdu.n3d b/modules/mogo-module-common/src/main/res/raw/v2x_yongdu.n3d index 978407d06e..a193a302e5 100644 Binary files a/modules/mogo-module-common/src/main/res/raw/v2x_yongdu.n3d and b/modules/mogo-module-common/src/main/res/raw/v2x_yongdu.n3d differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_obu_traffic_light.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_obu_traffic_light.png index 38dc68d539..81a5f5eee8 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_obu_traffic_light.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_obu_traffic_light.png differ