yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_robosweeper-d_app-module_221230_1.1.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robosweeper-d_app-module_221230_1.1.0

Browse Source
This commit is contained in:
aibingbing
2023-03-14 21:32:41 +08:00
parent 08b5bd0655 7a90ae8a52
commit 3e7ca6159e
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java
View File

@@ -85,6 +85,8 @@ public class AmapNaviToDestinationModel implements AMapNaviListener {
public void destroyAmaNavi(){
if (mAMapNavi != null){
isPlay = false;
sList.clear();
eList.clear();
mAMapNavi.stopNavi();
mAMapNavi.destroy();
mAMapNavi = null;

2
OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt
View File

@@ -457,7 +457,7 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
mSubInfo?.apply {
mLocation?.let {
val endPoint = CoordinateCalculateRouteUtil.coordinateConverterWgsToGcj(AbsMogoApplication.getApp(), endWgs84Lon, endWgs84Lat)
startNaviToStation(true, it.longitude, it.latitude, endPoint.longitude, endPoint.latitude)
startNaviToStation(true, it.latitude, it.longitude, endPoint.latitude, endPoint.longitude)
}
}
}

10
OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
View File

@@ -104,10 +104,6 @@ public class SweeperTaskModel {
//自动驾驶状态
private int mAutopilotState = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE;
private String longitude;//经度
private String latitude;//纬度
public static SweeperTaskModel getInstance() {
if (sInstance == null) {
synchronized (SweeperTaskModel.class) {
@@ -337,10 +333,12 @@ public class SweeperTaskModel {
private void addCoordinates(MogoLocation mogoLatLng) {
String tempLongitude = NumberFormatUtil.cutOutNumber(mogoLatLng.getLongitude(), 5);
String tempLatitude = NumberFormatUtil.cutOutNumber(mogoLatLng.getLatitude(), 5);
String latitude = NumberFormatUtil.cutOutNumber(points.get(points.size()-1).latitude, 5);
String longitude = NumberFormatUtil.cutOutNumber(points.get(points.size()-1).longitude, 5);
//用于过滤车是否停在原地，经纬度相同的情况
if (!tempLongitude.equals(longitude) && !tempLatitude.equals(latitude)) {
latitude = NumberFormatUtil.cutOutNumber(mogoLatLng.getLatitude(), 5);
longitude = NumberFormatUtil.cutOutNumber(mogoLatLng.getLongitude(), 5);
SweeperRoutePlanningUpdateReqBean.Result result = new SweeperRoutePlanningUpdateReqBean.Result();
result.latitude = mogoLatLng.getLatitude();
result.longitude = mogoLatLng.getLongitude();