Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0

2023-02-01 18:35:45 +08:00
parent 4e9ca58409 76b9abf4b2
commit 57ee81a459
119 changed files with 1390 additions and 1689 deletions
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt
@@ -3,7 +3,9 @@ package com.mogo.eagle.core.function.hmi.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import com.mogo.eagle.core.data.enums.DataSourceType
+import com.mogo.eagle.core.data.enums.TrafficLightEnum
+import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.hmi.WaringConst

 /**
@@ -57,11 +59,17 @@ class V2XTrafficLightBroadcastReceiver : BroadcastReceiver() {
     * @param trafficLightCountDown    对应交通灯倒计时，如果倒计时为0，则disable
     */
    private fun dispatchShowWaring(trafficLightCheckType: Int, trafficLightCountDown: Int) {
-        CallerHmiManager.showWarningTrafficLight(trafficLightCheckType,1)
+        val trafficLightType = when(trafficLightCheckType){
+            1 ->  TrafficLightEnum.RED
+            2 ->  TrafficLightEnum.YELLOW
+            3 -> TrafficLightEnum.GREEN
+            else -> TrafficLightEnum.BLACK
+        }
+        CallerTrafficLightListenerManager.showTrafficLight(trafficLightType,DataSourceType.DEFAULT)
        when(trafficLightCheckType){
-            1 -> CallerHmiManager.changeCountdownRed(trafficLightCountDown)
-            2 -> CallerHmiManager.changeCountdownYellow(trafficLightCountDown)
-            3 -> CallerHmiManager.changeCountdownGreen(trafficLightCountDown)
+            1 -> CallerTrafficLightListenerManager.changeCountdownRed(trafficLightCountDown)
+            2 -> CallerTrafficLightListenerManager.changeCountdownYellow(trafficLightCountDown)
+            3 -> CallerTrafficLightListenerManager.changeCountdownGreen(trafficLightCountDown)
        }
    }

@@ -69,6 +77,6 @@ class V2XTrafficLightBroadcastReceiver : BroadcastReceiver() {
     * 关闭交通灯
     */
    private fun dispatchCloseWaring() {
-        CallerHmiManager.disableWarningTrafficLight()
+        CallerTrafficLightListenerManager.disableTrafficLight()
    }
 }
--- 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
@@ -29,8 +29,6 @@ import com.mogo.eagle.core.data.map.Infrastructure
 import com.mogo.eagle.core.data.notice.NoticeNormalData
 import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData
 import com.mogo.eagle.core.data.report.ReportEntity
-import com.mogo.eagle.core.function.api.hmi.IMoGoHmiViewProxy
-import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoHmiProvider
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
@@ -78,17 +76,12 @@ import java.util.concurrent.atomic.AtomicReference
@Route(path = MoGoFragmentPaths.PATH_FRAGMENT_HMI)
 class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
    IMoGoHmiProvider,
-    IMoGoHmiViewProxy,
    MoGoHmiContract.View {

    companion object {
        private const val TAG = "MoGoHmiFragment"
    }

-    // HMI 视图控件代理
-    // todo 需要统一数据源  红绿灯 View代理
-    private var mViewTrafficLight: IViewTrafficLight? = null
-
    private val lastSpeakJob by lazy { AtomicReference<Job>() }
    private var lastShowV2XJob: Job? = null

@@ -98,14 +91,6 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),

    }

