From 4d22cdbf9783d4918b2038c2d164234eb0e3e9f8 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 7 Dec 2020 10:41:09 +0800 Subject: [PATCH 1/4] fixed bug --- .../src/main/java/com/mogo/module/share/TanluManager.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java index 5990aaba0c..395a1ea61b 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java @@ -545,7 +545,11 @@ public class TanluManager implements IMogoMarkerClickListener, markerShowEntity.setMarkerLocation(markerLocation); IMogoMarker mogoMarker = TanluServiceManager.getServiceApis().getMarkerService().drawMarker(markerShowEntity); - mogoMarker.setClickable(false); + if (mogoMarker != null) { + mogoMarker.setClickable(false); + } else { + Logger.e(TAG, "mogoMarker == null "); + } //添加图片动画 Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.tanlu_circle_image, null); From 178db17c2f066261408f970d2b0c07a161d35aaf Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 7 Dec 2020 12:06:13 +0800 Subject: [PATCH 2/4] opt --- .../com/mogo/module/v2x/fragment/V2XSurroundingFragment.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java index ddb5c38c6b..969b142807 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java @@ -166,6 +166,7 @@ public class V2XSurroundingFragment extends MvpFragment Date: Mon, 7 Dec 2020 12:08:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=20http://jira.zhidaoh?= =?UTF-8?q?ulian.com/browse/E84XAD-250=3Ffilter=3D-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 985900eb31..44ebe2db83 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 @@ -372,7 +372,9 @@ class V2XEventPanelFragment : MvpFragment { try { if (mRbSurroundingEvent?.isChecked == true) { - mV2XSurroundingFragment?.ttsForVoiceCheckout() + if (DebugConfig.isMapBased()) { + mV2XSurroundingFragment?.ttsForVoiceCheckout() + } } else { mRbSurroundingEvent?.isChecked = true mV2XSurroundingFragment?.fromVoice = true From 85eeac93d5621c4a8286f9fcceac36573c754a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 7 Dec 2020 14:29:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8Dbug=20h?= =?UTF-8?q?ttp://jira.zhidaohulian.com/browse/E84XAD-255?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/V2XServiceManager.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java index 47f348aff0..d541614125 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java @@ -14,6 +14,7 @@ import com.mogo.module.v2x.manager.IMoGoV2XMarkerManager; import com.mogo.module.v2x.manager.IMoGoV2XPolylineManager; import com.mogo.module.v2x.manager.IMoGoV2XStatusManager; import com.mogo.module.v2x.network.V2XRefreshModel; +import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; import com.mogo.service.adas.IMogoADASController; @@ -29,11 +30,11 @@ import com.mogo.service.module.IMogoMarkerService; import com.mogo.service.module.IMogoRegisterCenter; import com.mogo.service.module.IMogoSearchManager; import com.mogo.service.share.IMogoShareManager; +import com.mogo.service.share.IMogoTanluProvider; import com.mogo.service.share.IMogoTrafficUploadProvider; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.strategy.IMogoOnlineCarListPanelProvider; import com.mogo.service.strategy.IMogoRefreshStrategyController; -import com.mogo.service.share.IMogoTanluProvider; import com.mogo.service.windowview.IMogoTopViewManager; import com.mogo.service.windowview.IMogoWindowManager; import com.zhidao.carchattingprovider.CallChattingProviderConstant; @@ -96,7 +97,7 @@ public class V2XServiceManager { private static IMoGoV2XPolylineManager moGoV2XPolylineManager; private static IMoGoV2XStatusManager moGoV2XStatusManager; - private V2XServiceManager(){ + private V2XServiceManager() { } @@ -126,7 +127,7 @@ public class V2XServiceManager { mIMogoTrafficUploadProvider = mMogoServiceApis.getTrafficUploadApi(); mMogoOnlineCarListPanelProvider = mMogoServiceApis.getOnlineCarPanelApi(); //事件面板 - mIEventPanelProvider = mMogoServiceApis.getEventPanelManager(); + mIEventPanelProvider = mMogoServiceApis.getEventPanelManager(); mMarkerManager = mMapService.getMarkerManager(context); mNavi = mMapService.getNavi(context); @@ -239,6 +240,9 @@ public class V2XServiceManager { } public static IMoGoV2XStatusManager getMoGoV2XStatusManager() { + if (moGoV2XStatusManager == null) { + moGoV2XStatusManager = (IMoGoV2XStatusManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_STATUS_MANAGER).navigation(V2XUtils.getApp()); + } return moGoV2XStatusManager; } @@ -278,7 +282,7 @@ public class V2XServiceManager { return mIMogoTanluProvider; } - public static IMogoTrafficUploadProvider getIMogoTrafficUploadProvider(){ + public static IMogoTrafficUploadProvider getIMogoTrafficUploadProvider() { return mIMogoTrafficUploadProvider; } @@ -286,7 +290,7 @@ public class V2XServiceManager { return mMogoOnlineCarListPanelProvider; } - public static IEventPanelProvider getEventPanelProvider(){ + public static IEventPanelProvider getEventPanelProvider() { return mIEventPanelProvider; } }