From 3d755a3012c99f171e4027fad97a2cf5b22e8a59 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 30 Nov 2020 16:43:00 +0800 Subject: [PATCH 1/6] opt --- modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml index 327e0c3010..a2343c16c2 100644 --- a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml @@ -32,8 +32,8 @@ 0px - 2px - 2px + 0px + 0px 6px 6px \ No newline at end of file From 04820f0c2f9e3d7918356ce26b5053834bfa2aa2 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 17:45:18 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=87=BA=E8=A1=8C=E5=8A=A8=E6=80=81UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable/module_ext_dw_upload_road_condition_bkg.xml | 2 +- .../main/res/layout/item_v2x_scennario_history_other_help.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml index f2a8033f4b..1dc06f0ca5 100644 --- a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml +++ b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml @@ -2,7 +2,7 @@ - + diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index 8fd4be0d32..c975f7af0a 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -121,7 +121,7 @@ android:id="@+id/ivFaultHelpEventNavi" android:layout_width="@dimen/module_v2x_event_button_size" android:layout_height="@dimen/module_v2x_event_button_size" - android:layout_marginRight="26px" + android:layout_marginRight="@dimen/dp_40" android:src="@drawable/selector_nav_history" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" From 5323d6365281e72b549ff458f626a871a9f851d0 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 18:01:11 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=89=B2=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable/module_ext_dw_upload_road_condition_bkg.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml index 1dc06f0ca5..e46aa1dcdd 100644 --- a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml +++ b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml @@ -2,7 +2,7 @@ - + From 6b58a8604063b77612c995dc925157daf8441718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 30 Nov 2020 18:02:43 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/v2x/V2XEventPanelModuleProvider.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java index d7e2dd62a7..d02de41af6 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java @@ -98,22 +98,16 @@ public class V2XEventPanelModuleProvider implements @Override public void showPanelWithSelectedItem(int item) { - if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) { - V2XEventPanelFragment.Companion.getInstance().showPanelWithSelectedItem(item); - } + V2XEventPanelFragment.Companion.getInstance().showPanelWithSelectedItem(item); } @Override public void showPanel() { - if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) { - V2XEventPanelFragment.Companion.getInstance().showPanel(); - } + V2XEventPanelFragment.Companion.getInstance().showPanel(); } @Override public void hidePanel() { - if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) { - V2XEventPanelFragment.Companion.getInstance().hidePanel(); - } + V2XEventPanelFragment.Companion.getInstance().hidePanel(); } } From 19e646415ec01ebcba1a5e6dd1188e15d08175f7 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 30 Nov 2020 18:12:00 +0800 Subject: [PATCH 5/6] bugfix --- .../java/com/mogo/module/apps/AppsListActivity.java | 2 ++ .../java/com/mogo/module/service/MogoServices.java | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java index 1adc5272ea..0892ada5c5 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java @@ -44,6 +44,8 @@ public class AppsListActivity extends MvpActivity< AppsListView, AppsListPresent getWindow().setStatusBarColor( Color.BLACK ); } super.onCreate( savedInstanceState ); + // 透明 activity 不会让前一个 activity 走 onStop 方法 + AppServiceHandler.getApis().getStatusManagerApi().setMainPageIsBackgroundStatus( TAG, true ); AppServiceHandler.getApis().getStatusManagerApi().setAppListUIShow( TAG, true ); } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index 49470a79e3..e0321d28af 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -399,11 +399,14 @@ public class MogoServices implements IMogoMapListener, * 关闭所有模块的控制面板 */ private void closeAllPanel() { - mCallProviderResponse = new ICallChatResponse() { - @Override - public void hideUserWindowError(@NotNull String errorMsg) { - } - }; + + if ( mCallProviderResponse != null ) { + mCallProviderResponse = new ICallChatResponse() { + @Override + public void hideUserWindowError(@NotNull String errorMsg) { + } + }; + } MogoApisHandler.getInstance().getApis().getShareManager().dismissShareDialog(); MogoApisHandler.getInstance().getApis().getOnlineCarPanelApi().hidePanel(); MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false); From 18c31db124d7e77e64c5d5cf74b6c0b23757aced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 30 Nov 2020 20:10:14 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/listener/V2XLocationListener.java | 7 +++++++ .../module/v2x/scenario/scene/road/V2XRoadEventWindow.java | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java index b5104f1925..e2d5333ec9 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java @@ -35,6 +35,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_BLOCK_UP; import static com.mogo.module.v2x.V2XConst.MODULE_NAME; /** @@ -167,6 +168,12 @@ public class V2XLocationListener implements IMogoLocationListener, CarStatusList v2XMessageEntity.setContent(v2XRoadEventEntity); v2XMessageEntity.setShowState(true); V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity); + + //如果poiType是道路拥堵，则调用接口查询拥堵状态 + String poiType = v2XRoadEventEntity.getPoiType(); + if(poiType != null && poiType.equals(FOURS_BLOCK_UP)){ + V2XServiceManager.getIMogoTrafficUploadProvider().verifyCurrentTrafficStatus(); + } } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java index bf65720439..e0c344ca6a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java @@ -170,12 +170,6 @@ public class V2XRoadEventWindow extends RelativeLayout // 道路事件行驶到了50米附近，弹出事件纠错框给用户 //Logger.d(MODULE_NAME, "V2X===道路事件：" + v2XRoadEventEntity); - //如果poiType是道路拥堵，则调用接口查询拥堵状态 - String poiType = v2XRoadEventEntity.getPoiType(); - if(poiType != null && poiType.equals(FOURS_BLOCK_UP)){ - V2XServiceManager.getIMogoTrafficUploadProvider().verifyCurrentTrafficStatus(); - } - // 进行类型分发 switch (v2XRoadEventEntity.getPoiType()) { case V2XPoiTypeEnum.TRAFFIC_CHECK: // 交通检查