From 9c73d6b3c11d7e1635414f3996a29178b15c2393 Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Mon, 24 Feb 2020 14:40:08 +0800 Subject: [PATCH] UI-382 --- .../res/drawable-ldpi/ic_amap_navi_cursor.png | Bin 0 -> 16136 bytes modules/mogo-module-search/build.gradle | 2 ++ .../mogo/module/navi/manager/NaviManager.kt | 12 +++++-- .../navi/ui/search/ChoosePathFragment.kt | 24 ++++++++++--- .../mogo/module/navi/uitls/BitmapUtils.java | 15 ++++++-- .../res/layout/fragment_search_category.xml | 32 ++++++++++++++++++ .../main/res/mipmap-ldpi/icon_path_fail.png | Bin 0 -> 3753 bytes .../main/res/mipmap-xhdpi/icon_path_fail.png | Bin 0 -> 8648 bytes 8 files changed, 75 insertions(+), 10 deletions(-) create mode 100644 libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_amap_navi_cursor.png create mode 100755 modules/mogo-module-search/src/main/res/mipmap-ldpi/icon_path_fail.png create mode 100755 modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_path_fail.png diff --git a/libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_amap_navi_cursor.png b/libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_amap_navi_cursor.png new file mode 100644 index 0000000000000000000000000000000000000000..6957c2c84c78ac38719089548697f6a49b14844f GIT binary patch literal 16136 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 + "cancel" -> { SearchServiceHolder.fragmentManager .clearAll() } @@ -105,11 +106,17 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB mAdapter.setDatas(calculatedStrategies) mAdapter.selectTag = calculatedStrategies[0].tagId } - pb_path.visibility=View.GONE + pb_path.visibility = View.GONE + group_path.visibility = View.GONE + tv_navi_navi.text = getString(R.string.navi_to_there) } override fun onoCalculateFailed() { + group_path.visibility = View.VISIBLE + tv_navi_navi.text = "重试" + pb_path.visibility=View.GONE + } override fun onUpdateTraffic(traffic: MogoTraffic?) { @@ -165,7 +172,15 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB rv_search_result.adapter = mAdapter tv_navi_navi.setOnClickListener { - startNavi() + + if (group_path.visibility == View.VISIBLE) { + SearchServiceHolder.getNavi() + .naviTo(mogoTip) + pb_path.visibility=View.VISIBLE + group_path.visibility=View.GONE + } else { + startNavi() + } } SearchServiceHolder.getNavi() @@ -195,8 +210,7 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB AIAssist.getInstance(context) .registerUnWakeupCommand("startNavi", arrayOf(startNavi), this) AIAssist.getInstance(context) - .registerUnWakeupCommand("cancel", arrayOf("取消","退出","返回","退出导航","取消导航"), this) - + .registerUnWakeupCommand("cancel", arrayOf("取消", "退出", "返回", "退出导航", "取消导航"), this) } diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java index 08a9c0e10e..2ea9a43e0e 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java @@ -12,7 +12,8 @@ import androidx.core.content.ContextCompat; * 2020-01-13. */ public class BitmapUtils { - public static Bitmap createWaterMask(Context context, Bitmap src, String text, int textColor, int textSize) { + public static Bitmap createWaterMask(Context context, Bitmap src, String text, int textColor, + int textSize) { Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG); paint.setColor(ContextCompat.getColor(context, textColor)); paint.setTextSize(dp2px(context, textSize)); @@ -20,7 +21,6 @@ public class BitmapUtils { paint.setDither(true); // 获取跟清晰的图像采样 paint.setFilterBitmap(true);// 过滤一些 - int width = src.getWidth(); int height = src.getHeight(); //创建一个bitmap @@ -40,7 +40,16 @@ public class BitmapUtils { Bitmap ret = src.copy(config, true); //Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG); Canvas canvas = new Canvas(ret); - canvas.drawText(text, (width-bounds.width())/2.0F, (float) ( bounds.height()*1.8), paint); + + int i = Integer.parseInt(text); + if (i == 1) { + canvas.drawText(text, (width - bounds.width()*2) / 2.0F, (float) (bounds.height() * 1.8), + paint); + } else { + canvas.drawText(text, (width - bounds.width()) / 2.0F, (float) (bounds.height() * 1.8), + paint); + } + // 保存 //canvas.save(); //canvas.restore(); diff --git a/modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml b/modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml index 6721b99f25..7a451e6a5c 100644 --- a/modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml +++ b/modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml @@ -64,6 +64,38 @@ /> + + + + + + + + + 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 TmU47i00000NkvXXu0mjfWIRg_ literal 0 HcmV?d00001 diff --git a/modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_path_fail.png b/modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_path_fail.png new file mode 100755 index 0000000000000000000000000000000000000000..d3c2f3aaab47141de63234f7516237635c1e9b49 GIT binary patch literal 8648 zcmV;(AvfNMP)PyBf=NU{RCod1U45)wRh2*IzV~PWn>e5X;$!G2lA0Jl3E+eotR&M?3hIcXL-3Pi zVuH#9A_(O}XjKek5+(Wv_=O>YCC-t(k$t0mCY(vV{juxm(c9vde5*saplC@JO1#Q=%{En*gevc2d%C-Uur zxm_^t&9A%e1=U-`mm;%87+~+4-&~fx_~LpA?GsYwHL@!wSp3#Ov$>&xsfNeJ&_Z9D zeNbZCDzDqKqmJ5~f8h&Li?EFGv|2Q=^{&7E6ghT3D*^qBH1)N^1XeksU4#7s8C9Pr zK&R7rN#eXqj`Hv3*Ie`8!^Aw_x~(_Edyqb1vUAaq;+-xF5-9563k;bZzTlMt zyM_;oXMKUM*faLfP~ULI*AY|6^)`7{Um-{Liyn7A?-#7WQv7`8+G{_Pce^)Ap^l!< zq!tX@ANjuFE)Xg9ZaK9sAN$Hzz9(xN>t)`@f;70dapUC7)YKiaj?WmFkuQ)hpfgVH zSi$454O8-Ij*XSe9A0At_?1Fs5hFy(1b2Kr_Oxt^(zUG>B+04ujv1@&SeS_Mg z&Q24_@|Xnzd2Xdq=TlMH{KXe`^C!ozzy5)g-6-?()?j(oj!)0bd`*tzOQnE?AHM^9 z{pVz>_@cItl78L5fp%pwR+2Qf++-!IsU-4|dd3<8x%kpfVo(*KmW?mZHyXvar zr+dA-rJ$$7L1;((7%)2Z1#|`Q4IvioQ}aIgVf9n?etziqn1849$oTT*=gX1(7mqpW zJ!>^8PPFfB*syA**ZWU7ekY@_f$>LlWyeXwDFXy~P>fW={Jh_>6+GupotR5SU*_0U zsF815)KdO=zH6e>`KNs2#yS0lM%!3Sn$7HitFAgtj^z8Lu&<7H$<3+G%ZxMw&*gIt z+qCJ?xpE+1qRq{izVgbod9U}2QJRYtjR9);rUm7|6qL!l}^{wY*2Txsj<;NtjA4yTh`_RL42!_WhtjQN`ui`DVzK_GoMbL zPs`)r!tt+u_0E({YJTJfW3|c3yHA^oRn0dJ;yLxq^3TL*8=kS1;77&xfQ*&?9KKht z+$Zcu$zN=zrP1d~lSle2d!z>AnJZu8{z962L?!tefnV`lu}wh?t6$@CQHh4mC(rlg zV`Co}<(b@6+hk#;zVxM4^4*e$<(mci0Y;qxo?~3ab@QA9tsQP1RyP|H)n%7oWQ0=2x_THRpJ$U!Yn_>xcH0wd7bQvTx#!CQujkQ zcxvz7uSuGxD{w!6B5?>&01(4#p@MwiJn*0wUIm0Afz5i|ZlvJV52-5jo2)*AOpWAH zv4pEoE@!4j5x+>BoC@DBm+JS)lpIP$WayQIxN_!tu&I9 zyCTwn3!JELWR#Pt4s}5>A%nEI33nkL&BgE$;QIhA$onUGpxPW_xP!K?>}{)!t?VU&&TKIhq2G| z-G{GO@z&JOcqNbM{eS)I*R{D43|1TlXx&SMg%0$<<6Uo{%EK12rU5&QmiEK~wR`~r zm_)qlD)^+)0Gh-@t|4~jO-6UbBc|WaDR^nT@~momu_{`L*HapUmJeBqMH5!H zHdlC1g_jF43V|TV-15(TE*pExTU3NgJ~^2kCa7%g#EF7r3wAg{N@T6+v^h+|ik)PdC z5vcNpauGzTnnPZk|59uNprA)xQdO_R3%b-JtNi|U4SqSx*30qy zTC_o5NCtdU0W4C`gQ!v86->=3YhiDn+u+p?X~3}s=gw3=11^j==89NCJdxJmdr0~w z9_A@iUFHgE`2a-SCi`Um@+U9Q!vLqG)L=O}KLIHU!{U%a?gL;Tq*e!fYIr>Of{gyj zx5f8(v52Wa!aQ@Oe~2jq@9`NIsnr3W8Xgb6AftcsZShr4{%DQ$8yo!BOD}z0Z)Ro< zCUtkkH~|LbG|U`#_hQdq>T)c4irk7FeDL6EJx)ZR@8kw#&7#(+&=$0Az*cpH zwjCvZv?B$G;i*g7)(0^V6?15^9fVEW#gKm&JS z)D8Wb*ocdH#ZyJSDLDA)cHfViVh8tn@5T+3brl9s@^MAd8EIjJ>+A+`0@WQPd}w_p zzmi(Ko2DMT7(N;AkWnS^=$q8VGo-tIE&*>&^Y8WEgLuZ}hw7I9-*eBMz?Hz_YOvw6 zX#3f&O+pJII<&QOv*Gp2B1u-i6cT_G{;>K@G1>TEE%{4rPC#$R_rCDLNs^!*)xH2s zoK$xYn+|0(7jI-Bn}b0=q=2-1#RYc~X<<-No2`JpNtaUo5_1Q=9iKjU5Pt%{exPu! zp)pBVxOqKdAP#7$9hRC8Fp+qDe0UETKg1^wIw!;B7i&R$H^12OM{mcw_&*0T@-2Q0 zHZvsPpTXFzT4a9t0X?&WRUa@47LHiq;|^%xIbZP?u()7!K>-_uZ|bCH{ehrmo2d&w^LJABs67-clcpAci`Cohe}CA(O$j zky@GZ!JglrPU6F;#b}$4E^fhVtDlUIwV0>;(c5t;<}q66PzW{`w_Lp?Su6pD3xklBUOh^Y{LO`DI8SKT=vs~=;jiz)bF&VV5g+G-G&6h?J? zkjd$M%(xt}EBfhG-Pk$uq`IO7tZ7A8(fYeo=iH9gf{Khq(*lSh3jn{A)nWU1O3Bw5 z1R4F+sW4Z}ktg;3eEcaqJvq?~)B*URmW+qF&NhG9!7JqFRr1%c5W@o2J@Y6-z!f}~ zfEG$*v0zLR#xfu$h6;j=yr(P-sh>~X(-$a4o&RE{xH4D!45thl6}$z`Ul!nN#wDN? z44Q>*qJG74<&pXo2wY-C-ZxYxVnJmNSZok&NxgsX&li+&!S}!czcT2jiF*GLzhMVj z%*Zcn{<4F!tkhr@2?3F}4NzGq2z2b=T-29Il?5g8ab9p#X7LQ~^>NautW8)wn zcNPT+ipJ6>RLQGPxz`01DCYf8ea0x0v%)jEdH+M_KQmJ_m^;R=P`^Xs?g}ebiwiyk z%ST;f6J?1aDpvTK zIqocJw0&l^fEcWTxVVU*$%Qo7D$X)jQcPGr=DLLPAD0C1Pa2EAyHQsl%0jZ-<*_P5 zF#ZUun9^4$Aa){;Dd>_1#i-0b(=u&XUi*|It)lIUhl7h z8w55E%g=ZI@08jSO=2>wLIrb3A3rBQE3Q7}^rg(*(ZF+477)n!9IQz7vCgmQ0zjeLe~s80gv^*Pzx~Oe|20 zHuyGP@}zAYTYbx??4iq;Q@U;Di8WXGODFf>n+?y$5AR(Rx+-uC;@z(dw4TQ%?hy!n zZIb~(Hq^jk;;|=&y0k>5Gys(f?)0N=SP&K8&>vwe_59J>acM68rFl^X7Q3NfJn~3& z1&d{=38tW23{hX^D1(~v;yca1KAHD5JaywDbx)+*Y zi%p)oex8K|wZ+Er(Io^wg^?DOJm;;A#ezwj;p4*&oZdC~FaBYk`FIMS#I!v1tPH%3 z+2+Fh1Z+X`7k@j)$2*;!2g4DJ0OGMH0c!&c)g3_{WJDemw|ebUE7K`|LJVo2#8-#Z zDuS8%^{=yul`D&znk(itXWBAGxhE3oQp+E`?fgxaJt3P9LT*GJtjps(Hm6m zvC4-z!aRVt4_NkHJet9wJ17LLGV-vi8G0H(ho=g8q5B?qAlrBU{iXP0E)94U7e4-= z5Mzcv>QszHz&TLd!msf2k-seR$KZnvenTZJ@LAPv=4__=`Ay>BB<^T^lT)cx*4e(lyyIp+GU? z8wi=MN@c1A@cL{%sG7<}ix%wTY7PzY`cNw@g8}qdWSx{*%H-brhf06B$PH~nJeaqG zvC(H8-eS!kJw+~zJ$vqg3!aq(lD}bS3otUzW`u^O3O=&G#Rf1>`OC(5?$|r-(7zvr z&!UUb>uuN72&YXiXtEi>Y#4$afB|ax))@2+YWV>zqc_jUng&wl*l_$QO`?<^q@C@>)MB_kr$&|&R| z)vs|`5-FZE+w&oUgBh_ z$YQJk2U-^}oD6ya&jb>A+E`4>bKXX@FHJul`Cu~PB@_=w}R5V#S~tB2MT_%=Pwn#3q7>?l^To*`LyUZ zt6+Iu!O#gWBn=)^U*tjMg(i?HkB<-`6UvVhNmU&e8L-h8^uRai3l;|bD>h`|#duX| z(1kVySfeKK7Hj?z*LQvJl?ESo*IoE?wA)ZL3{uMvEU4Hu6~JOBkBba#qEOg@r@gSs zgVv4^BO9u*ij47r9(?-gT2l%!Z}lw?9o%z}rw;t83_9{c+@zXIkVSo+Hh2LT61+yq zUu?I9-UZZxR2mF%r_wp-N`hu?dg_n4hXm_AzQDB(H|6Ta+Z-4u< zvZXFiT?C9_3xHb{_9?U=Gbsm+dNQ;<;$RGxhfD^26IW%Tx9?ZK%DPiiS?9||E^A*8fLF|QjlhU{Gr#^zsp~}BEKK^h2@%ZC^w4sx?wV*80T_5=f zp2zQv0$bE59Kg7O=uV-m&Wv-RfFtXVisxfojQMBTZzg~G)5`y9VCc0+G$*CN7voH5 zdKVk@0>k42RCzbEiPFOg&SdAJk0~9nU7z_jS zl+RaC%Tv$FEYEqw2%ZBv7@*3_94QK>gS5CSU5V9%UsA>mu|O>!6g?hsNf8@(#!J5K zd=bJB`RDmdRqu4Jkgtt**Ckw%Nn%I@GA85$)_D=ed1C`R9i%}IGU|KE zIZ%uWzLBYdy9|2*sJV%+6tl^NaYCOlSw7Ain-Z2f>f2J^QqkWnU+!EHR2xaM!IO92 z{h}<%%Nr2}O|TfCCYczh*eVYS9OwiJUI!_r3yD(dk=Efu9r$sO2eo`qpf2Nsn6ij5 z3}bx=uULVqkARN|nFncYe8IQsNKdpkiFgLS$)c?UlkfWQhyP3H89atKSE4vlkyJQZ zBhN(LJe(s~20>mE05GwFJ$-`~)BP{Ia9^2+OkS<=oIY)1d=dwJh-!7X{Cxac7v?0^ z6?`L8aOzg`e|Ykqd;U>kiK$hCDJ01q3^f3aEn9Yh(A~NUo6tfanwSj^iQD8cCojbc z)bi0DexTcOFgDOOcti$O9(M2rpAN%fH--Z{j9_2Nd5-c&4?-`3v%+Q5wN-;*eEgkv z?vkGr_+(MJ0?sCFc{-~+<4`obQ)B_4$f77)#0;!DJp1XE<>@bC1$@N_Sao<_UvY+r z$6{KZ@yvDpg4aV2&uK2mL^ z=#Z9*&8THw2Pp7x6R7pgc%ZF3sJ!Tl{zX*81O~(5!xl2)Ss#{fnujf8RDQ1Wm)fHT zMeyyeLp2zXlka%Pm!(RNfY*Wq%A^NTB&{|qWC5bh(1rj@UMP|l)KJJ3n-myWwLn=xw z1hg$$Rc>kvb8JUcx1cZ}&*qDW3#AT^b4^9?@p+7tz1R2m9={1sPM}?#!wx%L-ZlTl zW2Ekza!c7|&wS`Zs}9V}JS>Vwb0vEtJtC#ppcv4j4EN-l=AmOpO5e|0TkvfQO1qT4 z&xdxTJ|3^1ng@>P?9Rr<&N%VsKd=7{Iy!5hvu-f(o?O5FGy(X96ygZnw+R?}O=DF1 zCftRRj~c(XmmRThd}87Q^4xuNwmFQ{U^sp1gCAU*O;6t^O~zmB=^v9ams+u@BNf4M z7r~du_x6=}H8K}>gje)a^9D-Ug#L*6Ps=;zb5Gp7S$@BD_G9D*!}XKrp8GNRdk{a8 zFM!6`6v)Zb37Z9q;pYo!|C-Vtb-wSZp7Z!#%g68ahn*+B*iH93oeNjqci)|q&6XmD zIT=r_U%ysX>`w(ue(oBn%5Xc{?>K)X`4ykCFP!wR6+DC>uMkcDbYXmb({`N8huAFQ zu<=*omAK?5GxkX^9~pJ$G9kvs`;jP~$%#>T_0Z z-aPAPuCLk9Uk7^tdyl~KiHS3$!Mm`UF-XIW65Yw%MWjX-Hgzu;TRigA1+L0~NnBE6 z8}*IMVsqY8s{`H-^({i$VV*M8Wh`~^$(KU%W#<`l*)kCs zM|?VuF*@Ta#y$CBDL_&lv}KToTE84!^)3}})4c53M<(+8{K@<8ANuRuY7}M3obF&k zBhV91IprT@Mcx#av+gKuq^w?0eUS&ns)jsJ%f}r-J?K!6)YwLSBLkiv^wp?O>;`|O z7(_?$0=2yAL5=_d4Lm*=xM`)-YCf6^cibG{=Vkn9-MV%14*Q3a(9uYWtGLb?=bD1@ z_Fg|VU+2@xMzyzCb-cshEuZUu^34y(Pyfy1XsYF$y8O#|=S}XPnz}<0Ji`Lly^EyG z>P6nYi`AV$nJCc~6a%}6G8MQB=bH3W^A4`{twi_ma{2b_@%P@_`ny7{!JXoQG#Eam z*!h!d*M3I6R=!bgYu{zN*j|mdyXBd9`N}O@z9)+Z8+zWyygY;JqDDf0w{`1xm#tXw zR_XSwy1hhEpH;ztJgD-9il8L3y7Xsd#IV$2fUmp&1bG-94`RwJPam+=`G9SBOx%jx zQG>PsPcjH)J&>u^L9i~41> z>Kz&~2+v!1d>_C1&GX-kbvhTXeDFd1gzAEiwzTnCrF97I>Y@7V8kWD9T-TF(lImDN_s^y%e@uxLwPMPU;FOp_| zR0{iA3+x+GX@FH0-Z#KE+~dX5f;-k7*k3rIz)m+ z+hALdXV$NO-QKCG^W<5*TI8!`=jdPL;|>DF@H@7Unrot=sU0p2eNJN7F3;BOM=o1- z?;AI7e!-wGN_I&!*jMhUv(8#|FwfCwH2mH2IzgJ#sT`sHh?S$4P4t-lUKWeI$?rZb z-*kUWR?b6WxBac#w$19tW<2&n-Y>}p`vN`rsZTBM{`t=*bvvDt$&; zR!D-ckvDEDq)GTEoOog2Kh5AjzU`6umvJwP<$s0WDZ6xMr`z4xdDEMoSown=>{sn2 aeEEOLa|HiZ-cYXq0000