From 797c6bfd4e8473019ab5a1610fdad489f8017a91 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Thu, 24 Mar 2022 16:12:59 +0800 Subject: [PATCH 01/23] =?UTF-8?q?[fix]=E6=B7=BB=E5=8A=A0speedLimit?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libraries/mogo-adas-data/src/main/proto/message_pad.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/mogo-adas-data/src/main/proto/message_pad.proto b/libraries/mogo-adas-data/src/main/proto/message_pad.proto index 0f21c4ba3a..907fc0ead6 100644 --- a/libraries/mogo-adas-data/src/main/proto/message_pad.proto +++ b/libraries/mogo-adas-data/src/main/proto/message_pad.proto @@ -147,7 +147,7 @@ message RouteInfo{ Location endLocation = 3; string endName = 4; repeated Location wayPoints = 5; - double speedLimit = 6; + double speedLimit = 6; //单位: km/h uint32 vehicleType = 7; bool isSpeakVoice = 8; } From 9fdb2617ec1f0da41dcda3f96bf0f0dd1d20164c Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Tue, 29 Mar 2022 15:55:27 +0800 Subject: [PATCH 02/23] =?UTF-8?q?[fix]=E8=AF=BB=E5=86=99=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E8=B6=85=E6=97=B6=E7=BC=A9=E7=9F=AD=E6=88=90?= =?UTF-8?q?5=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhidao/support/adas/high/socket/FpgaSocket.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java index b7d6bc2161..d266dce6e3 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java @@ -77,9 +77,9 @@ public class FpgaSocket implements IWebSocket { } if (okBuilder == null) { okBuilder = new OkHttpClient.Builder(); - okBuilder.writeTimeout(10, TimeUnit.SECONDS); - okBuilder.readTimeout(10, TimeUnit.SECONDS); - okBuilder.connectTimeout(10, TimeUnit.SECONDS); + okBuilder.writeTimeout(5, TimeUnit.SECONDS); + okBuilder.readTimeout(5, TimeUnit.SECONDS); + okBuilder.connectTimeout(5, TimeUnit.SECONDS); } if (client == null) { client = okBuilder.build(); From f7c48a68804c1fb7a9239fa79f81a3324915f120 Mon Sep 17 00:00:00 2001 From: renwj Date: Tue, 29 Mar 2022 18:37:12 +0800 Subject: [PATCH 03/23] =?UTF-8?q?[V2X]=E9=81=93=E8=B7=AF=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=B5=93=E9=9B=BE=E7=B1=BB=E5=9E=8B=E6=B2=A1=E6=9C=89=E6=B5=93?= =?UTF-8?q?=E9=9B=BE=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scene/road/V2XRoadEventScenario.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java index ed566537b0..72dbae0235 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java @@ -13,9 +13,13 @@ import com.mogo.eagle.core.function.v2x.events.manager.V2XStatusManager; import com.mogo.eagle.core.function.v2x.events.scenario.impl.AbsV2XScenario; import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker; import com.mogo.eagle.core.network.utils.GsonUtil; +import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.common.entity.V2XRoadEventEntity; +import com.mogo.module.common.enums.EventTypeEnum; import com.mogo.service.analytics.IMogoAnalytics; +import com.mogo.service.v2x.DisplayEffectsInterface; + import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -121,8 +125,18 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp CallerVisualAngleManager.INSTANCE.changeVisualAngle(CallerVisualAngleManager.Scene.RoadEvent.INSTANCE); CallerHmiManager.INSTANCE.showWarning(WarningDirectionEnum.ALERT_WARNING_TOP, TimeUnit.HOURS.toMillis(1)); V2XMessageEntity entity = getV2XMessageEntity(); - if (entity != null && entity.isNeedAddLine()) { - drawPOI(); + if (entity != null) { + if (entity.isNeedAddLine()) { + drawPOI(); + } + DisplayEffectsInterface wu = BridgeApi.INSTANCE.displayEffects(); + V2XRoadEventEntity content = entity.getContent(); + if (wu != null && content != null) { + MarkerExploreWay noveltyInfo = content.getNoveltyInfo(); + if (noveltyInfo != null && EventTypeEnum.FOURS_FOG.getPoiType().equals(content.getNoveltyInfo().getPoiType())) { + wu.displayEffects(EventTypeEnum.FOURS_FOG.getPoiType()); + } + } } } From a2ce9b0b3c6fb1990542f1bc7a21644cba32fb02 Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Tue, 29 Mar 2022 19:43:48 +0800 Subject: [PATCH 04/23] =?UTF-8?q?=E8=B0=83=E8=AF=95=E7=AA=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加鹰眼参数配置—设置刹车加速度阈值 --- .../autopilot/MoGoAutopilotProvider.kt | 2 +- .../adapter/MoGoHandAdasMsgManager.java | 13 ++-- .../hmi/ui/setting/DebugSettingView.kt | 47 +++++++++++++ .../main/res/layout/view_debug_setting.xml | 69 +++++++++++++++++++ .../eagle/core/data/constants/MoGoConfig.kt | 3 + 5 files changed, 129 insertions(+), 5 deletions(-) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt index 13d7dac84d..b31bd57da7 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt @@ -57,7 +57,7 @@ class MoGoAutopilotProvider : get() = TAG override fun init(context: Context) { - MoGoHandAdasMsgManager.getInstance() + MoGoHandAdasMsgManager.getInstance(context) CallerLogger.i("$M_ADAS_IMPL$TAG", "初始化工控机连接……") mContext = context // 初始化ADAS 域控制器 diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java index 784f21cfb5..b27b57f21b 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java @@ -1,9 +1,11 @@ package com.mogo.eagle.core.function.autopilot.adapter; +import android.content.Context; import android.text.TextUtils; import android.util.Log; import com.mogo.eagle.core.data.config.FunctionBuildConfig; +import com.mogo.eagle.core.data.constants.MoGoConfig; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotVehicleStateListener; @@ -13,6 +15,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateLi import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager; import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; +import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.util.ThreadUtils; import com.mogo.module.common.drawer.IdentifyDataDrawer; @@ -34,18 +37,20 @@ public class MoGoHandAdasMsgManager implements private final String TAG = "AdasEventManager"; private static volatile MoGoHandAdasMsgManager moGoHandAdasMsgManager; + private Context mContext; - private MoGoHandAdasMsgManager() { + private MoGoHandAdasMsgManager(Context context) { CallerAutopilotIdentifyListenerManager.INSTANCE.addListener(TAG, this); CallerAutopilotVehicleStateListenerManager.INSTANCE.addListener(TAG, this); CallerAutopilotCarConfigListenerManager.INSTANCE.addListener(TAG, this); + mContext = context; } - public static MoGoHandAdasMsgManager getInstance() { + public static MoGoHandAdasMsgManager getInstance(Context context) { if (moGoHandAdasMsgManager == null) { synchronized (MoGoHandAdasMsgManager.class) { if (moGoHandAdasMsgManager == null) { - moGoHandAdasMsgManager = new MoGoHandAdasMsgManager(); + moGoHandAdasMsgManager = new MoGoHandAdasMsgManager(context); } } } @@ -144,7 +149,7 @@ public class MoGoHandAdasMsgManager implements @Override public void onAutopilotBrakeLightByAcceleration(double acceleration) { //设置刹车信息 - if (acceleration < -2.5) { + if (acceleration < SharedPrefsMgr.getInstance(mContext).getFloat(MoGoConfig.BRAKE_ACCELERATION_THRESHOLD,-2.5F)) { brakeLight = 1; } else { brakeLight = 0; diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 21a25409f3..419160c5aa 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -257,6 +257,18 @@ class DebugSettingView @JvmOverloads constructor( } } + tbEagleEyeController.setOnCheckedChangeListener { buttonView, isChecked -> + if(isChecked){ + buttonView.setCompoundDrawables(null, null, iconDown, null) + //展示参数配置 + eagleEyeControllerLayout.visibility = View.VISIBLE + }else{ + buttonView.setCompoundDrawables(null, null, iconRight, null) + //隐藏参数配置 + eagleEyeControllerLayout.visibility = View.GONE + } + } + /** * 域控制器 */ @@ -388,6 +400,8 @@ class DebugSettingView @JvmOverloads constructor( } } + //设置鹰眼本地参数配置监听 + setEagleEyeConfigListener() //域控制器中心事件点击监听 setDomainControllerCheckedChangeListener() //Hmi控制中心事件点击监听 @@ -500,6 +514,39 @@ class DebugSettingView @JvmOverloads constructor( } + /** + * 设置鹰眼本地参数配置监听 + */ + private fun setEagleEyeConfigListener(){ + //初始化刹车加速度阈值信息 + val brakeThreshold = SharedPrefsMgr.getInstance(context) + .getFloat(MoGoConfig.BRAKE_ACCELERATION_THRESHOLD,-2.5F) + etInputBrakeThreshold.setText(brakeThreshold.toString()) + etInputBrakeThreshold.text?.let { etInputBrakeThreshold.setSelection(brakeThreshold.toString().length) } + //设置刹车加速度阈值信息 + btnBrakeThreshold.setOnClickListener { + val thresholdStr = etInputBrakeThreshold.text.toString() + if(thresholdStr.isNullOrEmpty()){ + ToastUtils.showShort("请输入正确的判定刹车加速度阈值") + }else{ + try{ + val thresholdStrFloat = thresholdStr.toFloat() + if(thresholdStrFloat<0){ + SharedPrefsMgr.getInstance(context).putFloat(MoGoConfig.BRAKE_ACCELERATION_THRESHOLD,thresholdStrFloat) + ToastUtils.showShort("刹车阈值设置成功") + }else{ + ToastUtils.showShort("刹车阈值加速度值应小于0") + } + }catch (e: Exception){ + ToastUtils.showShort("判定刹车加速度阈值格式设置不正确") + } + + + + } + } + } + /** * 设置域控制器点击监听 */ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index a0f9958855..b0c4f8f304 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -472,6 +472,75 @@ android:orientation="vertical" android:visibility="gone"> + + + + +