From bfd14106e02687684ca5c9436bc431ab3255fdf2 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 25 Nov 2021 15:38:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=85=8D=E5=90=88=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=94=B6=E4=B8=8D=E5=88=B0can=E6=95=B0=E6=8D=AE=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 4 ++-- .../mogo-core-function-main/build.gradle | 2 ++ .../core/function/main/MainMoGoApplication.java | 15 +++++++++++++++ .../function/obu/mogo/MogoPrivateObuManager.kt | 1 + .../mogo/module/adas/OnAdasListenerAdapter.java | 11 ++++++++++- 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/config.gradle b/config.gradle index c1d826e5b9..930960cdc6 100644 --- a/config.gradle +++ b/config.gradle @@ -112,8 +112,8 @@ ext { // obu sdk obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3", - mogoobu : 'com.zhidao.support.obu:mogoobu:1.0.0.17', - mogoami : 'com.zhidao.support.obu.ami:mogoami:1.0.0.4', + mogoobu : 'com.zhidao.support.obu:mogoobu:1.0.0.18', + mogoami : 'com.zhidao.support.obu.ami:mogoami:1.0.0.9', adasHigh : 'com.zhidao.support.adas:high:1.2.0.14', // google diff --git a/core/function-impl/mogo-core-function-main/build.gradle b/core/function-impl/mogo-core-function-main/build.gradle index 71ff1d4ab0..302f3076e7 100644 --- a/core/function-impl/mogo-core-function-main/build.gradle +++ b/core/function-impl/mogo-core-function-main/build.gradle @@ -60,6 +60,8 @@ dependencies { implementation rootProject.ext.dependencies.arouter kapt rootProject.ext.dependencies.aroutercompiler + implementation rootProject.ext.dependencies.mogoami + if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { implementation rootProject.ext.dependencies.mogoaicloudservicesdk implementation rootProject.ext.dependencies.mogocommons diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 82be77ffdb..d791a71401 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -17,6 +17,7 @@ import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.constants.SharedPrefsConstants; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.network.Utils; +import com.mogo.eagle.core.data.constants.MoGoConfig; import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.map.MapApiPath; @@ -38,6 +39,7 @@ import com.mogo.utils.ProcessUtils; import com.mogo.utils.logger.Logger; import com.mogo.utils.storage.SharedPrefsMgr; import com.zhidao.boot.persistent.lib.PersistentManager; +import com.zhidao.support.obu.ami.AmiClientManager; /** * 默认初始化一些基础服务配置 @@ -160,7 +162,11 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { clientConfig.setThirdPartyDeviceId(Utils.getDevicesId()); // 设置循环检测间隔时间 clientConfig.setLoopCheckDelay(5 * 1000); + //连接ami + connectAmiIp(); +// todo 使用旧链路 +// clientConfig.setUseOriginSocket(true); clientConfig.setIHttpDnsCurrentLocation(() -> { MogoLocation mogoLocation = @@ -220,6 +226,15 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { ); } + /** + * 连接ami + */ + private void connectAmiIp() { + String ipAddress = SharedPrefsMgr.getInstance(AbsMogoApplication.getApp().getBaseContext()).getString(MoGoConfig.OBU_IP, "192.168.1.199"); + Logger.d("OnAdasListenerAdapter", "application --ipAddress = " + ipAddress); + AmiClientManager.getInstance().setObuIp(ipAddress); + } + /** * 上传自车位置信息到云端 */ diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt index 7c75e64484..298f21b037 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt @@ -55,6 +55,7 @@ class MogoPrivateObuManager private constructor() { fun connectObu(context: Context, ipAddress: String) { //自研obu初始化 mObuStatusInfo.connectIP = ipAddress + if (!MogoObuManager.getInstance().isConnected) { MogoObuManager.getInstance().connect(context, mObuStatusInfo.connectIP) } else { diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java index 80040e80c6..c86ba7c645 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java @@ -2,6 +2,7 @@ package com.mogo.module.adas; import android.util.Log; +import com.mogo.commons.AbsMogoApplication; import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo; import com.mogo.eagle.core.data.autopilot.AutopilotCarStateInfo; import com.mogo.eagle.core.data.autopilot.AutopilotGuardianStatusInfo; @@ -9,12 +10,14 @@ import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage; +import com.mogo.eagle.core.data.constants.MoGoConfig; import com.mogo.eagle.core.data.traffic.TrafficData; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarStatusListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager; import com.mogo.utils.logger.Logger; +import com.mogo.utils.storage.SharedPrefsMgr; import com.zhidao.support.adas.high.AdasManager; import com.zhidao.support.adas.high.OnAdasListener; import com.zhidao.support.adas.high.bean.AutopilotRoute; @@ -42,22 +45,28 @@ import java.util.List; public class OnAdasListenerAdapter implements OnAdasListener { private final String TAG = "OnAdasListenerAdapter"; + @Override public void onRectData(RectInfo rectInfo) { ArrayList recognizedListResults = AdasObjectUtils.INSTANCE.regroupTrafficDataData(rectInfo.getModels()); CallerAutopilotIdentifyListenerManager.INSTANCE.invokeAutopilotIdentifyDataUpdate(recognizedListResults); } + @Override public void onCarStateData(CarStateInfo carStateInfo) { + Logger.d(TAG, "----1----carStateInfo.toString() = " + carStateInfo.toString()); AutopilotCarStateInfo autopilotCarStateInfo = AdasObjectUtils.INSTANCE.fromAdasCarStateInfoObject(carStateInfo); CallerAutopilotCarStatusListenerManager.INSTANCE.invokeAutopilotCarStateData(autopilotCarStateInfo); - + Logger.d(TAG, "----2----carStateInfo.toString() = " + carStateInfo.toString()); //can数据转发 CarStateInfo.ValuesBean bean = carStateInfo.getValues(); if (bean != null) { int turn_light = bean.getTurn_light(); //转向灯状态 0是正常 1是左转 2是右转 + Logger.d(TAG, "onCarStateData ---- turn_light = " + turn_light); AmiClientManager.getInstance().setTurnLightState(turn_light); + } else { + Logger.e(TAG, "bean == null "); } } From b66c53c1dbacbc946625b291c8aad01d4b9395fb Mon Sep 17 00:00:00 2001 From: lianglihui Date: Thu, 25 Nov 2021 15:48:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=BD=A6=E5=89=8D=E5=BC=95=E5=AF=BC?= =?UTF-8?q?=E7=BA=BF=20=20=E9=9D=9E=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6?= =?UTF-8?q?=E7=8A=B6=E6=80=81=20=E4=B8=8D=E7=BB=98=E5=88=B6=E8=BD=A6?= =?UTF-8?q?=E5=89=8D=E5=BC=95=E5=AF=BC=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/smp/SmallMapDirectionView.java | 2 +- .../service/routeoverlay/MogoRouteOverlayManager.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java index 4e6b82f97f..e6e392f6eb 100644 --- a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java +++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java @@ -181,7 +181,7 @@ public class SmallMapDirectionView @Override public void onLocationChanged(@Nullable MogoLocation location) { -// Logger.d(TAG, "onCarLocationChanged2 latLng:" + location); +// Logger.d(TAG, "onCarLocationChanged2 :" + location.getLatitude()+":"+location.getLongitude()); LatLng currentLatLng = new LatLng(location.getLatitude(), location.getLongitude()); //更新车辆位置 if (mCarMarker != null) { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java index 6199b3f8a7..f9c3deb7d9 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java @@ -22,7 +22,7 @@ public class MogoRouteOverlayManager implements IMogoCarLocationChangedListener2 private static volatile MogoRouteOverlayManager sInstance; private Context mContext; private String TAG = "MogoRouteOverlayManager"; - + private int STATUS_AUTOPILOT = STATUS_AUTOPILOT_DISABLE; private MogoRouteOverlayManager(Context context) { mContext = context; } @@ -98,7 +98,9 @@ public class MogoRouteOverlayManager implements IMogoCarLocationChangedListener2 latLngList.add(new MogoLatLng(routeModel.getLat(), routeModel.getLon())); } Log.e(TAG, "routeResult:" + latLngList.size()); - RouteOverlayDrawer.getInstance(mContext).putRouteList(latLngList); + if (STATUS_AUTOPILOT == IMogoAdasOCHCallback.STATUS_AUTOPILOT_RUNNING) { + RouteOverlayDrawer.getInstance(mContext).putRouteList(latLngList); + } } @Override @@ -108,7 +110,7 @@ public class MogoRouteOverlayManager implements IMogoCarLocationChangedListener2 @Override public void onStateChanged(int state, String reason) { -// this.STATUS_AUTOPILOT = state; + this.STATUS_AUTOPILOT = state; if (state != IMogoAdasOCHCallback.STATUS_AUTOPILOT_RUNNING) { RouteOverlayDrawer.getInstance(mContext).clearMogoRouteOverlay(); }