Merge branch 'master' into dev_MogoAP_eagle-220_211207_8.0.17
# Conflicts: # core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt # gradle.properties # modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java # modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java # modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
This commit is contained in:
@@ -763,7 +763,7 @@ public class AMapViewWrapper implements IMogoMapView,
|
||||
sysLocation.setProvider(location.getProvider());
|
||||
sysLocation.setAccuracy(location.getAcceleration());
|
||||
sysLocation.setTime(location.getDuration());
|
||||
sysLocation.setBearing(location.getHeading());
|
||||
sysLocation.setBearing((float) location.getHeading());
|
||||
sysLocation.setSpeed(location.getSpeed());
|
||||
|
||||
// 将有效经纬度暂存本地,提供给下一次的Http-DNS使用,防止首次请求位置获取不到
|
||||
@@ -884,6 +884,13 @@ public class AMapViewWrapper implements IMogoMapView,
|
||||
MogoMapListenerHandler.getInstance().onMapClick(ObjectUtils.fromAMap(lonLatPoint));
|
||||
}
|
||||
|
||||
|
||||
// @Override
|
||||
// public void onMapInit() {
|
||||
// Logger.i(TAG, "autoop--onMapInit: ");
|
||||
// MogoMapListenerHandler.getInstance().onMapLoaded();
|
||||
// }
|
||||
|
||||
@Override
|
||||
public void onMapLoaded() {
|
||||
Logger.i(TAG, "autoop--onMapLoaded: ");
|
||||
|
||||
@@ -154,7 +154,7 @@ public class ObjectUtils {
|
||||
location.setLatitude(aLocation.getLat());
|
||||
location.setLongitude(aLocation.getLon());
|
||||
location.setAltitude(aLocation.getAltitude());
|
||||
location.setBearing(aLocation.getHeading());
|
||||
location.setBearing((float) aLocation.getHeading());
|
||||
location.setCityCode(aLocation.getCityCode());
|
||||
location.setCityName(aLocation.getCity());
|
||||
location.setProvider(aLocation.getProvider());
|
||||
|
||||
Reference in New Issue
Block a user