From 90be9523dc008305aa0c738ac62acd840a97c1ee Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 30 Nov 2020 16:14:52 +0800 Subject: [PATCH 1/5] update callchat --- .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 1f3d18c759..6249850d4f 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -74,7 +74,6 @@ diff --git a/gradle.properties b/gradle.properties index 777b379662..0531e07889 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.8.9 +CARCHATTING_VERSION=1.9.0 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From 3d755a3012c99f171e4027fad97a2cf5b22e8a59 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 30 Nov 2020 16:43:00 +0800 Subject: [PATCH 2/5] 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 3/5] =?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 4/5] =?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 5/5] =?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(); } }