From b291b7403a9e65574894b6be84438e89b379b0fe Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 27 Jan 2022 15:20:11 +0800 Subject: [PATCH] opt --- config.gradle | 2 +- .../com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt | 4 ++-- .../core/function/hmi/ui/turnlight/TurnLightViewStatus.kt | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/config.gradle b/config.gradle index 3e60318c27..5f9130d7b2 100644 --- a/config.gradle +++ b/config.gradle @@ -114,7 +114,7 @@ ext { obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3", mogoobu : 'com.zhidao.support.obu:mogoobu:1.0.0.19', mogoami : 'com.zhidao.support.obu.ami:mogoami:1.0.0.10', - adasHigh : 'com.zhidao.support.adas:high:1.2.1.2_bate13', + adasHigh : 'com.zhidao.support.adas:high:1.2.1.2_bate14', // google googlezxing : "com.google.zxing:core:3.3.3", diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index ca649913ed..be7cafaebb 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -959,9 +959,9 @@ class MoGoHmiFragment : MvpFragment */ override fun showTurnLight(light: Int) { if (isOpenTurnlight) { + Log.d("liyz", "showTurnLight light = $light") turnLightView.setTurnLight(light) } -// Log.d("liyz", "showTurnLight light = $light"); } /** @@ -969,9 +969,9 @@ class MoGoHmiFragment : MvpFragment */ override fun showBrakeLight(light: Int) { if (isOpenTurnlight) { +// Log.d("liyz", "showBrakeLight light = $light") brakeView.setBrakeLight(light) } -// Log.d("liyz", "showBrakeLight light = $light"); } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightViewStatus.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightViewStatus.kt index e99cd1c97b..c05d125c8b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightViewStatus.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightViewStatus.kt @@ -83,6 +83,7 @@ class TurnLightViewStatus @JvmOverloads constructor( isDisappare = true isShowNormalBg = false isLeftLight = false + isRightLight = false isDisappare = false } } @@ -110,6 +111,10 @@ class TurnLightViewStatus @JvmOverloads constructor( left_select_image.clearAnimation() right_select_image.clearAnimation() + left_nor_image.clearAnimation() + right_nor_image.clearAnimation() + turn_light_layout.clearAnimation() + val disappearAnimationLeft = AlphaAnimation(1.0f, 0f) disappearAnimationLeft.duration = 300 @@ -142,7 +147,7 @@ class TurnLightViewStatus @JvmOverloads constructor( override fun onAnimationEnd(p0: Animation?) { turn_light_layout.visibility = View.GONE - stopAnimate() +// stopAnimate() } }) }