Skip to content

GitLab

Commit ba576672 authored by p x's avatar p x
Browse files

修改包结构

parent 31fad494
Hide whitespace changes
Inline Side-by-side
mapapi/src/main/java/com/sd/api/maps/amap/AmapLayers.kt 0 → 100644
View file @ ba576672
package com.sd.api.maps.amap
import com.amap.api.maps.AMap
import com.sd.api.core.MapReadyView
/**
*高德切换底图图层
*/
internal object AmapLayers {
fun toggleLayers(mapReadView: MapReadyView?, type: Int) {
when (type) {
1 -> {
mapReadView?.aMap?.setMapType(AMap.MAP_TYPE_NORMAL)
}
2 -> {
mapReadView?.aMap?.setMapType(AMap.MAP_TYPE_SATELLITE)
}
}
}
}
\ No newline at end of file
mapapi/src/main/java/com/sd/api/core/basic/amap/AmapLocationStyle.kt → mapapi/src/main/java/com/sd/api/maps/amap/AmapLocationStyle.kt
View file @ ba576672
package com.sd.api.core.basic.amap
package com.sd.api.maps.amap
import com.amap.api.maps.model.MyLocationStyle
import com.sd.api.core.MapReadyView
import com.sd.api.core.basic.MSLocStyle
import com.amap.api.maps.model.MyLocationStyle as aMapMyLocationStyle
import com.sd.api.maps.MSLocStyle
/**
* 显示定位小圆点
*/
object AmapLocationStyle {
internal object AmapLocationStyle {
// 高德定位类型
private var styleAMap = mapOf(
MSLocStyle.LOCATION_TYPE_LOCATE to aMapMyLocationStyle.LOCATION_TYPE_LOCATE,
MSLocStyle.LOCATION_TYPE_FOLLOW to aMapMyLocationStyle.LOCATION_TYPE_FOLLOW,
MSLocStyle.LOCATION_TYPE_MAP_ROTATE to aMapMyLocationStyle.LOCATION_TYPE_MAP_ROTATE,
MSLocStyle.LOCATION_TYPE_LOCATION_ROTATE to aMapMyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE,
MSLocStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER to aMapMyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER,
MSLocStyle.LOCATION_TYPE_FOLLOW_NO_CENTER to aMapMyLocationStyle.LOCATION_TYPE_FOLLOW_NO_CENTER,
MSLocStyle.LOCATION_TYPE_MAP_ROTATE_NO_CENTER to aMapMyLocationStyle.LOCATION_TYPE_MAP_ROTATE_NO_CENTER
MSLocStyle.LOCATION_TYPE_LOCATE to MyLocationStyle.LOCATION_TYPE_LOCATE,
MSLocStyle.LOCATION_TYPE_FOLLOW to MyLocationStyle.LOCATION_TYPE_FOLLOW,
MSLocStyle.LOCATION_TYPE_MAP_ROTATE to MyLocationStyle.LOCATION_TYPE_MAP_ROTATE,
MSLocStyle.LOCATION_TYPE_LOCATION_ROTATE to MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE,
MSLocStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER to MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER,
MSLocStyle.LOCATION_TYPE_FOLLOW_NO_CENTER to MyLocationStyle.LOCATION_TYPE_FOLLOW_NO_CENTER,
MSLocStyle.LOCATION_TYPE_MAP_ROTATE_NO_CENTER to MyLocationStyle.LOCATION_TYPE_MAP_ROTATE_NO_CENTER
)
//高德初始化定位蓝点样式类
private val aMyLocationStyle by lazy { aMapMyLocationStyle() }
private val aMyLocationStyle by lazy { MyLocationStyle() }
/**
* 设置定位蓝点样式
......
mapapi/src/main/java/com/sd/api/core/basic/amap/AmapMethodAdv.kt → mapapi/src/main/java/com/sd/api/maps/amap/AmapMethodAdv.kt
View file @ ba576672
package com.sd.api.core.basic.amap
package com.sd.api.maps.amap
import com.amap.api.maps.CameraUpdateFactory
import com.amap.api.maps.model.CameraPosition
import com.amap.api.maps.model.LatLng
import com.sd.api.core.MapReadyView
import com.amap.api.maps.model.LatLng as ALatLng
/**
* 高德地图方法交互
......@@ -24,7 +23,7 @@ object AmapMethodAdv {
) {
//参数依次是：视角调整区域的中心点坐标、希望调整到的缩放级别、俯仰角0°~45°（垂直与地图时为0）、偏航角 0~360° (正北方为0)
val mCameraUpdate = CameraUpdateFactory.newCameraPosition(
CameraPosition(ALatLng(lat, lng), 18f, 30f, 0f)
CameraPosition(LatLng(lat, lng), 18f, 30f, 0f)
)
mapReadView?.aMap?.moveCamera(mCameraUpdate)
}
......
mapapi/src/main/java/com/sd/api/core/basic/amap/AmapPoiSearch.kt → mapapi/src/main/java/com/sd/api/maps/amap/AmapPoiSearch.kt
View file @ ba576672
package com.sd.api.core.basic.amap
package com.sd.api.maps.amap
import com.amap.api.services.core.AMapException
import com.amap.api.services.poisearch.PoiSearch.SearchBound
import com.amap.api.services.core.LatLonPoint
import com.amap.api.services.core.PoiItem
import com.amap.api.services.poisearch.PoiResult
import com.amap.api.services.poisearch.PoiSearch
import com.sd.api.UserCtx
import com.sd.api.bean.PoiSearchRes
import com.sd.api.core.basic.OnMSPoiSearchLis
import com.amap.api.services.core.LatLonPoint as ALatLonPoint
import com.amap.api.services.poisearch.PoiResult as APoiResult
import com.amap.api.services.poisearch.PoiSearch as APoiSearch
import com.sd.api.maps.cdata.PoiSearchRes
import com.sd.api.maps.inters.OnMSPoiSearchLis
/**
* 高配的Poi 搜索相关
*/
object AmapPoiSearch : APoiSearch.OnPoiSearchListener {
object AmapPoiSearch : PoiSearch.OnPoiSearchListener {
private var onMSPoiSearchLis: OnMSPoiSearchLis? = null
......@@ -31,17 +31,17 @@ object AmapPoiSearch : APoiSearch.OnPoiSearchListener {
onMSPoiSearchLis: OnMSPoiSearchLis
) {
this.onMSPoiSearchLis = onMSPoiSearchLis
var context = UserCtx.instance.mContext
var context = UserCtx.Companion.instance.mContext
var query = APoiSearch.Query(keyWord, "", "").apply {
location = ALatLonPoint(lat, lng)
var query = PoiSearch.Query(keyWord, "", "").apply {
location = LatLonPoint(lat, lng)
cityLimit = false
// 返回父子关系
requireSubPois(true)
pageNum = 1
pageSize = 20
}
var poiSearch = APoiSearch(context, query)
var poiSearch = PoiSearch(context, query)
poiSearch.setOnPoiSearchListener(this)
poiSearch.searchPOIAsyn()
......@@ -62,20 +62,20 @@ object AmapPoiSearch : APoiSearch.OnPoiSearchListener {
onMSPoiSearchLis: OnMSPoiSearchLis
) {
this.onMSPoiSearchLis = onMSPoiSearchLis
var context = UserCtx.instance.mContext
var context = UserCtx.Companion.instance.mContext
var query = APoiSearch.Query(keyWord, "", "").apply {
location = ALatLonPoint(lat, lng)
var query = PoiSearch.Query(keyWord, "", "").apply {
location = LatLonPoint(lat, lng)
cityLimit = true
// 返回父子关系
requireSubPois(true)
pageNum = 1
pageSize = 20
}
var poiSearch = APoiSearch(context, query)
var poiSearch = PoiSearch(context, query)
poiSearch.setOnPoiSearchListener(this)
poiSearch.setBound(SearchBound(ALatLonPoint(lat, lng), radios, true))
poiSearch.setBound(PoiSearch.SearchBound(LatLonPoint(lat, lng), radios, true))
poiSearch.searchPOIAsyn()
......@@ -84,7 +84,7 @@ object AmapPoiSearch : APoiSearch.OnPoiSearchListener {
//--------------------------------高德POI 搜索- -------------------------------
override fun onPoiSearched(result: APoiResult?, rCode: Int) {
override fun onPoiSearched(result: PoiResult?, rCode: Int) {
if (rCode == AMapException.CODE_AMAP_SUCCESS) {
if (result != null && result.getQuery() != null) {// 搜索poi的结果
var temps = result?.getPois()
......@@ -107,7 +107,7 @@ object AmapPoiSearch : APoiSearch.OnPoiSearchListener {
}
}
override fun onPoiItemSearched(p0: com.amap.api.services.core.PoiItem?, p1: Int) {
override fun onPoiItemSearched(p0: PoiItem?, p1: Int) {
}
}
\ No newline at end of file
mapapi/src/main/java/com/sd/api/bean/MSLatLng.kt → mapapi/src/main/java/com/sd/api/maps/cdata/MSLatLng.kt
View file @ ba576672
package com.sd.api.bean
package com.sd.api.maps.cdata
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
......@@ -9,18 +9,4 @@ data class MSLatLng
(
var lat: Double = 0.0,
var lng: Double = 0.0
) : Parcelable
//{
// constructor(lat: Double, lng: Double) : this() {
// this.lat = lat
// this.lng = lng
// }
//
// // 纬度
// var lat = 0.0
//
// // 经度
// var lng = 0.0
//}
\ No newline at end of file
) : Parcelable
\ No newline at end of file
mapapi/src/main/java/com/sd/api/core/basic/MSMarker.kt → mapapi/src/main/java/com/sd/api/maps/cdata/MSMarker.kt
View file @ ba576672
package com.sd.api.core.basic
package com.sd.api.maps.cdata
import com.amap.api.maps.model.Marker as AMarker
import com.minedata.minenavi.map.Marker
import com.amap.api.maps.model.Marker as AMarker
/**返回的mark*/
object MSMarker {
......
mapapi/src/main/java/com/sd/api/core/basic/MSOverlay.kt → mapapi/src/main/java/com/sd/api/maps/cdata/MSOverlay.kt
View file @ ba576672
package com.sd.api.core.basic
package com.sd.api.maps.cdata
import com.amap.api.maps.model.Circle
import com.amap.api.maps.model.Polygon
......
mapapi/src/main/java/com/sd/api/bean/PoiSearchRes.kt → mapapi/src/main/java/com/sd/api/maps/cdata/PoiSearchRes.kt
View file @ ba576672
package com.sd.api.bean
package com.sd.api.maps.cdata
/**POI搜索返回*/
class PoiSearchRes {
......
mapapi/src/main/java/com/sd/api/core/basic/OnMSPoiSearchLis.kt → mapapi/src/main/java/com/sd/api/maps/inters/OnMSPoiSearchLis.kt
View file @ ba576672
package com.sd.api.core.basic
package com.sd.api.maps.inters
import com.sd.api.bean.PoiSearchRes
import com.sd.api.maps.cdata.PoiSearchRes
/**
* POI搜素回调
......
mapapi/src/main/java/com/sd/api/maps/mine/MineGestures.kt 0 → 100644
View file @ ba576672
package com.sd.api.maps.mine
import com.sd.api.core.MapReadyView
/**
* 四维手势交互
*/
internal object MineGestures {
//
// /***缩放**/
// fun setZoomGesturesEnabled(mapReadView: MapReadyView,enable: Boolean) {
// when (MSDKInitializer.getMapType()) {
// MAP_TYPE.MINE -> {
// mapReadView.fMapView?.zoomView.is
// }
//
// MAP_TYPE.AMAP -> {
// mapReadView.amap?.uiSettings?.setZoomGesturesEnabled(enable)
// }
// }
// }
/**
* 设置地图旋转手势是否可用
* @param mapReadView 地图准备就绪视图对象
* @param enable 是否启用旋转手势功能
*/
fun setRotateGesturesEnabled(mapReadView: MapReadyView?, enable: Boolean) {
// 根据不同的地图类型设置对应的旋转手势可用状态
mapReadView?.fMapView?.uiSettings?.isRotateGesturesEnabled = enable
}
/**
* 设置地图倾斜手势功能的启用状态
* @param mapReadView 地图准备就绪视图对象
* @param enable 是否启用倾斜手势功能，true为启用，false为禁用
* */
fun setTiltGesturesEnabled(mapReadView: MapReadyView?, enable: Boolean) {
// 根据不同的地图类型设置对应的倾斜手势功能
mapReadView?.fMapView?.uiSettings?.isTiltGesturesEnabled = enable
}
}
\ No newline at end of file
mapapi/src/main/java/com/sd/api/maps/mine/MineLayers.kt 0 → 100644
View file @ ba576672
package com.sd.api.maps.mine
import com.minedata.minenavi.map.MineMap
import com.minedata.minenavi.mapdal.CoordType
import com.sd.api.core.MapReadyView
/**
*四维切换底图图层
*/
internal object MineLayers {
fun toggleLayers(mapReadView: MapReadyView?, type: Int) {
when (type) {
1 -> {
switch2D(mapReadView?.mMineMap)
}
2 -> {
switchSatelliteLayer(mapReadView?.mMineMap)
}
}
}
private fun switch2D(mMineMap: MineMap?) {
//切换为2D平面图
// mMineMap?.setElevation(90f)
mMineMap?.setStyleClass("DEFAULT")
mMineMap?.enableSatelliteLayer(false)
}
private fun switchSatelliteLayer(mMineMap: MineMap?) {
//切换为卫星图
mMineMap?.setSatelliteImageType(MineMap.SatelliteImageSource.bing, CoordType.GCJ02)
mMineMap?.setStyleClass("SATELLITE")
mMineMap?.enableSatelliteLayer(true)
}
}
\ No newline at end of file
mapapi/src/main/java/com/sd/api/core/basic/mine/MineLocationStyle.kt → mapapi/src/main/java/com/sd/api/maps/mine/MineLocationStyle.kt
View file @ ba576672
package com.sd.api.core.basic.mine
package com.sd.api.maps.mine
import com.minedata.minenavi.map.MyLocationStyle
import com.sd.api.core.MapReadyView
import com.sd.api.core.basic.MSLocStyle
import com.sd.api.maps.MSLocStyle
/**
* 四维显示定位小圆点
*/
object MineLocationStyle {
internal object MineLocationStyle {
// 四维初始化定位蓝点样式类
private val myLocationStyle by lazy { MyLocationStyle() }
......
mapapi/src/main/java/com/sd/api/core/basic/mine/MineMethodAdv.kt → mapapi/src/main/java/com/sd/api/maps/mine/MineMethodAdv.kt
View file @ ba576672
package com.sd.api.core.basic.mine
package com.sd.api.maps.mine
import com.minedata.minenavi.mapdal.LatLng
import com.minedata.minenavi.util.Tools
import com.sd.api.core.MapReadyView
/**
* 四维地图方法交互
*/
......@@ -23,7 +22,6 @@ object MineMethodAdv {
) {
val point = Tools.latLngToPoint(LatLng(lat, lng))
mapReadView?.mMineMap?.setPointToCenter(point.x, point.y)
}
......
mapapi/src/main/java/com/sd/api/core/basic/mine/MinePoiSearch.kt → mapapi/src/main/java/com/sd/api/maps/mine/MinePoiSearch.kt
View file @ ba576672
package com.sd.api.core.basic.mine
package com.sd.api.maps.mine
import com.minedata.minenavi.mapdal.PoiItem
import com.minedata.minenavi.poiquery.LatLonPoint
......@@ -7,8 +7,8 @@ import com.minedata.minenavi.poiquery.PoiSearch
import com.minedata.minenavi.poiquery.SearchErrorCode
import com.minedata.minenavi.poiquery.SortType
import com.sd.api.UserCtx
import com.sd.api.bean.PoiSearchRes
import com.sd.api.core.basic.OnMSPoiSearchLis
import com.sd.api.maps.cdata.PoiSearchRes
import com.sd.api.maps.inters.OnMSPoiSearchLis
/**
* 四维Poi搜索相关
......@@ -32,7 +32,7 @@ object MinePoiSearch : PoiSearch.OnPoiSearchListener {
onMSPoiSearchLis: OnMSPoiSearchLis
) {
this.onMSPoiSearchLis = onMSPoiSearchLis
var context = UserCtx.instance.mContext
var context = UserCtx.Companion.instance.mContext
val poiSearch = PoiSearch(context)
poiSearch.setOnPoiSearchListener(this)
val query = PoiSearch.Query(keyWord, "", "").apply {
......@@ -67,7 +67,7 @@ object MinePoiSearch : PoiSearch.OnPoiSearchListener {
onMSPoiSearchLis: OnMSPoiSearchLis
) {
this.onMSPoiSearchLis = onMSPoiSearchLis
var context = UserCtx.instance.mContext
var context = UserCtx.Companion.instance.mContext
val poiSearch = PoiSearch(context)
poiSearch.setOnPoiSearchListener(this)
......
mapapi/src/main/java/com/sd/api/maps/proxyintfaces/IGesture.kt 0 → 100644
View file @ ba576672
package com.sd.api.maps.proxyintfaces
import com.sd.api.core.MapReadyView
interface IGesture {
/**
* 设置地图旋转手势是否可用
* @param mapReadView 地图准备就绪视图对象
* @param enable 是否启用旋转手势功能
*/
fun setRotateGesturesEnabled(mapReadView: MapReadyView?, enable: Boolean)
/**
* 设置地图倾斜手势功能的启用状态
* @param mapReadView 地图准备就绪视图对象
* @param enable 是否启用倾斜手势功能，true为启用，false为禁用
* */
fun setTiltGesturesEnabled(mapReadView: MapReadyView?, enable: Boolean)
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment