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

Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9

Browse Source
This commit is contained in:
wangcongtao
2020-12-30 14:54:01 +08:00
parent 6f16239630 a329707c08
commit c7b9d48d9a
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
View File

@@ -577,6 +577,7 @@ public class AMapViewWrapper implements IMogoMapView,
return;
}
if ( mCurrentUI == EnumMapUI.Type_VR ) {
Logger.w( TAG, "vr 模式下忽略该设置" );
return;
}
Logger.i( TAG, "showBounds:%s -%s-%s- %b ", tag, carPosition.toString(), bound.toShortString(), lockCarPosition );

4
modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java
View File

@@ -270,6 +270,10 @@ public class MapCenterPointStrategy {
if ( controller == null ) {
return;
}
if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ) {
Logger.w( TAG, "vr 模式下忽略该设置" );
return;
}
Logger.e( TAG, "scene"+scene );
Map< Integer, Map< String, MapCenterPoint > > strategies = sCommonStrategies;
if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ) {

12
modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallVisionProvider.java
View File

@@ -66,14 +66,10 @@ public class SmallVisionProvider implements IMogoSmallMapProvider, IMogoStatusCh
mContext = context;
try {
try {
// 替换高德地图的方法，解决因为加入换肤框架导致地图初始化失败
Method srcMethod = lg.class.getDeclaredMethod("a", Context.class, int.class, ViewGroup.class);
Method destMethod = lg2.class.getDeclaredMethod("a", Context.class, int.class, ViewGroup.class);
HookManager.get().hookMethod(srcMethod, destMethod);
} catch (NoSuchMethodException e) {
e.printStackTrace();
}
// 替换高德地图的方法，解决因为加入换肤框架导致地图初始化失败
Method srcMethod = lg.class.getDeclaredMethod("a", Context.class, int.class, ViewGroup.class);
Method destMethod = lg2.class.getDeclaredMethod("a", Context.class, int.class, ViewGroup.class);
HookManager.get().hookMethod(srcMethod, destMethod);
} catch (Exception e) {
e.printStackTrace();
}