From 637ca51dd58e12edad7a45746308991db723aa9b Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 30 May 2023 14:39:05 +0800 Subject: [PATCH] =?UTF-8?q?[dev=5Fminibus-d=5F230425=5F3.2.0]=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=B7=A5=E6=8E=A7=E6=9C=BA=E8=BF=87=E6=9D=A5obu?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E6=92=AD=E6=8A=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacenter/obu/MogoObuDcCombineManager.kt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt index a981320c86..7b4f7e6b00 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt @@ -21,6 +21,7 @@ import com.mogo.eagle.core.function.datacenter.obu.drawer.* import com.mogo.eagle.core.function.datacenter.obu.utils.TrafficDataConvertUtilsNew import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU +import com.mogo.eagle.core.utilcode.util.ConvertUtils import com.mogo.support.obu.ObuScene import com.zhidao.support.obu.constants.MogoObuShowConstants import kotlin.math.roundToInt @@ -135,8 +136,10 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener ) ttsContent = String.format( ttsContent, - Math.round(rsiWarningData.warningMsgList[0].distance).toString(), - Math.round(rsiWarningData.warningMsgList[0].eventRadius).toString() + ConvertUtils.intToChinese( + rsiWarningData.warningMsgList[0].distance.roundToInt()), + ConvertUtils.intToChinese( + rsiWarningData.warningMsgList[0].eventRadius.roundToInt()) ) } @@ -224,7 +227,8 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener ) ttsContent = String.format( ttsContent, - Math.round(rsiWarningData.warningMsgList[0].distance).toString() + ConvertUtils.intToChinese( + rsiWarningData.warningMsgList[0].distance.roundToInt()) ) } @@ -240,8 +244,10 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener ) ttsContent = String.format( ttsContent, - Math.round(rsiWarningData.warningMsgList[0].distance).toString(), - Math.round(rsiWarningData.warningMsgList[0].eventRadius).toString() + ConvertUtils.intToChinese( + rsiWarningData.warningMsgList[0].distance.roundToInt()), + ConvertUtils.intToChinese( + rsiWarningData.warningMsgList[0].eventRadius.roundToInt()) ) } @@ -255,7 +261,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener ) ttsContent = String.format( EventTypeEnumNew.getWarningTts(appId), - mLimitSpeed + ConvertUtils.intToChinese(mLimitSpeed) ) } }