diff --git a/OCH/mogo-och-bus-passenger/src/m2/assets/m2_map_style.data b/OCH/mogo-och-bus-passenger/src/m2/assets/m2_map_style.data index 4e4bb6709d..76641add90 100644 Binary files a/OCH/mogo-och-bus-passenger/src/m2/assets/m2_map_style.data and b/OCH/mogo-och-bus-passenger/src/m2/assets/m2_map_style.data differ diff --git a/OCH/mogo-och-bus-passenger/src/m2/assets/m2_map_style_extra.data b/OCH/mogo-och-bus-passenger/src/m2/assets/m2_map_style_extra.data index 3ce2c92d11..4bed4023d5 100644 Binary files a/OCH/mogo-och-bus-passenger/src/m2/assets/m2_map_style_extra.data and b/OCH/mogo-och-bus-passenger/src/m2/assets/m2_map_style_extra.data differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_operation_status_bg.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_operation_status_bg.png new file mode 100644 index 0000000000..3c339efde4 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_operation_status_bg.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png new file mode 100644 index 0000000000..c6717d2518 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_operation_status_select_bg.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_ai_collect.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_ai_collect.png new file mode 100755 index 0000000000..6da7b81fe4 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_ai_collect.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_bad_case.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_bad_case.png new file mode 100755 index 0000000000..22f88301f9 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_bad_case.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_operation_status_bg.xml b/OCH/mogo-och-bus/src/main/res/drawable/bus_operation_status_bg.xml deleted file mode 100644 index 4d612cb98f..0000000000 --- a/OCH/mogo-och-bus/src/main/res/drawable/bus_operation_status_bg.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_operation_status_select_bg.xml b/OCH/mogo-och-bus/src/main/res/drawable/bus_operation_status_select_bg.xml deleted file mode 100644 index f617cd9fce..0000000000 --- a/OCH/mogo-och-bus/src/main/res/drawable/bus_operation_status_select_bg.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml index 63d4c81b3e..dad68f79af 100644 --- a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml +++ b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml @@ -220,14 +220,11 @@ + android:layout_width="@dimen/dp_80" + android:layout_height="@dimen/dp_80" /> @@ -257,10 +254,8 @@ @@ -292,12 +285,9 @@ @@ -306,17 +296,14 @@ android:layout_height="@dimen/dp_80" android:layout_centerInParent="true" android:layout_gravity="center" - android:src="@drawable/bad_case_selector" /> + android:src="@drawable/icon_bad_case" /> @@ -325,7 +312,7 @@ android:layout_height="@dimen/dp_80" android:layout_centerInParent="true" android:layout_gravity="center" - android:src="@drawable/ai_collect_selector" /> + android:src="@drawable/icon_ai_collect" /> - - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bad_case_selector.xml b/OCH/mogo-och-charter/src/main/res/drawable/bad_case_selector.xml deleted file mode 100755 index bc47ce95d7..0000000000 --- a/OCH/mogo-och-charter/src/main/res/drawable/bad_case_selector.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_operation_status_bg.xml b/OCH/mogo-och-charter/src/main/res/drawable/bus_operation_status_bg.xml deleted file mode 100644 index 4d612cb98f..0000000000 --- a/OCH/mogo-och-charter/src/main/res/drawable/bus_operation_status_bg.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_operation_status_bg_selector.xml b/OCH/mogo-och-charter/src/main/res/drawable/bus_operation_status_bg_selector.xml index 3a3dc6a292..c992e49c31 100755 --- a/OCH/mogo-och-charter/src/main/res/drawable/bus_operation_status_bg_selector.xml +++ b/OCH/mogo-och-charter/src/main/res/drawable/bus_operation_status_bg_selector.xml @@ -4,5 +4,6 @@ - + + \ No newline at end of file diff --git a/OCH/mogo-och-charter/src/main/res/drawable/bus_operation_status_select_bg.xml b/OCH/mogo-och-charter/src/main/res/drawable/bus_operation_status_select_bg.xml deleted file mode 100644 index f617cd9fce..0000000000 --- a/OCH/mogo-och-charter/src/main/res/drawable/bus_operation_status_select_bg.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-charter/src/main/res/drawable/icon_ai_normal.png b/OCH/mogo-och-charter/src/main/res/drawable/icon_ai_normal.png deleted file mode 100755 index e98738b192..0000000000 Binary files a/OCH/mogo-och-charter/src/main/res/drawable/icon_ai_normal.png and /dev/null differ diff --git a/OCH/mogo-och-charter/src/main/res/drawable/icon_ai_select.png b/OCH/mogo-och-charter/src/main/res/drawable/icon_ai_select.png deleted file mode 100755 index d3e0107c02..0000000000 Binary files a/OCH/mogo-och-charter/src/main/res/drawable/icon_ai_select.png and /dev/null differ diff --git a/OCH/mogo-och-charter/src/main/res/drawable/icon_bad_case_select.png b/OCH/mogo-och-charter/src/main/res/drawable/icon_bad_case_select.png deleted file mode 100755 index ebacf3a11a..0000000000 Binary files a/OCH/mogo-och-charter/src/main/res/drawable/icon_bad_case_select.png and /dev/null differ diff --git a/OCH/mogo-och-charter/src/main/res/layout/charter_base_fragment.xml b/OCH/mogo-och-charter/src/main/res/layout/charter_base_fragment.xml index 7a0342c936..ba558f7e00 100644 --- a/OCH/mogo-och-charter/src/main/res/layout/charter_base_fragment.xml +++ b/OCH/mogo-och-charter/src/main/res/layout/charter_base_fragment.xml @@ -220,32 +220,25 @@ + android:layout_width="@dimen/dp_80" + android:layout_height="@dimen/dp_80" /> @@ -259,12 +252,9 @@ @@ -278,12 +268,9 @@