From 3eaad34ed7d23306b9ffde8e24d9f4e094d98a1e Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 26 Nov 2020 17:27:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[fix]=E6=9F=A5=E8=AF=A2=E5=87=BA=E8=A1=8C?= =?UTF-8?q?=E5=8A=A8=E6=80=81tts=E8=AF=AD=E9=9F=B3=E6=92=AD=E6=8A=A5?= =?UTF-8?q?=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/v2x/fragment/V2XEventPanelFragment.kt | 10 +++------- .../v2x/fragment/V2XScenarioHistoryFragment.java | 10 +++++----- 2 files changed, 8 insertions(+), 12 deletions(-) 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 da93fa5f15..62d57d394c 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 @@ -346,23 +346,19 @@ class V2XEventPanelFragment : MvpFragment { try { + mRbScenarioHistory?.isChecked = true mV2XScenarioHistoryFragment.fromVoice = true - if (mRbScenarioHistory?.isChecked == true) { - mV2XScenarioHistoryFragment.ttsForVoiceCheckout() - } else { - mRbScenarioHistory?.isChecked = true - } } catch (e: java.lang.Exception) { e.printStackTrace() } } 1 -> { try { - mV2XSurroundingFragment.fromVoice = true if (mRbSurroundingEvent?.isChecked == true) { mV2XSurroundingFragment.ttsForVoiceCheckout() } else { mRbSurroundingEvent?.isChecked = true + mV2XSurroundingFragment.fromVoice = true } } catch (e: java.lang.Exception) { e.printStackTrace() @@ -370,11 +366,11 @@ class V2XEventPanelFragment : MvpFragment { try { - mV2XShareEventsFragment.fromVoice = true if (mRbShareEvents?.isChecked == true) { mV2XShareEventsFragment.ttsForVoiceCheckout() } else { mRbShareEvents?.isChecked = true + mV2XShareEventsFragment.fromVoice = true } } catch (e: java.lang.Exception) { e.printStackTrace() diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java index 1ce7baece4..2d394ff5fd 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java @@ -128,11 +128,11 @@ public class V2XScenarioHistoryFragment mClHistoryList.setVisibility(View.GONE); } mV2XScenarioHistoryAdapter.notifyDataSetChanged(); - if (fromVoice == true){ + ttsForHistoryFirstToday(); + if (fromVoice == true) { ttsForVoiceCheckout(); fromVoice = false; } - ttsForHistoryFirstToday(); } }); } @@ -155,9 +155,9 @@ public class V2XScenarioHistoryFragment } /* - * 语音查询出行动态 TTS播报 - * */ - public void ttsForVoiceCheckout(){ + * 语音查询出行动态 TTS播报 + * */ + public void ttsForVoiceCheckout() { if (mV2XHistoryScenarioData.size() > 0) { AIAssist.getInstance(V2XUtils.getApp()). speakTTSVoice("为您找到以下动态请查看", null); From ac83f76e73e9dddfe34d63ecbb99d1855aea4036 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 26 Nov 2020 17:36:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[add]=20=E7=82=B9=E5=87=BB.9=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=B7=BB=E5=8A=A0F=E8=BD=A6=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_ext_shadow_bkg_pressed_light.9.png | Bin 0 -> 4253 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_shadow_bkg_pressed_light.9.png diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_shadow_bkg_pressed_light.9.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_shadow_bkg_pressed_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..1cac08b97c5a7b00c4b65b0b5dc0fb4f56ede0c4 GIT binary patch literal 4253 zcmXw7dpwix8#aeI%^^mNZ%E0xVKgi`hS=t?NlP_fhZ?CZB`eh|bZ|;KnPXy`g_J`{ zF@zFPb6nD#rXe``}^bF`}yp1Klgpz*L6M5{e0dlJ{WfeIhdT7n3#g6hpQj( zP7^&cVBmLh9WEm#rX1?&>V%8sf6c`n4ce>L>Oz=o$n7Dac{ikVeRg~}DKRaRK_|pZ z$_=`@>8eN-l|H+AV*B~O zIb0Zb;ll|?k(z#DA zIzPMHF0L+L4#4iwd+T?{Ie4&C4X3o#^#g6;@~z6JpwIDAtH+(eY+`<`teY4-y7W?TvR)kzL8{75_Rt2$(_goq}zg&A>n4mjbhpM!OFw#!pX@) zL4kqG!L>oZK2J|iKes-*W^XVgU(c9=hp$I}Yi#cX*V^QEs$xZ&Uf20i`$ z_n?I{H*f7!YBP3l?wzYG>Zm0wFv^V29Xq%!KQrL9m6g?OBjK69@y%hn_0N69ezoF} z-%eGAOK$PJ^2jfLcYtv-h?fxd@4us}6*3>CJbn=cG&jN?bK!MKko48A$$ha~uE8C( zJ!D`IFSU3Yh-0bza6(>XO`K89{jy5AZdsU4d z=IIAneW;|Zz2(yv1m2*;z!VCF$Z}xu(#=gq7pQ@Zn!R^H@LP+lLyz%G^)sVc7X&MCf}vaxA;TuzWj!a-BIt;$Y)Pf z8;Ed+^ekjfaS2 zuO==LZU~1$6xDYJ`;B}G&D^e_enu-kyCA`)dUI6?e)lQD8>iQnhsKD7cJER9)#Wh^ zK4L$#2Xn2i{~=43k!~e6<)Tpk}S}8EFWu&K7 z{bb6Hj%q03me(m*F1u5)U}>dWop*@}`+jW45<=03K-e%D6_f|QpJL1Cf7tc#L04zz za~k2+gQ?hyyh0lTSiDm=3Qf)ncZo`<8_KZ_cgkQI-fkCI=0C2en2RWws-o$m{h}hG zf32-xBlDOnDx*g0MqqG|aWnT_A$*9+j1V%IY{iLt8%k}uHy(P2LfcSbCrUl_ckHm; zfaJf?qY?75jc>o6l)$@7Uczg!4;1@-MtAZ;8LW9etC7~-7urZJQCRN5k4MjBMQRn; z9TXsXh0F6}*yffspGCyrB&q20mAad{Ra=iOVmXZ38rM^F?g$^}A4Pk2{79Zb0}4%B znP8USm57XX3C<#V_o*&x>pe)kMs9-X=``#Ufg6+zCygtCrPm3EkK9`m4WD`7^UK~ z|E#z{g}v3T6SL$BLLM|~ek0-kwkZJ#(2O&;P2c&3Xdr@9k4k-T`)+q&wO*OAJsE*j z-J93i%aIJ6@`#@b<+KM-fWNSLt?mcz#NZ#dA|D47QyEVd5avgY+Bc~}{c`NA@Js3< zG})|q?S?OsMRw=S{sgfX5YyihPA7ep410a%pR*m%zd@7_7;ZiI@wTBFODTZ9d4N}L z&u817r&C#20OA#UY-V^$NfYs24(UE%k|8QAe7bz>xz?i#{@YzeU=HOaY1U>>HKhvF zi#pVR6qHF4yQ%xYzZ}H!7z!$qL`a$&hFG+iO*!8*P!dt|f(nb%0_i+_ME(UH{zzbo z8lM5Ybs2-r;g8pX*i^>lMMUhyba9t$hQc8N^Xfe+BX$vS@_5qX4!`VnH&Nlkc}Zuq zJ;UIp%Rxf_n?llP2T!1Xm|pumRIj}XPZDKJErL5lWG>+Vj(~hnUC&b$?c-r-)>u_a zUeb)Dmw`rptUJwZ=^(uAbV zoxJX|K0RX56@utLtC5Qc9H|t<&du*{&DNSxfG)9?_z=}pc^Y9CV=3f zWAJltjL-+QXh1Xqn^|Mkku~}UD4@SHF6sWzei5NBdCMI1%wKWPd zi~K`ydj4JRKy;!Jkn(C5FM*@rAO!!HevT~X(!0&Je3B{Z$OM~dV=X(`SLv5?z+9vN zu$y%xyw52lZL9n(rE#7c_D3VnMJw|Vl)b&yT7%f}1u5zJ!Lz{P9oVr5U-M$mG@Vee zV%+>`z&pqDTKmU*j)z2?KmV&CD_(RL1kC-6%22-P+3s*in*8gQ8Z!On>xp~-=rFJ) z`GG{ZYjSe(gFBH!^5h!lC~W=9Yb%A06V`tVzh`+m?qfxSaQsSwuw2bO6KP1|DH|Lwq2lDT?b0MK`ERziD!4fsK<7dXGcbs zQ%;nf{w|l(IG#L{7_;OK6v<+Z5TGGfDX;nL#Kgp1*^${nV~rT@!#N22@jo3K{{fTh zfvE$q-}I}4QDB31H29T3F1h0dQ`! zHV`SA<4dnzy?U_u!dOU(8`(ymJP<3@qbfKx3=GR4Dh#xVU(OId2{QjZ9OUJm(?qWv z+^9{Gt{p6IZEMSCX`TOj1X^;v>j-scmZs#rv#-ab)^7X1Sm?cDV(PvJ}7Oj8V zT3Z#ln}_;Q=n*PIJ@Au3{<=oNil8Y`UivcM$A3D)e>2jFBVlc6ZGEcaCvYG_Gg-kj z()%{g`Ukb!tluT_t7yQzuQPW%VJN-n#wp)F<4uFe$FclMo*gY$V-z8eXEJTFow=H1 z@4&N}I^&)iv&KMM23Y;n(U*|lFM{-Y3X41=3be>^cvf*(mJY4gy7V4)gw>T)e3D&1Riro z!w3OdsL40E_A>W=zGtvrZN>7K$nf!`D?bXv6rz0h?<}Cu#~2k)ZcQXi&W$v8(PsD2 zcHn^_7(<20K}%N-RDR#oO*Wg#fF1$v2!vZ3Q9i5Y2cCZ0I_J;;L;+Wmle3>YU*Fz- zVX%~{i_nYEr}MmG^E_I2EgIy(baZw>LRODoruL!Gx2Z5OVRdAG`MJ(g%A>xR@i*cO zU9w%gbovx}$>R9Tiz}*Kjav0G${(zvycZFTRL0XQXPbULk6RdjHK{_ZXcuJE?FT@7 zR^No;L{C+2r&g{i{bTp7W9dtOgF@M~-J0;3ICJKK&+jCuGans$+o%k?wG-=IYl+1x zA+>vo7rX-Vb+8!B`L@!mefHuIye8_z4;2QE{El!-ev>`Ne~GGXq@4JvB-FxtCweO6 zT)?;WS@!~;z}?DlT-fx>uXKYVH|nk+j=qu7@MPnZJ}5!&k#6vvpU=PR`M^z8;DKRt z4yj%w=N^NNu`#-|BpJtMnay(76R-4TDp4u3)C5pVlchIJ)0sPMsKW4xjT3`GbwwHA zxOE&*%dLQ10XZX{X@bz3^I4h)$+%QWHzq_r>AG5f;h9a{+o#2#u?4GI$1%FQWhY52 z__C>ohJie8SHE(6sB&39rYg;x80Sr9b}u)L$zMynOiu{D9xnVie`zYlc4Sgp)gKki-nyptdSJm#qZ$ x@GAs?*yqiUMHw32<&G<&UB28kpKbdMvIw8+O_Lmq06sg2dAea-%bkhz{{es^5d;7L literal 0 HcmV?d00001 From 0000714a7a6d86b31701c13fafdbb99b118922ec Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 26 Nov 2020 18:23:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[add]=20=E8=BD=A6=E5=8F=8B=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=8F=B3=E4=BE=A7UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...selector_service_car_pannel_detials_light.xml | 6 ------ .../service_car_panel_call_normal_light.png} | Bin .../service_car_panel_details_normal_light.png} | Bin .../service_car_panel_details_pressed_light.png} | Bin .../service_car_pannel_call_pressed_light.png | Bin .../selector_service_car_panel_call_light.xml} | 4 ++-- .../selector_service_car_panel_details_light.xml | 6 ++++++ .../service_car_panel_call_normal_light.png | Bin 0 -> 3236 bytes .../service_car_panel_details_normal_light.png | Bin 0 -> 3056 bytes .../service_car_panel_details_pressed_light.png | Bin 0 -> 2986 bytes .../service_car_pannel_call_pressed_light.png | Bin 0 -> 3181 bytes 11 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_detials_light.xml rename skin/mogo-skin-light/src/main/{module-common-res/drawable-xhdpi/service_car_pannel_call_nomal_light.png => module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png} (100%) rename skin/mogo-skin-light/src/main/{module-common-res/drawable-xhdpi/service_car_pannel_detials_nomal_light.png => module-services-res/drawable-xhdpi/service_car_panel_details_normal_light.png} (100%) rename skin/mogo-skin-light/src/main/{module-common-res/drawable-xhdpi/service_car_pannel_detials_pressed_light.png => module-services-res/drawable-xhdpi/service_car_panel_details_pressed_light.png} (100%) rename skin/mogo-skin-light/src/main/{module-common-res => module-services-res}/drawable-xhdpi/service_car_pannel_call_pressed_light.png (100%) rename skin/mogo-skin-light/src/main/{module-common-res/drawable/selector_service_car_pannel_call_light.xml => module-services-res/drawable/selector_service_car_panel_call_light.xml} (69%) create mode 100644 skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_details_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_normal_light.png create mode 100644 skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_details_normal_light.png create mode 100644 skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_details_pressed_light.png create mode 100644 skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_pannel_call_pressed_light.png diff --git a/skin/mogo-skin-light/src/main/module-common-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 deleted file mode 100644 index 70f871f8a9..0000000000 --- a/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_detials_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_call_nomal_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_call_nomal_light.png rename to skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_detials_nomal_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_details_normal_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_detials_nomal_light.png rename to skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_details_normal_light.png diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_detials_pressed_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_details_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_detials_pressed_light.png rename to skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_details_pressed_light.png diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_pannel_call_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/service_car_pannel_call_pressed_light.png rename to skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_pannel_call_pressed_light.png diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_call_light.xml b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml similarity index 69% rename from skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_call_light.xml rename to skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml index 2c36033d92..980f940645 100644 --- a/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_service_car_pannel_call_light.xml +++ b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_details_light.xml b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_details_light.xml new file mode 100644 index 0000000000..3f12177da6 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_details_light.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_normal_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_normal_light.png new file mode 100644 index 0000000000000000000000000000000000000000..a37dc6a948f5cece381ce060b9d640019a9857b2 GIT binary patch literal 3236 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 literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_pannel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_pannel_call_pressed_light.png new file mode 100644 index 0000000000000000000000000000000000000000..87bedfbda0eab27a43097bc2d317f4e1292e32df GIT binary patch literal 3181 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 TQ Date: Thu, 26 Nov 2020 18:25:01 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...png => service_car_panel_call_pressed_light.png} | Bin .../selector_service_car_panel_call_light.xml | 2 +- ...png => service_car_panel_call_pressed_light.png} | Bin 3 files changed, 1 insertion(+), 1 deletion(-) rename skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/{service_car_pannel_call_pressed_light.png => service_car_panel_call_pressed_light.png} (100%) rename skin/mogo-skin-light/src/main/module-services-res/drawable/{service_car_pannel_call_pressed_light.png => service_car_panel_call_pressed_light.png} (100%) diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_pannel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_pannel_call_pressed_light.png rename to skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml index 980f940645..a0367b590f 100644 --- a/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml +++ b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_pannel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_pannel_call_pressed_light.png rename to skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png