From 6296f7d9e67a2b6e10a0b4acf5a7202339d93d38 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 17 Jul 2024 20:03:53 +0800 Subject: [PATCH] =?UTF-8?q?[6.5.0]=E7=BA=A2=E7=BB=BF=E7=81=AF=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E5=A4=84=E7=90=86=EF=BC=8C=E5=BD=93=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=88=B0=E5=BD=93=E5=89=8D=E9=BB=84=E7=81=AF=E7=81=AF=E6=80=81?= =?UTF-8?q?=E5=B0=8F=E4=BA=8E3=E7=A7=92=E6=97=B6=EF=BC=8C=E7=81=AF?= =?UTF-8?q?=E6=80=81=E6=AF=94=E4=BE=8B=E6=8C=89=E7=85=A73=E7=A7=92?= =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/ui/widget/FusionTrafficLightView.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/FusionTrafficLightView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/FusionTrafficLightView.kt index 965ae8eae6..7c5d392792 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/FusionTrafficLightView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/FusionTrafficLightView.kt @@ -126,12 +126,12 @@ class FusionTrafficLightView @JvmOverloads constructor( maxGreenDuration = currentDuration } TrafficLightEnum.YELLOW -> { - proportionList[1] = currentDuration maxYellowDuration = if(currentDuration < 3){ 3 }else{ currentDuration } + proportionList[1] = maxYellowDuration } else -> { proportionList[2] = currentDuration @@ -144,12 +144,12 @@ class FusionTrafficLightView @JvmOverloads constructor( maxGreenDuration = nextDuration } TrafficLightEnum.YELLOW -> { - proportionList[1] = nextDuration maxYellowDuration = if(nextDuration<3){ 3 }else{ nextDuration } + proportionList[1] = maxYellowDuration } else -> { proportionList[2] = nextDuration @@ -162,12 +162,12 @@ class FusionTrafficLightView @JvmOverloads constructor( maxGreenDuration = nextTwoDuration } TrafficLightEnum.YELLOW -> { - proportionList[1] = nextTwoDuration maxYellowDuration = if(nextTwoDuration<3){ 3 }else{ nextTwoDuration } + proportionList[1] = maxYellowDuration } else -> { proportionList[2] = nextTwoDuration