diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt index 69c93a4e25..bfc83e98b9 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt @@ -31,9 +31,9 @@ class BusOperationView @JvmOverloads constructor( override fun changerOperationStatus(isOut: Boolean) { if (isOut){ - ochBusOperationStatusCTV.setText("收车") + ochBusOperationStatusCTV.text = "收车" }else{ - ochBusOperationStatusCTV.setText("出车") + ochBusOperationStatusCTV.text = "出车" } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/icon_bus_operation_status.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/icon_bus_operation_status.png new file mode 100755 index 0000000000..3bb32ec0aa Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/icon_bus_operation_status.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/icon_bus_operation_status_un.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/icon_bus_operation_status_un.png new file mode 100755 index 0000000000..de0935fe4d Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/icon_bus_operation_status_un.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_bus_operation_status.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_bus_operation_status.png new file mode 100755 index 0000000000..3bb32ec0aa Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_bus_operation_status.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_bus_operation_status_un.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_bus_operation_status_un.png new file mode 100755 index 0000000000..de0935fe4d Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_bus_operation_status_un.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_bus_operation_status.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_bus_operation_status.png new file mode 100755 index 0000000000..3bb32ec0aa Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_bus_operation_status.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_bus_operation_status_un.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_bus_operation_status_un.png new file mode 100755 index 0000000000..de0935fe4d Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_bus_operation_status_un.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bus_operation_status_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bus_operation_status_bg.xml deleted file mode 100644 index 1a5ed95148..0000000000 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bus_operation_status_bg.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_och_bus_operation.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_och_bus_operation.xml index 34d3091b0b..267d9a844a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_och_bus_operation.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_och_bus_operation.xml @@ -7,6 +7,7 @@ android:layout_marginTop="40px" android:paddingBottom="40px" android:visibility="gone" + tools:visibility="visible" tools:ignore="DuplicateIds"> @@ -33,12 +35,11 @@ android:layout_below="@+id/tv_bus_operation_title" android:layout_marginStart="113px" android:layout_marginTop="40px" - android:background="@drawable/bus_operation_status_bg" - android:elevation="@dimen/dp_10" + android:background="@drawable/bus_operation_status_bg_selector1" android:gravity="center" android:text="出车" android:textAlignment="center" - android:textColor="@drawable/bus_autopilot_text_color_selector" + android:textColor="@color/bus_autopilot_text_color_normal" android:textSize="@dimen/module_mogo_och_autopilot_status_text_size" android:textStyle="bold" /> \ No newline at end of file