From 59f095e295391b49d6498e30cb8050f15a90ff57 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 8 Jan 2021 14:57:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=85=E5=AD=98=E6=B3=84?= =?UTF-8?q?=E6=BC=8F2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/map/impl/amap/AMapWrapper.java | 2 +- .../extensions/entrance/EntranceProvider.java | 8 ++-- .../extensions/utils/TopViewAnimHelper.java | 1 + .../com/mogo/module/main/MainActivity.java | 20 ++++++---- .../v2x/fragment/V2XEventPanelFragment.kt | 1 + .../fragment/V2XScenarioHistoryFragment.java | 39 ++++++++++++------- 6 files changed, 43 insertions(+), 28 deletions(-) diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapWrapper.java index b22bfc46a6..a1e9cea21c 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapWrapper.java @@ -45,7 +45,7 @@ public class AMapWrapper implements IMogoMap { public AMapWrapper( AMap map, Context context, IMogoMapUIController controller ) { this.mAMap = map; sAMap = map; - mContext = context; + mContext = context.getApplicationContext(); mUIcontroller = controller; // 设置实现自定义 info window if(mAMap!=null) { diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java index c76f444a51..e32d5850ff 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java @@ -28,13 +28,11 @@ import com.mogo.service.module.ModuleType; @Route( path = MogoModulePaths.PATH_ENTRANCE ) public class EntranceProvider implements IMogoModuleProvider { - EntranceFragment mFragment; - @Override public Fragment createFragment( Context context, Bundle data ) { - mFragment = new EntranceFragment(); + EntranceFragment mFragment = new EntranceFragment(); mFragment.setArguments( data ); - ExtensionServiceManager.init(context); + ExtensionServiceManager.init( context ); return mFragment; } @@ -76,7 +74,7 @@ public class EntranceProvider implements IMogoModuleProvider { @Override public void init( Context context ) { - ExtensionServiceManager.init(context); + ExtensionServiceManager.init( context ); } @Override 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 002a60c7cb..de88f7ac66 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 @@ -474,6 +474,7 @@ public class TopViewAnimHelper { topContainer = null; cameraMode = null; animNavInfoView = null; + vrModeNavInfoView = 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 c340c2e812..91d6eaf763 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 @@ -25,6 +25,7 @@ import com.mogo.module.main.service.MogoMainService; import com.mogo.module.main.windowview.FloatingViewHandler; import com.mogo.service.IMogoServiceApis; import com.mogo.service.adas.IMogoADASControlStatusChangedListener; +import com.mogo.service.fragmentmanager.FragmentStackTransactionListener; import com.mogo.service.fragmentmanager.IMogoFragmentManager; import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.statusmanager.IMogoStatusManager; @@ -45,7 +46,8 @@ import java.util.List; */ public class MainActivity extends MvpActivity< MainView, MainPresenter > implements MainView, IMogoLocationListener, - IMogoADASControlStatusChangedListener { + IMogoADASControlStatusChangedListener, + FragmentStackTransactionListener { protected static final String TAG = MainActivity.class.getSimpleName(); @@ -184,14 +186,16 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mMogoFragmentManager = mServiceApis.getFragmentManagerApi(); mMogoFragmentManager.init( this, R.id.module_main_id_search_fragment ); mMogoFragmentManager.initMessageHistoryContainerId( R.id.module_main_id_message_history_fragment_container ); - mMogoFragmentManager.registerMainFragmentStackTransactionListener( ( size ) -> { - if ( size == 0 ) { - showLayout(); - } else if ( size == 1 ) { - hideLayout(); - } - } ); + mMogoFragmentManager.registerMainFragmentStackTransactionListener( this ); + } + @Override + public void onTransaction( int size ) { + if ( size == 0 ) { + showLayout(); + } else if ( size == 1 ) { + hideLayout(); + } } private void resetMapUiStyle(){ diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index 64a2b39735..6928b349a0 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -271,6 +271,7 @@ class V2XEventPanelFragment : MvpFragment mV2XHistoryScenarioData = new ArrayList<>(); + private IMoGoV2XStatusChangedListener mListener; @Override protected int getLayoutId() { @@ -88,24 +89,25 @@ public class V2XScenarioHistoryFragment }); + mListener = new IMoGoV2XStatusChangedListener() { + @Override + public void onStatusChanged( V2XStatusDescriptor descriptor, boolean isTrue ) { + Logger.d( TAG, descriptor + " initViews --------> " + isTrue ); + if ( descriptor == V2XStatusDescriptor.EventPanelWindow_UI ) { + mPresenter.loadHistory(); + } + } + + @Override + public void init( Context context ) { + Logger.d( TAG, "init --------> " ); + } + }; V2XServiceManager.getMoGoV2XStatusManager() .registerStatusChangedListener( TAG, V2XStatusDescriptor.EventPanelWindow_UI, - new IMoGoV2XStatusChangedListener() { - @Override - public void onStatusChanged(V2XStatusDescriptor descriptor, boolean isTrue) { - Logger.d(TAG, descriptor + " initViews --------> " + isTrue); - if (descriptor == V2XStatusDescriptor.EventPanelWindow_UI) { - mPresenter.loadHistory(); - } - } - - @Override - public void init(Context context) { - Logger.d(TAG, "init --------> "); - } - }); + mListener ); } /** @@ -180,4 +182,13 @@ public class V2XScenarioHistoryFragment protected ScenarioHistoryPresenter createPresenter() { return new ScenarioHistoryPresenter(this); } + + @Override + public void onDestroyView() { + super.onDestroyView(); + V2XServiceManager.getMoGoV2XStatusManager().unregisterStatusChangedListener( TAG, + V2XStatusDescriptor.EventPanelWindow_UI, + mListener + ); + } }