diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/location/MoGoLocationDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/location/MoGoLocationDispatcher.kt index 4e8309243d..1d8b43098a 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/location/MoGoLocationDispatcher.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/location/MoGoLocationDispatcher.kt @@ -34,7 +34,7 @@ object MoGoLocationDispatcher : private var lastGnssLocation: MogoLocation = MogoLocation() /** - * 最后一次OBU GNSS 返回更新的位置 + * 最后一次OBU GNSS 返回更新的位置 */ private var lastOBULocation: MogoLocation = MogoLocation() @@ -69,16 +69,10 @@ object MoGoLocationDispatcher : lastGnssLocation.district = it.district lastGnssLocation.province = it.province lastGnssLocation.adCode = it.adCode - lastGnssLocation.locationDetail = it.locationDetail lastGnssLocation.poiName = it.poiName lastGnssLocation.aoiName = it.aoiName lastGnssLocation.street = it.street lastGnssLocation.streetNum = it.streetNum - lastGnssLocation.description = it.description - lastGnssLocation.buildingId = it.buildingId - lastGnssLocation.floor = it.floor - lastGnssLocation.errorCode = it.errorCode - lastGnssLocation.errorInfo = it.errorInfo } if (1 == FunctionBuildConfig.gpsProvider) { // WGS84坐标系高精度位置信息 @@ -158,16 +152,10 @@ object MoGoLocationDispatcher : lastOBULocation.district = it.district lastOBULocation.province = it.province lastOBULocation.adCode = it.adCode - lastOBULocation.locationDetail = it.locationDetail lastOBULocation.poiName = it.poiName lastOBULocation.aoiName = it.aoiName lastOBULocation.street = it.street lastOBULocation.streetNum = it.streetNum - lastOBULocation.description = it.description - lastOBULocation.buildingId = it.buildingId - lastOBULocation.floor = it.floor - lastOBULocation.errorCode = it.errorCode - lastOBULocation.errorInfo = it.errorInfo } if (2 == FunctionBuildConfig.gpsProvider) { diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLocation.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLocation.java index 33c4fb5091..0f5dac853c 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLocation.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLocation.java @@ -14,16 +14,10 @@ public class MogoLocation implements Cloneable { private String district = ""; private String province = ""; private String adCode = ""; - private String locationDetail = ""; private String poiName = ""; private String aoiName = ""; private String street = ""; private String streetNum = ""; - private String description = ""; - private String buildingId = ""; - private String floor = ""; - private int errorCode = 0; - private String errorInfo = ""; private int gpsAccuracyStatus = 0; private int satellite = 0; @@ -93,14 +87,6 @@ public class MogoLocation implements Cloneable { } } - public String getLocationDetail() { - return locationDetail; - } - - public void setLocationDetail(String locationDetail) { - this.locationDetail = locationDetail; - } - public String getPoiName() { return poiName; } @@ -117,22 +103,6 @@ public class MogoLocation implements Cloneable { this.aoiName = aoiName; } - public int getErrorCode() { - return errorCode; - } - - public void setErrorCode(int errorCode) { - this.errorCode = errorCode; - } - - public String getErrorInfo() { - return errorInfo; - } - - public void setErrorInfo(String errorInfo) { - this.errorInfo = errorInfo; - } - public String getStreet() { return street; } @@ -149,30 +119,6 @@ public class MogoLocation implements Cloneable { this.streetNum = streetNum; } - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getBuildingId() { - return buildingId; - } - - public void setBuildingId(String buildingId) { - this.buildingId = buildingId; - } - - public String getFloor() { - return floor; - } - - public void setFloor(String floor) { - this.floor = floor; - } - public int getGpsAccuracyStatus() { return gpsAccuracyStatus; } @@ -330,17 +276,11 @@ public class MogoLocation implements Cloneable { mogoLocation.adCode = lastLocation.adCode; mogoLocation.address = lastLocation.address; mogoLocation.aoiName = lastLocation.aoiName; - mogoLocation.buildingId = lastLocation.buildingId; mogoLocation.cityCode = lastLocation.cityCode; mogoLocation.cityName = lastLocation.cityName; - mogoLocation.description = lastLocation.description; mogoLocation.district = lastLocation.district; - mogoLocation.errorCode = lastLocation.errorCode; - mogoLocation.errorInfo = lastLocation.errorInfo; - mogoLocation.floor = lastLocation.floor; mogoLocation.gpsAccuracyStatus = lastLocation.gpsAccuracyStatus; mogoLocation.lastReceiveTime = lastLocation.lastReceiveTime; - mogoLocation.locationDetail = lastLocation.locationDetail; mogoLocation.locType = lastLocation.locType; mogoLocation.poiName = lastLocation.poiName; mogoLocation.provider = lastLocation.provider; @@ -394,16 +334,10 @@ public class MogoLocation implements Cloneable { ", district='" + district + '\'' + ", province='" + province + '\'' + ", adCode='" + adCode + '\'' + - ", locationDetail='" + locationDetail + '\'' + ", poiName='" + poiName + '\'' + ", aoiName='" + aoiName + '\'' + - ", errCode=" + errorCode + - ", errInfo='" + errorInfo + '\'' + ", street='" + street + '\'' + ", streetNum='" + streetNum + '\'' + - ", description='" + description + '\'' + - ", buildingId='" + buildingId + '\'' + - ", floor='" + floor + '\'' + ", gpsAccuracyStatus=" + gpsAccuracyStatus + ", satellite=" + satellite + '}'; diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt b/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt index fda36e748c..e440beb239 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt +++ b/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt @@ -100,16 +100,10 @@ class GDLocationClient private constructor() : AMapLocationListener, lastGaoDeLocation.district = it.district lastGaoDeLocation.province = it.province lastGaoDeLocation.adCode = it.adCode - lastGaoDeLocation.locationDetail = it.locationDetail lastGaoDeLocation.poiName = it.poiName lastGaoDeLocation.aoiName = it.aoiName lastGaoDeLocation.street = it.street lastGaoDeLocation.streetNum = it.streetNum - lastGaoDeLocation.description = it.description - lastGaoDeLocation.buildingId = it.buildingId - lastGaoDeLocation.floor = it.floor - lastGaoDeLocation.errorCode = it.errorCode - lastGaoDeLocation.errorInfo = it.errorInfo } try {