Skip to content

GitLab

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

修改DEMO

parent c0a4d214
Show whitespace changes
Inline Side-by-side
app/src/main/java/com/sd/demo/MainActivity.kt
View file @ d8a1e0d4
......@@ -137,11 +137,11 @@ class MainActivity : AppCompatActivity() {
*
* @param type MINE=四维 AMAP=高德
*/
fun initMap(type: MAP_TYPE = MAP_TYPE.AMAP) {
fun initMap(type: MAP_TYPE = MAP_TYPE.MINE) {
var url = "http://192.168.60.73:9999/tiles/{z}/{x}/{y}.png?layer=yizhuang:yizhuang_avp"
// var url = "http://192.168.60.73:9999/tiles/{z}/{x}/{y}.png?"
// var url = "http://192.168.59.216:8080/smartmap/yizhuang/wms?service=WMS&version=1.1.0&request=GetMap&layers=yizhuang:yizhuang_avp&bbox=116.49796295166,39.8062019348145,116.505592346191,39.8120422363281&width=256&height=256&srs=EPSG:3857&styles=&format=image/png"
// MSDKInitializer.setWmsUrl(url)
// MapSdkInit.setWmsUrl(url)
MapSdkInit.initialize(this, type, object : OnSdkInitCb {
override fun onInitSuccess() {
println("--------onMapInitSuccess")
......
app/src/main/java/com/sd/demo/ui/ChangeMapCenterAct.kt
View file @ d8a1e0d4
......@@ -28,7 +28,7 @@ class ChangeMapCenterAct : AppCompatActivity() {
// var mapCoreApi = MapCoreApi.mapCoreApi
binding.bt1.setOnClickListener {
//改变地图中心点，第二个参数是纬度,第三个参数是经度
//改变地图中心点，第一个参数是纬度,第二个参数是经度
MethodAdv.setMapCenter(binding.et1.text.toString().toDouble(), binding.et2.text.toString().toDouble())
}
//改变缩放级别
......
app/src/main/java/com/sd/demo/ui/DisplayMapActivity.kt
View file @ d8a1e0d4
......@@ -11,18 +11,18 @@ class DisplayMapActivity : AppCompatActivity() {
private lateinit var binding: ActivityDisplayMapBinding
// var mapReadView: MapReadyView? = null
var mapReadView: MapReadyView? = null
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = ActivityDisplayMapBinding.inflate(layoutInflater)
setContentView(binding.root)
// binding.MapView.addMapRenderCallback(object : OnMapReadyLis {
// override fun onMapReady(mapReadyView: MapReadyView) {
// this@DisplayMapActivity.mapReadView = mapReadyView
// }
// })
binding.MapView.addMapRenderCallback(object : OnMapReadyLis {
override fun onMapReady(mapReadyView: MapReadyView) {
this@DisplayMapActivity.mapReadView = mapReadyView
}
})
}
}
\ No newline at end of file
app/src/main/java/com/sd/demo/ui/PartRoadActivity.kt
View file @ d8a1e0d4
......@@ -7,8 +7,10 @@ import com.cusc.map.ui.MapReadyView
import com.google.gson.Gson
import com.cusc.map.maps.CalcuMapUtil
import com.cusc.map.maps.cdata.LatLngM
import com.cusc.map.parkroad.MsParkRoad
import com.cusc.map.parkroad.OnPrAddCar
import com.cusc.map.parkroad.ParkRoadM
import com.cusc.map.parkroad.PartType
import com.cusc.map.parkroad.RoadPos
import com.cusc.map.scenario.CucsVehicle
import com.cusc.map.scenario.PerceptionManager
import com.cusc.map.scenario.V2xWarn
......@@ -42,6 +44,7 @@ class PartRoadActivity : AppCompatActivity() {
// MsParkRoad.setCarRoadVM(mapReadView)
}
})
//设置局部图数据查询地址
binding.MapView.setRoadBaseUrl("http://172.24.124.130:8110/query/query3")
setLis()
}
......@@ -54,22 +57,22 @@ class PartRoadActivity : AppCompatActivity() {
}
// 添加底部光圈
binding.bt2.setOnClickListener {
MsParkRoad.showWarningCircle(true)
ParkRoadM.showWarningCircle(true)
}
//设置感知物显示距离
binding.bt3.setOnClickListener {
MsParkRoad.setDistanceVisible(100.0)
ParkRoadM.setDistanceVisible(100.0)
}
//跟车视角
binding.bt4.setOnClickListener {
MsParkRoad.setCameraPosition(25.0)
ParkRoadM.setCameraPosition(25.0)
}
//人行道
binding.bt5.setOnClickListener {
lifecycleScope.launch {
MsParkRoad.showWalkLine(true)
ParkRoadM.showWalkLine(true)
delay(2000)
MsParkRoad.showWalkLine(false)
ParkRoadM.showWalkLine(false)
}
}
//mark点
......@@ -89,9 +92,9 @@ class PartRoadActivity : AppCompatActivity() {
//预警雷达
binding.bt7.setOnClickListener {
lifecycleScope.launch {
MsParkRoad.toggleRadar(true)
ParkRoadM.toggleRadar(true)
delay(2000)
MsParkRoad.toggleRadar(false)
ParkRoadM.toggleRadar(false)
}
}
//加载感知物
......@@ -115,12 +118,12 @@ class PartRoadActivity : AppCompatActivity() {
//预加载主车
binding.bt11.setOnClickListener {
// println("-----点击预加载模型")
MsParkRoad.preloadMainCar(assets, "car.glb")
ParkRoadM.preloadMainCar(assets, "car.glb")
}
//预加载感知物
binding.bt12.setOnClickListener {
MsParkRoad.preloadParticipant(assets, "truck.glb", PartType.CAR)
MsParkRoad.preloadParticipant(assets, "passenger.glb", PartType.PEOPLE)
ParkRoadM.preloadParticipant(assets, "truck.glb", PartType.CAR)
ParkRoadM.preloadParticipant(assets, "passenger.glb", PartType.PEOPLE)
}
}
......@@ -153,7 +156,7 @@ class PartRoadActivity : AppCompatActivity() {
CucsVehicle.moveCar(VehiclePos.instance, 2)
//更新车辆位置.主车是否添加回调
// MsParkRoad.updateMainCar(RoadPos.instance, object : OnPrAddCar {
// ParkRoadM.updateMainCar(RoadPos.instance, object : OnPrAddCar {
// override fun onPrAddCar(isAdd: Boolean) {
// println("------------isAdd = ${isAdd}")
// }
......
app/src/main/java/com/sd/demo/ui/TCircelActivity.kt
View file @ d8a1e0d4
......@@ -6,7 +6,7 @@ import com.cusc.map.ui.MapReadyView
import com.cusc.map.maps.DelDrawInMap
import com.cusc.map.maps.cdata.MapOverlay
import com.cusc.map.maps.DrawInMap
import com.cusc.map.maps.MsCircleOptions
import com.cusc.map.maps.CircleOptionsM
import com.cusc.map.maps.cdata.LatLngM
import com.cusc.map.ui.MapView.OnMapReadyLis
import com.sd.demo.databinding.ActivityTcircelBinding
......@@ -33,11 +33,6 @@ class TCircelActivity : AppCompatActivity() {
override fun onMapReady(mapReadyView: MapReadyView) {
this@TCircelActivity.mapReadView = mapReadyView
//绘制一个圆形 116.3975,39.9079
var center = LatLngM(39.9079, 116.3975)
//构造圆形绘制选型
var msCircleOptions = MsCircleOptions()
mSOverlay = DrawInMap.drawCircle(center, msCircleOptions)
}
})
......@@ -46,6 +41,14 @@ class TCircelActivity : AppCompatActivity() {
//删除圆形
DelDrawInMap.deleteCircle(mSOverlay)
}
//绘制圆形
binding.bt2.setOnClickListener {
//绘制一个圆形 116.3975,39.9079
var center = LatLngM(39.9079, 116.3975)
//构造圆形绘制参数
var msCircleOptions = CircleOptionsM()
mSOverlay = DrawInMap.drawCircle(center, msCircleOptions)
}
}
......
app/src/main/java/com/sd/demo/ui/TGpsActivity.kt
View file @ d8a1e0d4
......@@ -2,9 +2,9 @@ package com.sd.demo.ui
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.cusc.map.location.MSLocCb
import com.cusc.map.location.MSLocation
import com.cusc.map.location.OnMsGpsLoc
import com.cusc.map.location.LocCbM
import com.cusc.map.location.LocationM
import com.cusc.map.location.OnGpsLoc
import com.cusc.map.maps.DrawInMap
import com.cusc.map.maps.MethodAdv
import com.cusc.map.maps.cdata.MarkerM
......@@ -43,8 +43,8 @@ class TGpsActivity : AppCompatActivity() {
binding.bt.setOnClickListener {
//开启定位
MSLocation.startLoc(object : OnMsGpsLoc {
override fun onMsGpsLoc(mSLocBean: MSLocCb) {
LocationM.startLoc(object : OnGpsLoc {
override fun onMsGpsLoc(mSLocBean: LocCbM) {
println("---------mSLocBean = ${mSLocBean}")
lat = mSLocBean.lat
lng = mSLocBean.lng
......@@ -72,14 +72,14 @@ class TGpsActivity : AppCompatActivity() {
override fun onStop() {
super.onStop()
//停止定位
MSLocation.stopLoc()
LocationM.stopLoc()
}
override fun onDestroy() {
super.onDestroy()
//清理资源
MSLocation.cleansLoc()
LocationM.cleansLoc()
}
}
\ No newline at end of file
app/src/main/java/com/sd/demo/ui/THighMapActivity.kt
View file @ d8a1e0d4
......@@ -6,7 +6,7 @@ import androidx.lifecycle.lifecycleScope
import com.google.gson.Gson
import com.cusc.map.highmap.AllLine
import com.cusc.map.highmap.CarNavPath
import com.cusc.map.highmap.HighMap
import com.cusc.map.highmap.ThreeHighMap
import com.cusc.map.maps.CalcuMapUtil
import com.cusc.map.maps.cdata.LatLngM
import com.cusc.map.scenario.CucsVehicle
......@@ -42,7 +42,7 @@ class THighMapActivity : AppCompatActivity() {
override fun onMapReady(mapReadyView: MapReadyView) {
this@THighMapActivity.mapReadView = mapReadyView
//传入3d tile加载地图 1= 亦庄示范区
HighMap.setTileInit(1)
ThreeHighMap.setTileInit(1)
}
})
......@@ -174,11 +174,11 @@ class THighMapActivity : AppCompatActivity() {
* */
fun toggleCircleRadar(dirent: Int) {
// HighMap.setCarBottomCircle(true)
HighMap.setCarRadarDirection(dirent)
ThreeHighMap.setCarRadarDirection(dirent)
lifecycleScope.launch {
delay(5000)
HighMap.setCarBottomCircle(false)
HighMap.setCarRadarDirection(0)
ThreeHighMap.setCarBottomCircle(false)
ThreeHighMap.setCarRadarDirection(0)
}
}
......
app/src/main/java/com/sd/demo/ui/TMarkerActivity.kt
View file @ d8a1e0d4
......@@ -27,8 +27,7 @@ class TMarkerActivity : AppCompatActivity() {
binding.MapView.addMapRenderCallback(object : OnMapReadyLis {
override fun onMapReady(mapReadyView: MapReadyView) {
this@TMarkerActivity.mapReadView = mapReadyView
//绘制Marker点 116.3985,39.9079
msMark = DrawInMap.drawMarket(39.907900, 116.398500)
// MSMethodAdv.setMapCenter(mapReadView, 39.977290, 116.337000)
}
})
......@@ -37,6 +36,10 @@ class TMarkerActivity : AppCompatActivity() {
//删除Marker点
DelDrawInMap.deleteMarker(msMark)
}
binding.bt2.setOnClickListener {
//绘制Marker点 116.3985,39.9079
msMark = DrawInMap.drawMarket(39.907900, 116.398500)
}
}
......
app/src/main/java/com/sd/demo/ui/TPoiSearchActivity.kt
View file @ d8a1e0d4
......@@ -58,7 +58,7 @@ class TPoiSearchActivity : AppCompatActivity() {
//poi搜索
fun testPoiSearch(keyword: String) {
//poi搜索
//poi关键字搜索
PoiSearch.startPoiSearch(
keyword,//关键字
41.80196,
......
app/src/main/java/com/sd/demo/ui/TPolygonActivity.kt
View file @ d8a1e0d4
......@@ -33,7 +33,7 @@ class TPolygonActivity : AppCompatActivity() {
override fun onMapReady(mapReadyView: MapReadyView) {
this@TPolygonActivity.mapReadView = mapReadyView
// MSMethodAdv.setMapZoom(mapReadView, 9f)
//绘制一个面
//绘制一个多边形
var mspLatLng = listOf<LatLngM>(
LatLngM(39.993391, 116.135272), LatLngM(39.808323, 116.057604),
LatLngM(39.904430, 116.265061), LatLngM(39.950192, 116.140002)
......@@ -48,9 +48,9 @@ class TPolygonActivity : AppCompatActivity() {
}
})
//删除面
//删除多边形
binding.bt1.setOnClickListener {
//删除面
//删除多边形
DelDrawInMap.deletePolygon(mSOverlay)
}
......
app/src/main/res/layout/activity_display_map.xml
View file @ d8a1e0d4
......@@ -9,16 +9,4 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
<!-- <ImageView-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="10dp"-->
<!-- android:src="#784125"/>-->
<!-- <com.cusc.map.ui.MapView-->
<!-- android:id="@+id/MapView2"-->
<!-- android:layout_width="200dp"-->
<!-- android:layout_height="300dp" />-->
<!-- <com.cusc.map.ui.MapView-->
<!-- android:id="@+id/MapView3"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="300dp" />-->
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/activity_tcircel.xml
View file @ d8a1e0d4
......@@ -15,6 +15,12 @@
android:layout_height="wrap_content"
android:text="删除圆形" />
<Button
android:id="@+id/bt2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="绘制圆形" />
</LinearLayout>
......
app/src/main/res/layout/activity_tmarker.xml
View file @ d8a1e0d4
......@@ -15,6 +15,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="删除mark" />
<Button
android:id="@+id/bt2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="绘制mark" />
</LinearLayout>
......
mapapi/src/main/java/com/cusc/map/MapSdkInit.kt
View file @ d8a1e0d4
......@@ -9,7 +9,7 @@ import com.minedata.minenavi.SDKInitializer
import com.minedata.minenavi.SDKInitializer.InitListener
import com.minedata.minenavi.map.MineMap
import com.permissionx.guolindev.PermissionX
import com.cusc.map.location.MSLocation
import com.cusc.map.location.LocationM
import com.cusc.map.ui.MapReadyView
......@@ -102,8 +102,8 @@ object MapSdkInit {
}
MAP_TYPE.MINE -> {
MSLocation.initLoc()
MSLocation.startLoc(null)
LocationM.initLoc()
LocationM.startLoc(null)
SDKInitializer.debug(false)
// SDKInitializer.enableEtaLog(false)
// SDKInitializer.outputLog(false)
......
mapapi/src/main/java/com/cusc/map/fragments/ForeMapFragment.kt
View file @ d8a1e0d4
......@@ -18,7 +18,7 @@ import com.minedata.minenavi.mapdal.NdsPoint
import com.minedata.minenavi.util.Tools
import com.cusc.map.UserCtx
import com.cusc.map.databinding.FragmentForeMapBinding
import com.cusc.map.location.MSLocCb
import com.cusc.map.location.LocCbM
import com.cusc.map.ui.MapView.OnMapReadyLis
import com.cusc.map.ui.MapReadyView
......@@ -90,7 +90,7 @@ class ForeMapFragment : Fragment() {
private fun setListener(mineMap: MineMap) {
binding.ivLocation.setOnClickListener {
//定位到地图中心点
var loc = MSLocCb.instance
var loc = LocCbM.instance
val point = Tools.latLngToPoint(LatLng(loc.lat, loc.lng))
mMineMap?.setPointToCenter(point.x, point.y)
}
......
mapapi/src/main/java/com/cusc/map/fragments/PartRoadFragment.kt
View file @ d8a1e0d4
......@@ -8,7 +8,7 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
import com.example.car_and_road_3d.CarAndRoadWebViewClient
import com.cusc.map.databinding.FragmentPartRoadBinding
import com.cusc.map.parkroad.MsParkRoad
import com.cusc.map.parkroad.ParkRoadM
import com.cusc.map.ui.MapReadyView
import com.cusc.map.ui.MapView.OnMapReadyLis
import com.cusc.map.vms.CarRoadVM
......@@ -55,7 +55,7 @@ class PartRoadFragment : Fragment() {
// }
//初始化局部视图控制器
MapReadyView.instance.carRoadVM = carRoadVM
MsParkRoad.setCarRoadVM(MapReadyView.instance)
ParkRoadM.setCarRoadVM(MapReadyView.instance)
onMapReadyLis?.onMapReady(MapReadyView.instance)
}
......
mapapi/src/main/java/com/cusc/map/highmap/HighMap.kt → mapapi/src/main/java/com/cusc/map/highmap/ThreeHighMap.kt
View file @ d8a1e0d4
......@@ -8,9 +8,9 @@ import com.unity3d.player.UnityPlayer
/**
* 四维高精地图操作
* 四维三维地图操作
*/
object HighMap :MsOperationParent() {
object ThreeHighMap :MsOperationParent() {
private var gson = Gson()
......
mapapi/src/main/java/com/cusc/map/location/MSLocCb.kt → mapapi/src/main/java/com/cusc/map/location/LocCbM.kt
View file @ d8a1e0d4
package com.cusc.map.location
/**定位数据回调*/
class MSLocCb {
class LocCbM {
companion object {
val instance: MSLocCb by lazy { MSLocCb() }
val instance: LocCbM by lazy { LocCbM() }
}
//当前经纬度
......
mapapi/src/main/java/com/cusc/map/location/MSLocation.kt → mapapi/src/main/java/com/cusc/map/location/LocationM.kt
View file @ d8a1e0d4
......@@ -7,7 +7,7 @@ import com.cusc.map.maps.amap.AmapGpsLocation
/**
* 定位类
*/
object MSLocation {
object LocationM {
fun initLoc(){
when (MapSdkInit.getMapType()) {
......@@ -26,7 +26,7 @@ object MSLocation {
* 设置GPS定位回调监听器
* @param onMsGpsLoc GPS定位回调监听器实例
*/
fun startLoc(onMsGpsLoc: OnMsGpsLoc?){
fun startLoc(onMsGpsLoc: OnGpsLoc?){
when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> {
MineGpsLocation.starLoc(onMsGpsLoc)
......
mapapi/src/main/java/com/cusc/map/location/MineGpsLocation.kt
View file @ d8a1e0d4
......@@ -24,7 +24,7 @@ object MineGpsLocation {
/**业务层Gps定位回调**/
private var onMsGpsLoc: OnMsGpsLoc? = null
private var onMsGpsLoc: OnGpsLoc? = null
/**初始化定位*/
fun initLoc() {
......@@ -37,7 +37,7 @@ object MineGpsLocation {
/**开启定位*/
fun starLoc(onMsGpsLoc: OnMsGpsLoc?) {
fun starLoc(onMsGpsLoc: OnGpsLoc?) {
this.onMsGpsLoc = onMsGpsLoc
MineLocationManager.getInstance().start(options)
}
......@@ -61,7 +61,7 @@ object MineGpsLocation {
override fun onLocationChanged(location: MineLocation?) {
// println("-------四维定位改变 = ${location?.latitude} curLng=${location?.longitude} speed=${location?.speed}")
var loc = MSLocCb.instance.apply {
var loc = LocCbM.instance.apply {
lat = location?.latitude ?: 0.0
lng = location?.longitude ?: 0.0
speed = location?.speed ?: 0f
......
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