diff --git a/.idea/misc.xml b/.idea/misc.xml index e8f4512c29..5d602f838c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -15,7 +15,12 @@ + + + + + diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/ViewTrafficLight.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/ViewTrafficLight.kt index 95b5d1f715..20eea7ba09 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/ViewTrafficLight.kt +++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/ViewTrafficLight.kt @@ -30,7 +30,7 @@ class ViewTrafficLight @JvmOverloads constructor( * @param checkLightId 0-都是默认,1-红,2-黄,3-绿 */ fun showWarningTrafficLight(checkLightId: Int) { - clTrafficLight.visibility = View.VISIBLE + visibility = View.VISIBLE when (checkLightId) { 0 -> { ctvRedTrafficLight.isChecked = false @@ -59,7 +59,7 @@ class ViewTrafficLight @JvmOverloads constructor( * 关闭红绿灯预警展示,并重制灯态 */ fun disableWarningTrafficLight() { - clTrafficLight.visibility = View.GONE + visibility = View.GONE ctvRedTrafficLight.isChecked = false ctvYellowTrafficLight.isChecked = false ctvGreenTrafficLight.isChecked = false diff --git a/modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml b/modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml index 5ac22aa8fb..a1ea4c63b9 100644 --- a/modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml +++ b/modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml @@ -12,8 +12,10 @@ android:layout_height="wrap_content" android:layout_marginTop="40px" android:layout_marginRight="40px" + android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + tools:visibility="visible" /> diff --git a/modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml b/modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml index 9de5cc63ba..d181b84b9f 100644 --- a/modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml +++ b/modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml @@ -10,7 +10,6 @@ android:paddingTop="10px" android:paddingEnd="10px" android:paddingBottom="10px" - android:visibility="gone" tools:visibility="visible"> + android:startColor="#66FF0808" + android:type="linear"/> \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_left.xml b/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_left.xml index eb144a1779..a9b438c963 100644 --- a/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_left.xml +++ b/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_left.xml @@ -3,6 +3,6 @@ + android:startColor="#66FF0808" + android:type="linear"/> \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_right.xml b/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_right.xml index 8584828ccb..1a6e8c89b3 100644 --- a/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_right.xml +++ b/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_right.xml @@ -3,6 +3,6 @@ + android:startColor="#66FF0808" + android:type="linear"/> \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_top.xml b/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_top.xml index dc0631a675..1188f9c6d0 100644 --- a/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_top.xml +++ b/modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_top.xml @@ -3,6 +3,6 @@ + android:startColor="#66FF0808" + android:type="linear"/> \ No newline at end of file