From 24b67af057595b4c04f1ca53a0091fe293039f13 Mon Sep 17 00:00:00 2001 From: zhuangyan Date: Fri, 20 Nov 2020 18:52:36 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E7=A7=BB=E5=8A=A8light=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=88=B0skin=20modle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service_car_pannel_call_nomal_light.png | Bin .../service_car_pannel_call_pressed_light.png | Bin .../service_car_pannel_detials_nomal_light.png | Bin .../service_car_pannel_detials_pressed_light.png | Bin .../selector_service_car_pannel_call_light.xml | 0 ...selector_service_car_pannel_detials_light.xml | 0 .../v2x_panel_close_press_light.png | Bin 0 -> 1628 bytes .../v2x_panel_close_press_light.png | Bin 0 -> 1628 bytes .../v2x_panel_close_press_light.png | Bin .../drawable/v2x_selector_colse_light.xml | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename {modules/mogo-module-service/src/main/res => skin/mogo-skin-light/src/main/module-common-res}/drawable-xhdpi/service_car_pannel_call_nomal_light.png (100%) rename {modules/mogo-module-service/src/main/res => skin/mogo-skin-light/src/main/module-common-res}/drawable-xhdpi/service_car_pannel_call_pressed_light.png (100%) rename {modules/mogo-module-service/src/main/res => skin/mogo-skin-light/src/main/module-common-res}/drawable-xhdpi/service_car_pannel_detials_nomal_light.png (100%) rename {modules/mogo-module-service/src/main/res => skin/mogo-skin-light/src/main/module-common-res}/drawable-xhdpi/service_car_pannel_detials_pressed_light.png (100%) rename {modules/mogo-module-service/src/main/res => skin/mogo-skin-light/src/main/module-common-res}/drawable/selector_service_car_pannel_call_light.xml (100%) rename {modules/mogo-module-service/src/main/res => skin/mogo-skin-light/src/main/module-common-res}/drawable/selector_service_car_pannel_detials_light.xml (100%) create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_press_light.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_press_light.png rename {modules/mogo-module-v2x/src/main/res => skin/mogo-skin-light/src/main/module-v2x-res}/drawable-xhdpi/v2x_panel_close_press_light.png (100%) rename {modules/mogo-module-v2x/src/main/res => skin/mogo-skin-light/src/main/module-v2x-res}/drawable/v2x_selector_colse_light.xml (100%) diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_call_nomal_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_call_nomal_light.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_call_nomal_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_call_nomal_light.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_call_pressed_light.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_call_pressed_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_call_pressed_light.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_detials_nomal_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_detials_nomal_light.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_detials_nomal_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_detials_nomal_light.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_detials_pressed_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_detials_pressed_light.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_detials_pressed_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_detials_pressed_light.png diff --git a/modules/mogo-module-service/src/main/res/drawable/selector_service_car_pannel_call_light.xml b/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_call_light.xml similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable/selector_service_car_pannel_call_light.xml rename to skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_call_light.xml diff --git a/modules/mogo-module-service/src/main/res/drawable/selector_service_car_pannel_detials_light.xml b/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_detials_light.xml similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable/selector_service_car_pannel_detials_light.xml rename to skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_detials_light.xml diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_press_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_press_light.png new file mode 100644 index 0000000000000000000000000000000000000000..e5084551a3231f00a3b829f7bf15602d214a05db GIT binary patch literal 1628 zcmV-i2BZ0jP)Px*7D+@wR9FekSW9RnMHKDsy!<~TM##b}ge=_5=u%vWvl@kLbb{hY2#JJDNF*VH zE76rA2x9&r2_XqFIHG38O~7$AuEd=>&PE8hh>L(BA^-1-=M?X@)z#Jgx?et6@LpBj zd+XG#TeoiAF2~80g@uJz$HvBfmA=cy;Naky5Lgck47eU8*%=ubakjU&*;Inw*4EZ% z>~wT=ICFDzY^q{~B1bXU(C6VCq^UAGI=YI6BDlbOb8~a^n;cJ7o=%`fES~zu9|?VZ zeX8pdg+OXZHO}r&Z<|nI;ZM{IA&7vj_Hye9@TjC{t}}@2!ZKMQ>Z_TYoOHUoyM<*p zrO(wGfdvYEVq)Uq(b3V%<>lpH-a!#MYu_6BCg}p6=k4_O_gDMEQG(i_EYv9S#>dAW zYs9Fg+BpyUT@#6wl@(`xeqMD=({XlxuPM>g)Z`1&HO&$bCKG<_)YQ~COG`_p?0>FB z&d$z`a`yK2_K;vvQPGCWqq4rf{zHgs5V$E`TU*;hgC6QuS66>RqQ5EFxkrbGhp(8D z_4W1F0r*Ei*c5{Oe}`GGn{=}eu-9zb`C4$m^z`&sySux$&B00ga-b;h11E5$MEIqp zr9bub^xROuaiH`paTq~{eVyauW2dUBN=Shkr{;mnBLu;l0gl$8yNYAAw6ypEk{*d& z)g*&WcW7v6@9gZXJV*}q7=|U{(sOMN864p_86Nh%y}d4z!9JHfH8rJJq9Iqn!mA|yyPxw0p{K4H6`4xNKn2Xe z4T3+3Fw@q0{-eNfbVIj6T2PUf3)-Wv3el{23o>4qg`qU6$Yt(D9RLoTot;%dNRmv_ z7=)IWmz_9px@)Xm8PQl6G6_yliOpv4SAw}etn@B3vOrF(3$U%nV)pZeOUh(2nZIK- zrVwulf=S^mlCPYeo<5ZqSYJK?#Vm2)(D=_-U>%g#k#2LFx5#A0#l^pP41Yo}>w|-X zfK6!@0p~3pRgl(pTR$P91|+4c#dn2#PzB1gehq7XlU@gEo%y6i!i{(Db^Z zqT+kF)f+lZZ$|>_LS~zj;(**nh`bRsu{lQiJU6(6A7Q2U3h~H93e)U}gku+Z(Z~W= zbDNN=yhrEM>9%&P!ZR~7A7lGIz(C(AZ6Fs&%fjJ5)iXd7+p2I*(GN}GtL*cn+7u5c z%&p(p*!cM(lJARH90OWiUENE%tN2^ZG=SmZ|Dr4xOkJoGbrS<9g?Z|eycEcwtFEaV zb>zGm{9MMxv`R2jTwGjq5Zcrg&I|^AXN6%J#RnMXWe90bYin!d2e=gg#GH=bW%xCO zOw$^~qXv_XWW*^eD^m(n5m+FkxUQ&RaSX?%EsXcn)#Xbpl9?CM0*Jg#DajqV5Gka^ z?Sja~)mZ3ne5KgOD@9qHU=p59agMtPMP+{1bq|-;Ye`qCgnh*4EaX#>Pe_Fi~QP&d;CK)m5jVp&@lhBLLqU@%DeqznYW2}@m24=F54o%eNK za0;o-hcz7|QehFI#SxZfFFT84Dv3z*u4z%xL+ZQ=iy&*Jc?eUV%X62`E2NFX#P9X@ z5dksIxJc>%0000cp+W@ literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_press_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_press_light.png new file mode 100644 index 0000000000000000000000000000000000000000..e5084551a3231f00a3b829f7bf15602d214a05db GIT binary patch literal 1628 zcmV-i2BZ0jP)Px*7D+@wR9FekSW9RnMHKDsy!<~TM##b}ge=_5=u%vWvl@kLbb{hY2#JJDNF*VH zE76rA2x9&r2_XqFIHG38O~7$AuEd=>&PE8hh>L(BA^-1-=M?X@)z#Jgx?et6@LpBj zd+XG#TeoiAF2~80g@uJz$HvBfmA=cy;Naky5Lgck47eU8*%=ubakjU&*;Inw*4EZ% z>~wT=ICFDzY^q{~B1bXU(C6VCq^UAGI=YI6BDlbOb8~a^n;cJ7o=%`fES~zu9|?VZ zeX8pdg+OXZHO}r&Z<|nI;ZM{IA&7vj_Hye9@TjC{t}}@2!ZKMQ>Z_TYoOHUoyM<*p zrO(wGfdvYEVq)Uq(b3V%<>lpH-a!#MYu_6BCg}p6=k4_O_gDMEQG(i_EYv9S#>dAW zYs9Fg+BpyUT@#6wl@(`xeqMD=({XlxuPM>g)Z`1&HO&$bCKG<_)YQ~COG`_p?0>FB z&d$z`a`yK2_K;vvQPGCWqq4rf{zHgs5V$E`TU*;hgC6QuS66>RqQ5EFxkrbGhp(8D z_4W1F0r*Ei*c5{Oe}`GGn{=}eu-9zb`C4$m^z`&sySux$&B00ga-b;h11E5$MEIqp zr9bub^xROuaiH`paTq~{eVyauW2dUBN=Shkr{;mnBLu;l0gl$8yNYAAw6ypEk{*d& z)g*&WcW7v6@9gZXJV*}q7=|U{(sOMN864p_86Nh%y}d4z!9JHfH8rJJq9Iqn!mA|yyPxw0p{K4H6`4xNKn2Xe z4T3+3Fw@q0{-eNfbVIj6T2PUf3)-Wv3el{23o>4qg`qU6$Yt(D9RLoTot;%dNRmv_ z7=)IWmz_9px@)Xm8PQl6G6_yliOpv4SAw}etn@B3vOrF(3$U%nV)pZeOUh(2nZIK- zrVwulf=S^mlCPYeo<5ZqSYJK?#Vm2)(D=_-U>%g#k#2LFx5#A0#l^pP41Yo}>w|-X zfK6!@0p~3pRgl(pTR$P91|+4c#dn2#PzB1gehq7XlU@gEo%y6i!i{(Db^Z zqT+kF)f+lZZ$|>_LS~zj;(**nh`bRsu{lQiJU6(6A7Q2U3h~H93e)U}gku+Z(Z~W= zbDNN=yhrEM>9%&P!ZR~7A7lGIz(C(AZ6Fs&%fjJ5)iXd7+p2I*(GN}GtL*cn+7u5c z%&p(p*!cM(lJARH90OWiUENE%tN2^ZG=SmZ|Dr4xOkJoGbrS<9g?Z|eycEcwtFEaV zb>zGm{9MMxv`R2jTwGjq5Zcrg&I|^AXN6%J#RnMXWe90bYin!d2e=gg#GH=bW%xCO zOw$^~qXv_XWW*^eD^m(n5m+FkxUQ&RaSX?%EsXcn)#Xbpl9?CM0*Jg#DajqV5Gka^ z?Sja~)mZ3ne5KgOD@9qHU=p59agMtPMP+{1bq|-;Ye`qCgnh*4EaX#>Pe_Fi~QP&d;CK)m5jVp&@lhBLLqU@%DeqznYW2}@m24=F54o%eNK za0;o-hcz7|QehFI#SxZfFFT84Dv3z*u4z%xL+ZQ=iy&*Jc?eUV%X62`E2NFX#P9X@ z5dksIxJc>%0000cp+W@ literal 0 HcmV?d00001 diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close_press_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_press_light.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close_press_light.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_press_light.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_colse_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_colse_light.xml similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_colse_light.xml rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_colse_light.xml From 35b6feb34956e94d6272b3c131a924a2c6655c46 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 23 Nov 2020 10:28:27 +0800 Subject: [PATCH 02/13] =?UTF-8?q?tts=E6=92=AD=E6=8A=A5-=E5=94=A4=E9=86=92?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/module/main/SchemeIntent.java | 3 ++- .../module/service/unwake/GlobalUnwakeManager.java | 6 ++++++ .../module/v2x/fragment/V2XEventPanelFragment.kt | 12 ++++-------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java index 08b519fed8..663a6f254d 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java @@ -151,6 +151,7 @@ public class SchemeIntent implements IMogoStatusChangedListener { if (TextUtils.isEmpty(type)) { return; } + Log.d("语音打开事件面板type",type); switch (type) { case TYPE_NAVI: handleNaviIntent(target); @@ -225,7 +226,7 @@ public class SchemeIntent implements IMogoStatusChangedListener { * 语音打开事件面板 * */ private void handleShowSharePanel(int item) { - Logger.d(TAG, "语音打开事件面板"); + Logger.d(TAG, "语音打开事件面板" + String.valueOf(item)); mApis.getEventPanelManager().showPanelWithSelectedItem(item); } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java index b16b7957e7..00c3f832c4 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java @@ -3,6 +3,7 @@ package com.mogo.module.service.unwake; import android.content.Context; import android.content.Intent; import android.net.Uri; +import android.util.Log; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.template.IProvider; @@ -73,16 +74,21 @@ public class GlobalUnwakeManager implements IProvider, IMogoIntentListener, IMog MogoApisHandler.getInstance().getApis().getShareManager().onGlobalUnwake(intentStr, intent); break; case VOICE_QUERY_HISTORY_INDEX: + Log.d("语音指令","VOICE_QUERY_HISTORY_INDEX"); Intent startForHis = new Intent( Intent.ACTION_VIEW ); startForHis.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK ); startForHis.setData( Uri.parse( "mogo://launcher/main/switch2?type=showHistoryPanel" ) ); context.startActivity( startForHis ); + break; case VOICE_QUERY_SURROUNDING_INDEX: + Log.d("语音指令","VOICE_QUERY_SURROUNDING_INDEX"); Intent startForSurrounding = new Intent( Intent.ACTION_VIEW ); startForSurrounding.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK ); startForSurrounding.setData( Uri.parse( "mogo://launcher/main/switch2?type=showSurroundingPanel" ) ); context.startActivity( startForSurrounding ); + break; case VOICE_QUERY_HEART_INDEX: + Log.d("语音指令","VOICE_QUERY_HEART_INDEX"); Intent start = new Intent( Intent.ACTION_VIEW ); start.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK ); start.setData( Uri.parse( "mogo://launcher/main/switch2?type=showSharePanel" ) ); 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 d7b1318b1a..6d06f2df79 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 @@ -258,14 +258,10 @@ class V2XEventPanelFragment : MvpFragment mV2XScenarioHistoryFragment.ttsForVoiceCheckout() + 1 -> mV2XSurroundingFragment.ttsForVoiceCheckout() + else -> mV2XShareEventsFragment.ttsForVoiceCheck() } } else { showPanel() From d833025bd890dbf03605834908ff4668321e978e Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Mon, 23 Nov 2020 11:48:29 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E4=BC=98=E5=8C=961.1.8=E8=87=AA=E8=BD=A6?= =?UTF-8?q?=E5=9B=BE=E6=A0=87ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_common_my_location_bg.png | Bin 0 -> 8943 bytes .../module_common_my_location_bg.png | Bin 0 -> 8943 bytes .../module_common_my_location_bg.png | Bin 0 -> 18510 bytes .../res/layout/module_common_my_location.xml | 2 +- .../extensions/entrance/EntrancePresenter.java | 4 ++-- 5 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 modules/mogo-module-common/src/main/res/drawable-ldpi/module_common_my_location_bg.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-mdpi/module_common_my_location_bg.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_my_location_bg.png diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/module_common_my_location_bg.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/module_common_my_location_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..27036dbe7c98024ce412eb99e0ac14703afc9d1b GIT binary patch literal 8943 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-common/src/main/res/layout/module_common_my_location.xml b/modules/mogo-module-common/src/main/res/layout/module_common_my_location.xml index 690f7b6c48..41f7e8c7d0 100644 --- a/modules/mogo-module-common/src/main/res/layout/module_common_my_location.xml +++ b/modules/mogo-module-common/src/main/res/layout/module_common_my_location.xml @@ -5,7 +5,7 @@ android:id="@+id/module_map_amap_my_location_bg_iv" android:layout_width="@dimen/module_map_amap_my_location_bg_size" android:layout_height="@dimen/module_map_amap_my_location_bg_size" - android:src="@drawable/map_api_ic_current_location2"/> + android:src="@drawable/module_common_my_location_bg"/> implements Weathe private void requestCarModelList() { Map params = new HashMap<>(8); - params.put("sn", Utils.getSn()); -// params.put("sn", "ZD802B1932L00617"); +// params.put("sn", Utils.getSn()); + params.put("sn", "ZD802B1932L00617"); mNetWork.create(UserInfoNetApiServices.class, DztHttpConstant.getBaseUrl()). requestCarModelList(params). subscribeOn(Schedulers.io()). From f37439aefc83912dd8942d72cc05ba6e9ffad299 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Mon, 23 Nov 2020 14:06:08 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=BC=98=E5=8C=961.1.8=E8=87=AA=E8=BD=A6?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=B0=BA=E5=AF=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libraries/map-amap/src/main/res/values-xhdpi/dimens.xml | 6 +++--- libraries/map-amap/src/main/res/values/dimens.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/map-amap/src/main/res/values-xhdpi/dimens.xml b/libraries/map-amap/src/main/res/values-xhdpi/dimens.xml index 9c08d26451..e296400581 100644 --- a/libraries/map-amap/src/main/res/values-xhdpi/dimens.xml +++ b/libraries/map-amap/src/main/res/values-xhdpi/dimens.xml @@ -1,6 +1,6 @@ - 370px - 78px - 120px + 360px + 63px + 96px \ No newline at end of file diff --git a/libraries/map-amap/src/main/res/values/dimens.xml b/libraries/map-amap/src/main/res/values/dimens.xml index d8d50de3af..5c0178abb7 100644 --- a/libraries/map-amap/src/main/res/values/dimens.xml +++ b/libraries/map-amap/src/main/res/values/dimens.xml @@ -1,7 +1,7 @@ 60px - 33px - 50px - 146px + 36px + 53px + 194px \ No newline at end of file From b0491943cb5665c91a99e032184a55bb847abb01 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 23 Nov 2020 15:45:53 +0800 Subject: [PATCH 05/13] =?UTF-8?q?tts-=E6=89=93=E5=BC=80=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/main/SchemeIntent.java | 11 +++++---- .../v2x/fragment/V2XEventPanelFragment.kt | 23 ++++++++++++++----- .../fragment/V2XScenarioHistoryFragment.java | 6 ++++- .../v2x/fragment/V2XShareEventsFragment.java | 4 ++-- .../v2x/fragment/V2XSurroundingFragment.java | 6 ++++- 5 files changed, 36 insertions(+), 14 deletions(-) diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java index 663a6f254d..09839d91eb 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java @@ -164,12 +164,15 @@ public class SchemeIntent implements IMogoStatusChangedListener { break; case TYPE_SHOW_ONLINE_CAR_PANEL: handleShowOnlineCarPanel(target); + break; case TYPE_SHOW_HISTORY_PANEL: - handleShowSharePanel(0); + handleShowEventPanel(0); + break; case TYPE_SHOW_SURROUNDING_PANEL: - handleShowSharePanel(1); + handleShowEventPanel(1); + break; case TYPE_SHOW_SHARE_PANEL: - handleShowSharePanel(2); + handleShowEventPanel(2); break; default: break; @@ -225,7 +228,7 @@ public class SchemeIntent implements IMogoStatusChangedListener { /* * 语音打开事件面板 * */ - private void handleShowSharePanel(int item) { + private void handleShowEventPanel(int item) { Logger.d(TAG, "语音打开事件面板" + String.valueOf(item)); mApis.getEventPanelManager().showPanelWithSelectedItem(item); } 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 6d06f2df79..6898259774 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 @@ -9,6 +9,7 @@ import android.text.Spanned import android.text.style.AbsoluteSizeSpan import android.text.style.ForegroundColorSpan import android.text.style.StyleSpan +import android.util.Log import android.view.View import android.widget.ImageView import android.widget.RadioButton @@ -256,20 +257,23 @@ class V2XEventPanelFragment : MvpFragment mV2XScenarioHistoryFragment.ttsForVoiceCheckout() - 1 -> mV2XSurroundingFragment.ttsForVoiceCheckout() - else -> mV2XShareEventsFragment.ttsForVoiceCheck() + try { + when (item) { + 0 -> mV2XScenarioHistoryFragment.ttsForVoiceCheckout() + 1 -> mV2XSurroundingFragment.ttsForVoiceCheckout() + else -> mV2XShareEventsFragment.ttsForVoiceCheckout() + } + } catch (e: java.lang.Exception) { + } + } else { showPanel() selectWithItem(item) } } - private fun initDetail() { mDetailRecyclerView!!.addItemDecoration(SpacesItemDecoration(resources.getDimension(R.dimen.share_item_padding).toInt())) mSurroundingDetailAdapter = V2XSurroundingDetailAdapter(activity, markerExploreWays) @@ -343,10 +347,14 @@ class V2XEventPanelFragment : MvpFragment { try { + mV2XScenarioHistoryFragment.fromVoice = true mRbScenarioHistory?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() @@ -354,6 +362,7 @@ class V2XEventPanelFragment : MvpFragment { try { + mV2XSurroundingFragment.fromVoice = true mRbSurroundingEvent?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() @@ -361,6 +370,7 @@ class V2XEventPanelFragment : MvpFragment { try { + mV2XShareEventsFragment.fromVoice = true mRbShareEvents?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() @@ -372,6 +382,7 @@ class V2XEventPanelFragment : MvpFragment { private String TAG = "ScenarioHistoryFragment"; - + public Boolean fromVoice = false; private V2XListEmptyView mEmptyView; private LinearLayout mClHistoryList; private RecyclerView mRecyclerView; @@ -128,6 +128,10 @@ public class V2XScenarioHistoryFragment mClHistoryList.setVisibility(View.GONE); } mV2XScenarioHistoryAdapter.notifyDataSetChanged(); + if (fromVoice == true){ + ttsForVoiceCheckout(); + fromVoice = false; + } ttsForHistoryFirstToday(); } }); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java index 9e0574e707..b270254009 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java @@ -105,7 +105,7 @@ public class V2XShareEventsFragment extends MvpFragment poiInfosList = new ArrayList<>(); private IMogoServiceApis mApis; private NetworkLoadingView mloadingImage; - + public Boolean fromVoice = false; @Override protected int getLayoutId() { @@ -199,6 +199,10 @@ public class V2XSurroundingFragment extends MvpFragment Date: Mon, 23 Nov 2020 16:42:00 +0800 Subject: [PATCH 06/13] =?UTF-8?q?[add]=20=E5=BF=83=E5=BD=A2=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=9B=BF=E6=8D=A2-=E4=BA=8B=E4=BB=B6=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E9=80=82=E9=85=8D=E6=96=B0UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/module_ext_layout_entrance.xml | 4 ++-- .../com/mogo/module/v2x/view/HeartLikeView.java | 13 +++++++++++-- ...y_heart_back.png => icon_gray_back_heart.png} | Bin .../icon_heart_like_for_gray_back.png | Bin 0 -> 1192 bytes .../icon_heart_like_for_gray_back.png | Bin 0 -> 2943 bytes .../res/layout/item_v2x_scennario_history.xml | 3 ++- .../res/layout/view_heart_like_gray_back.xml | 14 ++++++++++++++ .../src/main/res/values/style.xml | 4 ++++ .../icon_history_heart_back_light.png | Bin 1696 -> 0 bytes .../icon_gray_back_heart_light.png | Bin 0 -> 6150 bytes .../icon_history_heart_back_light.png | Bin 3126 -> 0 bytes 11 files changed, 33 insertions(+), 5 deletions(-) rename modules/mogo-module-v2x/src/main/res/drawable-mdpi/{icon_history_heart_back.png => icon_gray_back_heart.png} (100%) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_heart_like_for_gray_back.png create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_heart_like_for_gray_back.png create mode 100644 modules/mogo-module-v2x/src/main/res/layout/view_heart_like_gray_back.xml delete mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_history_heart_back_light.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_gray_back_heart_light.png delete mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_history_heart_back_light.png diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index 4918dd6b32..4446c317a0 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -103,8 +103,8 @@ { if (!isAnimator) { diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_history_heart_back.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_gray_back_heart.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_history_heart_back.png rename to modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_gray_back_heart.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_heart_like_for_gray_back.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_heart_like_for_gray_back.png new file mode 100644 index 0000000000000000000000000000000000000000..f3709207db0af5d22a3a976b70dd6774253aae01 GIT binary patch literal 1192 zcmV;Z1XufsP)Px(Vo5|nR7ef2R834=RTRGWF@waP*ro-HF1q(8DW*^*t&{)}T8aflg(82oi!M#v zxHEC-P7@PdkeDW2IGTop)J<#DjfP3exG-*vKeY>68iX>#Fz?-auID@V-8W338WSgZ zbMDVM=ljlg&U;GnuXgseFRG)bd$88EsaJnYHp@>Ym5NHrWt=IsK5)XVc6U12*tw}o zSZto`|6NzdM_p1Wi>t=zT2Hq#Tje2b=cgCU_Vyelv7#hVHjb68)nqN6l{3T6#x=Qs z1F=K1${#?M><838yADrg2UwVy$!a(#4-fvfG1UK@PNpXu#f-yvz_Fatamq-*K>`GD z2r~RceDI5p@ZcZ=Ct-JYu&-)raSP~!di(N6JHvoh$K)P(gzby z_T0?-WRka`93)5Kirme}*?~AVKe3!%ZivA`?7#M{*2&DI!^Sap)ImFXm8pn?A_yz# z+@)L=0O!2|AbaQ?uUWu#WL{S6+$vM-uypj(A4M^c|{Y3XGNn#43ptaOi zEH#C@f3$bHkGyfa^DsAM@1LK&cV}DZ4|Pj<3vn<>y zQn}I516vd?@HmY~IqU;J=_z6`jLv98=Zq{LE8iX@z^5=O9kZ$=S+4WI(_L zFhJEEhXEkhhQyu}0DN2k4FuW8YUPgPOp;tyr1GKvJF5uJ5*!FPchH}s01)#Pi%(ir zI0FgoSRqG?Ic4dIz$!RoVD;o_MRh4rjU<;!y==SVQ8>%4)Z_d{)5oGj7|`?$mEpbj zg~V5h6Jr*`)Zc5fp+~;D?%$d8ETw_YHrC9`Q}D%M_#x3BBFjql}CUjjJ>%-FvWDDq;jPAZ+lfo*wEkWUny0 z2Zb$I^Mm97#2NNrFMF9#&t3>9wawSVj}=$0`HcR57f`s|80>$M8?neec)%x2!BU_A z3JU;!&l3JHjkPXcUkW*P+WP_pr@#7+pHaqsW{L8s1W#6--{ZSD(Y9PFgqXeTzXFAz zwPRfqMD8L>)+7}$9N*0|z^B3If3>%dcFf=E?6~k>ll~2+1=Q6yH7c$E0000AP)Px=IY~r8RA>d&S#69|R~f!%W_A~ru6!)J3$?+jwN0#%LWM%*t1K2GXreLxFvK4wex&+CWBh1rQd5N@)*3LafPf0wT?)I#reG|wK~h=1VRm+R=H7dJ zp7)&h&Yg8iq2Ld1xO2|DAJ6l=?>YBl78BqIH*e^)#qb|BzxdUm!S=RqX2Rgd#y+v> z-s0fU-=bnMh>9aY%yDES$b=)Msd1?o$O$7IJPo1p?QNFP%+d^T(0Q?Sfh7bT%{|8w zJAJ{K*)yz6^dsD~Zdm76S1f&-b5rVE2Z)p+K#3|Lq$(Qx8J9{yrmpGsF>27U>F^OF z>_aOb`C#En{v@+#R6ZFm%zI#7+92MrYlF2>6xcWl;t*#P2K76BYx3>OVS+sjVT*zw zj-htb`hzgckG-*+7zQ$D0#5Y{Lt)J-OLPhF3>r*i2FrIcsJ?uAdrMR-{96-~AkU!f zP7*ZnLhJmG$0NmlWzazNCu6B=eP40oXZjL@pIlwJ?CjOHhqtTU*e#DQj>6(z=?=A` z78ArPqEh%=Tnd|1J0(usd(fD$YrSPK9c-tKVw|qX2tjP6*26I;!P+57Lcjf}bvO_Q znj>leREG{D*<=A7i!7J|fGq>cpGhl)+65C?q+rwFws;zS}Dj_~qh~g|?ywHY1ELwH)c2NI#E+!F>&a z^9$z6&h@f}ru6pJtM47hfjRfvf!Q-k)dCU*yJcfX6xm+~u??_w(b_n`1P$OA2X%3_ z!MyllUP1DoUhxd-v~?xq`;O$Y9j!5j7u(HtS34B z3NEo;ocfHl&zNx2hM%G-TL?&Y1r{&`Nyq>yF|ImUQW2qIJgFxpQ7(?7+hi#T<`jAm zM;H@86THH5l@#Pog0UKnRlBrk__5W%cB-TTA*w82{Q{H%6#)d7eBS{t6tTZc7P+vx z9Rf6vN?b(>oK&JhQn8GYQ`*PMCI2hfuir@sxZ-y0+DU`M`STi_Rx9OuP$ew`msP3#x#lt4au@s^Bbun-xRHss!r1vh1OI@Wec>KvMdD zSCMZy(%+ytqsMC!Xz=BQ56&uvVUO&P@){Iddi&}$=9Y}-=FD0$FzY_tp059>sK7qe zH6<>TzKt#{#+8ekkbMrX9$$JVxcsA^nr^}f7pk3(d*zA1m>)Fkdi5vi_=F(dyfGig zb{y~Cf$TJFJ-H9zeq`h4$8Ou%sfqTl+m50qu&ruP1tkbM~oK&fQJCj z%3@Yr&2E2_5CHkHJ6>uitXefYw#9A%^4CflT(&dUDX^Ur_x<^KV?WpVbQne7XOL_| zUNruK@oJK*6b=Z9bCq^f=oel$f!+-o4;sJ9BLW{=!RABl0#3Jf(!3wgzB z3Y>@}I`tlnR{+aZoXn zc%u2D$XB6>>L++bK5>ZWb_p@=K?MY-!-HaUZAp>(b`V$>QAf3DTikbwMr;tA#)5fZ zQBC#U>Fq*B8^LK~qRiFiM*5SJF{mUP1kYyhru9Q@0|8jFfP!D zIoN{6?xR1?)V{Fe3tFxwkjTy1I$n7Au7GJmh#{bomGfzfU*WFG@B`_e6#$kA062v} z+b4+%q&~*_GXYi+h-vQWUzQNmZ-42R2>y!zdjLr$wFhzSa>U~EgeXCXv{L$N$C>JH zUidxL2cYTY3XseS0iq`XT)X(D>8eQkYHQ4$6AvAGOA_%REz&RJUfz8l;EpHlN`w1K zq#aaU1>9tUyVKyrP41>j!twI*C2!)=|4^cqw}C`?xlKYwI|y+>eXOy!|MfHu=M@#G zbNui3d>C65&txvT?{R7_WNOEl$!71b22Q-H6)4fg#q;n($+jd)y;>y@<;FbN*mLZ# z=8PV%Nx3+J8#Nuyg>v@IwN-i3jgP+)X&#T~=mv_hgLuYRwDVuelzQh>v2&%9+I|{ucK45@|az1=e50 z@;$L(;e+j&n#?yEcI|mXF?6gbfX{yj{2pE~@bvWn+%z~uxF>Q&IDfhj+5z|m{<5*U zZrg7v$O;`Dci4DjJ7Vx7khwT{@P+^`wTT%Yj=vn|?n?Z7gZb`+eFwiRx%iL*(D8b7 z{7pPyrigA84R8ifq$6OOBjfvp(4=CRD^}V}P_))OhVKLT!MYm&@1sxtd3@L$F0*8B za#Cq?{N5(jNo-+kcFf)N`}Up2TY)w4=FWd&oL258ad-pb$RYqBohsW!YEqaAbFt#{ zg0yhKO9>TWh!MX7b8{8R5vSwFv;q%4WAc+s?bPhoPo4Zcoa-2J#ezm{ zCpx4smrFu9JeCR&0K|z{kLBiS6Jv^>RF13SPVVu=XKn3J9OZI&J8#9Cxx8{xASJkN z6I5E0d{|PkfB>4VsY0MM;R1CiJRY12AF%o=ZT5}+8 zObp^n?RN${77?LB1w@D_GzG5Yl1Cl_!pINIwE;4US#3TRar9{%b9nIWH?h;8+bOn_ z@Q@A;VM!J^4&RB2ZNUrxq-<{gdLmCMQNGh@0hAy=DEummPjkFLjps=0L?HbdqoREb zw-Kg?jNQ7mwshk4^N@3!D}utXgh?VLxK2nBV)x=ThNGWzWL%|C-tL^u*$J7#kol+> zkC$8vOkok;P6AVxdA}5FH>|y@7}^uqYj{0!VuVPh-$sU!( zGewAdV5c*rqSay3((-fj-^wh;rIXqeuOrXOF@1MXmR3WcdLplZxQWux(F<# zOOsrCCL8A#O@7VobJbC8ysiQ?acJd|X(Pq>ARa6qAbBD{1&_Mph+nEot(@OJn(uC} z2qIo!FVtqT4^8Sm`d8(AxABGwP_WBO7u|(zbpW>+`Hz;Q5YbUtSlTBdeX+^heZP{; z*@q_|?(b2K>mA=y0SbP#b^b@g$nJ;arbH+^=})({xTV~-qi7yUY!D0@lUd%}bM#M& zd86Y^6`*7n7tEc3-GjSUEPqo;U(8yBJ};#6fgP^NnD)l*zCS3&dmV2{0ZM-UlMl>6 z|6fIi8?*@5by(%0Xi6B?OgVDwWzD(S@s<{#V$RO{#G<%lcNzTO8n=rvhJUGA-`v~3 pO=JEq#(`Ngm*M{|y8f49{{wan7rfbsUN-;$002ovPDHLkV1jqLnaBVD literal 0 HcmV?d00001 diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml index c61b839713..bdd4fd14a4 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml @@ -90,7 +90,8 @@ android:layout_marginEnd="@dimen/dp_40" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingUnLike" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + app:showGrayBack="true" /> + + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/values/style.xml b/modules/mogo-module-v2x/src/main/res/values/style.xml index 41038019b1..0918a68fcb 100644 --- a/modules/mogo-module-v2x/src/main/res/values/style.xml +++ b/modules/mogo-module-v2x/src/main/res/values/style.xml @@ -7,4 +7,8 @@ + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_history_heart_back_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_history_heart_back_light.png deleted file mode 100644 index 20b806a8cb8997dd32f916e918ee21f9f179bc26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1696 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 Y0Rm-ojmcJaf&c&j07*qoM6N<$f^g$f+yDRo literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_history_heart_back_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_history_heart_back_light.png deleted file mode 100644 index 63d3c5739262a925772b1d270964a083cac5f0e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3126 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 Date: Mon, 23 Nov 2020 16:46:02 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E8=89=B2=E5=80=BC=E4=BF=AE=E6=94=B9?= 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 | 4 ++-- 1 file 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 5fe60723c9..ce11c8c720 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,13 +2,13 @@ - + - + From 9d5fc0f33efa0db3e579244e18b81e76e0c48463 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 23 Nov 2020 17:05:39 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E5=88=86=E4=BA=AB=E8=89=B2=E5=80=BC-?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= 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 ce11c8c720..f2a8033f4b 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 673abf4fc8785eb5e0ffca42f9d9261acc1f5176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 23 Nov 2020 17:10:21 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E5=B0=8F=E6=99=BA=E4=B9=9F=E8=B5=B0=E4=B8=BB=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E7=94=9F=E5=91=BD=E5=91=A8=E6=9C=9F=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E4=BC=9A=E5=85=B3=E9=97=ADEventPanel=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/main/MainActivity.java | 3 + .../com/mogo/module/service/MogoServices.java | 205 +++++------------- .../module/service/StatusChangedAdapter.java | 5 + .../statusmanager/IMogoStatusManager.java | 15 ++ .../statusmanager/StatusDescriptor.java | 5 + .../impl/statusmanager/MogoStatusManager.java | 12 + 6 files changed, 99 insertions(+), 146 deletions(-) diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index eb3be1a916..49aea0529a 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -275,6 +275,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme super.onResume(); mMogoStatusManager.setMainPageResumeStatus( TAG, true ); mMogoStatusManager.setMainPageLaunchedStatus( TAG, true ); + mMogoStatusManager.setMainPageIsBackgroundStatus( TAG, false ); if ( mCoverUpLayout.getVisibility() != View.VISIBLE ) { mServiceApis.getAdasControllerApi().showADAS(); } @@ -307,6 +308,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme @Override protected void onStop() { super.onStop(); + mMogoStatusManager.setMainPageIsBackgroundStatus( TAG, true ); } @Override @@ -353,6 +355,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterHostNaviListener(); mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterHostMapListener(); mMogoStatusManager.setMainPageLaunchedStatus( TAG, false ); + mMogoStatusManager.setMainPageIsBackgroundStatus( TAG, false ); mMogoFragmentManager.unregisterMainFragmentStackTransactionListener(); mMogoFragmentManager = null; mServiceApis.getMapServiceApi().getMapViewInstanceHandler().destroy(); 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 a27ce3c033..a41cde3874 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 @@ -6,14 +6,11 @@ import android.content.Intent; import android.content.IntentFilter; import android.location.Location; import android.net.ConnectivityManager; -import android.net.wifi.WifiManager; import android.os.Handler; import android.os.Looper; import android.os.Message; import android.text.TextUtils; -import android.util.Log; import android.view.MotionEvent; -import android.view.View; import androidx.annotation.NonNull; @@ -48,7 +45,6 @@ import com.mogo.module.service.launchercard.LauncherCardRefresher; import com.mogo.module.service.marker.MapMarkerManager; import com.mogo.module.service.network.RefreshCallback; import com.mogo.module.service.network.RefreshModel; -import com.mogo.module.service.network.bean.TtsConfigEntity; import com.mogo.module.service.ttsConfig.TtsConfigModleData; import com.mogo.module.service.network.bean.HomeCompanyDistanceForPushData; import com.mogo.module.service.network.bean.HomeCompanyDistanceForPushResponse; @@ -63,7 +59,6 @@ import com.mogo.service.fragmentmanager.FragmentStackTransactionListener; import com.mogo.service.fragmentmanager.IMogoFragmentManager; import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.intent.IMogoIntentManager; -import com.mogo.service.launcher.IMogoLauncher; import com.mogo.service.map.IMogoMapService; import com.mogo.service.module.IMogoActionManager; import com.mogo.service.module.IMogoRegisterCenter; @@ -78,12 +73,12 @@ import com.mogo.utils.logger.Logger; import com.mogo.utils.network.RequestOptions; import com.mogo.utils.network.utils.GsonUtil; import com.zhidao.carchattingprovider.CallChattingProviderConstant; +import com.zhidao.carchattingprovider.ICallChatResponse; import com.zhidao.carchattingprovider.ICallProviderResponse; import com.zhidao.carchattingprovider.ICarsChattingProvider; import com.zhidao.smartv2x.common.utils.LoggerUtils; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import org.json.JSONObject; import java.util.List; @@ -256,13 +251,13 @@ public class MogoServices implements IMogoMapListener, /** * 手动刷新回调 */ - private RefreshCallback mCustomRefreshCallback = new RefreshCallback< MarkerResponse >() { + private RefreshCallback mCustomRefreshCallback = new RefreshCallback() { @Override - public void onSuccess( MarkerResponse o ) { - MapMarkerManager.getInstance().onSyncMarkerResponse( o ); + public void onSuccess(MarkerResponse o) { + MapMarkerManager.getInstance().onSyncMarkerResponse(o); mLoopRequest = false; // 用户手动操作地图刷新成功后，设置状态为 true，引发延时策略 - mStatusManager.setUserInteractionStatus( ServiceConst.TYPE, true, true ); + mStatusManager.setUserInteractionStatus(ServiceConst.TYPE, true, true); } @Override @@ -338,12 +333,16 @@ public class MogoServices implements IMogoMapListener, } mIsMainPageFirstResume = false; LauncherCardRefresher.getInstance(mContext).stop(); - playAppTts(); - } else { unregisterInternalUnWakeupWords(); stopAutoRefreshStrategy(); + } + } + + @Override + public void onMainPageIsBackgroundStatusChanged(boolean isBackground) { + if (isBackground) { closeAllPanel(); } } @@ -402,96 +401,10 @@ public class MogoServices implements IMogoMapListener, */ private void closeAllPanel() { LoggerUtils.log("zy=======stop"); - // TODO @钟超 需要修改下kotlin的校验 - mCallProviderResponse = new ICallProviderResponse(){ + mCallProviderResponse = new ICallChatResponse() { @Override - public void mute(boolean b) { - - } - - @Override - public void matchInvokeResult(boolean b, @NotNull String s) { - - } - - @Override - public void match(@NotNull String s) { - - } - - @Override - public void invokeCallData(@NotNull String s) { - - } - - @Override - public void hangUp(boolean b) { - - } - - @Override - public void error(@NotNull String s) { - - } - - @Override - public void cancelMatch(boolean b) { - - } - - @Override - public void call(@NotNull String s) { - - } - - @Override - public void userWindowStatus(boolean b) { - - } - - @Override - public void userInfoCallBack(@Nullable String s, @Nullable String s1) { - - } - - @Override - public void isOnLine(boolean b, @Nullable String s) { - - } - - @Override - public void isFriend(boolean b) { - - } - - @Override - public void invisibleUser(boolean b) { - - } - - @Override - public void hideUserWindowError(@NotNull String s) { - - } - - @Override - public void canCall(boolean b) { - - } - - @Override - public void callInvokeError(@NotNull String s) { - - } - - @Override - public void addFriend(boolean b) { - - } - - @Override - public void callWindowStatus( boolean b ) { - + public void hideUserWindowError(@NotNull String errorMsg) { + LoggerUtils.log("zy=======errorMsg:" + errorMsg); } }; MogoApisHandler.getInstance().getApis().getShareManager().dismissShareDialog(); @@ -582,58 +495,58 @@ public class MogoServices implements IMogoMapListener, } private void initWorkThread() { - mThreadHandler = new Handler( WorkThreadHandler.getInstance().getLooper() ) { + mThreadHandler = new Handler(WorkThreadHandler.getInstance().getLooper()) { @Override - public void handleMessage( Message msg ) { - super.handleMessage( msg ); - if ( msg.what == ServiceConst.MSG_MAP_CHANGED ) { - if ( msg.obj instanceof RefreshObject ) { - RefreshObject ro = ( ( RefreshObject ) msg.obj ); - if ( invokeRefreshWhenTranslationByUser( ro.mLonLat ) ) { - notifyRefreshData( ro.mLonLat, ro.mRadius, ro.mCallback ); + public void handleMessage(Message msg) { + super.handleMessage(msg); + if (msg.what == ServiceConst.MSG_MAP_CHANGED) { + if (msg.obj instanceof RefreshObject) { + RefreshObject ro = ((RefreshObject) msg.obj); + if (invokeRefreshWhenTranslationByUser(ro.mLonLat)) { + notifyRefreshData(ro.mLonLat, ro.mRadius, ro.mCallback); mLastCustomRefreshCenterLocation = ro.mLonLat; } } - } else if ( msg.what == ServiceConst.MSG_REQUEST_DATA ) { - if ( msg.obj instanceof RefreshObject ) { - RefreshObject ro = ( ( RefreshObject ) msg.obj ); - if ( ro.mLonLat == null ) { + } else if (msg.what == ServiceConst.MSG_REQUEST_DATA) { + if (msg.obj instanceof RefreshObject) { + RefreshObject ro = ((RefreshObject) msg.obj); + if (ro.mLonLat == null) { invokeAutoRefreshStrategy(); - Logger.w( TAG, "lonLat is null." ); + Logger.w(TAG, "lonLat is null."); return; } - mRefreshModel.refreshExplorerWayData( ro.mLonLat, ro.mRadius, ro.mAmount, ro.mCallback ); - MapMarkerManager.getInstance().getOnlineCarDataByAutoRefreshStrategy( ro.mLonLat ); + mRefreshModel.refreshExplorerWayData(ro.mLonLat, ro.mRadius, ro.mAmount, ro.mCallback); + MapMarkerManager.getInstance().getOnlineCarDataByAutoRefreshStrategy(ro.mLonLat); - Logger.i( TAG, "刷新半径 = %s, 点 = %s, zoomLevel = %s, amount = %s", ro.mRadius, ro.mLonLat, mLastZoomLevel, ro.mAmount ); + Logger.i(TAG, "刷新半径 = %s, 点 = %s, zoomLevel = %s, amount = %s", ro.mRadius, ro.mLonLat, mLastZoomLevel, ro.mAmount); } - } else if ( msg.what == ServiceConst.MSG_LOCK_CAR ) { - if ( mStatusManager.isSearchUIShow() ) { + } else if (msg.what == ServiceConst.MSG_LOCK_CAR) { + if (mStatusManager.isSearchUIShow()) { return; } - mStatusManager.setUserInteractionStatus( TAG, true, false ); + mStatusManager.setUserInteractionStatus(TAG, true, false); mUiController.recoverLockMode(); } } }; } - private void registerMogoReceiver( Context context ) { - if ( context == null ) { + private void registerMogoReceiver(Context context) { + if (context == null) { return; } - List< MogoModule > modules = MogoModulePaths.getModules(); - if ( modules.isEmpty() || modules == null ) { + List modules = MogoModulePaths.getModules(); + if (modules.isEmpty() || modules == null) { return; } - mAIAssistReceiver = new MogoReceiver( context ); + mAIAssistReceiver = new MogoReceiver(context); IntentFilter filter = new IntentFilter(); - if ( modules != null && !modules.isEmpty() ) { - for ( MogoModule module : modules ) { - if ( TextUtils.isEmpty( module.getBroadcastAction() ) ) { + if (modules != null && !modules.isEmpty()) { + for (MogoModule module : modules) { + if (TextUtils.isEmpty(module.getBroadcastAction())) { continue; } - filter.addAction( module.getBroadcastAction() ); + filter.addAction(module.getBroadcastAction()); } } filter.addAction(MogoReceiver.VOICE_ACTION); @@ -717,30 +630,30 @@ public class MogoServices implements IMogoMapListener, } private void stopAutoRefreshStrategy() { - stopAutoRefreshStrategy( true ); + stopAutoRefreshStrategy(true); } - private void stopAutoRefreshStrategy( boolean stopOnlineCarRefresh ) { - mHandler.removeMessages( ServiceConst.MSG_TYPE_REFRESH_DECREASE ); - if ( stopOnlineCarRefresh ) { + private void stopAutoRefreshStrategy(boolean stopOnlineCarRefresh) { + mHandler.removeMessages(ServiceConst.MSG_TYPE_REFRESH_DECREASE); + if (stopOnlineCarRefresh) { MapMarkerManager.getInstance().stopAutoRefresh(); } } @Override - public void onLockMap( boolean isLock ) { - mThreadHandler.removeMessages( ServiceConst.MSG_LOCK_CAR ); - if ( !isLock ) { - mThreadHandler.sendEmptyMessageDelayed( ServiceConst.MSG_LOCK_CAR, ServiceConst.DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT ); + public void onLockMap(boolean isLock) { + mThreadHandler.removeMessages(ServiceConst.MSG_LOCK_CAR); + if (!isLock) { + mThreadHandler.sendEmptyMessageDelayed(ServiceConst.MSG_LOCK_CAR, ServiceConst.DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT); } } @Override - public void onMapChanged( MogoLatLng latLng, float zoom, float tilt, float bearing ) { + public void onMapChanged(MogoLatLng latLng, float zoom, float tilt, float bearing) { - MapMarkerManager.getInstance().syncLocation( latLng.lon, latLng.lat ); + MapMarkerManager.getInstance().syncLocation(latLng.lon, latLng.lat); - if ( mIsCameraInited ) { + if (mIsCameraInited) { mLastZoomLevel = zoom; mLastCustomRefreshCenterLocation = latLng; mIsCameraInited = false; @@ -750,26 +663,26 @@ public class MogoServices implements IMogoMapListener, // 部分非用户操作导致地图视图变化：绘线、圈点等不触发用户刷新 // 消费状态 - if ( mStatusManager.isUserInteracted() ) { + if (mStatusManager.isUserInteracted()) { mLastCustomRefreshCenterLocation = latLng; mLastZoomLevel = zoom; - Logger.d( TAG, "user interacted" ); + Logger.d(TAG, "user interacted"); return; } // v2x // adas 状态下不做任何操作 - if ( mStatusManager.isV2XShow() ) { + if (mStatusManager.isV2XShow()) { mLastCustomRefreshCenterLocation = latLng; mLastZoomLevel = zoom; - Logger.d( TAG, "user v2x show" ); + Logger.d(TAG, "user v2x show"); return; } // 搜索页面显示时不做任何策略 - if ( mStatusManager.isSearchUIShow() ) { + if (mStatusManager.isSearchUIShow()) { mLastCustomRefreshCenterLocation = latLng; mLastZoomLevel = zoom; - Logger.d( TAG, "user search Ui show" ); + Logger.d(TAG, "user search Ui show"); return; } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java index b452702a33..8b86e558bf 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java @@ -24,6 +24,9 @@ abstract class StatusChangedAdapter implements IMogoStatusChangedListener { case MAIN_PAGE_RESUME: onMainPageResumeStatusChanged( isTrue ); break; + case MAIN_PAGE_IS_BACKGROUND: + onMainPageIsBackgroundStatusChanged( isTrue ); + break; case SEEK_HELPING: onSeekHelpingStatusChanged( isTrue ); break; @@ -42,6 +45,8 @@ abstract class StatusChangedAdapter implements IMogoStatusChangedListener { public abstract void onMainPageResumeStatusChanged( boolean resume ); + public abstract void onMainPageIsBackgroundStatusChanged( boolean isBackground ); + public abstract void onSeekHelpingStatusChanged( boolean isSeekingHelping ); public abstract void onAccStatusChanged( boolean accOn ); diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusManager.java index f4655180d0..77a7055d18 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusManager.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusManager.java @@ -81,6 +81,13 @@ public interface IMogoStatusManager extends IProvider { */ boolean isMainPageOnResume(); + /** + * 主页是否在后台运行 + * + * @return true-在后台，false-不在后台 + */ + boolean isMainPageIsBackground(); + /** * 小智语音是否准备完毕 * @@ -208,6 +215,14 @@ public interface IMogoStatusManager extends IProvider { */ void setMainPageResumeStatus( String tag, boolean resume ); + /** + * 主页 后台运行 状态 + * + * @param tag 控制来源 + * @param isBackground true-在后台运行，false-不在后台运行（也可能是挂了） + */ + void setMainPageIsBackgroundStatus( String tag, boolean isBackground ); + /** * 设置小智语音状态 * diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/StatusDescriptor.java b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/StatusDescriptor.java index 42d71b3283..d33b78ea0c 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/StatusDescriptor.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/StatusDescriptor.java @@ -55,6 +55,11 @@ public enum StatusDescriptor { */ MAIN_PAGE_RESUME, + /** + * 主页 isBackground 状态 + */ + MAIN_PAGE_IS_BACKGROUND, + /** * 小智语音状态 */ diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java index 62c6076ff4..3244314524 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java @@ -96,6 +96,11 @@ public class MogoStatusManager implements IMogoStatusManager { return get_bool_val( StatusDescriptor.MAIN_PAGE_RESUME ); } + @Override + public boolean isMainPageIsBackground() { + return get_bool_val( StatusDescriptor.MAIN_PAGE_IS_BACKGROUND ); + } + @Override public boolean isAIAssistReady() { return get_bool_val( StatusDescriptor.AI_ASSIST_READY ); @@ -199,6 +204,13 @@ public class MogoStatusManager implements IMogoStatusManager { Logger.i( TAG, "setMainPageResumeStatus " + resume + " cost " + ( System.currentTimeMillis() - start ) + "ms" ); } + @Override + public void setMainPageIsBackgroundStatus(String tag, boolean isBackground) { + final long start = System.currentTimeMillis(); + doSetStatus( tag, StatusDescriptor.MAIN_PAGE_IS_BACKGROUND, isBackground ); + Logger.i( TAG, "setMainPageIsBackgroundStatus " + isBackground + " cost " + ( System.currentTimeMillis() - start ) + "ms" ); + } + @Override public void setAIAssistReady( String tag, boolean ready ) { doSetStatus( tag, StatusDescriptor.AI_ASSIST_READY, ready ); From b34f0cf907e02a2cd045fd3932f57bd981c8eb0d Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 23 Nov 2020 17:11:29 +0800 Subject: [PATCH 10/13] opt --- .../main/res/layout/module_v2x_event_surrounding_detail_item.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_surrounding_detail_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_surrounding_detail_item.xml index cf502b43fc..ed792ad4ce 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_surrounding_detail_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_surrounding_detail_item.xml @@ -74,6 +74,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_40" + app:showGrayBack="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/surrounding_road_unlike" app:layout_constraintTop_toTopOf="parent" /> From f68acde0c4a0c46721bfde16c0bdeb8d43905399 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 23 Nov 2020 17:14:31 +0800 Subject: [PATCH 11/13] no message --- .../src/main/res/layout/item_v2x_scennario_history.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml index bdd4fd14a4..43783d6c62 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml @@ -81,7 +81,7 @@ android:textSize="@dimen/panel_list_item_title_size" app:layout_constraintBottom_toBottomOf="@+id/tagEventType" app:layout_constraintStart_toEndOf="@+id/tagEventType" - app:layout_constraintTop_toTopOf="@+id/tagEventType" />¬ + app:layout_constraintTop_toTopOf="@+id/tagEventType" /> Date: Mon, 23 Nov 2020 17:18:12 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E5=AF=B9M1=E4=BD=8E=E9=85=8D=E8=BD=A6?= =?UTF-8?q?=E6=9C=BA=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=99=90=E5=88=B6=20?= =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E6=8E=A5=E6=94=B6=E9=81=93=E8=B7=AF=E6=B1=82?= =?UTF-8?q?=E5=8A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/module/v2x/V2XSocketManager.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java index 36c68f8619..ad0a8980a6 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java @@ -1,5 +1,6 @@ package com.mogo.module.v2x; +import com.mogo.commons.debug.DebugConfig; import com.mogo.module.v2x.listener.V2XMessageListener_401003; import com.mogo.module.v2x.listener.V2XMessageListener_401005; import com.mogo.module.v2x.listener.V2XMessageListener_401006; @@ -55,7 +56,10 @@ public class V2XSocketManager { Logger.d(MODULE_NAME, "开始注册Socket通道...."); register401011(); register401012(); - register401005(); + // M1 不基于地图的版本不接收道路求助，原因是车机内置地图版本不一样 + if (DebugConfig.isMapBased()) { + register401005(); + } register401007(); register401009(); // TODO 这里是前瞻需求，量产版本需要注释 From dfaabd36a2b7a71737672ec12f1defa766cebb74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 23 Nov 2020 17:21:52 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E9=92=88=E5=AF=B9M1=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E4=BA=86=E7=96=B2=E5=8A=B3=E9=A9=BE=E9=A9=B6=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/listener/V2XLocationListener.java | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 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 c70ac2c702..584671293c 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 @@ -126,22 +126,25 @@ public class V2XLocationListener implements IMogoLocationListener, CarStatusList } } - // 只有自研车机才有疲劳驾驶检测 - if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) { - V2XAlarmServer.getFatigueDrivingShow(location, drivingShowEntity -> { - Logger.i(V2XConst.MODULE_NAME, "疲劳驾驶POI查询结果为: " + GsonUtil.jsonFromObject(drivingShowEntity)); + // M1 不基于地图的版本没有疲劳检测，原因是车机内置地图版本不一样 + if (DebugConfig.isMapBased()) { + // 只有自研车机才有疲劳驾驶检测 + if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) { + V2XAlarmServer.getFatigueDrivingShow(location, drivingShowEntity -> { + Logger.i(V2XConst.MODULE_NAME, "疲劳驾驶POI查询结果为: " + GsonUtil.jsonFromObject(drivingShowEntity)); - String style = V2XServiceManager.getMoGoStatusManager().isMainPageOnResume() ? "1" : "2"; - trackWithType(V2XPoiTypeEnum.ALERT_FATIGUE_DRIVING, drivingShowEntity.getLon(), drivingShowEntity.getLat(), style); + String style = V2XServiceManager.getMoGoStatusManager().isMainPageOnResume() ? "1" : "2"; + trackWithType(V2XPoiTypeEnum.ALERT_FATIGUE_DRIVING, drivingShowEntity.getLon(), drivingShowEntity.getLat(), style); - V2XMessageEntity v2XMessageEntity = new V2XMessageEntity<>(); - v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING); - v2XMessageEntity.setContent(drivingShowEntity); - v2XMessageEntity.setShowState(drivingShowEntity.isShowWindow()); - // 广播给ADAS Launcher - ADASUtils.broadcastToADAS(V2XServiceManager.getContext(), drivingShowEntity); - V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity); - }); + V2XMessageEntity v2XMessageEntity = new V2XMessageEntity<>(); + v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING); + v2XMessageEntity.setContent(drivingShowEntity); + v2XMessageEntity.setShowState(drivingShowEntity.isShowWindow()); + // 广播给ADAS Launcher + ADASUtils.broadcastToADAS(V2XServiceManager.getContext(), drivingShowEntity); + V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity); + }); + } } // 巡航处理