-    /** todo ----------------------------------------------**/
-    /**
-     * 设置 红绿灯 代理View
-     */
-    override fun setProxyTrafficLightView(view: IViewTrafficLight) {
-        mViewTrafficLight = view
-    }
-
    /**
     * ok
     * 工控机重启返回结果
@@ -309,55 +294,6 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
        }
    }

-    /**
-     * 展示红绿灯预警
-     *
-     * @param checkLightId 0-都是默认不亮起，1-红，2-黄，3-绿
-     * @param lightSource 1:云端下发；2:自车感知
-     */
-    override fun showWarningTrafficLight(checkLightId: Int, lightSource: Int) {
-        mViewTrafficLight?.showWarningTrafficLight(checkLightId, lightSource)
-    }
-
-    override fun isWarningTrafficLightShow(): Boolean {
-        return mViewTrafficLight?.visibility == View.VISIBLE
-    }
-
-    /**
-     * 关闭红绿灯预警展示，并重制灯态
-     */
-    override fun disableWarningTrafficLight() {
-        mViewTrafficLight?.disableWarningTrafficLight()
-    }
-
-    /**
-     * 关闭红绿灯倒计时
-     */
-    override fun disableWarningTrafficLightCountDown() {
-        mViewTrafficLight?.disableCountdown()
-    }
-
-    override fun changeCountdownRed(redNum: Int) {
-        mViewTrafficLight?.changeCountdownRed(redNum)
-    }
-
-    override fun changeCountdownYellow(yellowNum: Int) {
-        mViewTrafficLight?.changeCountdownYellow(yellowNum)
-    }
-
-    override fun changeCountdownGreen(greenNum: Int) {
-        mViewTrafficLight?.changeCountdownGreen(greenNum)
-    }
-
-    /**
-     * @param readNum 红灯倒计时
-     * @param yellowNum 黄灯倒计时
-     * @param greenNum 绿灯倒计时
-     */
-    override fun changeCountdownTrafficLightNum(readNum: Int, yellowNum: Int, greenNum: Int) {
-        mViewTrafficLight?.changeCountdownTrafficLightNum(readNum, yellowNum, greenNum)
-    }
-
    /**
     * 展示指定方位上的红框预警
     * @param direction
@@ -509,7 +445,6 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
            "${SceneConstant.M_DEVA}${"TurnLight"}",
            "---showTurnLight = $light ---isLeftLight = $isLeftLight ---isRightLight = $isRightLight"
        )
-        if (HmiBuildConfig.isShowTurnLightView) {
            ThreadUtils.runOnUiThread {
                if (light == 1 || light == 2) {
                    if (!isVisualAngleChanged) {
@@ -557,7 +492,6 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
                    }
                }
            }
-        }
    }

    private var isBrake: Boolean = false
@@ -566,7 +500,6 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
     * 显示刹车效果
     */
    override fun showBrakeLight(light: Int) {
-        if (HmiBuildConfig.isShowBrakeLightView) {
            ThreadUtils.runOnUiThread {
                if (light == 1) { //刹车灯亮
                    if (!isBrake) {
@@ -587,8 +520,8 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
                        CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(3, 500)
                    }
                }
+                brakeView.setBrakeLight(light)
            }
-        }
    }
    /** todo----------------------------------------------- **/

@@ -658,14 +591,6 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
        }
    }

-    override fun setTurnLightFunction(isOpen: Boolean) {
-        HmiBuildConfig.isShowTurnLightView = isOpen
-    }
-
-    override fun setBrakeLightFunction(isOpen: Boolean) {
-        HmiBuildConfig.isShowBrakeLightView = isOpen
-    }
-
    override fun setSnBinding(isOpen: Boolean) {
        HmiBuildConfig.isShowSnBindingView = isOpen
    }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt
