完成网约车，出租车、小巴车资源适配

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java

@@ -59,18 +59,18 @@ public class OchBusStationAdapter extends RecyclerView.Adapter<OchBusStationAdap
             if (currentStation == 0) {
                 // 在起始点
                 holder.tvStationName.setTextColor(context.getResources().getColor(R.color.module_mogo_och_bus_arrived_station_name_text_color));
-                holder.ivIcon.setImageResource(R.drawable.module_mogo_och_bus_icon_arrived_station);
+                holder.ivIcon.setImageResource(R.drawable.module_mogo_och_icon_arrived_station);
                 holder.vDashBottom.setColor(context.getResources().getColor(R.color.module_mogo_och_bus_not_arrive_dash_color));
             } else {
                 holder.tvStationName.setTextColor(context.getResources().getColor(R.color.module_mogo_och_bus_current_station_name_text_color));
-                holder.ivIcon.setImageResource(R.drawable.module_mogo_och_bus_icon_arriving_station);
+                holder.ivIcon.setImageResource(R.drawable.module_mogo_och_icon_arriving_station);
                 holder.vDashTop.setGradient(context.getResources().getColor(R.color.module_mogo_och_bus_arriving_start_dash_color), context.getResources().getColor(R.color.module_mogo_och_bus_arriving_end_dash_color));
                 holder.vDashBottom.setColor(context.getResources().getColor(R.color.module_mogo_och_bus_not_arrive_dash_color));
             }
         } else if (position < currentStation) {
             // 驶过
             holder.tvStationName.setTextColor(context.getResources().getColor(R.color.module_mogo_och_bus_arrived_station_name_text_color));
-            holder.ivIcon.setImageResource(R.drawable.module_mogo_och_bus_icon_arrived_station);
+            holder.ivIcon.setImageResource(R.drawable.module_mogo_och_icon_arrived_station);
             if (position == currentStation - 1) {
                 holder.vDashBottom.setGradient(context.getResources().getColor(R.color.module_mogo_och_bus_leaving_start_dash_color), context.getResources().getColor(R.color.module_mogo_och_bus_leaving_end_dash_color));
                 holder.vDashTop.setColor(context.getResources().getColor(R.color.module_mogo_och_bus_arrived_dash_color));

OCH/mogo-och-bus/src/main/res/layout/fragment_och_bus.xml

@@ -115,7 +115,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="14px"
-            android:src="@drawable/module_mogo_och_bus_icon_arrived_station"
+            android:src="@drawable/module_mogo_och_icon_arrived_station"
             app:layout_constraintBottom_toBottomOf="@+id/module_och_bus_current_station"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="@+id/module_och_bus_current_station" />
@@ -125,7 +125,7 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:scaleType="fitXY"
-            android:src="@drawable/module_och_bus_dot_line"
+            android:src="@drawable/module_och_dot_line"
             app:layout_constraintBottom_toTopOf="@+id/blueDot"
             app:layout_constraintLeft_toLeftOf="@+id/greenDot"
             app:layout_constraintRight_toRightOf="@+id/greenDot"
@@ -135,7 +135,7 @@
             android:id="@+id/blueDot"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/module_mogo_och_bus_icon_arriving_station"
+            android:src="@drawable/module_mogo_och_icon_arriving_station"
             app:layout_constraintBottom_toBottomOf="@+id/module_och_bus_order_end_station"
             app:layout_constraintLeft_toLeftOf="@+id/greenDot"
             app:layout_constraintTop_toTopOf="@+id/module_och_bus_order_end_station" />

OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml

@@ -26,7 +26,7 @@
         android:layout_width="20px"
         android:layout_height="20px"
         android:scaleType="center"
-        android:src="@drawable/module_mogo_och_bus_icon_arrived_station"
+        android:src="@drawable/module_mogo_och_icon_arrived_station"
         app:layout_constraintBottom_toBottomOf="@id/module_mogo_och_bus_station_name"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintVertical_bias="0.4"

OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml

@@ -49,7 +49,7 @@
             android:id="@+id/greenDot"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/module_och_taxi_green_dot"
+            android:src="@drawable/module_mogo_och_icon_arriving_station"
             app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_start_station"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="@+id/module_och_taxi_order_start_station" />
@@ -83,7 +83,7 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:scaleType="fitXY"
-            android:src="@drawable/module_och_taxi_dot_line"
+            android:src="@drawable/module_och_dot_line"
             app:layout_constraintBottom_toTopOf="@+id/blueDot"
             app:layout_constraintLeft_toLeftOf="@+id/greenDot"
             app:layout_constraintRight_toRightOf="@+id/greenDot"
@@ -93,7 +93,7 @@
             android:id="@+id/blueDot"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/module_och_taxi_blue_dot"
+            android:src="@drawable/module_mogo_och_icon_arrived_station"
             app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_end_station"
             app:layout_constraintLeft_toLeftOf="@+id/greenDot"
             app:layout_constraintTop_toTopOf="@+id/module_och_taxi_order_end_station" />

OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml

@@ -9,13 +9,13 @@
     <dimen name="module_mogo_och_station_panel_container_margin_top_no_call">530px</dimen>
     <dimen name="module_mogo_och_station_panel_container_margin_top_with_call">492px</dimen>
 
-    <dimen name="module_mogo_och_slide_panel_block_start_x">30px</dimen>
-    <dimen name="module_mogo_och_slide_panel_block_start_y">30px</dimen>
+    <dimen name="module_mogo_och_slide_panel_block_start_x">20px</dimen>
+    <dimen name="module_mogo_och_slide_panel_block_start_y">20px</dimen>
     <dimen name="module_mogo_och_slide_panel_normal_text_margin_left">70px</dimen>
     <dimen name="module_mogo_och_slide_panel_normal_text_margin_right">130px</dimen>
     <dimen name="module_mogo_och_slide_panel_short_text_margin_left">93px</dimen>
     <dimen name="module_mogo_och_slide_panel_short_text_margin_right">150px</dimen>
-    <dimen name="module_mogo_och_slide_panel_textSize">48px</dimen>
+    <dimen name="module_mogo_och_slide_panel_textSize">70px</dimen>
 
     <dimen name="module_mogo_och_autopilot_status_bg_corner">24px</dimen>
     <dimen name="module_mogo_och_autopilot_status_bg_width">460px</dimen>