diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java index 19b0c39582..e9f70b9b43 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java @@ -103,6 +103,10 @@ class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClickListen mCloudSnapshotMarkersCaches.clear(); } catch ( Exception e ) { } + clearTargetTypeMarkers(); + } + + private void clearTargetTypeMarkers() { try { MogoApisHandler.getInstance().getApis() .getMapServiceApi().getMarkerManager( mContext ) @@ -118,14 +122,16 @@ class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClickListen */ public void renderSnapshotData( MogoSnapshotSetData data, boolean machineVision ) { - recordTimeFlag(); if ( !MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageLaunched() ) { + if ( !mCloudSnapshotMarkersCaches.isEmpty() ) { + clearOldStyleMarkers(); + } return; } if ( data == null || ( ( data.getAllList() == null || data.getAllList().isEmpty() ) && ( data.getNearList() == null || data.getNearList().isEmpty() ) ) ) { - MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager( AbsMogoApplication.getApp() ).removeMarkers( DataTypes.TYPE_MARKER_CLOUD_DATA ); + clearOldStyleMarkers(); return; } List< CloudRoadData > allDatumsList = new ArrayList<>(); @@ -220,21 +226,6 @@ class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClickListen purgeCloudSnapshotData( out ); } - /** - * 记录时间 - */ - private void recordTimeFlag() { -// if ( mLastReceiveTime != 0 ) { -// mAnimationDuration = System.currentTimeMillis() - mLastReceiveTime; -// if ( mAnimationDuration > 1000L ) { -// mAnimationDuration = 500L; -// } -// } else { -// mAnimationDuration = 500L; -// } -// mLastReceiveTime = System.currentTimeMillis(); - } - /** * vr 模式下显示合并数据,否则只显示上报位置的车辆 * diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java index c4e6c0511f..4d1de4513d 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java @@ -272,6 +272,8 @@ public class EntranceViewHolder { public void release(){ rootViewGroup = null; + featureViewGroup = null; + leftNoticeContainer = null; } } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java index 8269900c47..002a60c7cb 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java @@ -473,6 +473,7 @@ public class TopViewAnimHelper { topMotionLayout = null; topContainer = null; cameraMode = null; + animNavInfoView = null; } public void enterVrMode() { diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 3cdd2c62e8..c340c2e812 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -359,6 +359,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterHostAimlessModeListener(); mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterHostNaviListener(); mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterHostMapListener(); + mServiceApis.getRegisterCenterApi().unregisterADASControlStatusChangedListener( TAG ); mMogoStatusManager.setMainPageLaunchedStatus( TAG, false ); mMogoStatusManager.setMainPageIsBackgroundStatus( TAG, false ); mMogoFragmentManager.unregisterMainFragmentStackTransactionListener(); diff --git a/skin/skin-support/src/main/java/skin/support/SkinCompatManager.java b/skin/skin-support/src/main/java/skin/support/SkinCompatManager.java index 6c7dcd9bcf..c4522b2fae 100755 --- a/skin/skin-support/src/main/java/skin/support/SkinCompatManager.java +++ b/skin/skin-support/src/main/java/skin/support/SkinCompatManager.java @@ -154,7 +154,6 @@ public class SkinCompatManager extends SkinObservable { public static void destroy(){ sInstance.onDestroy(); - sInstance = null; } public void onDestroy(){