[3.3.0] 1、bus乘客屏小地图样式文件调整 2、B1乘客屏小地图调整

OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java

@@ -322,19 +322,34 @@ public class BusPassengerMapDirectionView
         mLineStationLatLng.addAll(mLineStationsList);
 
         if (mLineStationsList.size() > 0){
+            // 起点marker, 终点marker, 过站marker, 未过站marker
+
+            int size = mLineStationsList.size();
+
+            Marker mStartMarker = mAMap.addMarker(new MarkerOptions()
+                    .icon(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_start_point)));
+            Marker mEndMarker = mAMap.addMarker(new MarkerOptions()
+                    .icon(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_end_point)));
+
+            mStartMarker.setPosition(mLineStationsList.get(0));
+            mLineMarkers.add(0,mStartMarker);
+
             for (int i = 0; i < mLineStationsList.size(); i++) {
-                if (currentIndex == i){
-                    Marker mEndMarker = mAMap.addMarker(new MarkerOptions()
-                            .icon(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_view_dir_end_point)));
-                    mEndMarker.setPosition(mLineStationsList.get(i));
-                    mLineMarkers.add(i,mEndMarker);
-                }else {
-                    Marker mStartMarker = mAMap.addMarker(new MarkerOptions()
-                            .icon(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_view_dir_way_point)));
-                    mStartMarker.setPosition(mLineStationsList.get(i));
-                    mLineMarkers.add(i,mStartMarker);
+                if (currentIndex <= i && i < size-1 && i > 0){ //未到达
+                    Marker unArrivedMarker = mAMap.addMarker(new MarkerOptions()
+                            .icon(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_unarrived_point)));
+                    unArrivedMarker.setPosition(mLineStationsList.get(i));
+                    mLineMarkers.add(i,unArrivedMarker);
+                }else if (i < currentIndex && i > 0){
+                    Marker arrivedMarker = mAMap.addMarker(new MarkerOptions()
+                            .icon(BitmapDescriptorFactory.fromResource(R.drawable.bus_p_map_arrived_point)));
+                    arrivedMarker.setPosition(mLineStationsList.get(i));
+                    mLineMarkers.add(i,arrivedMarker);
                 }
             }
+
+            mEndMarker.setPosition(mLineStationsList.get(size-1));
+            mLineMarkers.add(size-1,mEndMarker);
         }
     }