From 552e0a5ee5eca5c52b03351a18a229dea913d405 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 10 Jan 2022 19:41:30 +0800 Subject: [PATCH] opt --- .../src/main/AndroidManifest.xml | 8 ++ .../receiver/TurnLightBroadcastReceiver.kt | 51 ++++++++ .../core/function/hmi/ui/MoGoHmiFragment.kt | 8 +- .../function/hmi/ui/turnlight/BrakeView.java | 112 ---------------- .../hmi/ui/turnlight/BrakeViewStatus.kt | 80 ++++++++++++ .../hmi/ui/turnlight/TurnLightView.java | 120 ------------------ .../hmi/ui/turnlight/TurnLightViewStatus.kt | 97 ++++++++++++++ .../src/main/res/layout/fragment_hmi.xml | 8 +- .../src/main/res/layout/view_brake_light.xml | 33 ----- .../res/layout/view_brake_light_status.xml | 44 +++++++ .../src/main/res/layout/view_turn_light.xml | 49 ------- .../res/layout/view_turn_light_status.xml | 56 ++++++++ .../function/call/hmi/CallerHmiManager.kt | 2 +- 13 files changed, 343 insertions(+), 325 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/TurnLightBroadcastReceiver.kt delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeView.java create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeViewStatus.kt delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightView.java create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightViewStatus.kt delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light.xml create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_turn_light.xml create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_turn_light_status.xml diff --git a/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml index 4e3fdff847..27c8e3db04 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml @@ -36,5 +36,13 @@ + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/TurnLightBroadcastReceiver.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/TurnLightBroadcastReceiver.kt new file mode 100644 index 0000000000..602986cc1b --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/TurnLightBroadcastReceiver.kt @@ -0,0 +1,51 @@ +package com.mogo.eagle.core.function.hmi.receiver + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.util.Log +import com.alibaba.android.arouter.launcher.ARouter +import com.mogo.eagle.core.data.constants.MogoServicePaths +import com.mogo.eagle.core.data.notice.NoticeNormalData +import com.mogo.eagle.core.function.call.hmi.CallerHmiManager +import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showBrakeLight +import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showTurnLight +import com.mogo.eagle.core.function.hmi.WaringConst +import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.mogo.eagle.core.utilcode.util.SharedPrefs +import com.mogo.service.IMogoServiceApis + +/** + * 转向灯，刹车 + * + * @author lixiaopeng + */ +class TurnLightBroadcastReceiver : BroadcastReceiver() { + + companion object { + private const val TAG = "TurnLightBroadcastReceiver" + } + + override fun onReceive(context: Context, intent: Intent) { + try { + val type = intent.getIntExtra("type", 0) + val lightInt = intent.getIntExtra("light", 0) + Logger.d("liyz", "TurnLightBroadcastReceiver type = $type ---- lightInt = $lightInt") + showTurnLight(type, lightInt) + } catch (e: Exception) { + e.printStackTrace() + } + } + + + private fun showTurnLight( //type 1,转向灯，2刹车 + type: Int, + lightInt: Int + ) { + if (type == 1) { + showTurnLight(lightInt) //设置转向灯 + } else if (type == 2) { + showBrakeLight(lightInt) //设置刹车信息 + } + } +} \ No newline at end of file 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 a987fc7d11..1747a9384b 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 @@ -30,8 +30,6 @@ import com.mogo.eagle.core.function.hmi.ui.notice.NoticeBannerView import com.mogo.eagle.core.function.hmi.ui.notice.NoticeNormalBannerView import com.mogo.eagle.core.function.hmi.ui.setting.DebugSettingView import com.mogo.eagle.core.function.hmi.ui.tools.AutoPilotAndCheckView -import com.mogo.eagle.core.function.hmi.ui.turnlight.BrakeView -import com.mogo.eagle.core.function.hmi.ui.turnlight.TurnLightView import com.mogo.eagle.core.function.hmi.ui.widget.V2XNotificationView import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.util.ThreadUtils @@ -642,8 +640,9 @@ class MoGoHmiFragment : MvpFragment * 显示转向灯效果 TODO */ override fun showTurnLight(light: Int) { + Logger.d("liyz", "hmiFragment showTurnLight --- light = $light") // turnLightView?.visibility = View.VISIBLE -// turnLightView.setTurnLight(light) + turnLightView.setTurnLight(light) } @@ -651,8 +650,9 @@ class MoGoHmiFragment : MvpFragment * 显示刹车效果 */ override fun showBrakeLight(light: Int) { + Logger.d("liyz", "hmiFragment showBrakeLight --- light = $light") // brakeView?.visibility = View.VISIBLE -// brakeView.setBrakeLight(light) + brakeView.setBrakeLight(light) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeView.java deleted file mode 100644 index 61d607fb1d..0000000000 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeView.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.mogo.eagle.core.function.hmi.ui.turnlight; - -import android.animation.AnimatorSet; -import android.animation.ObjectAnimator; -import android.content.Context; -import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.view.View; -import android.view.animation.AlphaAnimation; -import android.view.animation.DecelerateInterpolator; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.constraintlayout.widget.ConstraintLayout; - -import com.mogo.eagle.core.function.hmi.R; - -/** - * @author lixiaopeng - * @description 刹车 - * @since: 1/26/22 - */ -public class BrakeView extends ConstraintLayout { - - private LinearLayout brakeLayout; - private ImageView imageBrake; - private TextView tvBrake; - private Context mContext; - - public BrakeView(@NonNull Context context) { - super(context); - mContext = context; - LayoutInflater.from(context).inflate(R.layout.view_brake_light, this); - initView(); - } - - public BrakeView(@NonNull Context context, @Nullable AttributeSet attrs) { - super(context, attrs); - } - - public BrakeView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - public BrakeView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - } - - public void initView() { - brakeLayout = findViewById(R.id.layout_brake); - imageBrake = findViewById(R.id.image_brake); - tvBrake = findViewById(R.id.tv_brake); - } - - /** - * 刹车动画 - */ - public void setBrakeLight(int brakeLight) { - AlphaAnimation appearAnimation = new AlphaAnimation(0, 1f); - appearAnimation.setDuration(300); - - brakeLayout.startAnimation(appearAnimation); - imageBrake.startAnimation(appearAnimation); - tvBrake.startAnimation(appearAnimation); - brakeLayout.setVisibility(View.VISIBLE); - imageBrake.setVisibility(View.VISIBLE); - tvBrake.setVisibility(View.VISIBLE); - - if (brakeLight == 1) { //TODO 暂时还不知道数据 - - } else { //不踩刹车，就消失 - AlphaAnimation disappearAnimation = new AlphaAnimation(1, 0); - disappearAnimation.setDuration(300); - - scaleImageAndTv(); - - brakeLayout.startAnimation(disappearAnimation); - imageBrake.startAnimation(disappearAnimation); - tvBrake.startAnimation(disappearAnimation); - brakeLayout.setVisibility(View.GONE); - imageBrake.setVisibility(View.GONE); - tvBrake.setVisibility(View.GONE); - } - } - - - private void scaleImageAndTv() { - AnimatorSet animatorSuofang = new AnimatorSet();//组合动画 - ObjectAnimator scaleX = ObjectAnimator.ofFloat(imageBrake, "scaleX", 1f, 1.3f); - ObjectAnimator scaleY = ObjectAnimator.ofFloat(imageBrake, "scaleY", 1f, 1.3f); - animatorSuofang.setDuration(200); - animatorSuofang.setInterpolator(new DecelerateInterpolator()); - animatorSuofang.play(scaleX).with(scaleY); - animatorSuofang.start(); - - ObjectAnimator scaleXTv = ObjectAnimator.ofFloat(tvBrake, "scaleX", 1f, 1.3f); - ObjectAnimator scaleYTv = ObjectAnimator.ofFloat(tvBrake, "scaleY", 1f, 1.3f); - animatorSuofang.setDuration(200); - animatorSuofang.setInterpolator(new DecelerateInterpolator()); - animatorSuofang.play(scaleXTv).with(scaleYTv); - animatorSuofang.start(); - } - - private void stopAnimate() { - tvBrake.clearAnimation(); - imageBrake.clearAnimation(); - } - -} diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeViewStatus.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeViewStatus.kt new file mode 100644 index 0000000000..53ab8b9b90 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeViewStatus.kt @@ -0,0 +1,80 @@ +package com.mogo.eagle.core.function.hmi.ui.turnlight + +import android.animation.AnimatorSet +import android.animation.ObjectAnimator +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.view.View +import android.view.animation.AlphaAnimation +import android.view.animation.DecelerateInterpolator +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.function.hmi.R +import kotlinx.android.synthetic.main.view_brake_light_status.view.* + +/** + * @description + * + * @author lixiaopeng + * @since 2022/1/10 + */ +class BrakeViewStatus @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr) { + init { + LayoutInflater.from(context).inflate(R.layout.view_brake_light_status, this, true) + } + + /** + * 刹车动画 + */ + fun setBrakeLight(brakeLight: Int) { + if (brakeLight == 1) { //TODO 暂时还不知道数据，如果一直猜会怎样？ + var appearAnimation = AlphaAnimation(0f, 1f) + appearAnimation.duration = 300 + layout_brake.startAnimation(appearAnimation) + image_brake.startAnimation(appearAnimation) + tv_brake.startAnimation(appearAnimation) + layout_brake.visibility = View.VISIBLE + image_brake.visibility = View.VISIBLE + tv_brake.visibility = View.VISIBLE + + } else { //不踩刹车，就消失 + var disappearAnimation = AlphaAnimation(1f, 0f) + disappearAnimation.duration = 300 + scaleImageAndTv() + layout_brake.startAnimation(disappearAnimation) + image_brake.startAnimation(disappearAnimation) + tv_brake.startAnimation(disappearAnimation) + layout_brake.visibility = View.GONE + image_brake.visibility = View.GONE + tv_brake.visibility = View.GONE + } + } + + + private fun scaleImageAndTv() { + val animatorSuofang = AnimatorSet() //组合动画 + val scaleX = ObjectAnimator.ofFloat(image_brake, "scaleX", 1f, 1.3f) + val scaleY = ObjectAnimator.ofFloat(image_brake, "scaleY", 1f, 1.3f) + animatorSuofang.duration = 200 + animatorSuofang.interpolator = DecelerateInterpolator() + animatorSuofang.play(scaleX).with(scaleY) + animatorSuofang.start() + val scaleXTv = ObjectAnimator.ofFloat(tv_brake, "scaleX", 1f, 1.3f) + val scaleYTv = ObjectAnimator.ofFloat(tv_brake, "scaleY", 1f, 1.3f) + animatorSuofang.duration = 200 + animatorSuofang.interpolator = DecelerateInterpolator() + animatorSuofang.play(scaleXTv).with(scaleYTv) + animatorSuofang.start() + } + + private fun stopAnimate() { + tv_brake.clearAnimation() + image_brake.clearAnimation() + } + + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightView.java deleted file mode 100644 index 7a99d78ccb..0000000000 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightView.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.mogo.eagle.core.function.hmi.ui.turnlight; - -import android.content.Context; -import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.view.View; -import android.view.animation.AlphaAnimation; -import android.view.animation.Animation; -import android.view.animation.LinearInterpolator; -import android.widget.FrameLayout; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.constraintlayout.widget.ConstraintLayout; - -import com.mogo.eagle.core.function.hmi.R; - -/** - * @author lixiaopeng - * @description 顶部转向灯 - * @since: 1/26/22 - */ -public class TurnLightView extends ConstraintLayout { - - private FrameLayout mTurnLightBgLayout; - private ImageView mLeftNormalImage, mLeftSelectImage; - private ImageView mRightNormalImage, mRightSelectImage; - private Context mContext; - - public TurnLightView(@NonNull Context context) { - super(context); - mContext = context; - LayoutInflater.from(context).inflate(R.layout.view_turn_light, this); - initView(); - } - - public TurnLightView(@NonNull Context context, @Nullable AttributeSet attrs) { - super(context, attrs); - } - - public TurnLightView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - public TurnLightView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - } - - public void initView() { - mTurnLightBgLayout = findViewById(R.id.turn_light_layout); - mLeftNormalImage = findViewById(R.id.left_nor_image); - mLeftSelectImage = findViewById(R.id.left_select_image); - mRightNormalImage = findViewById(R.id.right_nor_image); - mRightSelectImage = findViewById(R.id.right_select_image); - } - - /** - * 转向灯动画 - */ - public void setTurnLight(int directionLight) { - //显示背景 - AlphaAnimation appearAnimation = new AlphaAnimation(0, 1f); - appearAnimation.setDuration(600); - - AlphaAnimation appearAnimationImage = new AlphaAnimation(0, 1f); - appearAnimation.setDuration(900); - - mTurnLightBgLayout.startAnimation(appearAnimation); - mLeftNormalImage.startAnimation(appearAnimationImage); - mRightNormalImage.startAnimation(appearAnimationImage); - mTurnLightBgLayout.setVisibility(View.VISIBLE); - mLeftNormalImage.setVisibility(View.VISIBLE); - mRightNormalImage.setVisibility(View.VISIBLE); - - //根据左右进行显示和隐藏，实际要判断每个来的时间和频度 TODO - if (directionLight == 1) { //左转向 - mLeftSelectImage.setVisibility(View.VISIBLE); - mRightSelectImage.setVisibility(View.GONE); - setAnimation(mLeftSelectImage); - } else if (directionLight == 2) { //右转向 - mLeftSelectImage.setVisibility(View.GONE); - mRightSelectImage.setVisibility(View.VISIBLE); - setAnimation(mRightSelectImage); - } else { //消失 - animationDisappear(); - } - } - - //消失动画，当转向等数据为空时候 - private void animationDisappear() { - mLeftSelectImage.setVisibility(View.GONE); - mRightSelectImage.setVisibility(View.GONE); - - AlphaAnimation disappearAnimationLeft = new AlphaAnimation(1, 0); - disappearAnimationLeft.setDuration(150); - AlphaAnimation disappearAnimationBg = new AlphaAnimation(1, 0); - disappearAnimationBg.setDuration(900); - - mTurnLightBgLayout.startAnimation(disappearAnimationBg); - mLeftNormalImage.startAnimation(disappearAnimationLeft); - mRightNormalImage.startAnimation(disappearAnimationLeft); - mTurnLightBgLayout.setVisibility(View.GONE); - mLeftNormalImage.setVisibility(View.GONE); - mRightNormalImage.setVisibility(View.GONE); - } - - //实现图片闪烁效果 - private void setAnimation(ImageView imageView) { - AlphaAnimation animation = new AlphaAnimation(1, 0); - - animation.setDuration(800); - animation.setInterpolator(new LinearInterpolator()); - animation.setRepeatCount(Animation.INFINITE); - animation.setRepeatMode(Animation.REVERSE); - imageView.startAnimation(animation); - } - - -} 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 new file mode 100644 index 0000000000..34c0419acc --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightViewStatus.kt @@ -0,0 +1,97 @@ +package com.mogo.eagle.core.function.hmi.ui.turnlight + +import android.content.Context +import android.util.AttributeSet +import android.util.Log +import android.view.LayoutInflater +import android.view.View +import android.view.animation.AlphaAnimation +import android.view.animation.Animation +import android.view.animation.LinearInterpolator +import android.widget.FrameLayout +import android.widget.ImageView +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.function.hmi.R +import kotlinx.android.synthetic.main.view_turn_light_status.view.* + +/** + * @description + * + * @author lixiaopeng + * @since 2022/1/10 + */ +class TurnLightViewStatus @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr) { + init { + LayoutInflater.from(context).inflate(R.layout.view_turn_light_status, this, true) + } + + /** + * 转向灯动画 + */ + fun setTurnLight(directionLight: Int) { + //显示背景 + val appearAnimation = AlphaAnimation(0f, 1.0f) + appearAnimation.duration = 600 + val appearAnimationImage = AlphaAnimation(0f, 1.0f) + appearAnimation.duration = 900 + turn_light_layout.startAnimation(appearAnimation) + left_nor_image.startAnimation(appearAnimationImage) + right_nor_image.startAnimation(appearAnimationImage) + + turn_light_layout.visibility = View.VISIBLE + left_nor_image.visibility = View.VISIBLE + right_nor_image.visibility = View.VISIBLE + + //根据左右进行显示和隐藏，实际要判断每个来的时间和频度 TODO + Log.d("liyz", "directionLight = $directionLight") + if (directionLight == 1) { //左转向 + left_select_image.visibility = View.VISIBLE + right_select_image.visibility = View.GONE + setAnimation(left_select_image) + } else if (directionLight == 2) { //右转向 + left_select_image.visibility = View.GONE + right_select_image.visibility = View.VISIBLE + setAnimation(right_select_image) + } else { //消失 + animationDisappear() + stopAnimate() + } + } + + //消失动画，当转向等数据为空时候 + private fun animationDisappear() { + left_select_image.visibility = View.GONE + right_select_image.visibility = View.GONE + val disappearAnimationLeft = AlphaAnimation(1.0f, 0f) + disappearAnimationLeft.duration = 150 + val disappearAnimationBg = AlphaAnimation(1.0f, 0f) + disappearAnimationBg.duration = 900 + turn_light_layout.startAnimation(disappearAnimationBg) + left_nor_image.startAnimation(disappearAnimationLeft) + right_nor_image.startAnimation(disappearAnimationLeft) + + turn_light_layout.visibility = View.GONE + left_nor_image.visibility = View.GONE + right_nor_image.visibility = View.GONE + } + + //实现图片闪烁效果 + private fun setAnimation(imageView: ImageView) { + val animation = AlphaAnimation(1.0f, 0f) + animation.duration = 800 + animation.interpolator = LinearInterpolator() + animation.repeatCount = Animation.INFINITE + animation.repeatMode = Animation.REVERSE + imageView.startAnimation(animation) + } + + private fun stopAnimate() { + left_select_image.clearAnimation() + right_select_image.clearAnimation() + } + +} \ No newline at end of file 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 f80876e857..e34535885b 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 @@ -128,24 +128,20 @@ tools:visibility="visible" /> - - - - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status.xml new file mode 100644 index 0000000000..8aa741682d --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status.xml @@ -0,0 +1,44 @@ + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_turn_light.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_turn_light.xml deleted file mode 100644 index 9fc5c4ebf8..0000000000 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_turn_light.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_turn_light_status.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_turn_light_status.xml new file mode 100644 index 0000000000..91b13bd8d5 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_turn_light_status.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt index 459032aa8c..b10fbffcba 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt @@ -212,7 +212,7 @@ object CallerHmiManager : CallerBase() { * @param brakeLight */ fun showBrakeLight(brakeLight: Int) { - waringProviderApi.showTurnLight(brakeLight) + waringProviderApi.showBrakeLight(brakeLight) } fun showNoSignalView() {