opt

libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkersHandler.java

@@ -86,7 +86,7 @@ public class MogoMarkersHandler implements IMogoMarkerClickListener, IMogoMarker
         if ( marker == null ) {
             return;
         }
-        if ( !mServicesMarkers.containsKey( tag ) ) {
+        if ( mServicesMarkers.get( tag ) == null ) {
             mServicesMarkers.put( tag, new ArrayList< IMogoMarker >() );
         }
         mServicesMarkers.get( tag ).add( marker );
@@ -96,7 +96,7 @@ public class MogoMarkersHandler implements IMogoMarkerClickListener, IMogoMarker
         if ( markers == null || markers.isEmpty() ) {
             return;
         }
-        if ( !mServicesMarkers.containsKey( tag ) ) {
+        if ( mServicesMarkers.get( tag ) == null ) {
             mServicesMarkers.put( tag, new ArrayList< IMogoMarker >() );
         }
         mServicesMarkers.get( tag ).addAll( markers );

libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNaviListener.java

@@ -11,44 +11,44 @@ public interface IMogoNaviListener {
     /**
      * 导航初始化失败
      */
-    void onInitNaviFailure();
+    default void onInitNaviFailure(){}
 
     /**
      * 导航初始化成功
      */
-    void onInitNaviSuccess();
+    default void onInitNaviSuccess(){}
 
     /**
      * 导航引导信息
      *
      * @param naviinfo
      */
-    void onNaviInfoUpdate( MogoNaviInfo naviinfo );
+    default void onNaviInfoUpdate( MogoNaviInfo naviinfo ){}
 
     /**
      * 导航开始回调
      */
-    void onStartNavi();
+    default void onStartNavi(){}
 
     /**
      * 导航停止：包括到达目的地和主动停止导航
      */
-    void onStopNavi();
+    default void onStopNavi(){}
 
     /**
      * 路径规划成功
      */
-    void onCalculateSuccess();
+    default void onCalculateSuccess(){}
 
     /**
      * 路径规划失败
      */
-    void onoCalculateFailed();
+    default void onoCalculateFailed(){}
 
     /**
      * 巡航信息发生改变
      * Deprecated, use {@link IMogoAimlessModeListener#onUpdateTraffic2(MogoTraffic)} instead.
      */
     @Deprecated
-    void onUpdateTraffic( MogoTraffic traffic );
+    default void onUpdateTraffic( MogoTraffic traffic ){}
 }

libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNaviListener2.java

@@ -11,10 +11,10 @@ public interface IMogoNaviListener2 extends IMogoNaviListener {
     /**
      * 实际导航结束
      */
-    void onArriveDestination();
+    default void onArriveDestination() { }
 
     /**
      * 模拟导航结束
      */
-    void onEndEmulatorNavi();
+    default void onEndEmulatorNavi(){}
 }

libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCalculatePath.java

@@ -20,12 +20,14 @@ public class MogoCalculatePath {
     /**
      * 时间
      */
-    private String mTime;
+    private String mFormattedTime;
+    private int mTime;
 
     /**
      * 距离
      */
-    private String mDistance;
+    private String mFormattedDistance;
+    private int mDistance;
 
     /**
      * 红绿灯个数
@@ -69,20 +71,20 @@ public class MogoCalculatePath {
         this.mStrategyName = mStrategyName;
     }
 
-    public String getTime() {
-        return mTime;
+    public String getFormattedTime() {
+        return mFormattedTime;
     }
 
-    public void setTime( String mTime ) {
-        this.mTime = mTime;
+    public void setFormattedTime( String mTime ) {
+        this.mFormattedTime = mTime;
     }
 
-    public String getDistance() {
-        return mDistance;
+    public String getFormattedDistance() {
+        return mFormattedDistance;
     }
 
-    public void setDistance( String mDistance ) {
-        this.mDistance = mDistance;
+    public void setFormattedDistance( String mDistance ) {
+        this.mFormattedDistance = mDistance;
     }
 
     public int getTrafficLights() {
@@ -125,4 +127,22 @@ public class MogoCalculatePath {
     public void setPathId( int mPathId ) {
         this.mPathId = mPathId;
     }
+
+    public int getTime() {
+        return mTime;
+    }
+
+    public MogoCalculatePath setTime( int time ) {
+        this.mTime = time;
+        return this;
+    }
+
+    public int getDistance() {
+        return mDistance;
+    }
+
+    public MogoCalculatePath setDistance( int distance ) {
+        this.mDistance = distance;
+        return this;
+    }
 }