From 2b84ca6b369edc5b51460142fe67d3047d326353 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 1 Dec 2020 10:04:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=88=9B=E5=BB=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/module/service/MogoServices.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 e0321d28af..b2471ce6ec 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 @@ -400,7 +400,7 @@ public class MogoServices implements IMogoMapListener, */ private void closeAllPanel() { - if ( mCallProviderResponse != null ) { + if ( mCallProviderResponse == null ) { mCallProviderResponse = new ICallChatResponse() { @Override public void hideUserWindowError(@NotNull String errorMsg) { @@ -411,9 +411,11 @@ public class MogoServices implements IMogoMapListener, MogoApisHandler.getInstance().getApis().getOnlineCarPanelApi().hidePanel(); MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false); MogoApisHandler.getInstance().getApis().getEventPanelManager().hidePanel(); - carsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation(); + if ( carsChattingProvider == null ) { + carsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation(); + } if ( carsChattingProvider != null ) { - carsChattingProvider.hideUserWindow("MOGO_COMMON_SERVICE", mContext, mCallProviderResponse); + carsChattingProvider.hideUserWindow(TAG, mContext, mCallProviderResponse); } } From bd9b13a5b9afd989cef442fd06748a2b15ca9c11 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 1 Dec 2020 10:37:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?ui-=E5=8E=BB=E5=88=86=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/module_event_panel_fragment_surrounding.xml | 2 +- .../src/main/res/layout/view_history_empty.xml | 2 +- .../module-v2x-res/drawable/bg_v2x_go_to_share_light.xml | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index 57fd474a50..d9a199c6aa 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -104,7 +104,7 @@ android:layout_marginTop="1px" android:gravity="center_horizontal" android:text="你可以试着分享一个事件给其他车主" - android:textColor="@color/v2x_FFF_333" + android:textColor="@color/v2x_FFF_666" android:textSize="@dimen/module_v2x_surrounding_top_textsize" /> - + \ No newline at end of file From 95cff9dcedd885d6dad8ed41aae90cf20fa91977 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 1 Dec 2020 10:39:48 +0800 Subject: [PATCH 3/5] no message --- .../main/res/layout/module_event_panel_fragment_surrounding.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index d9a199c6aa..b9b2ecf8f1 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -92,7 +92,7 @@ android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top" android:gravity="center_horizontal" android:text="周边5公里，暂无交通事件" - android:textColor="@color/v2x_FFF_333" + android:textColor="@color/v2x_FFF_666" android:textSize="@dimen/module_v2x_surrounding_top_textsize" /> Date: Tue, 1 Dec 2020 10:49:51 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[add]=20D=20=E4=B8=8B=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BFmore=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-ldpi/icon_event_panel_more_light.png | Bin 0 -> 289 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_event_panel_more_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_event_panel_more_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_event_panel_more_light.png new file mode 100644 index 0000000000000000000000000000000000000000..62e3039df2fb1c69853bdf8379f9eadfc6736607 GIT binary patch literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFY^SUU<4VhD5l(onpw>YW+Vi`g{Z8=I}#DDl{4Y02XDpnbWw`=|f@H6^WV+LmRGQ;r|q)v!q?T(O0f zSNfE=YvHQbzdoM({ej=~$0La5`_{>!p}8u5b7G%V*5%B4)^)9QW~_?t%UsQV@tmH* zX+gU#E1Y_qWRl>sul(3C9_92(!=%;8cW=~77;kP~qPti3=|?%^&2yL7@-DK`b7MaC i Date: Tue, 1 Dec 2020 11:09:24 +0800 Subject: [PATCH 5/5] opt --- .../mogo/module/service/intent/AccStatusIntentHandler.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java index 4b04d99478..2ee9216924 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java @@ -65,6 +65,11 @@ class AccStatusIntentHandler implements IntentHandler { if ( state != ACC_OFF && state != ACC_ON && state != ACC_OFF_DELAY ) { return; } + if ( state == ACC_ON || state == ACC_OFF_DELAY ) { + Intent newIntent = new Intent( "com.freedom.ser.ACTION" ); + newIntent.putExtra( "acc", true ); + context.sendBroadcast( newIntent ); + } boolean accOn = state == ACC_ON; if ( MarkerServiceHandler.getMogoStatusManager().isAccOn() == accOn ) { return;