diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml index c96dafc3ab..058ba4b9d4 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -193,6 +193,15 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> + + + - - R.layout.view_road_cross_live -// 0 -> R.layout.view_road_cross_live_light //todo test 1 -> R.layout.view_road_cross_live_light else -> R.layout.view_road_cross_live } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_light.9.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_light.9.png new file mode 100644 index 0000000000..d1f2517625 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_light.9.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_nor_light.9.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_nor_light.9.png deleted file mode 100644 index 7df8d70ba6..0000000000 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_nor_light.9.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_live_light_empty.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_live_light_empty.xml index 8e1b504558..1c02c83dcc 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_live_light_empty.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_live_light_empty.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml index 3a511c827b..0a70f9abdd 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml @@ -4,13 +4,14 @@ android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:background="@drawable/bg_nor_light"> + android:background="@drawable/bg_light"> #50E8E4 #252B3F #131415 + #B2BED9 #27FFFFFF #1E111111 #FF213757 diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt index 0ee40a2d7e..4a2cf0669e 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt @@ -26,14 +26,14 @@ object CallerMsgBoxManager { */ fun saveMsgBox(bean: MsgBoxBean) { CallerTrace.write(TAG,bean) - providerApi?.saveMsg(bean) + providerApi?.saveMsg(bean) //todo emArrow test } /** * 存储含有pb的数据到消息盒子(区别与上述方法中的trace write) */ fun saveMsgBoxHasPB(bean: MsgBoxBean){ - providerApi?.saveMsg(bean) +// providerApi?.saveMsg(bean) //todo emArrow test } /**