From 3caf13d71b4bb0066603d15aebe042e247484a7d Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 8 Feb 2023 00:30:49 +0800 Subject: [PATCH] =?UTF-8?q?[m1]=20[1.0.0]=20[=E8=B7=9D=E7=A6=BBui]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../m1/res/drawable-nodpi/bus_p_car_speed.png | Bin 0 -> 22923 bytes .../res/drawable/bus_p_distance_info_bg.xml | 6 + .../bus_p_function_distance_split_bg.xml | 5 + .../src/m1/res/layout/bus_p_fragment.xml | 134 +++++++++++++++++- .../src/m1/res/values/color.xml | 2 + .../src/m1/res/values/strings.xml | 2 + 6 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_car_speed.png create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_distance_info_bg.xml create mode 100644 OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_distance_split_bg.xml diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_car_speed.png b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_car_speed.png new file mode 100644 index 0000000000000000000000000000000000000000..baaa80c7655630ccc40e1580192495200a6305cb GIT binary patch literal 22923 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 + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_distance_split_bg.xml b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_distance_split_bg.xml new file mode 100644 index 0000000000..98e4a2c6aa --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_distance_split_bg.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml index ed49a275e5..8c7d595af8 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml @@ -6,7 +6,8 @@ + + + + + + + + + + + + + + + + + + + + + + + + + #2CBFFC #1060FF #96A5C2 + #F5FBFF + #112B57 #CCFFFFFF \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/values/strings.xml b/OCH/mogo-och-bus-passenger/src/m1/res/values/strings.xml index 383de93c7b..7f49cb4b57 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/res/values/strings.xml +++ b/OCH/mogo-och-bus-passenger/src/m1/res/values/strings.xml @@ -21,6 +21,8 @@ 开启顶灯2 开启氛围灯 + KM/h + \ No newline at end of file