From df74947e19a9da83e91e1c7ff6e1de865a22a93a Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 1 Dec 2022 18:25:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?2.13.0=20=E4=BC=98=E5=8C=96obu=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/eagle/core/data/enums/V2iEventTypeEnum.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/V2iEventTypeEnum.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/V2iEventTypeEnum.kt index e287315253..a08eb1494d 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/V2iEventTypeEnum.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/V2iEventTypeEnum.kt @@ -57,10 +57,10 @@ enum class V2iEventTypeEnum( ), TYPE_USECASE_ID_ROAD_SPEED_LIMIT( 1.toString(), - "限速", + "超速", poiTypeSrcVr = R.drawable.icon_warning_v2x_over_speed, - content = "前方%s米限速", - tts = "前方%s米限速" + content = "您已超速，请减速行驶", + tts = "您已超速，请减速行驶" ), //------------道路危险情况预警 end -----------> From b02e34ee768fc631d684d898eedea545269eff70 Mon Sep 17 00:00:00 2001 From: renwj Date: Thu, 1 Dec 2022 18:29:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[v2.13.0][=E7=8A=B6=E6=80=81=E6=A0=8F]?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo_core_function_devatools/status/model/StatusModel.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt index 17a2fa5456..f29e467b92 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/model/StatusModel.kt @@ -19,11 +19,11 @@ internal class StatusModel : ViewModel() { const val TAG = "StatusModel" val DEFAULTS = Pair(null, ArrayList().also { - it += RTKStatus("", -1) it += IpcStatus(CallerAutoPilotManager.isConnected()) - // it += NetStatus(false) it += CanStatus(false) it += TracingStatus(UNKNOWN) + it += RTKStatus("", -1) + // it += NetStatus(false) it += GpsStatus(enabled = false, isGranted = false) }) }