From 6b9dbbb8d25ef1c5ae06b39200209f6415f635eb Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Fri, 21 Oct 2022 15:35:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=A9=E5=A4=A7=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=B1=8F=E9=95=BF=E6=8C=89=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml index 042c7ad3ce..444016d9fd 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml @@ -8,7 +8,7 @@ Date: Fri, 21 Oct 2022 15:53:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BA=A2=E8=B7=AF=E7=81=AF=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=8E=A7=E5=88=B6=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/ui/widget/SingleTrafficLightView.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt index b856ecf35e..12842094df 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt @@ -7,6 +7,7 @@ import android.view.View import android.widget.ImageView import android.widget.TextView import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.data.config.HmiBuildConfig import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils @@ -49,7 +50,9 @@ class SingleTrafficLightView @JvmOverloads constructor( override fun showWarningTrafficLight(checkLightId: Int,lightSource: Int) { super.showWarningTrafficLight(checkLightId,lightSource) mCurrentLightId = checkLightId - updateTrafficLightIcon(checkLightId,lightSource) + if(!HmiBuildConfig.isShowTrafficLightView){ + updateTrafficLightIcon(checkLightId,lightSource) + } } /** From 61d94b804337a8a0989475a5c805d316d89fc80a Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Fri, 21 Oct 2022 16:02:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhidao/support/adas/high/protocol/RawData.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/protocol/RawData.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/protocol/RawData.java index ca42eea8b6..fef1bf24f3 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/protocol/RawData.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/protocol/RawData.java @@ -13,6 +13,11 @@ import okio.ByteString; * @des * @date 2021/10/20 * 原始数据格式：MagicCode(2字节 6d67) 偏移量(2字节 从原始数据头开始一直到Body头) 数据包总长度（4字节） Header Body + * 实例：（偏移量从数据第一个字节开始） + * 6d 67 00 10 00 00 00 07 Header 数据 + * MG头 偏移量 数据包总长度 + * 计算Header长度 = 偏移量- 8（MG头长度+偏移量长度+数据包总长度长度） + * 计算数据长度 = 数据包总长度 - 偏移量 */ public class RawData { public long receiveTime;//TODO 计算耗时 临时测试