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

Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_270_220510_2.7.0' into dev_robotaxi-d-app-module_270_220510_2.7.0

Browse Source 
# Conflicts:
#	core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java
This commit is contained in:
donghongyu
2022-05-20 17:55:57 +08:00
parent 383eba90e1 62ffb65aa5
commit 963cfccbc0
36 changed files with 816 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java
View File

@@ -57,7 +57,9 @@ public class MapFragment extends MvpFragment<MapView, MapPresenter>
@Override
public void stepInVrMode(boolean isDayMode) {
try {
mMogoMapView.getMap().getUIController().stepInVrMode(isDayMode);
if (mMogoMapView != null && mMogoMapView.getMap() != null && mMogoMapView.getMap().getUIController() != null) {
mMogoMapView.getMap().getUIController().stepInVrMode(isDayMode);
}
} catch (Exception e) {
e.printStackTrace();
}
@@ -198,7 +200,7 @@ public class MapFragment extends MvpFragment<MapView, MapPresenter>
@Override
public void changeMaoViewAngle(int type) {
if (mMogoMapView != null) {
if (mMogoMapView != null && mMogoMapView.getMap() != null && mMogoMapView.getMap().getUIController() != null) {
mMogoMapView.getMap().getUIController().changeMapViewAngle(type);
} else {
CallerLogger.INSTANCE.e(M_MAP + TAG, "mMogoMapView is null");
@@ -207,7 +209,7 @@ public class MapFragment extends MvpFragment<MapView, MapPresenter>
@Override
public void changeCurrentIcon(int iconId) {
if (mMogoMapView != null) {
if (mMogoMapView != null && mMogoMapView.getMap() != null && mMogoMapView.getMap().getUIController() != null) {
mMogoMapView.getMap().getUIController().changeCurrentIcon(iconId);
} else {
CallerLogger.INSTANCE.e(M_MAP + TAG, "mMogoMapView is null");
@@ -227,8 +229,8 @@ public class MapFragment extends MvpFragment<MapView, MapPresenter>
@Override
public void setMapDAngle(int mode) {
if (mMogoMapView != null) {
float angle = getSightModeAngle(mode);
float angle = getSightModeAngle(mode);
if (mMogoMapView != null && mMogoMapView.getMap() != null && mMogoMapView.getMap().getUIController() != null) {
mMogoMapView.getMap().getUIController().setMapDAngle(angle);
} else {
CallerLogger.INSTANCE.e(M_MAP + TAG, "mMogoMapView is null");
@@ -255,12 +257,12 @@ public class MapFragment extends MvpFragment<MapView, MapPresenter>
@Nullable
@Override
public CenterLine getCenterLineInfo(double lon, double lat, float angle) {
if (mMogoMapView != null) {
if (mMogoMapView != null && mMogoMapView.getMap() != null && mMogoMapView.getMap().getUIController() != null) {
return mMogoMapView.getMap().getUIController().getCenterLineInfo(lon, lat, angle);
} else {
CallerLogger.INSTANCE.e(M_MAP + TAG, "mMogoMapView is null");
return new CenterLine(); //上层使用应该判空
}
return null;
}
@Override