Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0

# Conflicts:
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java

libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java

@@ -114,5 +114,17 @@ public interface IMogoMap {
      */
     float getScalePerPixel();
 
-    void changeZoom(float zoom);
+    /**
+     * 改变地图缩放级别
+     *
+     * @param zoom
+     */
+    void changeZoom( float zoom );
+
+    /**
+     * 获取缩放比例
+     *
+     * @return
+     */
+    float getZoomLevel();
 }

libraries/mogo-map-api/src/main/java/com/mogo/map/MogoLatLng.java

@@ -54,4 +54,12 @@ public class MogoLatLng implements Parcelable {
             return new MogoLatLng[size];
         }
     };
+
+    @Override
+    public String toString() {
+        return "MogoLatLng{" +
+                "lat=" + lat +
+                ", lng=" + lng +
+                '}';
+    }
 }

libraries/mogo-map-api/src/main/java/com/mogo/map/listener/IMogoMapListener.java

@@ -3,8 +3,8 @@ package com.mogo.map.listener;
 import android.view.MotionEvent;
 
 import com.mogo.map.MogoLatLng;
+import com.mogo.map.location.MogoLocation;
 import com.mogo.map.model.MogoPoi;
-import com.mogo.map.navi.IMogoNaviListener;
 import com.mogo.map.uicontroller.EnumMapUI;
 
 /**
@@ -54,4 +54,12 @@ public interface IMogoMapListener {
      * @param ui
      */
     void onMapModeChanged( EnumMapUI ui );
+
+    /**
+     * @param latLng  中点的经纬度
+     * @param zoom    缩放大小
+     * @param tilt    倾斜度
+     * @param bearing 旋转角度
+     */
+    void onMapChanged( MogoLatLng latLng, float zoom, float tilt, float bearing );
 }

libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoMapListenerHandler.java

@@ -3,6 +3,7 @@ package com.mogo.map.listener;
 import android.view.MotionEvent;
 
 import com.mogo.map.MogoLatLng;
+import com.mogo.map.location.MogoLocation;
 import com.mogo.map.model.MogoPoi;
 import com.mogo.map.navi.MogoNaviInfo;
 import com.mogo.map.uicontroller.EnumMapUI;
@@ -103,4 +104,13 @@ public class MogoMapListenerHandler implements IMogoMapListener, IMogoMapListene
             }
         }
     }
+
+    @Override
+    public void onMapChanged( MogoLatLng location, float zoom, float tilt, float bearing ) {
+        if ( mDelegateListener != null ) {
+            synchronized ( mDelegateListener ) {
+                mDelegateListener.onMapChanged( location, zoom, tilt, bearing );
+            }
+        }
+    }
 }

libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java

@@ -66,4 +66,25 @@ public interface IMogoMapUIController {
      * @return 当前缩放级别下，地图上1像素点对应的长度，单位米
      */
     float getScalePerPixel();
+
+    /**
+     * 获取缩放比例
+     *
+     * @return
+     */
+    float getZoomLevel();
+
+    /**
+     * 获取视图东北角坐标
+     *
+     * @return
+     */
+    MogoLatLng getCameraNorthEastPosition();
+
+    /**
+     * 获取视图西南角坐标
+     *
+     * @return
+     */
+    MogoLatLng getCameraSouthWestPosition();
 }