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

修改底图命名

parent e2946046
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
android:layout_height="match_parent"> android:layout_height="match_parent">
<com.sd.api.ui.MapMultiView <com.cusc.map.ui.MapView
android:id="@+id/mapMultiView" android:id="@+id/MapView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
/> />
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
</LinearLayout> </LinearLayout>
<com.sd.api.ui.MapMultiView <com.cusc.map.ui.MapView
android:id="@+id/mapMultiView" android:id="@+id/MapView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
/> />
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
</LinearLayout> </LinearLayout>
<com.sd.api.ui.MapMultiView <com.cusc.map.ui.MapView
android:id="@+id/mapMultiView" android:id="@+id/MapView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
<!-- 小地图--> <!-- 小地图-->
......
...@@ -47,7 +47,7 @@ interface OnSdkInitCb { ...@@ -47,7 +47,7 @@ interface OnSdkInitCb {
} }
/**SDK初始化类*/ /**SDK初始化类*/
object MSDKInitializer { object MapSdkInit {
/**SDK初始化成功(失败)回调*/ /**SDK初始化成功(失败)回调*/
private var onSdkInitCb: OnSdkInitCb? = null private var onSdkInitCb: OnSdkInitCb? = null
......
...@@ -7,7 +7,7 @@ import com.minedata.minenavi.map.ModelOptions ...@@ -7,7 +7,7 @@ import com.minedata.minenavi.map.ModelOptions
import com.minedata.minenavi.map.Overlay import com.minedata.minenavi.map.Overlay
import com.minedata.minenavi.mapdal.LatLng import com.minedata.minenavi.mapdal.LatLng
import com.cusc.map.MAP_TYPE import com.cusc.map.MAP_TYPE
import com.cusc.map.MSDKInitializer import com.cusc.map.MapSdkInit
import com.cusc.map.maps.cdata.MSLatLng import com.cusc.map.maps.cdata.MSLatLng
import com.cusc.map.ui.MapReadyView import com.cusc.map.ui.MapReadyView
import com.cusc.map.utils.SmoothMoveUtils import com.cusc.map.utils.SmoothMoveUtils
...@@ -64,7 +64,7 @@ import java.io.IOException ...@@ -64,7 +64,7 @@ import java.io.IOException
) { ) {
// mMineMap?.removeOverlay(mainCarMo) // mMineMap?.removeOverlay(mainCarMo)
// deleteMyLocMarker() // deleteMyLocMarker()
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
CoroutineScope(Dispatchers.IO).launch { CoroutineScope(Dispatchers.IO).launch {
loadMainCar(context) loadMainCar(context)
...@@ -104,7 +104,7 @@ import java.io.IOException ...@@ -104,7 +104,7 @@ import java.io.IOException
lng: Double, lng: Double,
heading: Float heading: Float
) { ) {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
if (mainCarMo == null) if (mainCarMo == null)
return return
...@@ -131,7 +131,7 @@ import java.io.IOException ...@@ -131,7 +131,7 @@ import java.io.IOException
to: MSLatLng, to: MSLatLng,
durationMillis: Long=1000L durationMillis: Long=1000L
) { ) {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
SmoothMoveUtils.startSmoothMove( SmoothMoveUtils.startSmoothMove(
LatLng(from.lat, from.lng), LatLng(from.lat, from.lng),
......
...@@ -9,7 +9,7 @@ import com.amap.api.maps.AMap ...@@ -9,7 +9,7 @@ import com.amap.api.maps.AMap
import com.cusc.map.UserCtx import com.cusc.map.UserCtx
import com.cusc.map.databinding.FragmentAMapBinding import com.cusc.map.databinding.FragmentAMapBinding
import com.cusc.map.ui.MapReadyView import com.cusc.map.ui.MapReadyView
import com.cusc.map.ui.MapMultiView.OnMapReadyLis import com.cusc.map.ui.MapView.OnMapReadyLis
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
......
...@@ -19,7 +19,7 @@ import com.minedata.minenavi.util.Tools ...@@ -19,7 +19,7 @@ import com.minedata.minenavi.util.Tools
import com.cusc.map.UserCtx import com.cusc.map.UserCtx
import com.cusc.map.databinding.FragmentForeMapBinding import com.cusc.map.databinding.FragmentForeMapBinding
import com.cusc.map.location.MSLocCb import com.cusc.map.location.MSLocCb
import com.cusc.map.ui.MapMultiView.OnMapReadyLis import com.cusc.map.ui.MapView.OnMapReadyLis
import com.cusc.map.ui.MapReadyView import com.cusc.map.ui.MapReadyView
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
......
...@@ -10,7 +10,7 @@ import com.example.car_and_road_3d.CarAndRoadWebViewClient ...@@ -10,7 +10,7 @@ import com.example.car_and_road_3d.CarAndRoadWebViewClient
import com.cusc.map.databinding.FragmentPartRoadBinding import com.cusc.map.databinding.FragmentPartRoadBinding
import com.cusc.map.parkroad.MsParkRoad import com.cusc.map.parkroad.MsParkRoad
import com.cusc.map.ui.MapReadyView import com.cusc.map.ui.MapReadyView
import com.cusc.map.ui.MapMultiView.OnMapReadyLis import com.cusc.map.ui.MapView.OnMapReadyLis
import com.cusc.map.vms.CarRoadVM import com.cusc.map.vms.CarRoadVM
import kotlin.getValue import kotlin.getValue
......
...@@ -8,7 +8,7 @@ import android.view.ViewGroup ...@@ -8,7 +8,7 @@ import android.view.ViewGroup
import android.widget.FrameLayout import android.widget.FrameLayout
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import com.cusc.map.UserCtx import com.cusc.map.UserCtx
import com.cusc.map.ui.MapMultiView.OnMapReadyLis import com.cusc.map.ui.MapView.OnMapReadyLis
import com.cusc.map.ui.MapReadyView import com.cusc.map.ui.MapReadyView
import com.unity3d.player.IUnityPlayerLifecycleEvents import com.unity3d.player.IUnityPlayerLifecycleEvents
import com.unity3d.player.UnityPlayer import com.unity3d.player.UnityPlayer
......
...@@ -2,7 +2,7 @@ package com.cusc.map.highmap ...@@ -2,7 +2,7 @@ package com.cusc.map.highmap
import com.google.gson.Gson import com.google.gson.Gson
import com.cusc.map.MAP_TYPE import com.cusc.map.MAP_TYPE
import com.cusc.map.MSDKInitializer import com.cusc.map.MapSdkInit
import com.cusc.map.maps.MsOperationParent import com.cusc.map.maps.MsOperationParent
import com.unity3d.player.UnityPlayer import com.unity3d.player.UnityPlayer
...@@ -21,7 +21,7 @@ object HighMap :MsOperationParent() { ...@@ -21,7 +21,7 @@ object HighMap :MsOperationParent() {
* @param tileType 1=亦庄示范区 * @param tileType 1=亦庄示范区
*/ */
fun setTileInit(tileType: Int) { fun setTileInit(tileType: Int) {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
if (!isLoadUnityPlayer()) if (!isLoadUnityPlayer())
return return
...@@ -46,7 +46,7 @@ object HighMap :MsOperationParent() { ...@@ -46,7 +46,7 @@ object HighMap :MsOperationParent() {
lon: Double, lon: Double,
evel: Double, evel: Double,
) { ) {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
if (!isLoadUnityPlayer()) if (!isLoadUnityPlayer())
return return
...@@ -68,7 +68,7 @@ object HighMap :MsOperationParent() { ...@@ -68,7 +68,7 @@ object HighMap :MsOperationParent() {
* @param highPos 车辆位置对象 * @param highPos 车辆位置对象
*/ */
fun setCarPosition(highPos:HighPos) { fun setCarPosition(highPos:HighPos) {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
if (!isLoadUnityPlayer()) if (!isLoadUnityPlayer())
return return
...@@ -86,7 +86,7 @@ object HighMap :MsOperationParent() { ...@@ -86,7 +86,7 @@ object HighMap :MsOperationParent() {
* @param isOn true:显示 false:隐藏 * @param isOn true:显示 false:隐藏
*/ */
fun setCarBottomCircle(isOn: Boolean) { fun setCarBottomCircle(isOn: Boolean) {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
var bottomCircle = BottomCircle(isOn) var bottomCircle = BottomCircle(isOn)
UnityPlayer.UnitySendMessage( UnityPlayer.UnitySendMessage(
...@@ -106,7 +106,7 @@ object HighMap :MsOperationParent() { ...@@ -106,7 +106,7 @@ object HighMap :MsOperationParent() {
* 0=关闭 1=左前 2=正前 3=右前 4=右后 5=正后 6=左后 * 0=关闭 1=左前 2=正前 3=右前 4=右后 5=正后 6=左后
*/ */
fun setCarRadarDirection(dirent: Int) { fun setCarRadarDirection(dirent: Int) {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
var radarDirection = RadarDirection(dirent) var radarDirection = RadarDirection(dirent)
UnityPlayer.UnitySendMessage( UnityPlayer.UnitySendMessage(
...@@ -136,7 +136,7 @@ object HighMap :MsOperationParent() { ...@@ -136,7 +136,7 @@ object HighMap :MsOperationParent() {
drawpassed: Boolean = true, drawpassed: Boolean = true,
showdistance: Int = 45 showdistance: Int = 45
) { ) {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
var carNavPath = CarNavPath().apply { var carNavPath = CarNavPath().apply {
this.lines = lines this.lines = lines
...@@ -158,7 +158,7 @@ object HighMap :MsOperationParent() { ...@@ -158,7 +158,7 @@ object HighMap :MsOperationParent() {
* @param carNavPath 导航路径选项 * @param carNavPath 导航路径选项
*/ */
fun setCarNavPath(carNavPath : CarNavPath) { fun setCarNavPath(carNavPath : CarNavPath) {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
if (!isLoadUnityPlayer()) if (!isLoadUnityPlayer())
return return
...@@ -176,7 +176,7 @@ object HighMap :MsOperationParent() { ...@@ -176,7 +176,7 @@ object HighMap :MsOperationParent() {
* @param alertType 告警类型 2=红色;3=绿色(绿波);4=(感知车前的红色);5= (拥堵红色、施工红色、人行道红色)alertType=-1 时清空所有警戒线。 * @param alertType 告警类型 2=红色;3=绿色(绿波);4=(感知车前的红色);5= (拥堵红色、施工红色、人行道红色)alertType=-1 时清空所有警戒线。
*/ */
fun setAlertPath(alertLine: List<AlertLine>, alertType: Int) { fun setAlertPath(alertLine: List<AlertLine>, alertType: Int) {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
var alertPath = AlertPath(alertLine, alertType) var alertPath = AlertPath(alertLine, alertType)
UnityPlayer.UnitySendMessage(MODELNAME, "SetAlertPath", gson.toJson(alertPath)) UnityPlayer.UnitySendMessage(MODELNAME, "SetAlertPath", gson.toJson(alertPath))
...@@ -192,7 +192,7 @@ object HighMap :MsOperationParent() { ...@@ -192,7 +192,7 @@ object HighMap :MsOperationParent() {
* @param ptcList 感知物列表 * @param ptcList 感知物列表
*/ */
fun setPtcData(ptcList: List<UnityPtc>) { fun setPtcData(ptcList: List<UnityPtc>) {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
if (!isLoadUnityPlayer()) if (!isLoadUnityPlayer())
return return
...@@ -212,7 +212,7 @@ object HighMap :MsOperationParent() { ...@@ -212,7 +212,7 @@ object HighMap :MsOperationParent() {
* @param warnPtc 感知物状态列表 * @param warnPtc 感知物状态列表
*/ */
fun setWarnPtc(warnPtc: List<WarnPtc>) { fun setWarnPtc(warnPtc: List<WarnPtc>) {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
if (!isLoadUnityPlayer()) if (!isLoadUnityPlayer())
return return
...@@ -232,7 +232,7 @@ object HighMap :MsOperationParent() { ...@@ -232,7 +232,7 @@ object HighMap :MsOperationParent() {
* 清空场景中的所有感知物 * 清空场景中的所有感知物
*/ */
fun clearPtcData() { fun clearPtcData() {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
UnityPlayer.UnitySendMessage(MODELNAME, "ClearAllPtcData", "{}") UnityPlayer.UnitySendMessage(MODELNAME, "ClearAllPtcData", "{}")
} }
...@@ -246,7 +246,7 @@ object HighMap :MsOperationParent() { ...@@ -246,7 +246,7 @@ object HighMap :MsOperationParent() {
* 调整主摄像机的俯视角度 * 调整主摄像机的俯视角度
*/ */
fun setCameraAngle(angle: Float = 30f) { fun setCameraAngle(angle: Float = 30f) {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
UnityPlayer.UnitySendMessage(MODELNAME, "SetCameraAngle", "$angle") UnityPlayer.UnitySendMessage(MODELNAME, "SetCameraAngle", "$angle")
} }
...@@ -262,7 +262,7 @@ object HighMap :MsOperationParent() { ...@@ -262,7 +262,7 @@ object HighMap :MsOperationParent() {
* @param spaceCode 车位编号 当为空时则取消高亮 * @param spaceCode 车位编号 当为空时则取消高亮
*/ */
fun parkRoundLight(spaceCode: String) { fun parkRoundLight(spaceCode: String) {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
var parkRoundLight = ParkRoundLight().apply { var parkRoundLight = ParkRoundLight().apply {
this.spaceCode = spaceCode this.spaceCode = spaceCode
...@@ -283,7 +283,7 @@ object HighMap :MsOperationParent() { ...@@ -283,7 +283,7 @@ object HighMap :MsOperationParent() {
* 设置车辆停车状态,倒车特效 * 设置车辆停车状态,倒车特效
*/ */
fun setParkRever(reverCar: ReverCar) { fun setParkRever(reverCar: ReverCar) {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
UnityPlayer.UnitySendMessage(MODELNAME, "SetParking", gson.toJson(reverCar)) UnityPlayer.UnitySendMessage(MODELNAME, "SetParking", gson.toJson(reverCar))
} }
...@@ -297,7 +297,7 @@ object HighMap :MsOperationParent() { ...@@ -297,7 +297,7 @@ object HighMap :MsOperationParent() {
* @param complete true:完成 false:未完成 * @param complete true:完成 false:未完成
*/ */
fun setParkComplete(complete: Boolean) { fun setParkComplete(complete: Boolean) {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
var parkComplete = ParkComplete().apply { var parkComplete = ParkComplete().apply {
this.complete = complete this.complete = complete
...@@ -317,7 +317,7 @@ object HighMap :MsOperationParent() { ...@@ -317,7 +317,7 @@ object HighMap :MsOperationParent() {
/**设置车位停车状态*/ /**设置车位停车状态*/
fun setParkStatu(parkStatu: ParkStatu) { fun setParkStatu(parkStatu: ParkStatu) {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
UnityPlayer.UnitySendMessage(MODELNAME, "SetSpaceParkStatu", gson.toJson(parkStatu)) UnityPlayer.UnitySendMessage(MODELNAME, "SetSpaceParkStatu", gson.toJson(parkStatu))
} }
...@@ -330,7 +330,7 @@ object HighMap :MsOperationParent() { ...@@ -330,7 +330,7 @@ object HighMap :MsOperationParent() {
/**设置地锁动画*/ /**设置地锁动画*/
fun setLockStatus(lockStatu: LockStatu) { fun setLockStatus(lockStatu: LockStatu) {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
UnityPlayer.UnitySendMessage(MODELNAME, "SetLockStatus", gson.toJson(lockStatu)) UnityPlayer.UnitySendMessage(MODELNAME, "SetLockStatus", gson.toJson(lockStatu))
} }
......
package com.cusc.map.location package com.cusc.map.location
import com.cusc.map.MAP_TYPE import com.cusc.map.MAP_TYPE
import com.cusc.map.MSDKInitializer import com.cusc.map.MapSdkInit
import com.cusc.map.maps.amap.AmapGpsLocation import com.cusc.map.maps.amap.AmapGpsLocation
/** /**
...@@ -10,7 +10,7 @@ import com.cusc.map.maps.amap.AmapGpsLocation ...@@ -10,7 +10,7 @@ import com.cusc.map.maps.amap.AmapGpsLocation
object MSLocation { object MSLocation {
fun initLoc(){ fun initLoc(){
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
MineGpsLocation.initLoc() MineGpsLocation.initLoc()
} }
...@@ -27,7 +27,7 @@ object MSLocation { ...@@ -27,7 +27,7 @@ object MSLocation {
* @param onMsGpsLoc GPS定位回调监听器实例 * @param onMsGpsLoc GPS定位回调监听器实例
*/ */
fun startLoc(onMsGpsLoc: OnMsGpsLoc?){ fun startLoc(onMsGpsLoc: OnMsGpsLoc?){
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
MineGpsLocation.starLoc(onMsGpsLoc) MineGpsLocation.starLoc(onMsGpsLoc)
} }
...@@ -40,7 +40,7 @@ object MSLocation { ...@@ -40,7 +40,7 @@ object MSLocation {
/**停止定位*/ /**停止定位*/
fun stopLoc(){ fun stopLoc(){
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
MineGpsLocation.stopLoc() MineGpsLocation.stopLoc()
} }
...@@ -53,7 +53,7 @@ object MSLocation { ...@@ -53,7 +53,7 @@ object MSLocation {
/**清理定位资源**/ /**清理定位资源**/
fun cleansLoc(){ fun cleansLoc(){
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
MineGpsLocation.cleansLoc() MineGpsLocation.cleansLoc()
} }
......
package com.cusc.map.maps package com.cusc.map.maps
import com.cusc.map.MAP_TYPE import com.cusc.map.MAP_TYPE
import com.cusc.map.MSDKInitializer import com.cusc.map.MapSdkInit
import com.cusc.map.maps.cdata.MSOverlay import com.cusc.map.maps.cdata.MSOverlay
import com.cusc.map.maps.cdata.MSMarker import com.cusc.map.maps.cdata.MSMarker
...@@ -224,7 +224,7 @@ object DelDrawInMap : MsOperationParent() { ...@@ -224,7 +224,7 @@ object DelDrawInMap : MsOperationParent() {
return return
var mapReadView = getMapReadView() var mapReadView = getMapReadView()
// 根据不同的地图类型执行相应的删除操作 // 根据不同的地图类型执行相应的删除操作
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
// 从自定义地图中移除指定的标记点 // 从自定义地图中移除指定的标记点
mapReadView?.mMineMap?.removeMarker(mSMarker.maker) mapReadView?.mMineMap?.removeMarker(mSMarker.maker)
...@@ -249,7 +249,7 @@ object DelDrawInMap : MsOperationParent() { ...@@ -249,7 +249,7 @@ object DelDrawInMap : MsOperationParent() {
return return
var mapReadView = getMapReadView() var mapReadView = getMapReadView()
// 根据不同的地图类型删除对应的折线 // 根据不同的地图类型删除对应的折线
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
mapReadView?.mMineMap?.removeOverlay(mSOverlay.polyline) mapReadView?.mMineMap?.removeOverlay(mSOverlay.polyline)
} }
...@@ -271,7 +271,7 @@ object DelDrawInMap : MsOperationParent() { ...@@ -271,7 +271,7 @@ object DelDrawInMap : MsOperationParent() {
} }
var mapReadView = getMapReadView() var mapReadView = getMapReadView()
// 根据不同的地图类型执行对应的圆形删除操作 // 根据不同的地图类型执行对应的圆形删除操作
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
mapReadView?.mMineMap?.removeOverlay(mSOverlay.circle) mapReadView?.mMineMap?.removeOverlay(mSOverlay.circle)
} }
...@@ -292,7 +292,7 @@ object DelDrawInMap : MsOperationParent() { ...@@ -292,7 +292,7 @@ object DelDrawInMap : MsOperationParent() {
} }
var mapReadView = getMapReadView() var mapReadView = getMapReadView()
// 根据不同的地图类型执行对应的删除操作 // 根据不同的地图类型执行对应的删除操作
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
mapReadView?.mMineMap?.removeOverlay(mSOverlay.polygon) mapReadView?.mMineMap?.removeOverlay(mSOverlay.polygon)
} }
......
...@@ -2,7 +2,7 @@ package com.cusc.map.maps ...@@ -2,7 +2,7 @@ package com.cusc.map.maps
import androidx.core.graphics.toColorInt import androidx.core.graphics.toColorInt
import com.cusc.map.MAP_TYPE import com.cusc.map.MAP_TYPE
import com.cusc.map.MSDKInitializer import com.cusc.map.MapSdkInit
import com.cusc.map.maps.amap.AmapDrawInMap import com.cusc.map.maps.amap.AmapDrawInMap
import com.cusc.map.maps.cdata.MSLatLng import com.cusc.map.maps.cdata.MSLatLng
import com.cusc.map.maps.cdata.MSMarker import com.cusc.map.maps.cdata.MSMarker
...@@ -72,7 +72,7 @@ object DrawInMap : MsOperationParent() { ...@@ -72,7 +72,7 @@ object DrawInMap : MsOperationParent() {
lng: Double lng: Double
): MSMarker { ): MSMarker {
val mapReadView = getMapReadView() val mapReadView = getMapReadView()
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
return MineDrawInMap.drawMarket(mapReadView, lat, lng) return MineDrawInMap.drawMarket(mapReadView, lat, lng)
} }
...@@ -93,7 +93,7 @@ object DrawInMap : MsOperationParent() { ...@@ -93,7 +93,7 @@ object DrawInMap : MsOperationParent() {
msLatLng: List<MSLatLng>, msPolylineOptions: MsPolylineOptions msLatLng: List<MSLatLng>, msPolylineOptions: MsPolylineOptions
): MSOverlay { ): MSOverlay {
val mapReadView = getMapReadView() val mapReadView = getMapReadView()
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
return MineDrawInMap.drawPolyline( return MineDrawInMap.drawPolyline(
mapReadView, mapReadView,
...@@ -119,7 +119,7 @@ object DrawInMap : MsOperationParent() { ...@@ -119,7 +119,7 @@ object DrawInMap : MsOperationParent() {
msCircleOptions: MsCircleOptions? msCircleOptions: MsCircleOptions?
): MSOverlay { ): MSOverlay {
val mapReadView = getMapReadView() val mapReadView = getMapReadView()
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
return MineDrawInMap.drawCircle( return MineDrawInMap.drawCircle(
mapReadView, center, mapReadView, center,
...@@ -147,7 +147,7 @@ object DrawInMap : MsOperationParent() { ...@@ -147,7 +147,7 @@ object DrawInMap : MsOperationParent() {
msPolygonOptions: MsPolygonOptions msPolygonOptions: MsPolygonOptions
): MSOverlay { ): MSOverlay {
val mapReadView = getMapReadView() val mapReadView = getMapReadView()
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
return MineDrawInMap.drawPolygon( return MineDrawInMap.drawPolygon(
mapReadView, mapReadView,
......
package com.cusc.map.maps package com.cusc.map.maps
import com.cusc.map.MAP_TYPE import com.cusc.map.MAP_TYPE
import com.cusc.map.MSDKInitializer import com.cusc.map.MapSdkInit
import com.cusc.map.maps.amap.AmapGestures import com.cusc.map.maps.amap.AmapGestures
import com.cusc.map.maps.mine.MineGestures import com.cusc.map.maps.mine.MineGestures
...@@ -17,7 +17,7 @@ object Gestures : MsOperationParent() { ...@@ -17,7 +17,7 @@ object Gestures : MsOperationParent() {
*/ */
fun setRotateGesturesEnabled(enable: Boolean){ fun setRotateGesturesEnabled(enable: Boolean){
var mapReadView = getMapReadView() var mapReadView = getMapReadView()
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
MineGestures.setRotateGesturesEnabled(mapReadView, enable) MineGestures.setRotateGesturesEnabled(mapReadView, enable)
} }
...@@ -36,7 +36,7 @@ object Gestures : MsOperationParent() { ...@@ -36,7 +36,7 @@ object Gestures : MsOperationParent() {
* */ * */
fun setTiltGesturesEnabled(enable: Boolean){ fun setTiltGesturesEnabled(enable: Boolean){
var mapReadView = getMapReadView() var mapReadView = getMapReadView()
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
MineGestures.setTiltGesturesEnabled(mapReadView, enable) MineGestures.setTiltGesturesEnabled(mapReadView, enable)
} }
......
package com.cusc.map.maps package com.cusc.map.maps
import com.cusc.map.MAP_TYPE import com.cusc.map.MAP_TYPE
import com.cusc.map.MSDKInitializer import com.cusc.map.MapSdkInit
import com.cusc.map.ui.MapReadyView import com.cusc.map.ui.MapReadyView
import com.cusc.map.maps.amap.AmapLocationStyle import com.cusc.map.maps.amap.AmapLocationStyle
import com.cusc.map.maps.mine.MineLocationStyle import com.cusc.map.maps.mine.MineLocationStyle
...@@ -22,7 +22,7 @@ object LocStyle { ...@@ -22,7 +22,7 @@ object LocStyle {
mapReadView: MapReadyView?, mapReadView: MapReadyView?,
type: Int = MSLocStyle.LOCATION_TYPE_LOCATION_ROTATE type: Int = MSLocStyle.LOCATION_TYPE_LOCATION_ROTATE
){ ){
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
MineLocationStyle.setLocationStyle(mapReadView, type) MineLocationStyle.setLocationStyle(mapReadView, type)
} }
......
...@@ -4,7 +4,7 @@ import android.location.Location ...@@ -4,7 +4,7 @@ import android.location.Location
import com.amap.api.maps.AMapUtils import com.amap.api.maps.AMapUtils
import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.LatLng
import com.cusc.map.MAP_TYPE import com.cusc.map.MAP_TYPE
import com.cusc.map.MSDKInitializer import com.cusc.map.MapSdkInit
import com.cusc.map.maps.cdata.MSLatLng import com.cusc.map.maps.cdata.MSLatLng
import kotlin.math.atan2 import kotlin.math.atan2
import kotlin.math.cos import kotlin.math.cos
...@@ -26,7 +26,7 @@ object MSCalcuMapUtil { ...@@ -26,7 +26,7 @@ object MSCalcuMapUtil {
latLng2: MSLatLng latLng2: MSLatLng
): Float { ): Float {
// 根据不同的地图类型选择相应的距离计算方法 // 根据不同的地图类型选择相应的距离计算方法
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
// 使用Android原生Location类计算两点间距离 // 使用Android原生Location类计算两点间距离
var results = FloatArray(1) var results = FloatArray(1)
...@@ -62,7 +62,7 @@ object MSCalcuMapUtil { ...@@ -62,7 +62,7 @@ object MSCalcuMapUtil {
latLng2: MSLatLng latLng2: MSLatLng
): Float { ): Float {
// 根据不同地图类型进行面积计算 // 根据不同地图类型进行面积计算
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
return 0f return 0f
} }
......
package com.cusc.map.maps package com.cusc.map.maps
import com.cusc.map.MAP_TYPE import com.cusc.map.MAP_TYPE
import com.cusc.map.MSDKInitializer import com.cusc.map.MapSdkInit
import com.cusc.map.maps.amap.AmapLayers import com.cusc.map.maps.amap.AmapLayers
import com.cusc.map.maps.mine.MineLayers import com.cusc.map.maps.mine.MineLayers
...@@ -17,7 +17,7 @@ object MSLayer : MsOperationParent() { ...@@ -17,7 +17,7 @@ object MSLayer : MsOperationParent() {
*/ */
fun toggleLayers(type: Int) { fun toggleLayers(type: Int) {
var mapReadView = getMapReadView() var mapReadView = getMapReadView()
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
MineLayers.toggleLayers(mapReadView, type) MineLayers.toggleLayers(mapReadView, type)
} }
......
package com.cusc.map.maps package com.cusc.map.maps
import com.cusc.map.MAP_TYPE import com.cusc.map.MAP_TYPE
import com.cusc.map.MSDKInitializer import com.cusc.map.MapSdkInit
import com.cusc.map.bean.DriverRouteBean import com.cusc.map.bean.DriverRouteBean
import com.cusc.map.bean.WayPoi import com.cusc.map.bean.WayPoi
import com.cusc.map.intfaces.OnNaviPresenterListener import com.cusc.map.intfaces.OnNaviPresenterListener
...@@ -18,7 +18,7 @@ object MSNavi { ...@@ -18,7 +18,7 @@ object MSNavi {
var isStartNai = false var isStartNai = false
fun init() { fun init() {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
MineNai.init() MineNai.init()
} }
...@@ -49,7 +49,7 @@ object MSNavi { ...@@ -49,7 +49,7 @@ object MSNavi {
onNaviPresenterListener: OnNaviPresenterListener? onNaviPresenterListener: OnNaviPresenterListener?
) { ) {
isStartNai = true isStartNai = true
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
if (nType == 1) { if (nType == 1) {
MineNai.startNavi(mapReadView, onNaviPresenterListener) MineNai.startNavi(mapReadView, onNaviPresenterListener)
...@@ -71,7 +71,7 @@ object MSNavi { ...@@ -71,7 +71,7 @@ object MSNavi {
/**结束导航(模拟导航)**/ /**结束导航(模拟导航)**/
fun endNavi() { fun endNavi() {
isStartNai = false isStartNai = false
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
MineNai.stopNavi() MineNai.stopNavi()
} }
...@@ -90,7 +90,7 @@ object MSNavi { ...@@ -90,7 +90,7 @@ object MSNavi {
onNaviPresenterListener: OnNaviPresenterListener? onNaviPresenterListener: OnNaviPresenterListener?
) { ) {
isStartNai = true isStartNai = true
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
MineNai.startSimNavi( MineNai.startSimNavi(
mapReadView, mapReadView,
...@@ -107,7 +107,7 @@ object MSNavi { ...@@ -107,7 +107,7 @@ object MSNavi {
} }
fun addNaviListener(listener: OnNaviPresenterListener) { fun addNaviListener(listener: OnNaviPresenterListener) {
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
MineNai.addNaviListener(listener) MineNai.addNaviListener(listener)
} }
......
package com.cusc.map.maps package com.cusc.map.maps
import com.cusc.map.MAP_TYPE import com.cusc.map.MAP_TYPE
import com.cusc.map.MSDKInitializer import com.cusc.map.MapSdkInit
import com.cusc.map.maps.amap.AmapPoiSearch import com.cusc.map.maps.amap.AmapPoiSearch
import com.cusc.map.maps.inters.OnMSPoiSearchLis import com.cusc.map.maps.inters.OnMSPoiSearchLis
import com.cusc.map.maps.mine.MinePoiSearch import com.cusc.map.maps.mine.MinePoiSearch
...@@ -25,7 +25,7 @@ object MSPoi { ...@@ -25,7 +25,7 @@ object MSPoi {
adCode: String, adCode: String,
onMSPoiSearchLis: OnMSPoiSearchLis onMSPoiSearchLis: OnMSPoiSearchLis
){ ){
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
MinePoiSearch.startPoiSearch(keyWord, lat, lng,adCode, onMSPoiSearchLis) MinePoiSearch.startPoiSearch(keyWord, lat, lng,adCode, onMSPoiSearchLis)
} }
...@@ -51,7 +51,7 @@ object MSPoi { ...@@ -51,7 +51,7 @@ object MSPoi {
radios: Int, radios: Int,
onMSPoiSearchLis: OnMSPoiSearchLis onMSPoiSearchLis: OnMSPoiSearchLis
){ ){
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
MinePoiSearch.startPoiSearchBound(keyWord, lat, lng, radios,onMSPoiSearchLis) MinePoiSearch.startPoiSearchBound(keyWord, lat, lng, radios,onMSPoiSearchLis)
} }
......
...@@ -7,7 +7,7 @@ import com.minedata.minenavi.poiquery.LatLonPoint ...@@ -7,7 +7,7 @@ import com.minedata.minenavi.poiquery.LatLonPoint
import com.minedata.minenavi.poiquery.RegeocodeQuery import com.minedata.minenavi.poiquery.RegeocodeQuery
import com.minedata.minenavi.poiquery.RegeocodeResult import com.minedata.minenavi.poiquery.RegeocodeResult
import com.cusc.map.MAP_TYPE import com.cusc.map.MAP_TYPE
import com.cusc.map.MSDKInitializer import com.cusc.map.MapSdkInit
import com.cusc.map.UserCtx import com.cusc.map.UserCtx
import com.cusc.map.maps.cdata.RegeocodeRes import com.cusc.map.maps.cdata.RegeocodeRes
import com.amap.api.services.geocoder.GeocodeSearch as AGeocodeSearch import com.amap.api.services.geocoder.GeocodeSearch as AGeocodeSearch
...@@ -37,7 +37,7 @@ object MSRegeoCode : GeocodeSearch.OnGeocodeSearchListener, AGeocodeSearch.OnGeo ...@@ -37,7 +37,7 @@ object MSRegeoCode : GeocodeSearch.OnGeocodeSearchListener, AGeocodeSearch.OnGeo
return return
this.mSOnRegeo = msOnRegeo this.mSOnRegeo = msOnRegeo
var context= UserCtx.Companion.instance.mContext var context= UserCtx.Companion.instance.mContext
when (MSDKInitializer.getMapType()) { when (MapSdkInit.getMapType()) {
MAP_TYPE.MINE -> { MAP_TYPE.MINE -> {
val geocoderSearch = GeocodeSearch(context) val geocoderSearch = GeocodeSearch(context)
geocoderSearch.addOnGeocodeSearchListener(this) geocoderSearch.addOnGeocodeSearchListener(this)
......
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