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
app/src/main/java/com/sd/demo/adapter/PoiAdapter.kt
View file @ ba576672
......@@ -11,7 +11,7 @@ import androidx.core.text.set
import androidx.recyclerview.widget.RecyclerView
import com.chad.library.adapter4.BaseQuickAdapter
import com.minedata.minenavi.addons.DistanceBean
import com.sd.api.bean.PoiSearchRes
import com.sd.api.maps.cdata.PoiSearchRes
import com.sd.demo.utils.MyGeoTools
import com.sd.demo.databinding.PoiSearchListItemBinding
......
app/src/main/java/com/sd/demo/ui/CalculateDistanceActivity.kt
View file @ ba576672
......@@ -2,9 +2,9 @@ package com.sd.demo.ui
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.sd.api.bean.MSLatLng
import com.sd.api.maps.cdata.MSLatLng
import com.sd.api.core.MapReadyView
import com.sd.api.core.basic.MSCalcuMapUtil
import com.sd.api.maps.MSCalcuMapUtil
import com.sd.api.ui.MapMultiView.OnMapReadyLis
import com.sd.demo.utils.ToastHelper
import com.sd.demo.databinding.ActivityCalculateDistanceBinding
......
app/src/main/java/com/sd/demo/ui/ChangeMapCenterAct.kt
View file @ ba576672
......@@ -3,7 +3,7 @@ package com.sd.demo.ui
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.sd.api.core.MapReadyView
import com.sd.api.factorys.MapCoreApi
import com.sd.api.maps.MethodAdv
import com.sd.api.ui.MapMultiView.OnMapReadyLis
import com.sd.demo.databinding.ActivityChangeMapCenterBinding
......@@ -25,17 +25,17 @@ class ChangeMapCenterAct : AppCompatActivity() {
})
//获取接口功能实例
var mapCoreApi = MapCoreApi.mapCoreApi
// var mapCoreApi = MapCoreApi.mapCoreApi
binding.bt1.setOnClickListener {
//改变地图中心点，第二个参数是纬度,第三个参数是经度
mapCoreApi.setMapCenter(mapReadView, binding.et1.text.toString().toDouble(), binding.et2.text.toString().toDouble())
MethodAdv.setMapCenter(mapReadView, binding.et1.text.toString().toDouble(), binding.et2.text.toString().toDouble())
}
//改变缩放级别
binding.bt2.setOnClickListener {
var zoom = binding.et3.text.toString().toFloat()
//改变缩放级别
mapCoreApi.setMapZoom(mapReadView, zoom)
MethodAdv.setMapZoom(mapReadView, zoom)
}
// //设置地图边界范围
// binding.bt3.setOnClickListener {
......
app/src/main/java/com/sd/demo/ui/GestureDemo.kt
View file @ ba576672
......@@ -3,7 +3,7 @@ package com.sd.demo.ui
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.sd.api.core.MapReadyView
import com.sd.api.factorys.MapCoreApi
import com.sd.api.maps.Gestures
import com.sd.api.ui.MapMultiView.OnMapReadyLis
import com.sd.demo.databinding.ActivityGestureDemoBinding
......@@ -27,19 +27,15 @@ class GestureDemo : AppCompatActivity() {
}
})
//获取接口功能实例
var mapCoreApi = MapCoreApi.mapCoreApi
binding.bt1.setOnClickListener {
//关闭（打开）旋转
mapCoreApi.setRotateGesturesEnabled(mapReadView, false)
Gestures.setRotateGesturesEnabled(mapReadView, false)
}
binding.bt2.setOnClickListener {
//关闭（打开）倾斜开关
mapCoreApi.setTiltGesturesEnabled(mapReadView, false)
Gestures.setTiltGesturesEnabled(mapReadView, false)
}
}
......
app/src/main/java/com/sd/demo/ui/ShowCarOnlineActivity.kt
View file @ ba576672
......@@ -3,7 +3,7 @@ package com.sd.demo.ui
import android.os.Bundle
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import com.sd.api.bean.MSLatLng
import com.sd.api.maps.cdata.MSLatLng
import com.sd.api.bean.MSLocBean
import com.sd.api.core.MShowMainCarModel
import com.sd.api.core.MapReadyView
......
app/src/main/java/com/sd/demo/ui/ShowMyLocLandian.kt
View file @ ba576672
......@@ -4,7 +4,7 @@ import android.os.Bundle
import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity
import com.sd.api.core.MapReadyView
import com.sd.api.factorys.MapCoreApi
import com.sd.api.maps.LocStyle
import com.sd.api.ui.MapMultiView.OnMapReadyLis
import com.sd.demo.databinding.ActivityShowMyLocLandianBinding
import com.sd.demo.viewmodels.MapDemoVm
......@@ -25,12 +25,12 @@ class ShowMyLocLandian : AppCompatActivity() {
setContentView(binding.root)
//获取接口功能实例
var mapCoreApi = MapCoreApi.mapCoreApi
// var mapCoreApi = MapCoreApi.mapCoreApi
binding.mapMultiView.addMapRenderCallback(object : OnMapReadyLis {
override fun onMapReady(mapReadyView: MapReadyView) {
this@ShowMyLocLandian.mapReadView=mapReadyView
mapCoreApi.setLocationStyle(this@ShowMyLocLandian.mapReadView)
LocStyle.setLocationStyle(this@ShowMyLocLandian.mapReadView)
}
})
......
app/src/main/java/com/sd/demo/ui/TCircelActivity.kt
View file @ ba576672
......@@ -3,9 +3,9 @@ package com.sd.demo.ui
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.sd.api.core.MapReadyView
import com.sd.api.core.basic.MSDrawInMap
import com.sd.api.core.basic.MSOverlay
import com.sd.api.factorys.MapCoreApi
import com.sd.api.maps.DelDrawInMap
import com.sd.api.maps.cdata.MSOverlay
import com.sd.api.maps.DrawInMap
import com.sd.api.ui.MapMultiView.OnMapReadyLis
import com.sd.demo.databinding.ActivityTcircelBinding
......@@ -20,7 +20,7 @@ class TCircelActivity : AppCompatActivity() {
private var mSOverlay: MSOverlay? = null
//获取接口功能实例
var mapCoreApi = MapCoreApi.mapCoreApi
// var mapCoreApi = MapCoreApi.mapCoreApi
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
......@@ -32,14 +32,14 @@ class TCircelActivity : AppCompatActivity() {
this@TCircelActivity.mapReadView = mapReadyView
//绘制一个圆形 116.3975,39.9079
mSOverlay = mapCoreApi.drawCircle(mapReadView, 39.907923, 116.397512, 2000f)
mSOverlay = DrawInMap.drawCircle(mapReadView, 39.907923, 116.397512, 2000f)
}
})
//删除圆形
binding.bt1.setOnClickListener {
//删除圆形
MSDrawInMap.deleteCircle(mapReadView, mSOverlay)
DelDrawInMap.deleteCircle(mapReadView, mSOverlay)
}
}
......
app/src/main/java/com/sd/demo/ui/TDriveRouteActivity.kt
View file @ ba576672
......@@ -8,7 +8,7 @@ import com.minedata.minenavi.navi.GuidanceText
import com.minedata.minenavi.navi.NaviProgressData
import com.minedata.minenavi.navi.SmoothNaviData
import com.minedata.minenavi.navi.TmcSections
import com.sd.api.bean.MSLatLng
import com.sd.api.maps.cdata.MSLatLng
import com.sd.api.bean.WayPoi
import com.sd.api.core.MapReadyView
import com.sd.api.factorys.MapCoreApi
......
app/src/main/java/com/sd/demo/ui/TGpsActivity.kt
View file @ ba576672
......@@ -4,7 +4,7 @@ import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.sd.api.bean.MSLocBean
import com.sd.api.core.MapReadyView
import com.sd.api.core.basic.MSMarker
import com.sd.api.maps.cdata.MSMarker
import com.sd.api.core.basic.OnMsGpsLoc
import com.sd.api.factorys.MapCoreApi
import com.sd.api.ui.MapMultiView.OnMapReadyLis
......
app/src/main/java/com/sd/demo/ui/TLayersActivity.kt
View file @ ba576672
......@@ -4,7 +4,7 @@ package com.sd.demo.ui
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.sd.api.core.MapReadyView
import com.sd.api.factorys.MapCoreApi
import com.sd.api.maps.Layer
import com.sd.api.ui.MapMultiView.OnMapReadyLis
import com.sd.demo.R
import com.sd.demo.databinding.ActivityTlayersBinding
......@@ -32,16 +32,16 @@ class TLayersActivity : AppCompatActivity() {
})
//获取接口功能实例
var mapCoreApi = MapCoreApi.mapCoreApi
// var mapCoreApi = MapCoreApi.mapCoreApi
binding.rg.setOnCheckedChangeListener { group, checkedId ->
when (checkedId) {
R.id.rb1 -> {//普通
mapCoreApi.toggleLayers(mapReadView, 1)
Layer.toggleLayers(mapReadView, 1)
}
R.id.rb2 -> {//卫星
mapCoreApi.toggleLayers(mapReadView, 2)
Layer.toggleLayers(mapReadView, 2)
}
}
}
......
app/src/main/java/com/sd/demo/ui/TLineActivity.kt
View file @ ba576672
package com.sd.demo.ui
import android.graphics.Color
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.sd.api.bean.MSLatLng
import com.sd.api.maps.cdata.MSLatLng
import com.sd.api.core.MapReadyView
import com.sd.api.core.basic.MSDrawInMap
import com.sd.api.core.basic.MSOverlay
import com.sd.api.factorys.MapCoreApi
import com.sd.api.maps.DelDrawInMap
import com.sd.api.maps.cdata.MSOverlay
import com.sd.api.maps.DrawInMap
import com.sd.api.maps.MethodAdv
import com.sd.api.ui.MapMultiView.OnMapReadyLis
import com.sd.demo.databinding.ActivityTlineBinding
......@@ -20,6 +20,7 @@ class TLineActivity : AppCompatActivity() {
//覆盖物对象
private var mSOverlay: MSOverlay? = null
//虚线对象
private var mSOverlay2: MSOverlay? = null
......@@ -29,14 +30,14 @@ class TLineActivity : AppCompatActivity() {
setContentView(binding.root)
//获取接口功能实例
var mapCoreApi = MapCoreApi.mapCoreApi
// var mapCoreApi = MapCoreApi.mapCoreApi
binding.mapMultiView.addMapRenderCallback(object : OnMapReadyLis {
override fun onMapReady(mapReadyView: MapReadyView) {
this@TLineActivity.mapReadView = mapReadyView
//绘制Marker点 116.3985,39.9079
mapCoreApi.drawMarket( mapReadView, 39.907900, 116.398500)
mapCoreApi.setMapCenter(mapReadView, 39.999391, 116.135972)
DrawInMap.drawMarket(mapReadView, 39.907900, 116.398500)
MethodAdv.setMapCenter(mapReadView, 39.999391, 116.135972)
}
})
......@@ -47,7 +48,8 @@ class TLineActivity : AppCompatActivity() {
MSLatLng(39.900430, 116.265061), MSLatLng(39.955192, 116.140092)
)
mSOverlay =
mapCoreApi.drawPolyline(mapReadView, msLatLng, 5f, Color.argb(255, 255, 0, 255))
// DrawInMapPro.drawPolyline(mapReadView, msLatLng, Color.argb(255, 255, 0, 255),5f)
DrawInMap.drawPolyline(mapReadView, msLatLng)
}
binding.bt2.setOnClickListener {
//画虚线
......@@ -55,20 +57,18 @@ class TLineActivity : AppCompatActivity() {
MSLatLng(39.999591, 116.135973), MSLatLng(39.898123, 116.057691),
MSLatLng(39.900230, 116.265062), MSLatLng(39.951192, 116.140090)
)
mSOverlay2 = mapCoreApi.drawPolyline(
mSOverlay2 = DrawInMap.drawPolyline(
mapReadView,
msLatLng,
5f,
Color.argb(0, 255, 0, 255),
isDotted = true
)
}
//删除线
binding.bt3.setOnClickListener {
//删除实线
MSDrawInMap.deletePolyline(mapReadView,mSOverlay)
DelDrawInMap.deletePolyline(mapReadView, mSOverlay)
//删除虚线
MSDrawInMap.deletePolyline(mapReadView,mSOverlay2)
DelDrawInMap.deletePolyline(mapReadView, mSOverlay2)
}
......
app/src/main/java/com/sd/demo/ui/TMarkerActivity.kt
View file @ ba576672
......@@ -3,9 +3,9 @@ package com.sd.demo.ui
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.sd.api.core.MapReadyView
import com.sd.api.core.basic.MSDrawInMap
import com.sd.api.core.basic.MSMarker
import com.sd.api.factorys.MapCoreApi
import com.sd.api.maps.DelDrawInMap
import com.sd.api.maps.cdata.MSMarker
import com.sd.api.maps.DrawInMap
import com.sd.api.ui.MapMultiView.OnMapReadyLis
import com.sd.demo.databinding.ActivityTmarkerBinding
......@@ -26,23 +26,21 @@ class TMarkerActivity : AppCompatActivity() {
setContentView(binding.root)
//获取接口功能实例
var mapCoreApi = MapCoreApi.mapCoreApi
// var mapCoreApi = MapCoreApi.mapCoreApi
binding.mapMultiView.addMapRenderCallback(object : OnMapReadyLis {
override fun onMapReady(mapReadyView: MapReadyView) {
this@TMarkerActivity.mapReadView = mapReadyView
//绘制Marker点 116.3985,39.9079
msMark = mapCoreApi.drawMarket(mapReadView, 39.907900, 116.398500)
msMark = DrawInMap.drawMarket(mapReadView, 39.907900, 116.398500)
// MSMethodAdv.setMapCenter(mapReadView, 39.977290, 116.337000)
}
})
binding.bt1.setOnClickListener {
//删除Marker点
MSDrawInMap.deleteMarker(mapReadView, msMark)
DelDrawInMap.deleteMarker(mapReadView, msMark)
}
}
......
app/src/main/java/com/sd/demo/ui/TPoiSearchActivity.kt
View file @ ba576672
......@@ -2,10 +2,11 @@ package com.sd.demo.ui
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.sd.api.bean.PoiSearchRes
import com.sd.api.maps.cdata.PoiSearchRes
import com.sd.api.core.MapReadyView
import com.sd.api.core.basic.OnMSPoiSearchLis
import com.sd.api.maps.inters.OnMSPoiSearchLis
import com.sd.api.factorys.MapCoreApi
import com.sd.api.maps.MSPoi
import com.sd.api.ui.MapMultiView.OnMapReadyLis
import com.sd.demo.adapter.PoiAdapter
import com.sd.demo.databinding.ActivityTpoiSearchBinding
......@@ -59,7 +60,7 @@ class TPoiSearchActivity : AppCompatActivity() {
//poi搜索
fun testPoiSearch(keyword: String) {
//poi搜索
mapCoreApi.startPoiSearch(
MSPoi.startPoiSearch(
keyword,//关键字
41.80196,
123.43326,
......@@ -76,7 +77,7 @@ class TPoiSearchActivity : AppCompatActivity() {
//poi 范围搜索
fun testPoiSearchBound(keyword: String) {
//poi 范围搜索
mapCoreApi.startPoiSearchBound(
MSPoi.startPoiSearchBound(
keyword,
39.977290,
116.337000,
......
app/src/main/java/com/sd/demo/ui/TPolygonActivity.kt
View file @ ba576672
......@@ -2,11 +2,11 @@ package com.sd.demo.ui
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.sd.api.bean.MSLatLng
import com.sd.api.maps.cdata.MSLatLng
import com.sd.api.core.MapReadyView
import com.sd.api.core.basic.MSDrawInMap
import com.sd.api.core.basic.MSOverlay
import com.sd.api.factorys.MapCoreApi
import com.sd.api.maps.DelDrawInMap
import com.sd.api.maps.cdata.MSOverlay
import com.sd.api.maps.DrawInMap
import com.sd.api.ui.MapMultiView.OnMapReadyLis
import com.sd.demo.databinding.ActivityTpolygonBinding
......@@ -19,7 +19,7 @@ class TPolygonActivity : AppCompatActivity() {
//覆盖物对象
private var mSOverlay: MSOverlay? = null
//获取接口功能实例
var mapCoreApi = MapCoreApi.mapCoreApi
// var mapCoreApi = MapCoreApi.mapCoreApi
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
......@@ -37,14 +37,14 @@ class TPolygonActivity : AppCompatActivity() {
MSLatLng(39.993391, 116.135272), MSLatLng(39.808323, 116.057604),
MSLatLng(39.904430, 116.265061), MSLatLng(39.950192, 116.140002)
)
mSOverlay = mapCoreApi.drawPolygon(mapReadView, mspLatLng,true)
mSOverlay = DrawInMap.drawPolygon(mapReadView, mspLatLng,true)
}
})
//删除面
binding.bt1.setOnClickListener {
//删除面
MSDrawInMap.deletePolygon(mapReadView, mSOverlay)
DelDrawInMap.deletePolygon(mapReadView, mSOverlay)
}
}
......
app/src/main/java/com/sd/demo/ui/TReGeocodeActivity.kt
View file @ ba576672
......@@ -3,7 +3,7 @@ package com.sd.demo.ui
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.sd.api.bean.RegeocodeRes
import com.sd.api.core.basic.MSRegeoCode
import com.sd.api.maps.MSRegeoCode
import com.sd.demo.databinding.ActivityTreGeocodeBinding
......
mapapi/src/main/java/com/sd/api/bean/WayPoi.kt
View file @ ba576672
package com.sd.api.bean
import android.os.Parcelable
import com.sd.api.maps.cdata.MSLatLng
import kotlinx.parcelize.Parcelize
/**途经点Poi***/
......
mapapi/src/main/java/com/sd/api/core/MSRoutePlans.kt
View file @ ba576672
......@@ -27,7 +27,7 @@ import com.sd.api.MAP_TYPE
import com.sd.api.MSDKInitializer
import com.sd.api.UserCtx
import com.sd.api.bean.DriverRouteBean
import com.sd.api.bean.MSLatLng
import com.sd.api.maps.cdata.MSLatLng
import com.sd.api.bean.WayPoi
import com.sd.api.core.basic.OnDriveRoute
import com.sd.api.intfaces.MyAMapNaviListener
......
mapapi/src/main/java/com/sd/api/core/MShowMainCarModel.kt
View file @ ba576672
......@@ -8,7 +8,7 @@ import com.minedata.minenavi.map.Overlay
import com.minedata.minenavi.mapdal.LatLng
import com.sd.api.MAP_TYPE
import com.sd.api.MSDKInitializer
import com.sd.api.bean.MSLatLng
import com.sd.api.maps.cdata.MSLatLng
import com.sd.api.utils.SmoothMoveUtils
import com.sd.api.utils.FileIoUtils
import kotlinx.coroutines.CoroutineScope
......
mapapi/src/main/java/com/sd/api/core/basic/amap/AmapNai.kt
View file @ ba576672
......@@ -6,7 +6,7 @@ import com.amap.api.navi.AmapNaviParams
import com.amap.api.navi.AmapNaviType
import com.amap.api.navi.AmapPageType
import com.sd.api.UserCtx
import com.sd.api.bean.MSLatLng
import com.sd.api.maps.cdata.MSLatLng
import com.sd.api.bean.WayPoi
import com.amap.api.maps.model.LatLng as ALatLng
......
mapapi/src/main/java/com/sd/api/core/basic/amap/AmapRoutePlans.kt
View file @ ba576672
......@@ -9,7 +9,7 @@ import com.amap.api.navi.model.NaviLatLng
import com.amap.api.navi.view.RouteOverLay
import com.sd.api.UserCtx
import com.sd.api.bean.DriverRouteBean
import com.sd.api.bean.MSLatLng
import com.sd.api.maps.cdata.MSLatLng
import com.sd.api.bean.WayPoi
import com.sd.api.core.MapReadyView
import com.sd.api.core.basic.OnDriveRoute
......
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