From 96610e886ea7826dd5373e479d7e5aa9f137c3c2 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 8 Jan 2021 14:57:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=85=E5=AD=98?= =?UTF-8?q?=E6=B3=84=E6=BC=8F2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java --- .../com/mogo/map/impl/amap/AMapWrapper.java | 2 +- .../back/BackToLauncherModuleProvider.java | 1 + .../extensions/entrance/EntranceProvider.java | 8 ++-- .../extensions/utils/TopViewAnimHelper.java | 1 + .../com/mogo/module/main/MainActivity.java | 42 +++++++------------ .../v2x/fragment/V2XEventPanelFragment.kt | 1 + .../fragment/V2XScenarioHistoryFragment.java | 39 ++++++++++------- 7 files changed, 47 insertions(+), 47 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-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java index 952ece3f5c..76ad6b0406 100644 --- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java +++ b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToLauncherModuleProvider.java @@ -53,6 +53,7 @@ public class BackToLauncherModuleProvider implements IMogoModuleProvider { switch ( product ) { case "f80x": case "f8xx": + case "f8Amap": BackToMainHomeManager.addMainHomeView(); break; case "changanauto": 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 56fb98282c..f2cc701298 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 @@ -3,14 +3,11 @@ package com.mogo.module.main; import android.content.Intent; import android.os.Bundle; import android.util.Log; -import android.view.LayoutInflater; import android.view.View; import android.widget.FrameLayout; -import com.alibaba.android.arouter.launcher.ARouter; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.core.view.LayoutInflaterCompat; import com.mogo.commons.context.ContextHolderUtil; import com.mogo.commons.debug.DebugConfig; @@ -18,8 +15,6 @@ import com.mogo.commons.mvp.MvpActivity; import com.mogo.commons.voice.AIAssist; import com.mogo.map.location.IMogoLocationListener; import com.mogo.map.location.MogoLocation; -import com.mogo.map.marker.IMogoMarker; -import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.api.CallChatApi; @@ -30,12 +25,12 @@ 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; import com.mogo.skin.support.SkinMode; import com.mogo.utils.NetworkUtils; -import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.Logger; import com.zhidao.adasconfig.api.AdasConfigApiController; import com.zhidao.adasconfig.common.log.LoggerController; @@ -43,9 +38,6 @@ import com.zhidao.autopilot.support.api.AutopilotServiceManage; import java.util.List; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - /** * @author congtaowang * @since 2019-12-23 @@ -54,8 +46,8 @@ import androidx.annotation.Nullable; */ public class MainActivity extends MvpActivity< MainView, MainPresenter > implements MainView, IMogoLocationListener, - IMogoMarkerClickListener, - IMogoADASControlStatusChangedListener { + IMogoADASControlStatusChangedListener, + FragmentStackTransactionListener { protected static final String TAG = MainActivity.class.getSimpleName(); @@ -139,10 +131,10 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme @Override protected void onCreate( @Nullable Bundle savedInstanceState ) { super.onCreate( savedInstanceState ); - ContextHolderUtil.holdContext(this); + ContextHolderUtil.holdContext( this ); mPresenter.postLoadModuleMsg(); - NetworkUtils.listenNetStrength(this); + NetworkUtils.listenNetStrength( this ); } private void init() { @@ -170,7 +162,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostMapListener( EventDispatchCenter.getInstance() ); mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostNaviListener( EventDispatchCenter.getInstance() ); mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostAimlessModeListener( EventDispatchCenter.getInstance() ); - mServiceApis.getMapServiceApi().getHostListenerRegister().registerMarkerClickListener( this ); + mServiceApis.getMapServiceApi().getHostListenerRegister().registerMarkerClickListener( EventDispatchCenter.getInstance() ); } } @@ -194,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(){ @@ -272,12 +266,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme EventDispatchCenter.getInstance().onLocationChanged( location ); } - @Override - public boolean onMarkerClicked( IMogoMarker marker ) { - EventDispatchCenter.getInstance().onMarkerClicked( marker ); - return false; - } - @Override public void onMapUiModeChanged( EnumMapUI mapUI ) { switch ( mapUI ) { 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 + ); + } } From 96bdb4f450fa52a4343a73712242cdaa85fcb360 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 8 Jan 2021 15:45:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=C3=A8=C2=A6fix=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- .../authorize/authprovider/launcher/MogoMainAuthorize.kt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 26ae450265..f07db0dbee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -139,7 +139,7 @@ HTTPDNS_NOOP_VERSION = 2.0.12 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.2.56 +CARCHATTING_VERSION=2.2.57 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.10 # websocket diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt index 4b527dc993..e62a641977 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt @@ -97,7 +97,11 @@ class MogoMainAuthorize private constructor() : MogoAuthorizeManagerImpl(), IMog } } - fun release(){ + fun release() { + if (authorizeDialog != null && authorizeDialog!!.isShowing) { + authorizeDialog!!.dismiss() + authorizeDialog = null + } mContext = null } From 8bcfa2c739765941cb07b3bf522fbf3a598e23b6 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 8 Jan 2021 17:07:09 +0800 Subject: [PATCH 3/4] fix bug --- .idea/gradle.xml | 1 - gradle.properties | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 9d8d20d50d..5974cf305a 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -84,7 +84,6 @@ diff --git a/gradle.properties b/gradle.properties index f07db0dbee..6965fad3d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -139,7 +139,7 @@ HTTPDNS_NOOP_VERSION = 2.0.12 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.2.57 +CARCHATTING_VERSION=2.2.58 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.10 # websocket From cec1d63e5fc946a1736b541776456a36f6a72930 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 8 Jan 2021 18:03:48 +0800 Subject: [PATCH 4/4] fix bug --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6965fad3d9..e7d1dec48c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -139,7 +139,7 @@ HTTPDNS_NOOP_VERSION = 2.0.12 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.2.58 +CARCHATTING_VERSION=2.2.59 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.10 # websocket