diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java index 6e3225295c..6fe456a84c 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java @@ -8,6 +8,7 @@ import android.telephony.TelephonyManager; import android.telephony.cdma.CdmaCellLocation; import android.telephony.gsm.GsmCellLocation; +import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.utils.DeviceIdUtils; @@ -64,10 +65,14 @@ public class Utils { public static final String PROPERTIES = "android.os.SystemProperties"; public static String getSn() { - if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE ) { - return DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp()); - } - return getSystemProperties( GSM_SERIAL ); + return "X2020210526D3DC7BA891CE2D76"; +// if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE ) { +// return DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp()); +// } +// if(DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO){ +// return MoGoAiCloudClientConfig.getInstance().getSn(); +// } +// return getSystemProperties( GSM_SERIAL ); } public static String getFotaVersion() { diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index d91b1cb832..2c3ee4aa9a 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.5.29' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.32' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' } diff --git a/libraries/map-custom/map-version-update b/libraries/map-custom/map-version-update index 8ef85c8c99..796687b4c9 100644 --- a/libraries/map-custom/map-version-update +++ b/libraries/map-custom/map-version-update @@ -47,4 +47,11 @@ mapAutoView.setOnMapViewVisualAngleChangeListener 8.5.29 添加了3D锚点动画 近远景切换，会导致车道线渲染不全 -修改地图移动方法 \ No newline at end of file +修改地图移动方法 + +8.5.31 +修改近景切换 +添加自动开启定位开关 +修改桥模型 + +8.5.32 diff --git a/modules/mogo-module-adas/build.gradle b/modules/mogo-module-adas/build.gradle index 4b60ecbe31..d676eba886 100644 --- a/modules/mogo-module-adas/build.gradle +++ b/modules/mogo-module-adas/build.gradle @@ -45,7 +45,7 @@ dependencies { // 现有的ADAS的通讯SDK，需要将里面的东西融合到我们项目中 compileOnly rootProject.ext.dependencies.adasapi - api "com.zhidao.support.adas:high:1.1.9.0" + api "com.zhidao.support.adas:high:1.1.9.1" annotationProcessor rootProject.ext.dependencies.aroutercompiler if (Boolean.valueOf(RELEASE)) { 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 483a5eea8d..c8b768b081 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 @@ -26,10 +26,10 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL private final String TAG = "AdasEventManager"; - private Gson gson; + private final Gson gson; - private ArrayList iAdasEventListeners; - private ArrayList iAdasStatusListeners; + private final ArrayList iAdasEventListeners = new ArrayList<>(); + private final ArrayList iAdasStatusListeners = new ArrayList<>(); public AdasEventManager() { gson = GsonUtil.getGson(); @@ -37,31 +37,31 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL public void addEventListener(AdasDataListener listener) { Logger.d(TAG,"添加adas事件监听"); - if (iAdasEventListeners == null) { - iAdasEventListeners = new ArrayList(); + if(iAdasEventListeners.contains(listener)){ + return; } iAdasEventListeners.add(listener); } public void removeEventListener(AdasDataListener listener) { Logger.d(TAG,"注销adas事件监听"); - if (iAdasEventListeners != null && iAdasEventListeners.contains(listener)) { + if (iAdasEventListeners != null) { iAdasEventListeners.remove(listener); } } public void addStatusListener(AdasStatusListener listener) { Logger.d(TAG,"添加adas状态事件监听"); - if (iAdasStatusListeners == null) { - iAdasStatusListeners = new ArrayList(); + if(iAdasStatusListeners.contains(listener)){ + return; } iAdasStatusListeners.add(listener); } public void removeStatusListener(AdasStatusListener listener) { Logger.d(TAG,"注销adas状态事件监听"); - if (iAdasEventListeners != null && iAdasEventListeners.contains(listener)) { - iAdasEventListeners.remove(listener); + if (iAdasStatusListeners != null) { + iAdasStatusListeners.remove(listener); } } @@ -186,13 +186,24 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL } } + @Override + public void onAutopilotRoute(String route) { + + } + @Override public void onWebSocketConnectSuccess() { - Logger.d(TAG,"websocket连接成功"); + Logger.d(TAG,"webSocket 连接成功"); + for (AdasStatusListener listener :iAdasStatusListeners) { + listener.onServiceConnected(); + } } @Override public void onWebSocketConnectFailed() { - Logger.d(TAG,"websocket连接失败"); + Logger.d(TAG,"webSocket 连接失败"); + for (AdasStatusListener listener :iAdasStatusListeners) { + listener.onServiceDisconnected(); + } } } diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java index 96e9e280a1..4db28d6873 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java @@ -18,7 +18,7 @@ import com.zhidao.support.adas.high.AdasManager; */ @Route(path = MogoServicePaths.PATH_ADAS) public class AdasProvider implements IProvider { - private final String TAG = "AdasProvider"; + private static final String TAG = "AdasProvider"; private AdasEventManager adasEventManager; @Override @@ -43,7 +43,7 @@ public class AdasProvider implements IProvider { adasEventManager.removeEventListener(listener); } - public void addAdaStatusListener(AdasStatusListener listener) { + public void addAdasStatusListener(AdasStatusListener listener) { adasEventManager.addStatusListener(listener); } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java index 25c7223016..5368014d73 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java @@ -80,7 +80,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer { } List allDatumsList = new ArrayList<>(); - prepareData(resultList, allDatumsList); +// prepareData(resultList, allDatumsList); Map newAdasRecognizedMarkersCaches = new ConcurrentHashMap<>(); List newDiffSet = new ArrayList<>(); @@ -159,7 +159,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer { * @param out */ private void prepareData(List in, List out) { - foreCastPoint(in); +// foreCastPoint(in); out.addAll(in); } @@ -179,7 +179,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer { Log.d(FORECAST, "time internal less than 0 , uuid : " + adasResult.uuid); continue; } - long startTime = System.nanoTime(); + long startTime = System.currentTimeMillis(); // 预测点 Log.d(FORECAST, "time internal : " + internal + " speed : " + adasResult.speed); double foreCastDistance = adasResult.speed * internal / 1000; @@ -191,7 +191,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer { float distanceFromSelf = CoordinateUtils.calculateLineDistance(getCurCoordinates()[0], getCurCoordinates()[1] , foreCastMogoLatLon.getLon(), foreCastMogoLatLon.getLat()); - long foreCastInternal = System.nanoTime() - startTime; + long foreCastInternal = System.currentTimeMillis() - startTime; Log.d(FORECAST, "foreCastInternal :" + foreCastInternal); //todo 看是否耗时，增加的时间需要从当前SNTP时间减去 adasResult.lat = foreCastMogoLatLon.getLat(); diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java index d4027235c3..5e36dcf97d 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java @@ -380,7 +380,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic Log.d(FORECAST, "time internal less than 0 , uuid : " + proto.getUuid()); continue; } - long startTime = System.nanoTime(); + long startTime = System.currentTimeMillis(); // 预测点 Log.d(FORECAST, "time internal : " + internal + " speed : " + proto.getSpeed()); double foreCastDistance = proto.getSpeed() * internal / 1000; @@ -392,7 +392,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic float distanceFromSelf = CoordinateUtils.calculateLineDistance(getCurCoordinates()[0], getCurCoordinates()[1] , foreCastMogoLatLon.getLon(), foreCastMogoLatLon.getLat()); - long foreCastInternal = System.nanoTime() - startTime; + long foreCastInternal = System.currentTimeMillis() - startTime; Log.d(FORECAST, "foreCastInternal :" + foreCastInternal); //todo 看是否耗时，增加的时间需要从当前SNTP时间减去 builder.setWgslat(foreCastMogoLatLon.getLat()); diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index 08f3953e57..c0a1e05622 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -53,7 +53,9 @@ import com.zhidao.autopilotservice.model.AdasAIDLAutopilotArriveModel; import com.zhidao.autopilotservice.model.AdasAIDLAutopilotStateModel; import com.zhidao.autopilotservice.model.AdasAIDLOwnerCarRectModel; import com.zhidao.autopilotservice.model.AdasAIDLOwnerCarStateModel; +import com.zhidao.support.adas.high.AdasManager; import com.zhidao.support.adas.high.OnAdasListener; +import com.zhidao.support.adas.high.bean.BasicInfo; import com.zhidao.support.adas.high.bean.RectInfo; import com.zhidao.support.adas.high.bean.WarnMessageInfo; import com.zhidao.support.adas.high.msg.MyMessageFactory; @@ -223,6 +225,11 @@ public class MogoADASController implements IMogoADASController { DebugConfig.setStatus(DebugConfig.sAdasRecognized, true); } + @Override + public void onAutopilotRoute(String route) { + + } + @Override public void onWarnMessage(WarnMessageInfo warnMessageInfo) { if (warnMessageInfo == null) { @@ -306,12 +313,14 @@ public class MogoADASController implements IMogoADASController { } Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); init( AbsMogoApplication.getApp() ); - adasProvider.addAdaStatusListener(new AdasStatusListener() { + adasProvider.addAdasStatusListener(new AdasStatusListener() { @Override public void onServiceConnected() { super.onServiceConnected(); Logger.d( TAG, "adas statuslistener connected & send sn"); - AutopilotServiceManage.getInstance().aiCloudToAdasData(Utils.getSn()+"xavier"); + BasicInfo info=new BasicInfo(); + info.setSn(Utils.getSn()+"xavier"); + AdasManager.getInstance().setBasicInfo(info); invokeShowADASOperation(); }