From 30c83e3c5a6219b4a45d5a325615dc35c970f168 Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Wed, 25 Mar 2020 11:25:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B5=B7=E7=82=B9?= =?UTF-8?q?=EF=BC=8C=E7=BB=88=E7=82=B9=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/drawable-ldpi/ic_navi_start.png | Bin 2166 -> 2209 bytes .../main/res/drawable-ldpi/ic_navi_target.png | Bin 2140 -> 2179 bytes .../main/res/drawable/shape_round_gray.xml | 7 ++ .../main/res/layout/dialog_navi_notice.xml | 86 ++++++++---------- 4 files changed, 45 insertions(+), 48 deletions(-) mode change 100755 => 100644 libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_navi_start.png mode change 100755 => 100644 libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_navi_target.png create mode 100644 modules/mogo-module-extensions/src/main/res/drawable/shape_round_gray.xml diff --git a/libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_navi_start.png b/libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_navi_start.png old mode 100755 new mode 100644 index b2efbe3bf67a37e0b457fbf1cb20e6a6e5a0e5b2..32454791f84613e5a7e75d18a2e2346ea789b98d GIT binary patch literal 2209 zcmV;S2wwMzP)2nupv1H;UK!=)Sp3=G2z$1uRR-97!@^t_pYA-b>XSMT-L-~0Mc z_xJU@X3`|vuE~^NA*LYg5RV}25e|q)5snBaiZk=lcL5WF??VjZ*uNR9?G3woGZe*}PG{7eF8!ku5osoF!GPFZRC=sm0+IdIJjZxU?UA&7%*4j|NzD2W zD@%$W^Y?#JAku*;oXM7EZz^?iKGackHlj}q1T9CEkv>72^Rd;A+6UxWXVF-{M)=Yy zccQ7qEwxEu@Oiga^i#kQjR*`>GKj#keSD5uw2MY}o2P)o`)D!D2s0xLVN0{T!%$P?0Y}W6q(~%`UZ_rQCB0 zDZ8@y3soub^pqJ<8A;H{0AJVpoB94LeN9lW?=|Csw%#<3fNd#}JLppT2xifwa@9qcXvGgOBA)xLXBt?P!mAvF=G(D#vcR(}g*Ac1YD-Ad^k?k7G!qj!YyK4+dk zuDx~%jr{~-2AxG`nrxin#GgMiq2~`#W<^ZP4aOZ4!{cX^$?}x780W!E|WQep& z2Re-Yh)_hds*3nzXq!yz2f9rCK2zkYCfVE1LmFn$Ty&-BX1ct)uAN%(X=ef0LJTvw zHJ_;NO5*chP2;%nR)_6*4QZH7E83kdvq|+je^7cccz;J8>~Cifv=h3k;gm`OX_|U6 zcwxT+5>Y!|RSj|7RUjJZ_ir*}8E7`x(|hWOh)&Zt#ED244lEWFLmyG$#C#q4j+eQd-;#}Yi5C?gma^RP25b-y_~);_nfG)20(>PH}mFF+u=bKo}DM{Kws+lbvj zAj5`&b5ie@7ObHA-jj4`eQ0V~JTwVskw2Tz9ew)afom296eY{vsQdvQgxB-WNWEX2 zzmkfZM?drZn5E^8omS7qCI@#q<#_66V3DsDCdoEboCl5o7LlM$*&s6XtNJlUpyeb9U~h}`t@qV@S_WUrN{0HKVb+&b%W5`^NoqVS@V;P^oQpJ7DK z#3I+_otCXHO$J-|>$} zf>nh^mSx3CJYMi$O21I%(SmrW;%pH~3TNh)mA_khD^|KZKLId*$czztE?Mvr{e_rI zx03P1J@7x$t%<~g`uPN|es)P#bkUOQQTfx>EM7>3&8A-`e*aH#V~OPUNl*GqFrEHn jarn_x@SywLgvI?2YAAGa>?zEm00000NkvXXu0mjfG@)As literal 2166 zcmV-+2#NQJP)Px-FiAu~R9Fd}SZi!t#T7m?dw1>i3p;ikJEm3~ha@;5r70iie? zpi&9cA5}$FQKeE_LTRO_RBF`zKtl8dEe+5RQTHK3NGhl(3T_nA#tIM;69qqTVq$x} zws-HH>33%C?B47nOBieK%stO<&N*}Ly%uy8;}7~`!vf80QAFDW(JCU*rb)M9#vhFl z=`l_6ElKJhRaF1d*F^L5M>P-q%H!Ai+)aV@AJRlyNmJZu0EB_Svl%?GMa)7_RtPbm zg!k|_MdzRuD1W^okjM4AD}#XcYOVXMiHIjAz#D1n)$q%(r4R>YjCS8Iy5F{TimzpX zJm#P7Q(8R$^2Q z&p3NIAdfB#ttCG=3g=13tYp|E)(NqaTRSAqP>C7f=g5oQ@?cfZ|ClYEjLP~y3zSZx zKuG}&|2W5P=5+wxorw;*FS(LxDMmq{49(0~vo5c#4QI#A&{uZNvmdBr0H4mk$BVr) zCq4(pw)~dRvPunXqeghtC=*7MYXJD@2Cs=em1xeZMFhz zpP-woTj}>RZ_}_pWB4WQOQC9|UgD(!-K&(cwc^0Knbom=ZGMc7Ell7>(2m+J>WtUZ zZ>CStlvPHw*ke#UYi@EdmFE}z6!4HA zjrlQ^yC;thuMXkYw19$DX=`!ZPt$P5)`Jnk8^!lnr^o^z-Iy`%x22$@Ck(G%?GoQ&!(eu;q=6yO(`JK7lTA9$F($prE z(zA@%HkH3sHJZ~ZcAK;PLt z_AhH5EKY1*gk`zks8KJ_G)h{namvNBMklo=Vk%h3MdX8Qn#TNDnlj+5^W|07&@vqD z0G^h{>rmiH8p)<|HNpT~w%CtdqYkAQ^|V%lNYCbC04#`p0PV$|?V78qn&{0r?k7aY z(&N-Wb;hh4aiUnRJzh%>w5~TacNv3zD)2pfXbLq^5Bb2dLkgP!Ti#=%V zBf~G^4V)IUgXl2Ph}Y0hul+2YU6`WLOp0!;?=T`ma~J9L)QCBre42a|cb1D6+vJ@x zAWuk&#(M9oE+jf5{!6CGV!+q^xfl>5#OJb^a<{U`{tMz}kWYaVaRjL?hI z@6ibQ#P+7^s3+NMeui1$vUlWlnwqy=7-%BW`1p|W3C3W$(*tLZG)}AZ8JwP`T)2!l zD+%gt?4qNoQM!idOYC)PBVhO629#!EroueS}my0|LBSn9iJZ*XqM>rZ0 zDd@w7Sk3Z%T^lbMAnfz&r~mdKqJkF{tIV{*5rz^Hp_&s7ZwnpeZG{4+vYZl%RLbxD zZpEFCvY*@=TB3W&J`~t1`9@~n&RoOd*)*SUjy5E>j>;H4*YJ3bu3>|Hu}`;I2i4r) z|5krXN~@#DV;2+nS>mF=_ipVXViRYR$^1%#Qw9u(gg9GE@|MR}ZNK1jE(5~EyNCX| zHlwqzLZ#7Uz5@QLXy?giZw$0Jgl^PqHfl5rcU)-h3im=>jEUIh z=hpNcFC|qL2n+A{@1NJ^Jc;3s#P52^C9TE_G#)G8Ycm%_BNuGHW02z(P<);31UpZx% z6)qnc2;1pBzJI0fXAWa&pL_+LbG`((e{~t5(wD0S!e%zV@yF##XOH0jD4n^Z1iFy&oD}hm zhi?9=ePb%^vn2In0bxs@|Mzc~Vf#n$Y+A;r19dWt5A2Qq+;H!3Nlz7s9~%hU-8}eY s=R!8~92-f*6FU#xbkDg8{>rld4<`n0g;6Q?JOBUy07*qoM6N<$f<5>tEC2ui diff --git a/libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_navi_target.png b/libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_navi_target.png old mode 100755 new mode 100644 index 7ee0a97750ebcab4eb3768e19fca0625db90808d..8669793958e0880d352916a89f23e69cac029664 GIT binary patch literal 2179 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 FV1i$dStbAg literal 2140 zcmV-i2&4CjP)Px-7D+@wR9FeESZiz)RTMsV9=qKZfhu4t&s7mYVh|dl2C0P-E6AfL7Q*9~5EG1= zpazI&0fPkN9}*Lzzf=+=JQ^Shra%Mz!9#+`Dy z$;>@-&+EJAoO@<=1$AS{_3L|5Q`01n$k%A-k%j8j%10PuwL zytST`<>@SF5E+eVP(oAz)KUQYJ)Iq1%V^ieqge2WP5$fOJ&0w53oKPD-nn#VJ) zTT+Mx)~Z!iDMHDIE!5(aH!?<%pf$)bCMQFb+N3eF;>^s)&$(9 z?l`t|X$3UC4+`8*Iv7zzWOjJ%+D+QNAJy3M)jzBn~nL$NfQ@c;jO6Cr!P%;^A zu+>JkJvO{%%_$bKw498`*9AfN>zcsKz8%roR+cJ}VQEeB&(NeLPG`Q)BFNg^7(%>(6KxRCOk^1y(F zsKnX?ODOZMqJhfq;NxzN8l^z+LTKt#e_azT@4l-^ zcG}gxVH7h4t0j?`3=oEr&Xn_Tn5?2Ak}WOd963TZQsJIEM>3J1@N2IrRp;DE}CbVC0#eFLIx=Yq?sCv zK<-16CXsjR7P$=#6n^CuB^O7XEPcFJ9} zi0mxzXLcsbqB|_91ZizVSvin57+3 zsdok)NEueCK@@b<^``OBw1k*Cu`U+WynLHaDM)o;waPvoHnmtuZqv= z-=7?;G1$D>vndzH+c|xjTDNSWIDqLWs0ed<^nNuB3>NBOCx9$vUT4IJn_6rB;tO?j zz3bPt2~{H=dW8*;PF)>2I6(r9FN98;!|$Gf11WLsntCAyBY=8P>0m?LVff_W+9~i| zYFw+U<1g^O>{y}a86yRlZIcD#q2a@oGeTG8;_Ug>TZA_^#m}4}t_{98g}yCispF;=VptzR@+pgcCrpT7oPm-#sh05Q=+dcE@wSpx=;K+)>aj*z#ZJ|e}%6vELp zxS3&a0dmo{a_yWr;TNRhC8H6H5I}ue@ZERIRsRT^=DN7!ya|DPt-v!6?x;4J8t<|l zd5_}_%QfPmhw#og5)#o0BP9_W*D&fN3}AdEaLgM~)T)C*Rs+y8%AzT3+x$)9_Zq67 zH}8FXW2_5?REJXK`_d(qTQVIz23$M9{^T3zkSYh53RX?{?+VZ&!B zK;)uDc0+UX9te$3=j48`VKWB`9(bTseD#%+0)!u~%$d^%Q8|JFit=-p9Uu~VEiIpQ zaHWqIGr;MHXdM~G*he;Q{Fm+U=%Uk5Q86;%d9~p6RucFBcEhx+afKT5)yFj&)W~3xtI(&zdy~-zr=)5BWekYj@)r zjv8_NO9yP;d_0|6Mj$MF>D5=C2AI9re;=is%&`ybE+Ygd{{qCsfm^qpNC$$~vI1d& zi{<4b(U$ijE&cepJA;j*@c%J{m^i4aO8t<^q<=>stoYaT=_8P$eE{>Yu6$nCCnRIV z2yqo4CJf%b{S3=z8+QeS4b)AY`XoLn_rYnQZ!k-$V7MMfbV79J&fk3bEW}*{VH+39 z%b%cloFmgei%mXde^V$l;jyZ!jDO5@*6$V&R=zZC+T$_DsR5V)U5s(V!-2#5qh#QY z9p^jqvpshk2pjur%9KYFi9`*)CkC+rT_gCFcG0q|lEFXx@JBYM>3H`9gbme|l?`#F ztif-RA^Z}=^`|LBNp$z_Khrt7)7m`)VZ#?nO9#0^Y-ZY&a@J#e_FQE8UdI2QtQY7p S=;-GF0000 + + + + + diff --git a/modules/mogo-module-extensions/src/main/res/layout/dialog_navi_notice.xml b/modules/mogo-module-extensions/src/main/res/layout/dialog_navi_notice.xml index 9b5e0a7fa9..219a84d48b 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/dialog_navi_notice.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/dialog_navi_notice.xml @@ -1,58 +1,48 @@ - - + - + + + - - - - - - \ No newline at end of file From 326057e39d95269f99b4633e829474ef425c10e1 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Wed, 25 Mar 2020 13:54:40 +0800 Subject: [PATCH 2/6] opt --- .../src/main/java/com/mogo/module/service/MogoServices.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2112206b1c..65e4a298f7 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 @@ -440,7 +440,7 @@ public class MogoServices implements IMogoMapListener, } break; case MotionEvent.ACTION_UP: - mStatusManager.setUserInteractionStatus( TAG, true, true ); + restartAutoRefreshAtTime( ServiceConst.DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT ); break; } } From df4d78b0ef0778f3b64ebf42591472da9633bbaa Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Wed, 25 Mar 2020 16:26:53 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/drawable/shape_react_blue_grident.xml | 7 +++++-- .../src/main/res/drawable/shape_react_blue_grident.xml | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/res/drawable/shape_react_blue_grident.xml b/modules/mogo-module-extensions/src/main/res/drawable/shape_react_blue_grident.xml index 29d764182d..3c91cb81a9 100644 --- a/modules/mogo-module-extensions/src/main/res/drawable/shape_react_blue_grident.xml +++ b/modules/mogo-module-extensions/src/main/res/drawable/shape_react_blue_grident.xml @@ -1,11 +1,14 @@ - + - + diff --git a/modules/mogo-module-search/src/main/res/drawable/shape_react_blue_grident.xml b/modules/mogo-module-search/src/main/res/drawable/shape_react_blue_grident.xml index 804e5a8de3..88bff113e6 100644 --- a/modules/mogo-module-search/src/main/res/drawable/shape_react_blue_grident.xml +++ b/modules/mogo-module-search/src/main/res/drawable/shape_react_blue_grident.xml @@ -5,5 +5,10 @@ android:angle="180" android:endColor="#3E7FFC" android:startColor="#5CC1FF" /> + + + From 1d115dd9466ee6f9544f13465c2b6041f0c1f1a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 25 Mar 2020 18:39:37 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BA=86=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E8=BD=A6=E8=BE=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e93a3715c4..4ddd932e45 100644 --- a/gradle.properties +++ b/gradle.properties @@ -54,7 +54,7 @@ CARCHATTING_VERSION=1.0.2.2-SNAPSHOT # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.0.2.2-SNAPSHOT # 在线车辆F -MOGO_MODULE_ONLINECAR_VERSION=1.0.1-SNAPSHOT +MOGO_MODULE_ONLINECAR_VERSION=1.0.2-SNAPSHOT # v2x MOGO_MODULE_V2X_VERSION=1.0.3-SNAPSHOT # 媒体卡片 From d77b63e6fa9aaaaeb0c0b6f6ef8f4d1af097bd6b Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 26 Mar 2020 11:02:06 +0800 Subject: [PATCH 5/6] add navilisten api --- .idea/misc.xml | 2 +- gradle.properties | 36 ++++++++--------- .../impl/amap/navi/NaviListenerAdapter.java | 19 +++++---- .../com/mogo/map/navi/IMogoNaviListener2.java | 20 ++++++++++ .../map/navi/MogoNaviListenerHandler.java | 16 +++++++- .../module/main/cards/MogoModulesManager.java | 39 ++++++++++++++++++- 6 files changed, 104 insertions(+), 28 deletions(-) create mode 100644 libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNaviListener2.java diff --git a/.idea/misc.xml b/.idea/misc.xml index 707ee6e613..2dc54c489f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index e0da3af9ed..79610a7704 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,24 +27,24 @@ PASSWORD=xintai2018 RELEASE=false # 模块版本 ## 工程内模块 -MOGO_MODULE_SHARE_VERSION=1.0.2-SNAPSHOT -MOGO_COMMONS_VERSION=1.0.2-SNAPSHOT -MOGO_UTILS_VERSION=1.0.2-SNAPSHOT -MAP_AMAP_VERSION=1.0.2-SNAPSHOT -MOGO_MAP_VERSION=1.0.2-SNAPSHOT -MOGO_MAP_API_VERSION=1.0.2-SNAPSHOT -MOGO_MODULE_COMMON_VERSION=1.0.2-SNAPSHOT -MOGO_MODULE_MAIN_VERSION=1.0.2-SNAPSHOT -MOGO_MODULE_MAP_VERSION=1.0.2-SNAPSHOT -MOGO_SERVICE_VERSION=1.0.2-SNAPSHOT -MOGO_SERVICE_API_VERSION=1.0.2-SNAPSHOT -MOGO_MODULE_APPS_VERSION=1.0.2-SNAPSHOT -MOGO_CONNECTION_VERSION=1.0.2-SNAPSHOT -MOGO_MODULE_NAVI_VERSION=1.0.2-SNAPSHOT -MOGO_MODULE_SERVICE_VERSION=1.0.2-SNAPSHOT -MOGO_MODULE_EXTENSIONS_VERSION=1.0.2-SNAPSHOT -MOGO_MODULE_SEARCH_VERSION=1.0.2-SNAPSHOT -MOGO_MODULE_BACK_VERSION=1.0.2-SNAPSHOT +MOGO_MODULE_SHARE_VERSION=1.0.3-SNAPSHOT +MOGO_COMMONS_VERSION=1.0.3-SNAPSHOT +MOGO_UTILS_VERSION=1.0.3-SNAPSHOT +MAP_AMAP_VERSION=1.0.3-SNAPSHOT +MOGO_MAP_VERSION=1.0.3-SNAPSHOT +MOGO_MAP_API_VERSION=1.0.3-SNAPSHOT +MOGO_MODULE_COMMON_VERSION=1.0.3-SNAPSHOT +MOGO_MODULE_MAIN_VERSION=1.0.3-SNAPSHOT +MOGO_MODULE_MAP_VERSION=1.0.3-SNAPSHOT +MOGO_SERVICE_VERSION=1.0.3-SNAPSHOT +MOGO_SERVICE_API_VERSION=1.0.3-SNAPSHOT +MOGO_MODULE_APPS_VERSION=1.0.3-SNAPSHOT +MOGO_CONNECTION_VERSION=1.0.3-SNAPSHOT +MOGO_MODULE_NAVI_VERSION=1.0.3-SNAPSHOT +MOGO_MODULE_SERVICE_VERSION=1.0.3-SNAPSHOT +MOGO_MODULE_EXTENSIONS_VERSION=1.0.3-SNAPSHOT +MOGO_MODULE_SEARCH_VERSION=1.0.3-SNAPSHOT +MOGO_MODULE_BACK_VERSION=1.0.3-SNAPSHOT MOGO_MODULE_AUTHORIZE_VERSION=1.0.0-SNAPSHOT MOGO_MODULE_GUIDE_VERSION=1.0.0-SNAPSHOT diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java index b89eca72b5..d52c05fb59 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java @@ -171,24 +171,33 @@ public class NaviListenerAdapter extends AMapNaviListenerAdapter { @Override public void onEndEmulatorNavi() { - stopNaviDelay(); + stopNaviDelay( () -> { + MogoNaviListenerHandler.getInstance().onEndEmulatorNavi(); + } ); } @Override public void onArriveDestination() { - stopNaviDelay(); + stopNaviDelay( () -> { + MogoNaviListenerHandler.getInstance().onArriveDestination(); + } ); } /** * 避免导航结束语音播报被立刻打断的情况 + * + * @param after 停止后的行为 */ - private void stopNaviDelay() { + private void stopNaviDelay( Runnable after ) { UiThreadHandler.postDelayed( () -> { if ( TextUtils.isEmpty( mLastSpeakWord ) || !mLastSpeakWord.contains( "结束" ) ) { AIAssist.getInstance( mContext ).speakTTSVoice( "到达目的地附近，本次导航结束" ); } mLastSpeakWord = ""; stopNavi(); + if ( after != null ) { + after.run(); + } }, 5_000L ); } @@ -238,10 +247,6 @@ public class NaviListenerAdapter extends AMapNaviListenerAdapter { if ( mNaviOverlayHelper != null ) { mNaviOverlayHelper.handleClickedPolyline( polyline, isNaviing() ); mAMapNavi.selectRouteId( mNaviOverlayHelper.getSelectedPathId() ); -// if ( isNaviing() ) { -// mAMapNavi.stopNavi(); -// mAMapNavi.startNavi( mClient.isRealNavi() ? NaviType.GPS : NaviType.EMULATOR ); -// } } } diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNaviListener2.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNaviListener2.java new file mode 100644 index 0000000000..831d5d77a0 --- /dev/null +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNaviListener2.java @@ -0,0 +1,20 @@ +package com.mogo.map.navi; + +/** + * @author congtaowang + * @since 2019-12-25 + *