@@ -82,8 +82,8 @@ class PncActionsView @JvmOverloads constructor(
                        //如果是存在云端红绿灯数据条件下，设置云端数据
                        if (PncActionsHelper.isWaitingTrafficlight(it.drivingState.number, it.drivingAction.number)
                            && mTrafficLightResult != null
-                            && getWaitTrafficlightTime().isNotBlank()) {
-                            actions += ",预计${getWaitTrafficlightTime()}秒后通过"
+                            && getWaitTrafficLightTime().isNotBlank()) {
+                            actions += ",预计${getWaitTrafficLightTime()}秒后通过"
                        } else {
                            mTrafficLightResult = null
                        }
@@ -106,7 +106,7 @@ class PncActionsView @JvmOverloads constructor(
        mTrafficLightResult = trafficLightResult
    }

-    private fun getWaitTrafficlightTime(): String {
+    private fun getWaitTrafficLightTime(): String {
        return if (mTrafficLightResult != null
            && mTrafficLightResult!!.currentRoadTrafficLight() != null
            && mTrafficLightResult!!.currentRoadTrafficLight()!!.isRed()
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -1048,29 +1048,6 @@ internal class DebugSettingView @JvmOverloads constructor(
            }
        }

-
-        /**
-         * 打开、关闭转向灯控制
-         */
-        tbOpenLight.setOnCheckedChangeListener { _, isChecked ->
-            if (!isChecked) {
-                CallerHmiManager.setTurnLightFunction(true)
-            } else {
-                CallerHmiManager.setTurnLightFunction(false)
-            }
-        }
-
-        /**
-         * 打开、关闭刹车控制
-         */
-        tbOpenBrakeLight.setOnCheckedChangeListener { _, isChecked ->
-            if (!isChecked) {
-                CallerHmiManager.setBrakeLightFunction(true)
-            } else {
-                CallerHmiManager.setBrakeLightFunction(false)
-            }
-        }
-
        /**
         * sn绑定控制
         */
@@ -1959,22 +1936,6 @@ internal class DebugSettingView @JvmOverloads constructor(
    }


-    /**
-     * 车辆转向灯 数据
-     * @param lightSwitch
-     */
-    override fun onAutopilotLightSwitchData(lightSwitch: Chassis.LightSwitch?) {
-
-    }
-
-    /**
-     * 车辆刹车灯 数据
-     * @param brakeLight
-     */
-    override fun onAutopilotBrakeLightData(brakeLight: Boolean) {
-
-    }
-
    /**
     * 车辆方向盘转向角回调
     * @param steering 方向盘转向角
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
@@ -20,6 +20,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.function.business.routeoverlay.RouteStrategy
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
+import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import kotlinx.android.synthetic.main.view_sop_setting.view.*
@@ -139,7 +140,7 @@ internal class SOPSettingView @JvmOverloads constructor(
                HmiBuildConfig.isShowTrafficLightView = false
            } else {
                HmiBuildConfig.isShowTrafficLightView = true
-                CallerHmiManager.disableWarningTrafficLight()
+                CallerTrafficLightListenerManager.disableTrafficLight()
            }
        }

--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt
@@ -5,13 +5,17 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.config.HmiBuildConfig
+import com.mogo.eagle.core.data.enums.DataSourceType
+import com.mogo.eagle.core.data.enums.TrafficLightEnum
 import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener
 import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener.Companion.TrafficLightView_TAG
-import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight
+import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
+import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
@@ -23,13 +27,18 @@ class SingleTrafficLightView @JvmOverloads constructor(
    context: Context?,
    attrs: AttributeSet? = null,
    defStyleAttr: Int = 0
-) : IViewTrafficLight(context, attrs, defStyleAttr), IViewControlListener {
+) : LinearLayout(context, attrs, defStyleAttr), IViewControlListener, IMoGoTrafficLightListener {
+
+    companion object {
+        private const val TAG = "SingleTrafficLightView"
+    }
+
    private var mLightIconIV: ImageView? = null
    private var mLightIconBG: ImageView? = null
    private var mLightTimeTV: GradientTextView? = null
    private var mLightSourceTV: TextView? = null
    private var mLightSourceDivider: View? = null
-    private var mCurrentLightId = 0
+    private var mCurrentLightId = TrafficLightEnum.BLACK

    override fun onAttachedToWindow() {
        super.onAttachedToWindow()
@@ -40,6 +49,7 @@ class SingleTrafficLightView @JvmOverloads constructor(
        mLightSourceTV = findViewById(R.id.hmi_traffic_light_source)
        mLightSourceDivider = findViewById(R.id.hmi_traffic_light_divider)

+        CallerTrafficLightListenerManager.addListener(TAG, this)
        CallerHmiViewControlListenerManager.addListener(TrafficLightView_TAG, this)
    }

@@ -50,6 +60,7 @@ class SingleTrafficLightView @JvmOverloads constructor(

    override fun onDetachedFromWindow() {
        super.onDetachedFromWindow()
+        CallerTrafficLightListenerManager.removeListener(TAG)
        CallerHmiViewControlListenerManager.removeListener(TrafficLightView_TAG)
    }

@@ -57,10 +68,10 @@ class SingleTrafficLightView @JvmOverloads constructor(
     * 展示红绿灯预警
     *
     * @param checkLightId 0-都是默认，1-红，2-黄，3-绿
-     * @param lightSource 1:云端下发；2:自车感知
+     * @param lightSource 1:云端下发；2:自车感知 3:OBU
     */
-    override fun showWarningTrafficLight(checkLightId: Int, lightSource: Int) {
-        super.showWarningTrafficLight(checkLightId, lightSource)
+    override fun showTrafficLight(checkLightId: TrafficLightEnum, lightSource: DataSourceType) {
+        super.showTrafficLight(checkLightId, lightSource)
        mCurrentLightId = checkLightId
        if (!HmiBuildConfig.isShowTrafficLightView) {
            updateTrafficLightIcon(checkLightId, lightSource)
@@ -70,16 +81,16 @@ class SingleTrafficLightView @JvmOverloads constructor(
    /**
     * 关闭红绿灯预警展示，并重制灯态
     */
-    override fun disableWarningTrafficLight() {
-        super.disableWarningTrafficLight()
+    override fun disableTrafficLight() {
+        super.disableTrafficLight()
        UiThreadHandler.post {
-            mCurrentLightId = 0
+            mCurrentLightId = TrafficLightEnum.BLACK
            this@SingleTrafficLightView.visibility = GONE
        }
    }

-    override fun disableCountdown() {
-        super.disableCountdown()
+    override fun disableTrafficLightCountDown() {
+        super.disableTrafficLightCountDown()
        UiThreadHandler.post {
            // 小巴车的司机端需要展示红绿灯信号来源
            if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)
@@ -118,9 +129,9 @@ class SingleTrafficLightView @JvmOverloads constructor(
        UiThreadHandler.post {
            resetView()
            when (mCurrentLightId) {
-                1 -> changeCountdownRed(redNum)
-                2 -> changeCountdownYellow(yellowNum)
-                3 -> changeCountdownGreen(greenNum)
+                TrafficLightEnum.RED -> changeCountdownRed(redNum)
+                TrafficLightEnum.YELLOW -> changeCountdownYellow(yellowNum)
+                TrafficLightEnum.GREEN -> changeCountdownGreen(greenNum)
                else -> UiThreadHandler.post { mLightTimeTV!!.text = "" }
            }
        }
@@ -140,7 +151,7 @@ class SingleTrafficLightView @JvmOverloads constructor(
                )
                mLightTimeTV!!.text = redNum.toString()
            } else {
-                disableCountdown()
+                disableTrafficLightCountDown()
                mLightTimeTV!!.text = ""
            }
        }
@@ -160,7 +171,7 @@ class SingleTrafficLightView @JvmOverloads constructor(
                )
                mLightTimeTV!!.text = greenNum.toString()
            } else {
-                disableCountdown()
+                disableTrafficLightCountDown()
                mLightTimeTV!!.text = ""
            }
        }
@@ -180,7 +191,7 @@ class SingleTrafficLightView @JvmOverloads constructor(
                )
                mLightTimeTV!!.text = yellowNum.toString()
            } else {
-                disableCountdown()
+                disableTrafficLightCountDown()
                mLightTimeTV!!.text = ""
            }
        }
@@ -192,30 +203,33 @@ class SingleTrafficLightView @JvmOverloads constructor(
     * @param lightId 0-都是默认，1-红，2-黄，3-绿
     * @param lightSource 1:云端下发；2:自车感知
     */
-    private fun updateTrafficLightIcon(lightId: Int, lightSource: Int) {
+    private fun updateTrafficLightIcon(lightId: TrafficLightEnum, lightSource: DataSourceType) {
        UiThreadHandler.post {
            when (lightId) {
-                1 -> {
+                TrafficLightEnum.RED -> {
                    mLightIconIV!!.setBackgroundResource(R.drawable.hmi_light_red_nor)
                    this@SingleTrafficLightView.visibility = VISIBLE
                }
-                2 -> {
+                TrafficLightEnum.YELLOW -> {
                    mLightIconIV!!.setBackgroundResource(R.drawable.hmi_lightyellow_nor)
                    this@SingleTrafficLightView.visibility = VISIBLE
                }
-                3 -> {
+                TrafficLightEnum.GREEN -> {
                    mLightIconIV!!.setBackgroundResource(R.drawable.hmi_light_green_nor)
                    this@SingleTrafficLightView.visibility = VISIBLE
                }
                else -> this@SingleTrafficLightView.visibility = GONE
            }
            when (lightSource) {
-                1 -> {
+                DataSourceType.AICLOUD -> {
                    mLightSourceTV!!.text = "云端下发"
                }
-                2 -> {
+                DataSourceType.TELEMATIC -> {
                    mLightSourceTV!!.text = "自车感知"
                }
+                DataSourceType.OBU -> {
+                    mLightSourceTV!!.text = "OBU"
+                }
                else -> {
                    mLightSourceTV!!.visibility = GONE
                }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficLightView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficLightView.kt
@@ -1,122 +0,0 @@
-package com.mogo.eagle.core.function.hmi.ui.widget
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.view.View
-import androidx.constraintlayout.widget.ConstraintLayout
-import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight
-import com.mogo.eagle.core.function.hmi.R
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import kotlinx.android.synthetic.main.view_traffic_light_vr.view.*
-
-/**
- * @author xiaoyuzhou
- * @date 2021/8/4 3:16 下午
- * 红绿灯控件
- */
-class TrafficLightView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0
-) : IViewTrafficLight(context, attrs, defStyleAttr)  {
-
-
-    init {
-        LayoutInflater.from(context).inflate(R.layout.view_traffic_light_vr, this, true)
-    }
-
-    /**
-     * 展示红绿灯预警
-     *
-     * @param checkLightId 0-都是默认，1-红，2-黄，3-绿
-     * @param lightSource 1:云端下发；2:自车感知
-     */
-    override fun showWarningTrafficLight(checkLightId: Int,lightSource: Int) {
-        UiThreadHandler.post {
-            visibility = View.VISIBLE
-            when (checkLightId) {
-                0 -> {
-                    ctvRedTrafficLight.isChecked = false
-                    ctvYellowTrafficLight.isChecked = false
-                    ctvGreenTrafficLight.isChecked = false
-                }
-                1 -> {
-                    ctvRedTrafficLight.isChecked = true
-                    ctvYellowTrafficLight.isChecked = false
-                    ctvGreenTrafficLight.isChecked = false
-                }
-                2 -> {
-                    ctvRedTrafficLight.isChecked = false
-                    ctvYellowTrafficLight.isChecked = true
-                    ctvGreenTrafficLight.isChecked = false
-                }
-                3 -> {
-                    ctvRedTrafficLight.isChecked = false
-                    ctvYellowTrafficLight.isChecked = false
-                    ctvGreenTrafficLight.isChecked = true
-                }
-            }
-        }
-    }
-
-    /**
-     * 关闭红绿灯预警展示，并重制灯态
-     */
-    override fun disableWarningTrafficLight() {
-        UiThreadHandler.post {
-            visibility = View.GONE
-            ctvRedTrafficLight.isChecked = false
-            ctvYellowTrafficLight.isChecked = false
-            ctvGreenTrafficLight.isChecked = false
-            ctvRedTrafficLight.text = ""
-            ctvYellowTrafficLight.text = ""
-            ctvGreenTrafficLight.text = ""
-        }
-    }
-
-
-    /**
-     * @param readNum 红灯倒计时
-     * @param yellowNum 黄灯倒计时
-     * @param greenNum 绿灯倒计时
-     */
-    override fun changeCountdownTrafficLightNum(readNum: Int, yellowNum: Int, greenNum: Int) {
-        UiThreadHandler.post {
-            changeCountdownGreen(readNum)
-            changeCountdownYellow(yellowNum)
-            changeCountdownRed(greenNum)
-        }
-    }
-
-    override fun changeCountdownGreen(greenNum: Int) {
-        UiThreadHandler.post {
-            if (greenNum > 0) {
-                ctvGreenTrafficLight.text = "$greenNum"
-            } else {
-                ctvGreenTrafficLight.text = ""
-            }
-        }
-    }
-
-    override fun changeCountdownYellow(yellowNum: Int) {
-        UiThreadHandler.post {
-            if (yellowNum > 0) {
-                ctvYellowTrafficLight.text = "$yellowNum"
-            } else {
-                ctvYellowTrafficLight.text = ""
-            }
-        }
-    }
-
-     override fun changeCountdownRed(redNum: Int) {
-        UiThreadHandler.post {
-            if (redNum > 0) {
-                ctvRedTrafficLight.text = "$redNum"
-            } else {
-                ctvRedTrafficLight.text = ""
-            }
-        }
-    }
-
-}
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -1286,30 +1286,6 @@
                        android:textOn="显示「小地图」"
                        android:textSize="@dimen/dp_24" />

-                    <ToggleButton
-                        android:id="@+id/tbOpenLight"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_columnWeight="1"
-                        android:layout_margin="2dp"
-                        android:gravity="center"
-                        android:padding="@dimen/dp_20"
-                        android:textOff="关闭「转向灯控制」"
-                        android:textOn="打开「转向灯控制」"
-                        android:textSize="@dimen/dp_24" />
-
-                    <ToggleButton
-                        android:id="@+id/tbOpenBrakeLight"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_columnWeight="1"
-                        android:layout_margin="2dp"
-                        android:gravity="center"
-                        android:padding="@dimen/dp_20"
-                        android:textOff="关闭「刹车控制」"
-                        android:textOn="打开「刹车控制」"
-                        android:textSize="@dimen/dp_24" />
-
                    <ToggleButton
                        android:id="@+id/tbOpenSnBinding"
                        android:layout_width="wrap_content"
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_traffic_light_vr.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_traffic_light_vr.xml
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/clTrafficLight"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@drawable/bg_waring_traffic_light_vr"
-    android:paddingStart="10dp"
-    android:paddingTop="10dp"
-    android:paddingEnd="10dp"
-    android:paddingBottom="10dp"
-    tools:visibility="visible">
-
-    <CheckedTextView
-        android:id="@+id/ctvRedTrafficLight"
-        android:layout_width="110dp"
-        android:layout_height="110dp"
-        android:background="@drawable/icon_waring_traffic_light_red_vr"
-        android:gravity="center"
-        android:textAlignment="center"
-        android:textColor="#FFFFFF"
-        android:textSize="38dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:checked="true"
-        tools:text="99" />
-
-    <CheckedTextView
-        android:id="@+id/ctvYellowTrafficLight"
-        android:layout_width="110dp"
-        android:layout_height="110dp"
-        android:layout_marginStart="90dp"
-        android:background="@drawable/icon_waring_traffic_light_yellow_vr"
-        android:gravity="center"
-        android:singleLine="true"
-        android:textAlignment="center"
-        android:textColor="#FFFFFF"
-        android:textSize="38dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/ctvRedTrafficLight"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:checked="true"
-        tools:text="99" />
-
-    <CheckedTextView
-        android:id="@+id/ctvGreenTrafficLight"
-        android:layout_width="110dp"
-        android:layout_height="110dp"
-        android:layout_marginStart="90dp"
-        android:background="@drawable/icon_waring_traffic_light_green_vr"
-        android:gravity="center"
-        android:textAlignment="center"
-        android:textColor="#FFFFFF"
-        android:textSize="38dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/ctvYellowTrafficLight"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:checked="true"
-        tools:text="99" />
-</androidx.constraintlayout.widget.ConstraintLayout>