diff --git a/config.gradle b/config.gradle index 1e68d20361..4615e6c779 100644 --- a/config.gradle +++ b/config.gradle @@ -114,7 +114,7 @@ ext { obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3", mogoobu : 'com.zhidao.support.obu:mogoobu:1.0.0.19', mogoami : 'com.zhidao.support.obu.ami:mogoami:1.0.0.10', - adasHigh : 'com.zhidao.support.adas:high:1.2.1.2', + adasHigh : 'com.zhidao.support.adas:high:1.2.1.2_bate1', // google googlezxing : "com.google.zxing:core:3.3.3", diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index adf88cd446..873553cb80 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -635,6 +635,20 @@ class MoGoHmiFragment : MvpFragment } } + /** + * 显示转向灯效果 + */ + override fun showTurnLight(light: Int) { + TODO("Not yet implemented") + } + + /** + * 显示刹车效果 + */ + override fun showBrakeLight(brakeLight: Int) { + TODO("Not yet implemented") + } + override fun onDestroy() { super.onDestroy() Log.d(TAG, "onDestroy") diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt index 766219767d..483f2954d6 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt @@ -148,4 +148,15 @@ interface IMoGoWaringProvider { fun showToolsView() fun hideToolsView() + + /** + * 展示转向灯 + */ + fun showTurnLight(light: Int) + + /** + * 展示刹车灯 + */ + fun showBrakeLight(brakeLight: Int) + } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt index 6cc235a4c9..459032aa8c 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt @@ -197,6 +197,24 @@ object CallerHmiManager : CallerBase() { waringProviderApi.startRoadCameraLive(flvUrl) } + /** + * 呈现转向灯ui + * + * @param light + */ + fun showTurnLight(light: Int) { + waringProviderApi.showTurnLight(light) + } + + /** + * 呈现刹车灯ui + * + * @param brakeLight + */ + fun showBrakeLight(brakeLight: Int) { + waringProviderApi.showTurnLight(brakeLight) + } + fun showNoSignalView() { waringProviderApi.showNoSignView() } 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 804756a709..410f61af6a 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 @@ -15,6 +15,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener 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.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.zhidao.support.adas.high.AdasManager; import com.zhidao.support.adas.high.OnAdasListener; @@ -23,6 +24,8 @@ import com.zhidao.support.adas.high.bean.AutopilotStatus; import com.zhidao.support.adas.high.bean.AutopilotWayArrive; import com.zhidao.support.adas.high.bean.CarLaneInfo; import com.zhidao.support.adas.high.bean.CarStateInfo; +import com.zhidao.support.adas.high.bean.IPCUpgradePatchDownloadProgressInfo; +import com.zhidao.support.adas.high.bean.IPCUpgradeStateInfo; import com.zhidao.support.adas.high.bean.LightStatueInfo; import com.zhidao.support.adas.high.bean.ObstaclesInfo; import com.zhidao.support.adas.high.bean.RectInfo; @@ -62,13 +65,22 @@ public class OnAdasListenerAdapter implements OnAdasListener { // Log.w("DHY-location", bean.getLon() + "," + bean.getLat() + " OnAdasListenerAdapter-onCarStateData:"); 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); + int turnLight = bean.getTurn_light(); //转向灯状态 0是正常 1是左转 2是右转 + AmiClientManager.getInstance().setTurnLightState(turnLight); + int brakeLight = bean.getBrake_light(); //TODO + Logger.d(TAG, "onCarStateData ---- turnLight = " + turnLight + "---brakeLight = " + brakeLight); + + //设置转向灯 + CallerHmiManager.INSTANCE.showTurnLight(turnLight); + + //设置刹车信息 + CallerHmiManager.INSTANCE.showBrakeLight(brakeLight); } else { Logger.e(TAG, "bean == null "); } + + AutopilotCarStateInfo autopilotCarStateInfo = AdasObjectUtils.INSTANCE.fromAdasCarStateInfoObject(carStateInfo); CallerAutopilotCarStatusListenerManager.INSTANCE.invokeAutopilotCarStateData(autopilotCarStateInfo); } @@ -187,5 +199,13 @@ public class OnAdasListenerAdapter implements OnAdasListener { } + @Override + public void onUpgradeStateInfo(IPCUpgradeStateInfo info) { + } + + @Override + public void onUpgradePatchDownload(IPCUpgradePatchDownloadProgressInfo info) { + + } }