> steps = mRouteLine.getNewSteps();
- if (isSameCity ) {
- // 同城 (同城时,每个steps的get(i)对应的List是一条step的不同方案,此处都选第一条进行绘制,即get(0))
-
- // step node
- for ( int i = 0; i < steps.size(); i++ ) {
-
- MassTransitRouteLine.TransitStep step = steps.get(i).get(0);
- Bundle b = new Bundle();
- b.putInt("index", i + 1);
-
- if (step.getStartLocation() != null) {
- overlayOptionses.add((new MarkerOptions()).position(step.getStartLocation())
- .anchor(0.5f, 0.5f).zIndex(10).extraInfo(b).icon(getIconForStep(step)));
- }
-
- // 最后一个终点
- if ( (i == steps.size() - 1) && (step.getEndLocation() != null)) {
- overlayOptionses.add((new MarkerOptions()).position(step.getEndLocation())
- .anchor(0.5f, 0.5f).zIndex(10)
- .icon(getIconForStep(step))
- );
- }
-
- }
-
- // polyline
- for ( int i = 0; i < steps.size(); i++ ) {
- MassTransitRouteLine.TransitStep step = steps.get(i).get(0);
- int color = 0;
- if (step.getVehileType() != MassTransitRouteLine.TransitStep
- .StepVehicleInfoType.ESTEP_WALK) {
- // color = Color.argb(178, 0, 78, 255);
- color = getLineColor() != 0 ? getLineColor() : Color.argb(178, 0, 78, 255);
- } else {
- // color = Color.argb(178, 88, 208, 0);
- color = getLineColor() != 0 ? getLineColor() : Color.argb(178, 88, 208, 0);
- }
- overlayOptionses.add(new PolylineOptions()
- .points(step.getWayPoints()).width(10).color(color)
- .zIndex(0));
- }
-
- } else {
- // 跨城 (跨城时,每个steps的get(i)对应的List是一条step的子路线sub_step,需要将它们全部拼接才是一条完整路线)
- int stepSum = 0;
- for (int i = 0; i < steps.size(); i++ ) {
- stepSum += steps.get(i).size();
- }
-
- // step node
- int k = 1;
- for ( int i = 0; i < steps.size(); i++ ) {
-
- for (int j = 0; j < steps.get(i).size(); j++ ) {
- MassTransitRouteLine.TransitStep step = steps.get(i).get(j);
- Bundle b = new Bundle();
- b.putInt("index", k);
-
- if (step.getStartLocation() != null) {
- overlayOptionses.add((new MarkerOptions()).position(step.getStartLocation())
- .anchor(0.5f, 0.5f).zIndex(10).extraInfo(b).icon(getIconForStep(step)));
- }
-
- // 最后一个终点
- if ( (k == stepSum ) && (step.getEndLocation() != null)) {
- overlayOptionses.add((new MarkerOptions()).position(step.getEndLocation())
- .anchor(0.5f, 0.5f).zIndex(10).icon(getIconForStep(step)));
- }
-
- k++;
- }
- }
-
-
- // polyline
- for ( int i = 0; i < steps.size(); i++ ) {
-
- for (int j = 0; j < steps.get(i).size(); j++ ) {
- MassTransitRouteLine.TransitStep step = steps.get(i).get(j);
- int color = 0;
- if (step.getVehileType() != MassTransitRouteLine.TransitStep
- .StepVehicleInfoType.ESTEP_WALK) {
- // color = Color.argb(178, 0, 78, 255);
- color = getLineColor() != 0 ? getLineColor() : Color.argb(178, 0, 78, 255);
- } else {
- // color = Color.argb(178, 88, 208, 0);
- color = getLineColor() != 0 ? getLineColor() : Color.argb(178, 88, 208, 0);
- }
- if (step.getWayPoints() != null ) {
- overlayOptionses.add(new PolylineOptions()
- .points(step.getWayPoints()).width(10).color(color)
- .zIndex(0));
- }
- }
- }
-
- }
-
- // 起点
- if (mRouteLine.getStarting() != null && mRouteLine.getStarting().getLocation() != null) {
- overlayOptionses.add((new MarkerOptions()).position(mRouteLine.getStarting().getLocation())
- .icon(getStartMarker() != null
- ? getStartMarker() : BitmapDescriptorFactory.fromAssetWithDpi("Icon_start.png"))
- .zIndex(10));
- }
- // 终点
- if (mRouteLine.getTerminal() != null && mRouteLine.getTerminal().getLocation() != null) {
- overlayOptionses
- .add((new MarkerOptions())
- .position(mRouteLine.getTerminal().getLocation())
- .icon(getTerminalMarker() != null ? getTerminalMarker() :
- BitmapDescriptorFactory
- .fromAssetWithDpi("Icon_end.png"))
- .zIndex(10));
- }
-
- return overlayOptionses;
-
- }
-
- private BitmapDescriptor getIconForStep(MassTransitRouteLine.TransitStep step) {
- switch (step.getVehileType()) {
- case ESTEP_WALK:
- return BitmapDescriptorFactory.fromAssetWithDpi("Icon_walk_route.png");
- case ESTEP_TRAIN:
- return BitmapDescriptorFactory.fromAssetWithDpi("Icon_subway_station.png");
- case ESTEP_DRIVING:
- case ESTEP_COACH:
- case ESTEP_PLANE:
- case ESTEP_BUS:
- return BitmapDescriptorFactory.fromAssetWithDpi("Icon_bus_station.png");
- default:
- return null;
- }
- }
-
- @Override
- public boolean onMarkerClick(Marker marker) {
- return false;
- }
-
- @Override
- public boolean onPolylineClick(Polyline polyline) {
- return false;
- }
-}
diff --git a/BiuBike/app/src/main/java/overlayutil/OverlayManager.java b/BiuBike/app/src/main/java/overlayutil/OverlayManager.java
deleted file mode 100644
index a7f8a97..0000000
--- a/BiuBike/app/src/main/java/overlayutil/OverlayManager.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package overlayutil;
-
-import com.baidu.mapapi.map.BaiduMap;
-import com.baidu.mapapi.map.BaiduMap.OnPolylineClickListener;
-import com.baidu.mapapi.map.MapStatusUpdateFactory;
-import com.baidu.mapapi.map.Marker;
-import com.baidu.mapapi.map.Overlay;
-import com.baidu.mapapi.map.OverlayOptions;
-import com.baidu.mapapi.model.LatLngBounds;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.baidu.mapapi.map.BaiduMap.OnMarkerClickListener;
-
-/**
- * 该类提供一个能够显示和管理多个Overlay的基类
- *
- * 复写{@link #getOverlayOptions()} 设置欲显示和管理的Overlay列表
- *
- *
- * 通过
- * {@link com.baidu.mapapi.map.BaiduMap#setOnMarkerClickListener(com.baidu.mapapi.map.BaiduMap.OnMarkerClickListener)}
- * 将覆盖物点击事件传递给OverlayManager后,OverlayManager才能响应点击事件。
- *
- * 复写{@link #onMarkerClick(com.baidu.mapapi.map.Marker)} 处理Marker点击事件
- *
- */
-public abstract class OverlayManager implements OnMarkerClickListener, OnPolylineClickListener {
-
- BaiduMap mBaiduMap = null;
- private List mOverlayOptionList = null;
-
- List mOverlayList = null;
-
- /**
- * 通过一个BaiduMap 对象构造
- *
- * @param baiduMap
- */
- public OverlayManager(BaiduMap baiduMap) {
- mBaiduMap = baiduMap;
- // mBaiduMap.setOnMarkerClickListener(this);
- if (mOverlayOptionList == null) {
- mOverlayOptionList = new ArrayList();
- }
- if (mOverlayList == null) {
- mOverlayList = new ArrayList();
- }
- }
-
- /**
- * 覆写此方法设置要管理的Overlay列表
- *
- * @return 管理的Overlay列表
- */
- public abstract List getOverlayOptions();
-
- /**
- * 将所有Overlay 添加到地图上
- */
- public final void addToMap() {
- if (mBaiduMap == null) {
- return;
- }
-
- removeFromMap();
- List overlayOptions = getOverlayOptions();
- if (overlayOptions != null) {
- mOverlayOptionList.addAll(getOverlayOptions());
- }
-
- for (OverlayOptions option : mOverlayOptionList) {
- mOverlayList.add(mBaiduMap.addOverlay(option));
- }
- }
-
- /**
- * 将所有Overlay 从 地图上消除
- */
- public final void removeFromMap() {
- if (mBaiduMap == null) {
- return;
- }
- for (Overlay marker : mOverlayList) {
- marker.remove();
- }
- mOverlayOptionList.clear();
- mOverlayList.clear();
-
- }
-
- /**
- * 缩放地图,使所有Overlay都在合适的视野内
- *
- * 注: 该方法只对Marker类型的overlay有效
- *
- *
- */
- public void zoomToSpan() {
- if (mBaiduMap == null) {
- return;
- }
- if (mOverlayList.size() > 0) {
- LatLngBounds.Builder builder = new LatLngBounds.Builder();
- for (Overlay overlay : mOverlayList) {
- // polyline 中的点可能太多,只按marker 缩放
- if (overlay instanceof Marker) {
- builder.include(((Marker) overlay).getPosition());
- }
- }
- mBaiduMap.setMapStatus(MapStatusUpdateFactory
- .newLatLngBounds(builder.build()));
- }
- }
-
-}
diff --git a/BiuBike/app/src/main/java/overlayutil/PoiOverlay.java b/BiuBike/app/src/main/java/overlayutil/PoiOverlay.java
deleted file mode 100644
index c815c7c..0000000
--- a/BiuBike/app/src/main/java/overlayutil/PoiOverlay.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package overlayutil;
-
-import android.os.Bundle;
-
-import com.baidu.mapapi.map.BaiduMap;
-import com.baidu.mapapi.map.BitmapDescriptorFactory;
-import com.baidu.mapapi.map.Marker;
-import com.baidu.mapapi.map.MarkerOptions;
-import com.baidu.mapapi.map.OverlayOptions;
-import com.baidu.mapapi.map.Polyline;
-import com.baidu.mapapi.search.poi.PoiResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 用于显示poi的overly
- */
-public class PoiOverlay extends OverlayManager {
-
- private static final int MAX_POI_SIZE = 10;
-
- private PoiResult mPoiResult = null;
-
- /**
- * 构造函数
- *
- * @param baiduMap
- * 该 PoiOverlay 引用的 BaiduMap 对象
- */
- public PoiOverlay(BaiduMap baiduMap) {
- super(baiduMap);
- }
-
- /**
- * 设置POI数据
- *
- * @param poiResult
- * 设置POI数据
- */
- public void setData(PoiResult poiResult) {
- this.mPoiResult = poiResult;
- }
-
- @Override
- public final List getOverlayOptions() {
- if (mPoiResult == null || mPoiResult.getAllPoi() == null) {
- return null;
- }
- List markerList = new ArrayList();
- int markerSize = 0;
- for (int i = 0; i < mPoiResult.getAllPoi().size()
- && markerSize < MAX_POI_SIZE; i++) {
- if (mPoiResult.getAllPoi().get(i).location == null) {
- continue;
- }
- markerSize++;
- Bundle bundle = new Bundle();
- bundle.putInt("index", i);
- markerList.add(new MarkerOptions()
- .icon(BitmapDescriptorFactory.fromAssetWithDpi("Icon_mark"
- + markerSize + ".png")).extraInfo(bundle)
- .position(mPoiResult.getAllPoi().get(i).location));
-
- }
- return markerList;
- }
-
- /**
- * 获取该 PoiOverlay 的 poi数据
- *
- * @return
- */
- public PoiResult getPoiResult() {
- return mPoiResult;
- }
-
- /**
- * 覆写此方法以改变默认点击行为
- *
- * @param i
- * 被点击的poi在
- * {@link com.baidu.mapapi.search.poi.PoiResult#getAllPoi()} 中的索引
- * @return
- */
- public boolean onPoiClick(int i) {
-// if (mPoiResult.getAllPoi() != null
-// && mPoiResult.getAllPoi().get(i) != null) {
-// Toast.makeText(BMapManager.getInstance().getContext(),
-// mPoiResult.getAllPoi().get(i).name, Toast.LENGTH_LONG)
-// .show();
-// }
- return false;
- }
-
- @Override
- public final boolean onMarkerClick(Marker marker) {
- if (!mOverlayList.contains(marker)) {
- return false;
- }
- if (marker.getExtraInfo() != null) {
- return onPoiClick(marker.getExtraInfo().getInt("index"));
- }
- return false;
- }
-
- @Override
- public boolean onPolylineClick(Polyline polyline) {
- // TODO Auto-generated method stub
- return false;
- }
-}
diff --git a/BiuBike/app/src/main/java/overlayutil/TransitRouteOverlay.java b/BiuBike/app/src/main/java/overlayutil/TransitRouteOverlay.java
deleted file mode 100644
index c8197ca..0000000
--- a/BiuBike/app/src/main/java/overlayutil/TransitRouteOverlay.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package overlayutil;
-
-import android.graphics.Color;
-import android.os.Bundle;
-import android.util.Log;
-
-import com.baidu.mapapi.map.BaiduMap;
-import com.baidu.mapapi.map.BitmapDescriptor;
-import com.baidu.mapapi.map.BitmapDescriptorFactory;
-import com.baidu.mapapi.map.Marker;
-import com.baidu.mapapi.map.MarkerOptions;
-import com.baidu.mapapi.map.Overlay;
-import com.baidu.mapapi.map.OverlayOptions;
-import com.baidu.mapapi.map.Polyline;
-import com.baidu.mapapi.map.PolylineOptions;
-import com.baidu.mapapi.search.route.TransitRouteLine;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 用于显示换乘路线的Overlay,自3.4.0版本起可实例化多个添加在地图中显示
- */
-public class TransitRouteOverlay extends OverlayManager {
-
- private TransitRouteLine mRouteLine = null;
-
- /**
- * 构造函数
- *
- * @param baiduMap
- * 该TransitRouteOverlay引用的 BaiduMap 对象
- */
- public TransitRouteOverlay(BaiduMap baiduMap) {
- super(baiduMap);
- }
-
- @Override
- public final List getOverlayOptions() {
-
- if (mRouteLine == null) {
- return null;
- }
-
- List overlayOptionses = new ArrayList();
- // step node
- if (mRouteLine.getAllStep() != null
- && mRouteLine.getAllStep().size() > 0) {
-
- for (TransitRouteLine.TransitStep step : mRouteLine.getAllStep()) {
- Bundle b = new Bundle();
- b.putInt("index", mRouteLine.getAllStep().indexOf(step));
- if (step.getEntrance() != null) {
- overlayOptionses.add((new MarkerOptions())
- .position(step.getEntrance().getLocation())
- .anchor(0.5f, 0.5f).zIndex(10).extraInfo(b)
- .icon(getIconForStep(step)));
- }
- // 最后路段绘制出口点
- if (mRouteLine.getAllStep().indexOf(step) == (mRouteLine
- .getAllStep().size() - 1) && step.getExit() != null) {
- overlayOptionses.add((new MarkerOptions())
- .position(step.getExit().getLocation())
- .anchor(0.5f, 0.5f).zIndex(10)
- .icon(getIconForStep(step)));
- }
- }
- }
-
- if (mRouteLine.getStarting() != null) {
- overlayOptionses.add((new MarkerOptions())
- .position(mRouteLine.getStarting().getLocation())
- .icon(getStartMarker() != null ? getStartMarker() :
- BitmapDescriptorFactory
- .fromAssetWithDpi("Icon_start.png")).zIndex(10));
- }
- if (mRouteLine.getTerminal() != null) {
- overlayOptionses
- .add((new MarkerOptions())
- .position(mRouteLine.getTerminal().getLocation())
- .icon(getTerminalMarker() != null ? getTerminalMarker() :
- BitmapDescriptorFactory
- .fromAssetWithDpi("Icon_end.png"))
- .zIndex(10));
- }
- // polyline
- if (mRouteLine.getAllStep() != null
- && mRouteLine.getAllStep().size() > 0) {
-
- for (TransitRouteLine.TransitStep step : mRouteLine.getAllStep()) {
- if (step.getWayPoints() == null) {
- continue;
- }
- int color = 0;
- if (step.getStepType() != TransitRouteLine.TransitStep.TransitRouteStepType.WAKLING) {
-// color = Color.argb(178, 0, 78, 255);
- color = getLineColor() != 0 ? getLineColor() : Color.argb(178, 0, 78, 255);
- } else {
-// color = Color.argb(178, 88, 208, 0);
- color = getLineColor() != 0 ? getLineColor() : Color.argb(178, 88, 208, 0);
- }
- overlayOptionses.add(new PolylineOptions()
- .points(step.getWayPoints()).width(10).color(color)
- .zIndex(0));
- }
- }
- return overlayOptionses;
- }
-
- private BitmapDescriptor getIconForStep(TransitRouteLine.TransitStep step) {
- switch (step.getStepType()) {
- case BUSLINE:
- return BitmapDescriptorFactory.fromAssetWithDpi("Icon_bus_station.png");
- case SUBWAY:
- return BitmapDescriptorFactory.fromAssetWithDpi("Icon_subway_station.png");
- case WAKLING:
- return BitmapDescriptorFactory.fromAssetWithDpi("Icon_walk_route.png");
- default:
- return null;
- }
- }
-
- /**
- * 设置路线数据
- *
- * @param routeOverlay
- * 路线数据
- */
- public void setData(TransitRouteLine routeOverlay) {
- this.mRouteLine = routeOverlay;
- }
-
- /**
- * 覆写此方法以改变默认起点图标
- *
- * @return 起点图标
- */
- public BitmapDescriptor getStartMarker() {
- return null;
- }
-
- /**
- * 覆写此方法以改变默认终点图标
- *
- * @return 终点图标
- */
- public BitmapDescriptor getTerminalMarker() {
- return null;
- }
-
- public int getLineColor() {
- return 0;
- }
- /**
- * 覆写此方法以改变起默认点击行为
- *
- * @param i
- * 被点击的step在
- * {@link com.baidu.mapapi.search.route.TransitRouteLine#getAllStep()}
- * 中的索引
- * @return 是否处理了该点击事件
- */
- public boolean onRouteNodeClick(int i) {
- if (mRouteLine.getAllStep() != null
- && mRouteLine.getAllStep().get(i) != null) {
- Log.i("baidumapsdk", "TransitRouteOverlay onRouteNodeClick");
- }
- return false;
- }
-
- @Override
- public final boolean onMarkerClick(Marker marker) {
- for (Overlay mMarker : mOverlayList) {
- if (mMarker instanceof Marker && mMarker.equals(marker)) {
- if (marker.getExtraInfo() != null) {
- onRouteNodeClick(marker.getExtraInfo().getInt("index"));
- }
- }
- }
- return true;
- }
-
- @Override
- public boolean onPolylineClick(Polyline polyline) {
- // TODO Auto-generated method stub
- return false;
- }
-
-}
diff --git a/BiuBike/app/src/main/java/overlayutil/WalkingRouteOverlay.java b/BiuBike/app/src/main/java/overlayutil/WalkingRouteOverlay.java
deleted file mode 100644
index ba716da..0000000
--- a/BiuBike/app/src/main/java/overlayutil/WalkingRouteOverlay.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package overlayutil;
-
-import android.graphics.Color;
-import android.os.Bundle;
-import android.util.Log;
-
-import com.baidu.mapapi.map.BaiduMap;
-import com.baidu.mapapi.map.BitmapDescriptor;
-import com.baidu.mapapi.map.BitmapDescriptorFactory;
-import com.baidu.mapapi.map.Marker;
-import com.baidu.mapapi.map.MarkerOptions;
-import com.baidu.mapapi.map.Overlay;
-import com.baidu.mapapi.map.OverlayOptions;
-import com.baidu.mapapi.map.Polyline;
-import com.baidu.mapapi.map.PolylineOptions;
-import com.baidu.mapapi.model.LatLng;
-import com.baidu.mapapi.search.route.WalkingRouteLine;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 用于显示步行路线的overlay,自3.4.0版本起可实例化多个添加在地图中显示
- */
-public class WalkingRouteOverlay extends OverlayManager {
-
- private WalkingRouteLine mRouteLine = null;
-
- public WalkingRouteOverlay(BaiduMap baiduMap) {
- super(baiduMap);
- }
-
- /**
- * 设置路线数据。
- *
- * @param line
- * 路线数据
- */
- public void setData(WalkingRouteLine line) {
- mRouteLine = line;
- }
-
- @Override
- public final List getOverlayOptions() {
- if (mRouteLine == null) {
- return null;
- }
-
- List overlayList = new ArrayList();
- if (mRouteLine.getAllStep() != null
- && mRouteLine.getAllStep().size() > 0) {
- for (WalkingRouteLine.WalkingStep step : mRouteLine.getAllStep()) {
- Bundle b = new Bundle();
- b.putInt("index", mRouteLine.getAllStep().indexOf(step));
- if (step.getEntrance() != null) {
- overlayList.add((new MarkerOptions())
- .position(step.getEntrance().getLocation())
- .rotate((360 - step.getDirection()))
- .zIndex(10)
- .anchor(0.5f, 0.5f)
- .extraInfo(b)
- .icon(BitmapDescriptorFactory
- .fromAssetWithDpi("Icon_line_node.png")));
- }
-
- // 最后路段绘制出口点
- if (mRouteLine.getAllStep().indexOf(step) == (mRouteLine
- .getAllStep().size() - 1) && step.getExit() != null) {
- overlayList.add((new MarkerOptions())
- .position(step.getExit().getLocation())
- .anchor(0.5f, 0.5f)
- .zIndex(10)
- .icon(BitmapDescriptorFactory
- .fromAssetWithDpi("Icon_line_node.png")));
-
- }
- }
- }
- // starting
- if (mRouteLine.getStarting() != null) {
- overlayList.add((new MarkerOptions())
- .position(mRouteLine.getStarting().getLocation())
- .icon(getStartMarker() != null ? getStartMarker() :
- BitmapDescriptorFactory
- .fromAssetWithDpi("Icon_start.png")).zIndex(10));
- }
- // terminal
- if (mRouteLine.getTerminal() != null) {
- overlayList
- .add((new MarkerOptions())
- .position(mRouteLine.getTerminal().getLocation())
- .icon(getTerminalMarker() != null ? getTerminalMarker() :
- BitmapDescriptorFactory
- .fromAssetWithDpi("Icon_end.png"))
- .zIndex(10));
- }
-
- // poly line list
- if (mRouteLine.getAllStep() != null
- && mRouteLine.getAllStep().size() > 0) {
- LatLng lastStepLastPoint = null;
- for (WalkingRouteLine.WalkingStep step : mRouteLine.getAllStep()) {
- List watPoints = step.getWayPoints();
- if (watPoints != null) {
- List points = new ArrayList();
- if (lastStepLastPoint != null) {
- points.add(lastStepLastPoint);
- }
- points.addAll(watPoints);
- overlayList.add(new PolylineOptions().points(points).width(10)
- .color(getLineColor() != 0 ? getLineColor() : Color.argb(178, 0, 78, 255)).zIndex(0));
- lastStepLastPoint = watPoints.get(watPoints.size() - 1);
- }
- }
-
- }
-
- return overlayList;
- }
-
- /**
- * 覆写此方法以改变默认起点图标
- *
- * @return 起点图标
- */
- public BitmapDescriptor getStartMarker() {
- return null;
- }
- public int getLineColor() {
- return 0;
- }
- /**
- * 覆写此方法以改变默认终点图标
- *
- * @return 终点图标
- */
- public BitmapDescriptor getTerminalMarker() {
- return null;
- }
-
- /**
- * 处理点击事件
- *
- * @param i
- * 被点击的step在
- * {@link com.baidu.mapapi.search.route.WalkingRouteLine#getAllStep()}
- * 中的索引
- * @return 是否处理了该点击事件
- */
- public boolean onRouteNodeClick(int i) {
- if (mRouteLine.getAllStep() != null
- && mRouteLine.getAllStep().get(i) != null) {
- Log.i("baidumapsdk", "WalkingRouteOverlay onRouteNodeClick");
- }
- return false;
- }
-
- @Override
- public final boolean onMarkerClick(Marker marker) {
- for (Overlay mMarker : mOverlayList) {
- if (mMarker instanceof Marker && mMarker.equals(marker)) {
- if (marker.getExtraInfo() != null) {
- onRouteNodeClick(marker.getExtraInfo().getInt("index"));
- }
- }
- }
- return true;
- }
-
- @Override
- public boolean onPolylineClick(Polyline polyline) {
- // TODO Auto-generated method stub
- return false;
- }
-}
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libBDSpeechDecoder_V1.so b/BiuBike/app/src/main/jniLibs/armeabi/libBDSpeechDecoder_V1.so
deleted file mode 100644
index f438fea..0000000
Binary files a/BiuBike/app/src/main/jniLibs/armeabi/libBDSpeechDecoder_V1.so and /dev/null differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_base_v4_1_1.so b/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_base_v4_1_1.so
deleted file mode 100644
index 94c1612..0000000
Binary files a/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_base_v4_1_1.so and /dev/null differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_base_v5_4_4.so b/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_base_v5_4_4.so
new file mode 100644
index 0000000..8ca6a28
Binary files /dev/null and b/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_base_v5_4_4.so differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_base_v6_1_0.so b/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_base_v6_1_0.so
new file mode 100644
index 0000000..5c38811
Binary files /dev/null and b/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_base_v6_1_0.so differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_bikenavi_v6_1_0.so b/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_bikenavi_v6_1_0.so
new file mode 100644
index 0000000..2c11d53
Binary files /dev/null and b/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_bikenavi_v6_1_0.so differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_cloud_v4_1_1.so b/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_cloud_v4_1_1.so
deleted file mode 100644
index 21a9db6..0000000
Binary files a/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_cloud_v4_1_1.so and /dev/null differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_map_for_bikenavi_v6_1_0.so b/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_map_for_bikenavi_v6_1_0.so
new file mode 100644
index 0000000..1c6c273
Binary files /dev/null and b/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_map_for_bikenavi_v6_1_0.so differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_map_v4_1_1.so b/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_map_v4_1_1.so
deleted file mode 100644
index ffc2360..0000000
Binary files a/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_map_v4_1_1.so and /dev/null differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_map_v5_4_4.so b/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_map_v5_4_4.so
new file mode 100644
index 0000000..195d906
Binary files /dev/null and b/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_map_v5_4_4.so differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_map_v6_1_0.so b/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_map_v6_1_0.so
new file mode 100644
index 0000000..b986b1f
Binary files /dev/null and b/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_map_v6_1_0.so differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_radar_v4_1_1.so b/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_radar_v4_1_1.so
deleted file mode 100644
index 00196f1..0000000
Binary files a/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_radar_v4_1_1.so and /dev/null differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_search_v4_1_1.so b/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_search_v4_1_1.so
deleted file mode 100644
index ce265d4..0000000
Binary files a/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_search_v4_1_1.so and /dev/null differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_util_v4_1_1.so b/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_util_v4_1_1.so
deleted file mode 100644
index fff6786..0000000
Binary files a/BiuBike/app/src/main/jniLibs/armeabi/libBaiduMapSDK_util_v4_1_1.so and /dev/null differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libBaiduTraceSDK_v3_1_3.so b/BiuBike/app/src/main/jniLibs/armeabi/libBaiduTraceSDK_v3_1_3.so
new file mode 100755
index 0000000..932ee8e
Binary files /dev/null and b/BiuBike/app/src/main/jniLibs/armeabi/libBaiduTraceSDK_v3_1_3.so differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libapp_BaiduNaviApplib.so b/BiuBike/app/src/main/jniLibs/armeabi/libapp_BaiduNaviApplib.so
deleted file mode 100644
index 3edb1d0..0000000
Binary files a/BiuBike/app/src/main/jniLibs/armeabi/libapp_BaiduNaviApplib.so and /dev/null differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libapp_BaiduVIlib.so b/BiuBike/app/src/main/jniLibs/armeabi/libapp_BaiduVIlib.so
deleted file mode 100644
index e927389..0000000
Binary files a/BiuBike/app/src/main/jniLibs/armeabi/libapp_BaiduVIlib.so and /dev/null differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libaudiomessage-jni.so b/BiuBike/app/src/main/jniLibs/armeabi/libaudiomessage-jni.so
deleted file mode 100644
index 05ced27..0000000
Binary files a/BiuBike/app/src/main/jniLibs/armeabi/libaudiomessage-jni.so and /dev/null differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libbd_etts.so b/BiuBike/app/src/main/jniLibs/armeabi/libbd_etts.so
deleted file mode 100644
index 4ff80e2..0000000
Binary files a/BiuBike/app/src/main/jniLibs/armeabi/libbd_etts.so and /dev/null differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libbds.so b/BiuBike/app/src/main/jniLibs/armeabi/libbds.so
deleted file mode 100644
index 3c1ed9b..0000000
Binary files a/BiuBike/app/src/main/jniLibs/armeabi/libbds.so and /dev/null differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libbdtts.so b/BiuBike/app/src/main/jniLibs/armeabi/libbdtts.so
deleted file mode 100644
index cb02769..0000000
Binary files a/BiuBike/app/src/main/jniLibs/armeabi/libbdtts.so and /dev/null differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libcurl.so b/BiuBike/app/src/main/jniLibs/armeabi/libcurl.so
deleted file mode 100644
index a500e7b..0000000
Binary files a/BiuBike/app/src/main/jniLibs/armeabi/libcurl.so and /dev/null differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libetts_domain_data_builder.so b/BiuBike/app/src/main/jniLibs/armeabi/libetts_domain_data_builder.so
deleted file mode 100644
index 66e566a..0000000
Binary files a/BiuBike/app/src/main/jniLibs/armeabi/libetts_domain_data_builder.so and /dev/null differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libgnustl_shared.so b/BiuBike/app/src/main/jniLibs/armeabi/libgnustl_shared.so
deleted file mode 100644
index ab4b3bf..0000000
Binary files a/BiuBike/app/src/main/jniLibs/armeabi/libgnustl_shared.so and /dev/null differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libindoor.so b/BiuBike/app/src/main/jniLibs/armeabi/libindoor.so
new file mode 100644
index 0000000..a0879cf
Binary files /dev/null and b/BiuBike/app/src/main/jniLibs/armeabi/libindoor.so differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/liblocSDK6a.so b/BiuBike/app/src/main/jniLibs/armeabi/liblocSDK6a.so
deleted file mode 100755
index 83f7f12..0000000
Binary files a/BiuBike/app/src/main/jniLibs/armeabi/liblocSDK6a.so and /dev/null differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/liblocSDK8a.so b/BiuBike/app/src/main/jniLibs/armeabi/liblocSDK8a.so
new file mode 100644
index 0000000..5286996
Binary files /dev/null and b/BiuBike/app/src/main/jniLibs/armeabi/liblocSDK8a.so differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/liblocnaviSDK.so b/BiuBike/app/src/main/jniLibs/armeabi/liblocnaviSDK.so
deleted file mode 100644
index 2538224..0000000
Binary files a/BiuBike/app/src/main/jniLibs/armeabi/liblocnaviSDK.so and /dev/null differ
diff --git a/BiuBike/app/src/main/jniLibs/armeabi/libmsc.so b/BiuBike/app/src/main/jniLibs/armeabi/libmsc.so
deleted file mode 100644
index 52e9f47..0000000
Binary files a/BiuBike/app/src/main/jniLibs/armeabi/libmsc.so and /dev/null differ
diff --git a/BiuBike/app/src/main/res/mipmap-xhdpi/icon_end.png b/BiuBike/app/src/main/res/mipmap-xhdpi/icon_end.png
new file mode 100644
index 0000000..48933b4
Binary files /dev/null and b/BiuBike/app/src/main/res/mipmap-xhdpi/icon_end.png differ
diff --git a/BiuBike/app/src/main/res/mipmap-xhdpi/icon_gcoding.png b/BiuBike/app/src/main/res/mipmap-xhdpi/icon_gcoding.png
new file mode 100755
index 0000000..16adf26
Binary files /dev/null and b/BiuBike/app/src/main/res/mipmap-xhdpi/icon_gcoding.png differ
diff --git a/BiuBike/app/src/main/res/mipmap-xhdpi/icon_geo.png b/BiuBike/app/src/main/res/mipmap-xhdpi/icon_geo.png
old mode 100755
new mode 100644
diff --git a/BiuBike/app/src/main/res/mipmap-xhdpi/icon_point.png b/BiuBike/app/src/main/res/mipmap-xhdpi/icon_point.png
new file mode 100644
index 0000000..1f8567b
Binary files /dev/null and b/BiuBike/app/src/main/res/mipmap-xhdpi/icon_point.png differ
diff --git a/BiuBike/app/src/main/res/mipmap-xhdpi/icon_start.png b/BiuBike/app/src/main/res/mipmap-xhdpi/icon_start.png
new file mode 100644
index 0000000..680d135
Binary files /dev/null and b/BiuBike/app/src/main/res/mipmap-xhdpi/icon_start.png differ