+ * 导航监听:区分导航结束 + */ +public interface IMogoNaviListener2 extends IMogoNaviListener { + + /** + * 实际导航结束 + */ + void onArriveDestination(); + + /** + * 模拟导航结束 + */ + void onEndEmulatorNavi(); +} diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoNaviListenerHandler.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoNaviListenerHandler.java index 7cc2f00e1a..042db244bc 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoNaviListenerHandler.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoNaviListenerHandler.java @@ -6,7 +6,7 @@ package com.mogo.map.navi; *

* 地图监听注册管理 */ -public class MogoNaviListenerHandler implements IMogoNaviListener, IMogoNaviListenerRegister, IMogoAimlessModeListener { +public class MogoNaviListenerHandler implements IMogoNaviListener2, IMogoNaviListenerRegister, IMogoAimlessModeListener { private static volatile MogoNaviListenerHandler sInstance; @@ -128,4 +128,18 @@ public class MogoNaviListenerHandler implements IMogoNaviListener, IMogoNaviList mAimlessDelegateListener.onUpdateCongestion( info ); } } + + @Override + public void onArriveDestination() { + if ( mDelegateListener instanceof IMogoNaviListener2 ) { + ( ( IMogoNaviListener2 ) mDelegateListener ).onArriveDestination(); + } + } + + @Override + public void onEndEmulatorNavi() { + if ( mDelegateListener instanceof IMogoNaviListener2 ) { + ( ( IMogoNaviListener2 ) mDelegateListener ).onEndEmulatorNavi(); + } + } } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java index b932dcf256..961aafd349 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java @@ -19,6 +19,7 @@ import com.mogo.map.model.MogoPoi; import com.mogo.map.navi.IMogoAimlessModeListener; import com.mogo.map.navi.IMogoCarLocationChangedListener; import com.mogo.map.navi.IMogoNaviListener; +import com.mogo.map.navi.IMogoNaviListener2; import com.mogo.map.navi.MogoCongestionInfo; import com.mogo.map.navi.MogoNaviInfo; import com.mogo.map.navi.MogoTraffic; @@ -59,7 +60,7 @@ import java.util.Map; */ public class MogoModulesManager implements MogoModulesHandler, IMogoMapListener, - IMogoNaviListener, + IMogoNaviListener2, IMogoLocationListener, IMogoIntentListener { @@ -671,6 +672,42 @@ public class MogoModulesManager implements MogoModulesHandler, } } + @Override + public void onArriveDestination() { + Iterator< IMogoNaviListener > iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners(); + if ( iterator == null ) { + return; + } + while ( iterator.hasNext() ) { + IMogoNaviListener listener = iterator.next(); + if ( listener instanceof IMogoNaviListener2 ) { + try { + ( ( IMogoNaviListener2 ) listener ).onArriveDestination(); + } catch ( Exception e ) { + Logger.e( TAG, e, "error." ); + } + } + } + } + + @Override + public void onEndEmulatorNavi() { + Iterator< IMogoNaviListener > iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners(); + if ( iterator == null ) { + return; + } + while ( iterator.hasNext() ) { + IMogoNaviListener listener = iterator.next(); + if ( listener instanceof IMogoNaviListener2 ) { + try { + ( ( IMogoNaviListener2 ) listener ).onEndEmulatorNavi(); + } catch ( Exception e ) { + Logger.e( TAG, e, "error." ); + } + } + } + } + @Override public String getCurrentModuleName() { return mEnableModuleName; From fe33b9521c75683ab341e1e2839a6730965c6b16 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 26 Mar 2020 11:14:31 +0800 Subject: [PATCH 6/6] add voice control --- .../com/mogo/module/extensions/ExtensionsModuleConst.java | 1 + .../mogo/module/extensions/entrance/EntrancePresenter.java | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java index 10bc476db0..aab4fbee5b 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java @@ -36,6 +36,7 @@ public class ExtensionsModuleConst { //唤醒指令 //分享路况/上报路况/上报拥堵/上报交通检查/上报封路 唤醒 public static final String UPLOAD_ROAD_CONDITION_AWAKEN = "com.zhidao.pathfinder.report.roadCondition"; + public static final String UPLOAD_ROAD_CONDITION = "command_upload_roadcondition"; //关闭分享框 唤醒 public static final String SHARE_DIALOG_CLOSE = "com.zhidao.share.close"; // 两次未回复关闭分享对话框 diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java index 93465a16f1..00d5b691a4 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java @@ -125,6 +125,8 @@ public class EntrancePresenter extends Presenter { * 注册唤醒命令 */ private void registerAwakeVoice() { + mogoIntentManager.registerIntentListener(ExtensionsModuleConst.UPLOAD_ROAD_CONDITION, mogoIntentListener); + mogoIntentManager.registerIntentListener(ExtensionsModuleConst.GO_TO_SHARE, mogoIntentListener); mogoIntentManager.registerIntentListener(ExtensionsModuleConst.SHARE_DIALOG_CLOSE, mogoIntentListener); mogoIntentManager.registerIntentListener(ExtensionsModuleConst.UPLOAD_ROAD_CONDITION_AWAKEN, mogoIntentListener); @@ -206,6 +208,8 @@ public class EntrancePresenter extends Presenter { ShareControl.getInstance(mContext).dismissDialog(); Logger.d(TAG, "mogoIntentListener 两次未回复关闭对话框"); } + } else if (intentStr.equals(ExtensionsModuleConst.UPLOAD_ROAD_CONDITION)) { //上报路况 免唤醒 --ok + uploadRoadCondition(); } } }; @@ -244,7 +248,8 @@ public class EntrancePresenter extends Presenter { Log.d(TAG, "handleNeedAuthorizeCmd 上报封路 ----> "); uploadRoadClosed(); } else if (mVoiceCmdType.equals(ExtensionsModuleConst.UPLOAD_ROAD_BLOCK) - || mVoiceCmdType.equals(ExtensionsModuleConst.UPLOAD_ROAD_CONDITION_AWAKEN)) { //上报拥堵, 分享路况, 上报路况 + || mVoiceCmdType.equals(ExtensionsModuleConst.UPLOAD_ROAD_CONDITION_AWAKEN) + || mVoiceCmdType.equals(ExtensionsModuleConst.UPLOAD_ROAD_CONDITION)) { //上报拥堵, 分享路况, 上报路况 Log.d(TAG, "handleNeedAuthorizeCmd 上报路况 ----> "); uploadRoadCondition(); }