From 91cb2891cbca76bdb523c17e2e4c5d933c054009 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 30 Nov 2020 20:13:49 +0800 Subject: [PATCH 01/16] fix bug --- gradle.properties | 2 +- .../module/common/dialog/BaseFloatDialog.java | 26 ++++++++++++++++++- .../share/dialog/GridFixableShareDialog.kt | 12 --------- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0531e07889..125dc02de4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.9.0 +CARCHATTING_VERSION=1.9.1-SNAPSHOT # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java index b39f1dfb0c..d70fa857b7 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java @@ -7,7 +7,9 @@ import android.view.WindowManager; import androidx.annotation.NonNull; import com.mogo.commons.debug.DebugConfig; +import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.R; +import com.mogo.utils.logger.Logger; /** * 浮在各种wm上面的dialog基类，调用了window.setType @@ -15,13 +17,16 @@ import com.mogo.module.common.R; * @author tongchenfei */ public class BaseFloatDialog extends Dialog { + + private static final String TAG = "BaseFloatDialog"; + public BaseFloatDialog(@NonNull Context context) { this(context, R.style.BaseFloatDialogStyle); } public BaseFloatDialog(@NonNull Context context, int themeResId) { super(context, themeResId); - if(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD) { + if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD) { addFlag(); } } @@ -32,4 +37,23 @@ public class BaseFloatDialog extends Dialog { | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION | WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE); } + + @Override + public void show() { + Logger.d(TAG, "onShow===="); + if (DebugConfig.isNeedHideAdasWhenShare()) { + MogoApisHandler.getInstance().getApis().getAdasControllerApi().closeADAS(); + } + super.show(); + } + + @Override + public void dismiss() { + Logger.d(TAG, "onDismiss===="); + if (DebugConfig.isNeedHideAdasWhenShare() + && MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageOnResume()) { + MogoApisHandler.getInstance().getApis().getAdasControllerApi().showADAS(); + } + super.dismiss(); + } } diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt index c91a4a13af..6c47af485f 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt @@ -105,22 +105,10 @@ class GridFixableShareDialog(context: Context) : BaseFloatDialog(context) { } override fun show() { - Logger.d(TAG, "onShow====") - if (DebugConfig.isNeedHideAdasWhenShare()) { - mApis.adasControllerApi.closeADAS() - } gridBtnManager.showShareButton() super.show() } - override fun dismiss() { - Logger.d(TAG, "onDismiss=====") - if (DebugConfig.isNeedHideAdasWhenShare() && mApis.statusManagerApi.isMainPageOnResume) { - mApis.adasControllerApi.showADAS() - } - super.dismiss() - } - companion object { private const val TAG = "GridFixableShareDialog" } From 0a9040ea4d58c4d5af945947eaa34d12c4a9ded4 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 20:20:13 +0800 Subject: [PATCH 02/16] UI --- .../module-v2x-res/drawable/bg_v2x_event_list_item_light.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml index 534a55cc22..77ada92145 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file From 0f9fc1adbdad6d15329eea087232a4366f697d14 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 21:11:31 +0800 Subject: [PATCH 03/16] =?UTF-8?q?ui-=E5=88=86=E4=BA=AB=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/module_v2x_event_share_item.xml | 52 +++++++++---------- .../src/main/res/values-xhdpi/dimens.xml | 4 ++ .../src/main/res/values/dimens.xml | 3 ++ 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml index f656dd22e9..1258242d0d 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml @@ -9,51 +9,51 @@ android:layout_marginBottom="@dimen/dp_14" android:background="@drawable/bg_v2x_event_list_item"> - - + + + + - - 26px 25px 2px + 82px + 55px + 95px + 24px diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index c371aabb58..a4124c9e9f 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -66,6 +66,9 @@ 29px -8px 84px + 67px + 45px + 52px 13px From 57376bce282f599ccd5bfef361973c5a1def30f1 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 21:13:26 +0800 Subject: [PATCH 04/16] no message --- .../src/main/res/layout/module_v2x_event_share_item.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml index 1258242d0d..aaa1eba0c2 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml @@ -49,7 +49,6 @@ android:layout_alignLeft="@+id/road_case_useful" android:gravity="left" android:paddingLeft="@dimen/num_padding_left" - android:paddingRight="@dimen/dp_28" android:text="10009" android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/share_item_text_size" /> From b45595497668ab8e601f8bdba520a3ad6ef8928d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 30 Nov 2020 21:57:33 +0800 Subject: [PATCH 05/16] fix bug --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 125dc02de4..cfd79540ae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.9.1-SNAPSHOT +CARCHATTING_VERSION=1.9.2 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From 5abf15ccb00294fbb624436d1ad86839dab7d40e Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Dec 2020 10:00:04 +0800 Subject: [PATCH 06/16] update callchat --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index cfd79540ae..a672326161 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.9.2 +CARCHATTING_VERSION=1.9.3 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From 2b84ca6b369edc5b51460142fe67d3047d326353 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 1 Dec 2020 10:04:21 +0800 Subject: [PATCH 07/16] =?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 08/16] =?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 09/16] 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 10/16] =?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 11/16] 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; From bb85b86bdd10f3f3a2f0dd71a4463dfd3fe6ebbe Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Dec 2020 11:09:55 +0800 Subject: [PATCH 12/16] update callchat --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a672326161..d43e3d70b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.9.3 +CARCHATTING_VERSION=1.9.4 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From b2c2c0ba05926b567b6319b59041a85ca2fccd24 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 1 Dec 2020 11:22:27 +0800 Subject: [PATCH 13/16] opt2 --- .../com/mogo/module/service/intent/AccStatusIntentHandler.java | 2 ++ 1 file changed, 2 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 2ee9216924..17f2bd0459 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 @@ -68,7 +68,9 @@ class AccStatusIntentHandler implements IntentHandler { if ( state == ACC_ON || state == ACC_OFF_DELAY ) { Intent newIntent = new Intent( "com.freedom.ser.ACTION" ); newIntent.putExtra( "acc", true ); + newIntent.addFlags( Intent.FLAG_INCLUDE_STOPPED_PACKAGES ); context.sendBroadcast( newIntent ); + Logger.d( TAG, "发送广播：com.freedom.ser.ACTION" ); } boolean accOn = state == ACC_ON; if ( MarkerServiceHandler.getMogoStatusManager().isAccOn() == accOn ) { From 61c897fd900bf60f76cafdda4f228057298cc70e Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Dec 2020 14:27:14 +0800 Subject: [PATCH 14/16] fix UI and update callchat --- gradle.properties | 2 +- ...e_carchatting_launcher_calling_bg_light.9.png | Bin 2802 -> 0 bytes ...e_carchatting_launcher_calling_bg_light.9.png | Bin 4686 -> 0 bytes ...e_carchatting_launcher_calling_bg_light.9.png | Bin 2806 -> 0 bytes ...ule_carchatting_launcher_calling_bg_light.xml | 8 ++++++++ 5 files changed, 9 insertions(+), 1 deletion(-) delete mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png delete mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png delete mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml diff --git a/gradle.properties b/gradle.properties index d43e3d70b1..d584595fab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.9.4 +CARCHATTING_VERSION=1.9.7 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png deleted file mode 100644 index a4979dd265b4784303b33e6fda6ea16cb27bac2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2802 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 Eg29=KAOHXW diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png deleted file mode 100644 index f68dcac5f89b08c08065931eff5ff07a6120928e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4686 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 diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.9.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.9.png deleted file mode 100644 index 9947fa9c1a6cfa2b3edb125a0f5da7d9600ef969..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2806 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 IM6N<$f^Z;viU0rr diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml new file mode 100644 index 0000000000..3b290c7bc7 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file From baeea673143a26bb1217fb1ad8320c76036f66c4 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 1 Dec 2020 14:35:35 +0800 Subject: [PATCH 15/16] =?UTF-8?q?[fix]d=20m-=E5=87=BA=E8=A1=8C=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E5=AF=BC=E8=88=AA=E5=9B=BE=E7=89=87=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable/v2x_nav_normal_light.png | Bin 3236 -> 3176 bytes .../drawable/v2x_nav_select_light.png | Bin 3181 -> 3128 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_normal_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_normal_light.png index a37dc6a948f5cece381ce060b9d640019a9857b2..96bcc0308cb71320991f9b08cd00742f1e96e963 100644 GIT binary patch delta 3158 zcmV-c45{;^8R!_0F@GXSL_t(&1)W-1h*jAYz3*8Hf`VEOIAOY>6Gh8;K*jW{`Y?1H zJ~V>^h)P2X4iSV1f`Uc`qeL_oB#_jHKXx?wVW1^`bd`QMmSZWJ6jl+?sA!?Y*-|TO z?Yir@->Lgb+XMIQdF_3Md(RzSlDKyE?AfOJ`uf#U<;a{mb$_ZYpU)?`TrM1wCQZua zX{15MUAuM}f9cYtwz4y4&NMS(_wL=vix)4FSFc`$=zLjO*&k?Jw{BgsapOjF2uOrI zfBt;PDR|3IBO7y2K_lDf(W9+c6VQc*>>{LzJQ?Oqh_%(+~;(?B>mz zt=hJ>wp^JdhJSMB&Yj82moJm5swy*HxpL(lg4#!B{rdH0tgNhjKPc>m@(6_itkw#; zc=2M9gSzp)FDM^F`5g-Riaikusbo%u3AB?@fOiH!W-xumj~}1QanM>@Td(>c=#tvn z+T_ifH+I0DY~Q}!fI`M}q|381aB>;Mp=0ylRw{yR0Doxk4j9|y@#Duyp-?Caf=?lI z7UhND7=W@W${bZ@gG27}<;(AUSd3#Y1Pa4l*<#u0SBB#YWl$i`dpc^BY~8xm0yO+(>NEonA3mHkH#dg>t_}vO z(TD!b6w=P0Ki_y7o<4n=Y}>ZY0O;(iu^^8mV~-v^EDKAOPBfg~QjqFkzr+^-Q{eiO z()W?N47tiC7icRyqIgm^Pe+X!RU4KOE_nqEX@4!9V)PWGrJ|yuuYvH#H>~o%!fCm5 z;2&U>_m@l>GI^zVo+`Mm{0nl26(b)~l@E5o8+jWUkPapT6-(a&a?!^Ja_y-6Lc@+_V~(vw#^dGchk zXMfM0V51KkFl(`KoF{J@CNd#fLe#M-kUSUkkt0WvTeoi6^^x+sckhg^s;Wx3f2sL6 z@HJ(;1#^{;sE^N2 znKFgDg>*%L)a#Ig2p0&HIZ-5`XRs zZ`(cKBPNUD%6uLxb)ter>064&@K^Ejo`u(GG6f)E4tGzhK<6Pz1@t{}+`(}i^Ibi0 z;=~5|c1Al*hAYdj5&SIy;+{}O@}NhL8gb$M3G^MW5NQRO$#9~7hO0!Ui^Uh<3xWO^ zZoYn=;unz)$#4_)4T5>sW=%k%v47sn&ZiYa+f6pnqGY(5?8DHs-)BY3+z**RMFUtA z!)FxPNP~d+DL}SWL=b^@2510j0`KSeRwN8PwEc`hXhqAF0WQcKB+KSyI!G1|xhqbe z?<^QUmJIXMzPY(!kb|fPl8%&mJ~&iYS0@i1JSa+-`hA5_vJosJgSpB)aeoDt26X^B zcI;S!D^A$sO8H}J;!V?!xq1FYV4_*QknZNqo5|6mN9`i49h#I!|Ni}p=34U(T)R7C z&z1{_$vm&*&!0a}4jw$1Jbd^t?9fW2&2zwj0p{-G#gksWdbPrCpam);W%4IZoZ!QH z(d_`M)!`E^TC_+oMFl&|m4D&6fB>foyV$d5r+=p7(w}mOfp(cKw`oHcLhZ z3GGIbJR5_2;D=lG4+15L9QM-a%AbpTmj%o z@gatw9H)g;MZJ`g349XAS7M&(KJyVN&x;IMNAa13iq9fZIr#;^Cf)i;qzNw24w$O z`q3Rr@0b4$;D7MGT1i+SXTukorK5kAK1&y4LvF#xk6-9rk?f^tryWDFUC^ODNW4;o zi>ep`llM(F>AkFY?@!+Qcs|P?_G)}m_zh@ye(r!5D!^Hcz_PBQKM{Bh&PjfCI4_-RDA*glfkvu7u`?X&#UD~>d7)Zth# zcI;St?SF0_ct!LjdR?agfm0Tscmm4LgO}1Np1yqjd+pjadlG7CX}^i1T?acuo~>WM ze#z?9tBvPR7JjU!4_1eLn$vUpAu3gb2O%$877%q=jgN2a1ZRU^df8Yw8}o=4jdcqb zE)03&dQ_)@r9Y|>c!yvgP{tQ}P}X8_(tEPu%?tf{Ffxqkh6_{v7R3igx*v8fZ1 z{+t6O`A5&I>nCpgT*abvLq}qkMHB9CyfWd+b|Kw^ZcBlg1pfK$}S!KbV%oYWD}lj z+-y06EK0LRI(P0|n@z5aI7YIl@=?yx(T=Bp>O7ux8UR?M08dK=XN^{zggDZPvVT)k zr%ts_X&DY1HY_O=3g+u^6(byPQ;qb|;dC`4MvQ2G;fKzB4MU?qvS_UHiD^@lo|MH% zmVL&I8DSZ+bIX=33!U=5;yoqrWnoH(32NkP1M0&i2SxA^{~VmcQ*j(9*#eOyt0{@M zQKwFlK6~~oX>4q?S9smKcMruX#((=uM_Njs+Un7%$?&nOPlxL8X~X_>rb0aMhrng` z1;jYs7GoY* z7xn($F1?Fyg>L2#djCcceF_(#rvmrIs0jMW?)i`LRSsd1iWe4fFiX{#rGHiOk7?$N z#ZKtpH_-hNN2mW5@`Za06-LS?S-dIJAKBz9pA@?l9aF3l;;rkrj`CBwzp^TKd56K00rmJ(O-f74to1%p*rFH z$d~F=sm?&pt!E>a+ClIgZ%<(31R3%tcPs;o7l9o9qcjS$TEHle1m%AveuRTJ+C4!T w_5}R@VE+$zemK64*{H*8T>I2c5HxQ82k9}bUfp}atN;K207*qoM6N<$f@P^FJpcdz delta 3219 zcmV;E3~cl07^E4HF@Ii3L_t(&1)W-1h*ilMuG`%TDlM)76(KE(C8pa>H&xU~ypRPr>A;)|d-U~Kc?+U^mIGbjpz#Ay*lTw3jX-{0pe z|66@-+gfn$zi(A_>eQ)oLvZcFg$sA<>gtw>RUmTq?AgY$vVXErC=}u~X3UsE8HE(^ z+PQOQ#IIhx+E{-6{P}yZ=tQeGZ{CEesw%TKgNllZzf(Zs)TvY9=+UFm+G1Y1bScJM zx^!vSvu96JY{q0`40#|ubm&ksBpy)0kc$^D{%S<_W72cy&P6L(j~X?qP(}fhiE*-8 z8yg!771ZSQ@_*$^%To09>(}4IsHtaGuU;M2tXUIo-n^Tcc| zp(|Ie6eXlGKGcHr(Ur%M$P`v0kA$K*7)DS|LaU0z-ue1uo8UWK=B-+xAB8nMaPAQ>1Y>wr{Y<;s;7 znNDhIYN8=bs$;Q8IU1)9NGqe=Ol zVhAP!HhOuH5pN=T=S)x|&8uzOwta>T8+MQUDD_j70x1ikWA0wQe0f(ik^vQDkO#qA zVtg3ffq!y8Dec|6*T!tYf(4;NhYn<`Ln35){geU~Fk{T<*s)_IW16ayy1<*tl3}}c z?aXlI%$d=^tTPAHHwzl5En2k5BJJP5U#w^>z1VxyP_%yi`h~l9?}mpDABGhxRv2G$ zgQeymZ|B#qU)wz7UBJabhL#uSpKLlIN<&CxT)jvaf*%RF9el}Qlb4Fa_x=^RBn@;u+;vH@=~*7SYRh`v10QV=;5 zlz&ripUOz%nlxg>h+5O@c8j#8%G6WU_K^PjciF5tyS0>Rexbj z;(+*I!UcU`?=a<4A6Nb0!GrVHxa@Jb#5?v*#1~A1d0hnIzVBVs5t0Y7GG9X1jFw|T z?=Z#rJU|dz%~PL6%T+2A%}InO*HXZ*5pW3jmAD?_`U%^yn$e?2-;{1ku*G0lS*F9- zCQe!vX-)|7QPIy>c>9BHzCvUfG&4K?LJ;iGPqr?5?!c z*Vl)`hY#Dz&$mP06iB?327d~Cf?a6js!t^M#-)P?4<1+`t$(|A*?!x6!_FXogcEw4 zGVHv#X$obS=Kmn#n>Rq!RuO}-YChAvT#ji^Ts`A)h-`OO0pa}AAPual1ihTjOWBK0 zc;m*6A@-UpV+lzU=he4w-+x#cgDqaXSn394BPd%bIsOuxjgHaG0d7v~8dcS?W5=jN zJ6#GQUnw8Z{EB)ym;}#4pug9+!!nKHnfvZphvm0`X4IkE`f)_St*SkJ$e*&?AT#J$y0Db z(md9ZjUo6^aBO(WIA(ux(WMii0+G?9M-ST#)43*$hbK;)h|a06K$-u>GQ3Znp+hw( zq_p_RFf3ob+^X_{n14W3Rh7(Qpo}qt(8i3L6cTbMT(pP8d-v`gwr}4a`t<2z-N$5^ z0N-$AD@c7LXfKFyCB+*xPwl!&iI7c!ny4n4JauoLT)KojV)^2WFYXby%7|d4u#F^f zHahW+K1Rz%kowqpEmk1%V=xkUs5!~P`)f|Tds8LtjO#>htsO9qo7oQi*RKJa>c{P?5JiYRNTwOAOEEk{Ayk<1b$E~o_QoVah2iSKFI zdwt?w$K!eWkk{aBYB^whe{SY4Wr)^0TI$#bm9B@Br+-a0;*GF^>~Vn(HDs*6GF&EfonW* zA6$4|z*Lv?)2C0v^XJb)`}XZaw{G3c7j32M{fKA6oFBzbMJb<~n&HET$3-TN7!NxT z@Q2hOFMlv~e4^CBp%*(QZYIg24zCFlCUCzIJ1ftg`fQSU=yCcZoi_4t%|LM3W1qQCs|%P?--I5Sfm?}KgY{`Z?%pZ9i1}v2EKo3mY zEtGN~hk0_!cpv2zCLX`OO`kr!Xhgg(`cM;}kcoq%f?mh-JU_9uLmi$c$K<6TNJlEjI~6WCapJ_# zzkmN&oC@T7{no8p0}u10>mhOPU$l=eoKU*rd0*lIR+fK*24N>MrQ{ThhoOxu=?Ho| zyz1FAjEe~yM~#W_^APT3<5gvE+OqeFl7B~*I)Qz*HIz#o(^T)2?0*+si_DWy(Q zT6%+md9WyjbMDd-r%u8wL&>SoCKBjxI-*$3~2yIPxjl!?Xju3J1VSi+0q_b{4o5#5hh7Fz)bJubP2lykK_aNvMVM-@OF6(}f~AV+WAx^})YW(MkZ^|bxCZ^!eIBBu(T7R*8IAU=ZVG!>(IrL6i;!##gmx)rw|D5p=fLP{= z#ZksasB7xfsezYow3i>xCk|O1&O*ilnzLA#6!9_D{&d!YgObj(09JtP1?4|Yj*o#` zw{C@J&z^;zJ$v#GeF67~)D6l;{v{M2BXt5r6@3hBRv3-Yo7FJ-38)>&`G4d*PRDGX zXN>Gea?c~~`NU-}==Hr^d}rSP-tRu?{EbfZDO?UclyjeqlAxaC9&e4VV#pVvaQUJi zj8Y9osra*op_@t$);H{BKm$s?CWS;MM4Jc??dK9Z1JZx2A zGT=WbaI@E-$EJvvCO|%Wlz+`76mjuQ!ToqYj%_IKA)HVx@rT%{PD+1LVcrIY;2K`q|wI6{u^^#X;1^(HE<@si@_;>JNjA}J{c@Q9< zDZj;430Wl|&7K2)2Kjy9e0JW#Xw+gf{`0v-&}rKK50HyHT}_&bO*wP47pMDVsKJy1#4Ju8ksPh<~hGx2`Fh%{p2plZp6L zRaIpig$xmoA3yH!&6_tjXt2A-e<)uFE4j#3>`W&QlmH~MM;=7YnDt#jMfFjG$cT%G+J^2 zaqHHt-@keD=3@%boe$X=jz~TcDOlmArlz=wV__Jh%$hZ8G8s17lP6EkTBU2(u0>a_ zT#49`@87?V8XFs*Wi({SkVM$syLbO}oU9!sz5&$7sVVYF}GzKUnho*fa>LgI*^e#MFvT^*f2w(Q=$`y0$5<)T6ODTKSLP8fT# zM1yBAV(xGNIN|&_G<=7up}KVGQn_TwlKnnk^`Ns28#Xkc#S?um1wlDr-Qwc2eHSiV zSbwd$le3lohZEUT$HD0|yux3Tu0fdL8_8@WBqc#hx48IMuU?H#o;(?k4$81_5Mc88 zfw-g4k*gHx6UuNJzi{C~^x(k*H@I2nAm_t{O^X|4ZNZZLZH`kO<_}AEI3weGSzBA{ zAdS&53!!x)ddQJ7gst)%=T>JS|05==h<_%UIB}xm)Ya9w<>L13+wL7#Hgd{^*A{Ds zbk=k2+qb`rh3XfUX>l3o)vH(3yLazs)TmL8bnxK8I7887)I#YKX0aZPw8kxN1%;E( zr$>(-u`@1=EYcN}4k2H1j>aYo&q^7Qfa*RJf6}B$t~uw-nG=sd@q9=doK51F8h>-u zFl;6+OOOI87Ehz4$#9NazI=Ijj^lF3)h(n`Tx*b=Z!a#Z$9r(V|)-n~D~6 zR#Q{+JM8cFQQOaib-rt&=W@AwtAAIo{uxB$RnhkvbcTK#R$pHq94yv=90`(#OwVED zePZQ=Ya&)XLUUDph$AX8LlyM#$5`_lRJSmZ8Rp4@*u6IIv&_)93dEI(pwE{K&nT7` zXNIP$u#RlBR>3+bCWDhxBE#4jnl3S1tx-7>jZlwxgyIWFJ%?`jUNX)ZwtwW!i(4C- zPKp-t;Be~HDK3-=hm>I-0=VYnJ|lx8${Wv1E?tVQU%wtNp1wTmEZeqi zyMyDwPjlP1Z$B1VJe$Q@e&y)iy?fEcix(4X8vBk41e$IGv9fGsbAQ zpmL6``n}s5wy>Hp3DA*@T1ex3Sd?XHX=$@^{#Q0wC60kIwv{t0GM9-c*TR9?~wqy_WUI}Mn2+9H`*{Fa2{_Y{|(4j+dMt{s~+_-TPjiGgv zC%%ebYU_Yeg^CRH>(?*Qyq!CDcH-8Cua61(-_DtYWK4CdU}=K}4RV<=EAF~j#22)> z#IcJzo<$Qq^%=Hqm4(v*v*$Bm!UQYsaLP$mOzijnm_-xJ2{9!^gH}Bpf4j?ycU(j-2}OJ@7`&cL=TJU7-$NWkP%BG z?ze!ofqBsxa{~m2wjpUOP8n5 zxpU{byBzAp&RFTwr%#7s4k*`_f)mhJ3l=P>wz4f9W2m^Le1C>_sMI>PxI}%L>O9)c zpFiInZ6!+>bVdf2glV{)iU*AhIVCfASZ5(0FYdpVE?xTbW=iYdRA&-BaNxjHIQZ(mL;LJLV^0uL$V=SK(8KKsyVtV^7($fU}89*<}jxJii?sNN=8t@&|tBIBx_-- zKt7QmmZc%S`k`inS#@(O|2TF>`$qk1&psmmN6c?vp}7s13IuYcV7kC8k3SzOgJJ{=Xgs=XCe|$E7ri7GiM^qp22{r zuf%LZA>1ZNJsyel1)@+);>nNdw85O1SQ#sYiW0Id$b&j>3()luhaDkqTH|+x_T)5_ z5P$iiOO9~t*s)}#7R4d~n-FQNW9XOVV5~$!At*z>0Z!pOPV3Ab(j|?-GI3rI@v4hO z2@xk>&xjEtBLBXIGPY3G#$w|mFJE{^o~=_Y4f^X)np}uZUEcYyCwN1`q?CwoLN*Zp zEfOjWUdi~-CTe(fSsWG4T4RP88x!C1M1S+4WPCd70|yRlm6&>O{P^)9l>|+;3DrBI zSwVcbKg+~wNTh&-1g&t0X8E!qXzhtMV88(P?-T~5goyLw9(yySBfo<3>C1{vh{S4m zp;L?9^0$^DypS?w$4U8otIuFmm)zjNgI$p9F+RM*Q{YxsxP`)HOHg!v*UDcTwCoij zl)>Mu{)y>7J{3zb1ZB+UrO~Y%zpUTCf8Sl<;ZFd^=YJM2UYz(Cm^ijj37?NY!CJy2fcv_uKneYzM5CU? zSx+l|Pf(9VFip?Wjju*r7fkb$a`vo(kK@qkK85>qruKx_E?zisS(sF`Cxjj5f}^nHV#Oi|-y!tS=k^l2h)QBsEGFyoGe~p+cKB=f=~97* zf)}P8-NUCybTZbcp?Lb^`3dTs(2FJc zq+S8O#4Xc*kia!8+E*}D{~!&$@g4MkR1%@M{tG;n2Wz7zxiSC%002ovPDHLkV1k_e B1AhPj delta 3164 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 Date: Tue, 1 Dec 2020 14:45:14 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=91=A8?= =?UTF-8?q?=E8=BE=B9=E9=81=93=E8=B7=AF=E4=BA=8B=E4=BB=B6=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E6=92=AD=E6=8A=A5=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/fragment/V2XSurroundingFragment.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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 571707afcb..ddb5c38c6b 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 @@ -198,6 +198,8 @@ public class V2XSurroundingFragment extends MvpFragment 0) { + if (!hasBroadTts) { + if (eventCount > 0) { AIAssist.getInstance(V2XUtils.getApp()). - speakTTSVoice("发现周边" + poiInfosList.size() + "条交通信息", null); + speakTTSVoice("发现周边" + eventCount + "条交通信息", null); } else { + Logger.e(TAG,"周边没有发现交通信息"); } } }