From 1880d3dda281dd7d645abb442e8a42cef22b7845 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Thu, 3 Sep 2020 14:59:01 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=92=8C=E5=A4=B1=E8=B4=A5tip=E7=9A=84?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/share/manager/UploadHelper.kt | 3 +++ .../drawable-ldpi/module_share_upload_fail.png | Bin 0 -> 2696 bytes .../module_share_upload_success.png | Bin 0 -> 2580 bytes .../drawable-mdpi/module_share_upload_fail.png | Bin 0 -> 2696 bytes .../module_share_upload_success.png | Bin 0 -> 2580 bytes .../drawable-xhdpi/module_share_upload_fail.png | Bin 0 -> 10737 bytes .../module_share_upload_success.png | Bin 0 -> 11136 bytes .../module/tanlu/fragment/TanluListWindow.java | 4 ++-- .../drawable-ldpi/module_tanlu_upload_fail.png | Bin 0 -> 2696 bytes .../module_tanlu_upload_success.png | Bin 0 -> 2580 bytes .../drawable-mdpi/module_tanlu_upload_fail.png | Bin 0 -> 2696 bytes .../module_tanlu_upload_success.png | Bin 0 -> 2580 bytes .../drawable-xhdpi/module_tanlu_upload_fail.png | Bin 0 -> 10737 bytes .../module_tanlu_upload_success.png | Bin 0 -> 11136 bytes 14 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 modules/mogo-module-share/src/main/res/drawable-ldpi/module_share_upload_fail.png create mode 100644 modules/mogo-module-share/src/main/res/drawable-ldpi/module_share_upload_success.png create mode 100644 modules/mogo-module-share/src/main/res/drawable-mdpi/module_share_upload_fail.png create mode 100644 modules/mogo-module-share/src/main/res/drawable-mdpi/module_share_upload_success.png create mode 100644 modules/mogo-module-share/src/main/res/drawable-xhdpi/module_share_upload_fail.png create mode 100644 modules/mogo-module-share/src/main/res/drawable-xhdpi/module_share_upload_success.png create mode 100644 modules/mogo-module-tanlu/src/main/res/drawable-ldpi/module_tanlu_upload_fail.png create mode 100644 modules/mogo-module-tanlu/src/main/res/drawable-ldpi/module_tanlu_upload_success.png create mode 100644 modules/mogo-module-tanlu/src/main/res/drawable-mdpi/module_tanlu_upload_fail.png create mode 100644 modules/mogo-module-tanlu/src/main/res/drawable-mdpi/module_tanlu_upload_success.png create mode 100644 modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/module_tanlu_upload_fail.png create mode 100644 modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/module_tanlu_upload_success.png diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt index 342cfb8c97..fc6b28db4f 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt @@ -6,10 +6,12 @@ import com.mogo.commons.debug.DebugConfig import com.mogo.commons.voice.AIAssist import com.mogo.map.MogoLatLng import com.mogo.map.location.MogoLocation +import com.mogo.module.share.R import com.mogo.module.share.ShareControl import com.mogo.module.share.dialog.LaucherShareDialog import com.mogo.service.tanlu.TanluUploadParams import com.mogo.utils.NetworkUtils +import com.mogo.utils.TipDrawable import com.mogo.utils.TipToast import com.mogo.utils.logger.Logger @@ -42,6 +44,7 @@ object UploadHelper { }else{ // 没网就直接提示失败 AIAssist.getInstance(context).speakTTSVoice("分享失败，请检查网络") + TipToast.tip("分享失败，请检查网络", TipDrawable(context.resources.getDrawable(R.drawable.module_share_upload_fail))) } } } diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/module_share_upload_fail.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/module_share_upload_fail.png new file mode 100644 index 0000000000000000000000000000000000000000..f11f2cb3cd02b4ad7a6b16e6b78f160993abf652 GIT binary patch literal 2696 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/module_share_upload_success.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/module_share_upload_success.png new file mode 100644 index 0000000000000000000000000000000000000000..1ad96fc40f6196e3f489f038819fc1d708e53225 GIT binary patch literal 11136 zcmV-`D}U69P)PyLI!Q!9RCoc+eF>ahRhj3xZ>g$mm4$?a5CQ=K5orhkY-|v>5jR|ZD%!0MV2Ft< zj@a!oGdhFg3@(k^uY0Da?df*yu^SrN27y*=6a!?>pz7yS#gEIoF_kpm*Q*|9w}-)U|2aoM$I7;k>O+q*GH> zm)7{HxwMK;T61ffn%!+@og=bAVck=YL#E~&KDBC9YbuFi)g6LCJ}|1Eaw$h zR+3c(LYk_;B3#oNJrIVq%ivpkZ#uQN@PVFv-%kO7)`*#~v|V){TYj|Lv}`fx%C8}| zLZOYh49|} z;*FNgiv)ef!w@kWh1=Gio2(#C z5G6|yX7LQK?Qeajpb-V8_TMgiO~O3qEjz$4Vahcum-lpxU%IF5myMWVYHS=C7<{C? zz10E~D2xf8Ew8vB$O)utCq_~c1~V3vHiCcI13$+gXc2`6wmqjQWm;n;rj>orU;6XA zMXB({o!fN`ydWW%kj*JGLLY^$!2z`n!8b3&yg^;_mcMZ9F~K9Vch(QSmljN$mLD1# zaQ}4jDKcBXu<981shzun0_7@`lP)=P^REPwK!N4Og~WXV6VHTc*^HLD@rLC`eU9x!ipw9oua@x87MiZus;6eQ5zOEh}N_X^hyRN}OY}h*3k^r{xDPyvq zIDekI>6FuFv@?ytY4ywP+ccBjD2++n-mvu9#%2Rg=<24lx>Ry^o%cr>o1ybzOzzD) zcea`^jj+UsW!><`lug5QfTWW^9zM&bD(>g6yI5??7gO=zj_tx!tFuFF4)Z|hXz{@j z_uwV()P;EMZ#L7l+Qt+x#ZU`P%w!N>w_>?Fx>RsC?CEra)k=uKqMko=@b=`g?vC-_ zbapm3%JD;ItaYPMeD#x$XHs?DF*ICs`zFTSH}-Xl;h+y31V$%wdwN}IY+~Zqn8fEZ zf;{5$9)HvwRV=#io_G=*O}VWjBZ7F}{ct+Y5OcG_98#tg z*?jxrR`;Fm12ZDdgKWb>EDP8pXP=kYu9cgqZSdTN8EOstzJaMJ_nod@?fVUj0OCzp za!+~k_jlb$U}2iF^TvlBNOw<7vYE*_ku}P39x)vz*eDOVCBOQo|C;W{AesT26^$Iz zDESH2#X=j|9H_U!R0B(EVl+3Ugq49X(lfLSi?o`j@P@%a{I3b^7 zLz~aB&}nskAtu{#~LGOW(2xXegzqLG(1|Fa-ZF^ zPshOP8GjseztDZ~VBHXuWUx>_a>m*2{+FNS=5bF+y6}{5hCj2rL&kw|gmgmA5E-YX=~`V_(1h~?3em8Ik2dG= z>$f~1hW=vB32qLKCdB8Ki@R#;MQZ?G;weou}SO@I;BiJ9^)<&$ux}_xV*T zHOISsj!ho5AkFm)W8I!kcZ5=}bQDyVABz|6v=AXLc5^ zz5m{4J8Kp38t2dy1@#O$mPl|K(*Dtp2b%#oJ>7G`MW-H>BxlXz1p$;<=NJb?$-d4l zv0>^5FYLtSm3Q1$8!i@-2^_}=Du!*S{g^l$l_eef-1e(J+R#ozV(ety-8U_)_D%Jt zl}b{rRP=BTPAWi}8J1{!t2FJ$S z1X5MOhj}k!>1aU)7GR}pEtj#zr8p$1)hcQA(pyeC?UvZ);j|A6{DyS=l&0~iXQyy_ z^w{1#0KkhuetP?%U{8#4m^_b5hMZ!77idK3`O6U0LY&);S1Lcc^UQUZkTsifNbuL= zsOG@r=vX%nmbc?fR)G*=W6(Cg%z0*>d16L}L6YtR;StX&Tr8SMYhSwiobx~JRT@?^ zg6A<_GCA7ua9f+>Q41tNfQrTMpbR7}L;zzz-Z<4VGL)yBfr@qJ zV&k7vs}0}(`Zu+TKE6!O@x&!bYd_eGjH^;((87xV9`2krfCeCAkKoBL`|SHR>k>W- z$0pKWzU6JQ^APY{@p-&k)Y6y%vqAbp|1sV(W z#J=y7){GrX%hc4~hu`|n;{^Psp}zE?T|344?{ZG_I?u69WjBQ-_fxy}5}OteS^_3; z_Q~-PZVCZ#*x&Qa)9zrSARvET$h6A$5_D&e*p7o! zY=R^tBf}>i3Zb5ZD|^WwckJqK?>n$)j6-LILin&)O$8-@Mib~S#c|5to^&#HVmOXr z5cqs}`*t^iK1)2O$s_2m12lDM*QT8GsStd4kRh&Pvj$+0F3e! z%JJCMOA5e&WB$Vau5{bRt8t+1%Oy|$=8=)f$#Z&mP0Y_}wF6BW#m9sNkTQiH;9FV6n{kP5=`61cX94 z#YBKgGkO4_1hpw`icX)?u}^7t?#J0~bxZrEYtNvXm1*FO@%jhve;Di3x%+S|AD|eh z2ypC3biot(NG1d`1COFMr-Lkw;YXJg8)yEk+c3@u-UKfC#m{aoRx0oA#O4tPLC|rg zW55JpvWGjT<*K@nhfP8Y@}BM*<@T1O^w-}#_Jqgsx-Ycl+<) zqd11)Njqt!LP35bZ^cwwfYB-ON)DzGB6|1_UUKUB*C&Y|n!^v_1%Y2bbfB}jSXwa% zpwD&h=Wkk>`AZl&|8>Kq6YCpqY4aSnw7H4b`_i=F*4=XQ>4!ZchXsE9@W8f~QsE^# zdwX4Hd?x}oR7K@0na!Bc5nYatrE2SS5Wl~Q$&GF#@WLZO8Aq6=wx{yx+cIsuBF9IU}tpK+Ve6y zqq@Uv>yY5D9PWRhrCfgH!?+w$0RSroA^--%fJ#7IWe8OFJ`t}DobswqtDvL55|{pP z-&lIbx>r2!8c&Vq1;250s2>?yw3#R8C6_=A6P+cQqSiA;w{dKE48LRxa5^w2bYXp?#o*W$IsxM&*-@psXD?&= zVo&Vq*Fl_#b>LU7U6Z4e*QaUt!M1KdTMfZ)7#Y}GsZ6#!*%4iipgh57f)t>T0zoZ$ zxfmD}mFFwzFgO;YN#8ooO=1P>!U@d-_y2tMnO}c!=+DZ9;<1nK-m3s<)IRj(_n3|5 zddN8BWaH#E0$s^0YyP7xU$pJ*ljdbvb5ogsejoh3=4W@;H#Sp7otg93<8pTI#K>5D zClVdRKxvpo9MhRMV*S9=hRU(cLU~bFz}l4W8F{q3jQ8O=cklhLeZ#B8j{nL`o9>B` z(JlDVK!8vHiZcTT+Z$2f+KF}Jwg49qXfX)3H4;?5PpbY`8SlRb#~a0J^`Z|y`Y3N; z4JCkIf3W{D{9K<5jpHmTF5-o@v>~-LHLyB>Xk@)?#tdoxqv~qU^sSaKyuM65Z=|nS za8DoT(laDa3*cJ{#cw~lb7$};*$^Y@G&2H_627hb-kAobpn^Vlo~_x0uFO@TM*&#h z3uo*@XOcU(YBjm=&O4VGNCAK4VBed0vvF_^19V`3=|Xs+_D=mC(|ANFPCWqAhqeG0 zr(TBbz$c9aam0o%+-i{^#pT=pF3L{UCUK^sMb^+lG5OJxdv#eb_g=#~?)fyvVzQaG z*P#y^g*n&&Z#eE)IbLdm|G(XsbjTRN)LD3NY6F@ZOSn$`mwS1SvpJxI zIbn@%Fyv)o*|<$T9d*_^)PYZ1N^&ho&JDP2gx54Du@_x|lN4daI#E0LCpPHfrW%r5 zsi{y{ESYC7Qcw^il1wmBTZu~dZK*_rvVOQ@d!E;V1FkQuK2|{6h1sv}!(nzT8@HjC zNdWu05hn%P-J3uis7{r-(fT^Rrn$wfo4-Kd*q7=}2X6YTTd=|10N@6ing42MH*Vd{ zu5@No(whr}b}E?nXWjY_?q=>C{JnaMz6pm~!4f!)h#_xe zB`$BUk9(HfNjUTQUnibStq>rXLEeIpIqs(lPiP2UGEU(5C{Q|xK*NsprDc8i!Z{hH zj$4gslXV=NdpZFS8|f_f;7Ng9xDcxuthy5s%-4@Uu`U8R+O!X+$`^3o9D~&j)C2cR zvltcIYM*_<6xHIJGX9fdc}>&miUKcBND%|tq)^s?H|(o-KeI&w(BZGT)wl}qrPasN zoj0IzDJoPO!G!tAh#8KKWk`L}_Pk-a@qaiXAAkeri*yT%|;G0qK+kN@? z-Mig>T=`}8Z7u%_o~q*x$V!k0A=oF=J5Ya-eZQCpV2ZI%3|_vl zWX&m8FUEx)DV|}>uq_a>SBRAZpL#Ix-}mlw&*9cpT~+)Jh#MDmJpygl?XfQ`Z=XFc zs*8r`8U?p#;>nz}RFoTnO5aS9srOkf@3#;sFlXB^Wa3j?G)Yo+M7r>ThN zkmifEOxKcSe6fd}-R6xO@w}M_f7@wiysH&I!OM`v#-t6CMni3e<&a0#TUa4K{(zL3 zQeKbXR6pW-ngBQZpy{EB&T+F{z(w9#Q}Mr&%@R(j#;Vn)c_Rd)HGmY5wl>5Dn`{_e zHX@RQED(ej_>i>?oO%)z(}Xtrjn;9Ylb^SV^}X%NtNxoX@D;${@$$1yUs&WRtv5=E z$bdJcY|kTrIKxU-{m>ROsx6=*T{daJ0+BugqF?)f$bJFm*lAPwLn7n90(kaudF`Vo z;E-2bQJE!I!*rm<*H!WksTwjaX6p7tmI5rWKW!aXPWVo6nuuRt(zXp(eJc>r5c@IV zO`Cr;Hd3v%9KhpZbQfn<-1}exSeg7$w!E>xXCFF2R~wQ|%18oelQOJ*F?|N+cJT?Z z>!xANWS)9=t^30{^HKA3Z8~r;>h=*CB#!Vp&LH@qZ$S&-X?e~?=uRusz*FLmbI&g< z12EiqE(-E3Sz!i!hP)FMpoGe@ZyB`O0L3+V#?Q39zVHCtH8ow|zG>5aw3{yt!DA@X za(T|Y6=~v{W00n8j#(RxbtG%Rgyv;TR(K-obv&Q4l5O_ecL8|$@7gwA{W)Xj>mZwF zun#B6>+id#Hi{F80Zb!LlbVhUpw+_1H1bz{eK=E*tSFi`&~1t}NxIE890+ z{kN2xsXQ-uQ+m}sKN-ZY#I4S`{m~dShH%os5@*yCbQw5)7cl5 zi^W9<7T7Qa{k-I&%yzuJXj^HVoiglb@M$1URhBA*CacvwnA1NlR0}sPI`PDNc@87Y z-{aTsJn>hK^u4)KseQJkSb7Dnd*N9LJTip@jNl5&5Eh*woW~F2H@!H)aug!lydIDQ z9usE?_e};A^Vwg3BmKEJU73ePvKc=M$N++lL7AMy(@n)<^Jo6~lv8jv`MWE>^~A3q z>%T0iBwt0qOE_zhbk{jF=ni04gh#q`W^z5k0HBg$iDS)UPR?GVc>zBH%zJ%-CXXgW z)~|7)FN*plb|E|T%G|91}$ z{8dX+`7&Gu#U8oh_F^xzA9q;S69~7Okz7K7!w~tU!jf-^*Q61z7|7_?dEzSgkmzX7 z4@S`TK77s{ue>eBqj8IH@t+d`CqGlT5c{WhopsJ%h>auoWnsQ(le|-;sg!)Vi0H;} z2F6>t4)Shr1g9y2izs+=YzejC8zof0L6>t+Y9j}(kZ}{<<>wZDK7h5d;7i8yCX}Yj)boi;}QsG$44z~j@cId_Z zb0L|qT2GX;G|*_~iDOF+PXqEi2;`HK2OIdbW5wFE2fLi@Fl5|JTl6EpdHmE{jEgF* z_<@H!?3r)>$+_ph9atlSbUMmC^2gC%h#Iz_Y zmIu^cl68Z`Fm-k_gebwLXqcXOVP2!9q!G{SW$;i}WZ?t<8uD@jON_kJ;Ap58aCHJd z1O4)z3tn@<;cNl)GpizZv^JGrIfNqR=0#N=jo9(TqdUI5nw15NS=lnqJyD&SsiMt4Ss8W>ozk9i0zuw zh?ccGvrS^L5?a#mI-Xz0BCTnIUgtZv2&#Cx8$a%+LknA%9CN7Uhq^PC4-NHyYi?8d za<1dN^9&~(Au$RCsszbR@%L~X&HpNOrWOFmg|~0ag<9O^*Z=8`O|& z@J-kFyoPlYUtPjW48`QFzj*B%?;x*HnKAKrrW%hXlwQ&^Jmhxp5>}LSnU{(n021Sz zFlI3hC|Yuk(CN-iO-u1MKZ8iw;qw(oMha-t$x#deiTj@qzTqv`1p86La7HBOHXIx{P%adf?8I}i`|&)8;GhJZ zdcdYgU{a*wmr4h^az!_AO^3WXF*Jp2GLcXEw}jQr`q`~Y!jJVeada;LO)b=cp5xc` zASxl%^^F(%u{QCsEWjNA&A1VzQgFBb>f%e@CdBAVud_!4J~>oQl5Elm%KPOpvEqnk z3;7^w5E0$m4Z)!ww}l<_geiQH5udcnWh{H-Bzm52SXi@Amsc5C^J9GFdjFnhdmO4_tVyu5fm0q4a^?UM8E_?Kx9-DMJg`C#vZO@-o$J$-#L z)5Qpl%P2MogigG3%7)oUn(;_CkfgIjbv%&9Gn=gWky%6?ub1bmNwqCJ?REE*Z(R)Djwrjs7N_-*Z!ksp(IJ$!Iv@XvYL|6I2|E+?RT5^2tyOB-LT z`R#p4Pqqva=JwAQr=3` zRv(_{ZPvv=H`$06ED4)E^<{dBO?}cn?@Q$?M|l7BT0H!THzUZ6wX2bwkFQuJHzkU$ z`SOOiBvQW~zcB&=;Y)0$%Nm~w)_eZmi1$k@<1b#+Eb(FI$>ILDS8(}uA1~cTMI1#l zl`OHzFQH4Abugyu`5B=r<(>99?ZK~D*;8F;V4 z3)GLpozC2{dCMMWBj3owZIb6G?YQ-*&weAI8OUVpKqh6}-X?(r{E(HLP!As)Ak!a* z-?=#Jhy2&T{$6RQuWLPas7XH_*5-Y*`q?8ILs!PpD{s@=9P| z*MCn4JduSJO46r+rkv>;&z?+>AejiWA7r5&`H_S#UxtLs^VxEfClk-(B+hoG{Q#2v z?e4yCQ?vOs999dR2}ZGm0zklExtb;qJXN{R0i3DHqt@PX%kiaZrFvOfPFz1>WrV&<@EW@SM)AeZB7OM=f(F;T{mqG~R?Rn>*TT zumt?`OHX&tVvGCqt~NK!YaMk1(iETK)-Qk1Gpw}3HXon)2zHvsVJFFf<$dFp?aBN1?H(;9 z$(*gdJ$Q14vyCGrqN*evjF}Fb0L~a!t19ciXod$q8z>~kTmbBVd5C8UuIRz<3qB7K9lYX^FcZXby|WUWBiae zFW1z2z$L(lS8M&d&3%&lj2}#C!{)51Zrl_^ELbUM{)`r}>L; z{HtreZUMiq<8VUefD^Nocp?gZFeK$Z@gj?pCMF%4>4Nd$H?Vv+eSY|AV$^Q_4+v zX!jqV+d5iIT+>e6P>QD+jU{ym3_Sx91OzB{P#jYb8#xa&4~9S+*$e?icBa{kcmV?& zf+OeO1R`GW5n)mF`h*ZQuaoCB!V_fBuvj@z1suf`@LuE;4+G%uR?6d|lnuW?UCJBp zlj>R6l+x8LbLE|R6c8f-AkLH!3`?Nk(Lp`w6sqe9&+Ci4GAW>PzOP{Q447^0iy>`u zR!J9nURMZ8Y)s3^n@y?Jz35q=10uF*-|%@X@n8j24}kjogdEW?J_W2Ed_K396vp@j zh8LGgqlqZ*+V<31T$JC8v)E)O4l()K0x^g>l&Br3($Jm+0^z!zLK1KYZaUvv_IA}2 zzAX`8PuGD>br8W)|CTf|GCpZPvKjc^g4dR$vt7q8hP;#}l{^;15V;jAyElX~Wy6Ju5l=pAj);csY*o(EO+>JxbaQT)_Q7oX? zp@M)(MJ;mV%e5YZ?e#s=sM56{*ik(VHco>1Gyl_cIHSG3ZxE~`G^UG9C5YHGUW^mW zX>oX6$wnkwIMC-D|B70<^t_MKDazn_dgJ2F4?T%v{Fjg8I!-4BAdI>fwM4`TP)xQ& zp(jz+H7%(o=S^vFjS}YtL=XJnQw<2$Xcmz5=~dmU|G2H{z?rw1vm5wKu$RsI!Sakh zX0=c5B6H2nUuygCRhhdA1Z4DO`Vnb*^WrBqUx+Jf_u_(n(uHH}F)S;V#yF5^iBX(5 zMPP8S3*e?FUi?h)@o3^jEF)E?Q>iX2CY0p2DlT_)vFHn!r=8362EQVsU)ooa!-0^hsCRf89g(-`146OL!8|g&=W%xF#hEHU>?dP@p5R z_yI6_9Eb%;8`frRv&<42^UY4E#gCu}B(oLkCZ~{ z-k;u!*Fe6KTfiVJ;iwh1qN4^{_6d`jgSI3k}`J2zhYId)!1p|2NRF1qihpTrBR zzK9DM3GNSf{kX~~e?1~M8|kPXC|cSH{w+yNiWNz!9{{08HYuY?SLvYDAgLLf5VydC zPcEfAQY@sM-_ig@XCw&O1OCEi6?!Zvrop@ouMGTZ@ z3?u&LO;Ke+8zqj3&0UDoF^QIr27^H#Ot#4yyv$&c=;hcnS*blQzhybRs375MMfob- z0v@(0mcQJ#>G_XRXzFkZ{r^@9_XSV(b$tz6!d1LWjmenARmPD5{yY~h2xT^XkH8Yf zZkTmUcr;i>&m=C=XVa4F$x?}JaCE3V#|93wx`02nmh#FhN3vL)NK5HQ+BRJKt=Ptq zZ2#60p9jgeGf$*b-$-iddy`tV!1(y#U`%4G;CqC5YlH!^1XCtXWZb3?Nhr4%4p3Zt zKj!1_vf@RA*bYZW{0j;7y1pwE$I?>r#W}4@zu4$3Gd6pq+7{=LvUgZ^&inCgYbxVY zpT_$z--(^{(zI3;Ja+oe+aYTBIgr$v9~ez92>369!dc7pmp$Gb#Sx$5e0Pwjr~7u!{+Rc SwLu~P0000>event.lat = " + event.lat + " >>event.lon = " + event.lon + " >>event.imageUrl =" + event.imageUrl); @@ -1118,7 +1118,7 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL AIAssist.getInstance(getContext()).speakTTSVoice(( String.format(voiceShareSuccessTts, getMathRandom())), null); - TipToast.shortTip("分享成功"); + TipToast.shortTip("分享成功",new TipDrawable(getResources().getDrawable(R.drawable.module_tanlu_upload_success))); IMogoMarker mogoMarker = TanluServiceManager.getServiceApis().getMarkerService().drawMarker(markerShowEntity); diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/module_tanlu_upload_fail.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/module_tanlu_upload_fail.png new file mode 100644 index 0000000000000000000000000000000000000000..f11f2cb3cd02b4ad7a6b16e6b78f160993abf652 GIT binary patch literal 2696 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/module_tanlu_upload_success.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/module_tanlu_upload_success.png new file mode 100644 index 0000000000000000000000000000000000000000..1ad96fc40f6196e3f489f038819fc1d708e53225 GIT binary patch literal 11136 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 SwLu~P0000 Date: Thu, 3 Sep 2020 17:07:03 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0SkinAbleBitmap=E5=AF=B9Tr?= =?UTF-8?q?ansformation=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/common/glide/SkinAbleBitmapTarget.java | 15 ++++++++++++++- .../extensions/entrance/EntranceFragment.java | 6 +++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/glide/SkinAbleBitmapTarget.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/glide/SkinAbleBitmapTarget.java index f7f69cc940..70a68303ed 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/glide/SkinAbleBitmapTarget.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/glide/SkinAbleBitmapTarget.java @@ -7,9 +7,14 @@ import android.widget.ImageView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.bumptech.glide.load.Transformation; +import com.bumptech.glide.load.engine.Resource; +import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPoolAdapter; +import com.bumptech.glide.load.resource.bitmap.BitmapResource; import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.transition.Transition; +import com.mogo.commons.AbsMogoApplication; public /** @@ -33,7 +38,15 @@ class SkinAbleBitmapTarget extends SimpleTarget< Bitmap > { public void onResourceReady( @NonNull Bitmap resource, @Nullable Transition< ? super Bitmap > transition ) { try { mTarget.setImageResource( 0 ); - mTarget.setImageBitmap( resource ); + if(mOptions.getTransformations().containsKey(Bitmap.class)) { + Transformation t = (Transformation) mOptions.getTransformations().get(Bitmap.class); + BitmapResource r = BitmapResource.obtain(resource, new BitmapPoolAdapter()); + Resource r2 = t.transform(AbsMogoApplication.getApp(), r, resource.getWidth(), + resource.getHeight()); + mTarget.setImageBitmap(r2.get()); + }else { + mTarget.setImageBitmap(resource); + } } catch( Exception e ){ e.printStackTrace(); } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index bf2ac37b46..c93701df86 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -17,6 +17,7 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.ConstraintSet; import com.alibaba.android.arouter.launcher.ARouter; +import com.bumptech.glide.request.RequestOptions; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.mvp.MvpFragment; @@ -32,6 +33,7 @@ import com.mogo.map.navi.MogoTraffic; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.module.common.dialog.WMDialog; +import com.mogo.module.common.glide.SkinAbleBitmapTarget; import com.mogo.module.common.map.CustomNaviInterrupter; import com.mogo.module.common.map.MapCenterPointStrategy; import com.mogo.module.common.map.Scene; @@ -540,7 +542,9 @@ public class EntranceFragment extends MvpFragment Date: Thu, 3 Sep 2020 17:09:19 +0800 Subject: [PATCH 3/7] =?UTF-8?q?[add]=20=E8=A7=A6=E5=8F=91=E8=BF=9D?= =?UTF-8?q?=E7=AB=A0=E5=81=9C=E8=BD=A6=20=E7=99=BD+=E9=BB=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/view/RoundConstraintLayout.java | 20 ++++-------------- .../drawable/v2x_drawable_event_more_bkg.xml | 2 +- .../main/res/layout/item_v2x_fault_help.xml | 6 +++--- .../res/layout/item_v2x_illegal_parking.xml | 8 +++---- .../res/layout/item_v2x_scennario_history.xml | 4 ++-- .../layout/module_v2x_event_share_empty.xml | 2 +- .../res/layout/view_video_layout_normal.xml | 4 ++-- .../src/main/res/values/colors.xml | 7 +++--- .../icon_illegal_parking_light.png | Bin 0 -> 4908 bytes .../icon_illegal_parking_light.png | Bin 0 -> 8993 bytes .../src/main/module-v2x-res/values/colors.xml | 5 +++-- 11 files changed, 24 insertions(+), 34 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_illegal_parking_light.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_illegal_parking_light.png diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java index b8a025e465..ab9a98ef87 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java @@ -14,7 +14,9 @@ import androidx.appcompat.app.AppCompatDelegate; import androidx.constraintlayout.widget.ConstraintLayout; import com.mogo.module.v2x.R; +import com.mogo.skin.support.IMogoSkinCompatSupportable; import com.mogo.skin.support.IMogoSkinSupportInstaller; +import com.mogo.skin.support.MogoSkinManager; import com.mogo.skin.support.SkinMode; /** @@ -24,7 +26,7 @@ import com.mogo.skin.support.SkinMode; * desc : * version: 1.0 */ -public class RoundConstraintLayout extends ConstraintLayout implements IMogoSkinSupportInstaller { +public class RoundConstraintLayout extends ConstraintLayout implements IMogoSkinCompatSupportable { private float roundLayoutRadius = 14f; private Path roundPath; @@ -81,23 +83,9 @@ public class RoundConstraintLayout extends ConstraintLayout implements IMogoSkin super.draw(canvas); } - @Override - public void install(Application application) { - - } @Override - public void loadSkin(SkinMode skinMode) { - - } - - @Override - public AppCompatDelegate getSkinAppCompatDelegate(AppCompatActivity activity, AppCompatCallback callback) { - return null; - } - - @Override - public void init(Context context) { + public void applySkin() { } } diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml index 1dad69a517..fc21ce668b 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml @@ -3,7 +3,7 @@ diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml index bb45e400c0..903bed8cfa 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml @@ -60,7 +60,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_10" - android:textColor="@color/v2x_FFF_333_white" + android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/dp_28" android:textStyle="bold" app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead" @@ -74,7 +74,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:alpha="0.59" - android:textColor="@color/v2x_FFF_999_white" + android:textColor="@color/v2x_FFF_999" android:textSize="@dimen/dp_26" app:layout_constraintStart_toStartOf="@id/tvFaultHelpName" app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName" @@ -86,7 +86,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_30" android:gravity="center_vertical" - android:textColor="@color/v2x_FFF_333_white" + android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/dp_80" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall" diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml index b7d53a2321..f59c92e5d9 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml @@ -1,5 +1,5 @@ - - + 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 d9afa4955a..cabc198172 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 @@ -77,7 +77,7 @@ android:layout_marginRight="@dimen/dp_30" android:ellipsize="end" android:maxLines="1" - android:textColor="#FFFFFF" + android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/dp_34" app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike" app:layout_constraintStart_toEndOf="@+id/ivIconP" @@ -92,7 +92,7 @@ android:layout_marginBottom="@dimen/dp_24" android:alpha="0.6" android:gravity="center_vertical" - android:textColor="#FFFFFF" + android:textColor="@color/v2x_FFF_666" android:textSize="@dimen/dp_30" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/tvAddress" diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml index 43c372672e..79771659da 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml @@ -22,7 +22,7 @@ android:alpha="0.7" android:gravity="bottom" android:text="你还没有分享过道路事件，快去试试吧" - android:textColor="@color/v2x_FFF_333_white" + android:textColor="@color/v2x_FFF_333" android:textSize="18px" /> #FFFFFF #10121E #99FFFFFF - #FFFFFF - #FFFFFF - #ff616381 + #FFFFFF + #FFFFFF + #ff616381 + #FFFFFF //endColor="#ff616381" android:startColor="#ff48495e" diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_illegal_parking_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_illegal_parking_light.png new file mode 100644 index 0000000000000000000000000000000000000000..46e9240f435c2c72bfedbc1a3826355403ac9c4e GIT binary patch literal 4908 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 Hu0mjfT*uEO literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml index c354dea572..ad612b83a5 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml @@ -10,7 +10,8 @@ #FFFFFF #333333 #333333 - #999999 - #333333 + #999999 + #333333 + #666666 From 034d66f7606c7c2c6a943933c008307b5cfc142d Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 3 Sep 2020 18:14:06 +0800 Subject: [PATCH 4/7] =?UTF-8?q?[add]=20=20=E7=96=B2=E5=8A=B3=E9=A9=BE?= =?UTF-8?q?=E9=A9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/v2x/view/RoundConstraintLayout.java | 1 + .../res/drawable/v2x_drawable_event_more_bkg.xml | 2 +- .../main/res/layout/item_v2x_fatigue_driving.xml | 8 ++++---- .../src/main/res/layout/item_v2x_live_video.xml | 4 ++-- .../src/main/res/values-xhdpi/dimens.xml | 3 ++- .../src/main/res/values/dimens.xml | 2 ++ .../drawable-ldpi/icon_parking_p_light.png | Bin 0 -> 3414 bytes .../drawable/v2x_alert_window_bg_light.xml | 4 ++-- 8 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_parking_p_light.png rename skin/mogo-skin-light/src/main/{module-share-res => module-v2x-res}/drawable/v2x_alert_window_bg_light.xml (80%) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java index ab9a98ef87..40e05358a0 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java @@ -32,6 +32,7 @@ public class RoundConstraintLayout extends ConstraintLayout implements IMogoSkin private Path roundPath; private RectF rectF; + public RoundConstraintLayout(Context context) { this(context, null); } diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml index fc21ce668b..c5f6baf569 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml @@ -1,7 +1,7 @@ - + diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml index 3c6389b1f9..073241387f 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml @@ -1,5 +1,5 @@ - - + diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml index a2c65f66b0..48bdbca7bd 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index 5aefcf5679..ca2c085464 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -53,6 +53,7 @@ 16px 16px 4px - + 30px + 120px diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index 735550dda3..5d2165aaac 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -56,5 +56,7 @@ 16px 20px 66px + 16px + diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_parking_p_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_parking_p_light.png new file mode 100644 index 0000000000000000000000000000000000000000..430f4db85208062046918702e0a38d5a056e96a1 GIT binary patch literal 3414 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 literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-share-res/drawable/v2x_alert_window_bg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml similarity index 80% rename from skin/mogo-skin-light/src/main/module-share-res/drawable/v2x_alert_window_bg_light.xml rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml index a6ee48b155..fc0bfb4660 100644 --- a/skin/mogo-skin-light/src/main/module-share-res/drawable/v2x_alert_window_bg_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml @@ -4,8 +4,8 @@ \ No newline at end of file From e7923b9e2c2404fa202bb913cea59ed002bc6088 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 3 Sep 2020 18:52:59 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=BC=B9=E6=A1=86?= =?UTF-8?q?=E7=99=BD+=E9=BB=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/item_v2x_event_detail.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml index 13636e15b9..6ab4954639 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file From bdc261110a42986b1779bd4f07b0308221b06989 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 3 Sep 2020 19:10:11 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=99=BD+=E9=BB=91=20=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/v2x/view/V2XLiveGSYVideoView.java | 8 +++++++- .../main/res/layout/item_v2x_event_detail.xml | 2 +- .../src/main/res/values/colors.xml | 4 +--- .../icon_default_black_logo_light.png | Bin 0 -> 2630 bytes .../icon_default_black_logo_light.png | Bin 0 -> 2630 bytes .../icon_default_black_logo_light.png | Bin 0 -> 8896 bytes .../src/main/module-v2x-res/values/colors.xml | 1 + 7 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_default_black_logo_light.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_default_black_logo_light.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_default_black_logo_light.png diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java index cf25fe1b0d..5099c33fbb 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java @@ -24,6 +24,7 @@ import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.module.v2x.voice.V2XVoiceCallbackListener; import com.mogo.module.v2x.voice.V2XVoiceConstants; import com.mogo.module.v2x.voice.V2XVoiceManager; +import com.mogo.skin.support.IMogoSkinCompatSupportable; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; import com.tencent.rtmp.ITXLivePlayListener; @@ -41,7 +42,7 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME; * desc : * version: 1.0 */ -public class V2XLiveGSYVideoView extends RoundLayout { +public class V2XLiveGSYVideoView extends RoundLayout implements IMogoSkinCompatSupportable { private final String TAG = "V2XLiveGSYVideoView"; private TXCloudVideoView mTxcVideoView; @@ -278,4 +279,9 @@ public class V2XLiveGSYVideoView extends RoundLayout { .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_REFRESH_LIVE_UN_WAKEUP); super.onDetachedFromWindow(); } + + @Override + public void applySkin() { + + } } diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml index 6ab4954639..7b835f3f95 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml @@ -14,7 +14,7 @@ android:id="@+id/rlRoadEventImg" android:layout_width="wrap_content" android:layout_height="match_parent" - android:background="#555A75" + android:background="@color/v2x_555A_F5F5" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/modules/mogo-module-v2x/src/main/res/values/colors.xml b/modules/mogo-module-v2x/src/main/res/values/colors.xml index 34a620d9e7..1285a749e4 100644 --- a/modules/mogo-module-v2x/src/main/res/values/colors.xml +++ b/modules/mogo-module-v2x/src/main/res/values/colors.xml @@ -17,8 +17,6 @@ #FFFFFF #ff616381 #FFFFFF - //endColor="#ff616381" android:startColor="#ff48495e" - - + #555A75 \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_default_black_logo_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_default_black_logo_light.png new file mode 100644 index 0000000000000000000000000000000000000000..c20fc4631402b94fbf3090a300cb2ffdbfd7eada GIT binary patch literal 2630 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 literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_default_black_logo_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_default_black_logo_light.png new file mode 100644 index 0000000000000000000000000000000000000000..c20fc4631402b94fbf3090a300cb2ffdbfd7eada GIT binary patch literal 2630 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 literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_default_black_logo_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_default_black_logo_light.png new file mode 100644 index 0000000000000000000000000000000000000000..cfbbe87d04f4f1e1297fa122442ed44faa1ec961 GIT binary patch literal 8896 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 #333333 #666666 + #F5F5F5 From 625a5e743f10fcf09bb6c58b22168252c8ce2b83 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 3 Sep 2020 20:07:15 +0800 Subject: [PATCH 7/7] opt --- .idea/misc.xml | 2 +- .../zhidao/roadcondition/service/CosStatusController.kt | 7 +++---- .../java/com/zhidao/roadcondition/util/AnalyticsUtil.kt | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 21e99e2dc0..cd77a1f062 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt index 6ef394fe31..836d01608a 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt @@ -121,7 +121,6 @@ class CosStatusController : CosStatusCallback { downloadUrl: String?, localPath: String? ) { - Log.d(TAG, "uploadFile mType= $mType") Log.d(TAG, "uploadCosCompleted localPath = $localPath") Log.d(TAG, "uploadCosCompleted downloadUrl = $downloadUrl") Log.d(TAG, "uploadCosCompleted cosPath = $cosPath") @@ -150,17 +149,19 @@ class CosStatusController : CosStatusCallback { sendGetInfoFailedReceiver("100") } } else { + trackUploadCos(4) //分享成功，并打点，如果是上报拥堵，需要takeVideo LatLngStickyEventBus.getInstance() .postSticky(GetImageSuccessEvent(downloadUrl, mType)) //上传录像以及缩略图成功 sendInformation(INFO_TYPE_VIDEO, videoAndThumbMap) } + } else { + trackUploadCos(5) } } else { //上传图片成功, 如果是上报路况，直接上传，TODO Log.d(TAG, "uploadCosCompleted 分享成功 ---- mType = $mType") -// if (mType.equals("1") || mType.equals("-1")) { sendInformationDirectly( INFO_TYPE_IMG, mutableMapOf("pic" to downloadUrl as String), @@ -170,7 +171,6 @@ class CosStatusController : CosStatusCallback { mLongitude, mLatitude ) -// } } Log.d(TAG, "delete file: ${localPath!!}") CosCallbackMapController.unregisterCallback(localPath) @@ -200,7 +200,6 @@ class CosStatusController : CosStatusCallback { longitude: Double, latitude: Double ) { - Log.d(TAG, "sendInformationDirectly isCustomSend = ${entity?.isCustom}") Log.d(TAG, "sendInformationDirectly poiType= $poiType ---- mainInfoId= $mainInfoId") //开始上传 entity?.isCustom?.let { diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt index 1e48a22717..3ef6ac2e10 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt @@ -28,7 +28,7 @@ const val CarNet_Get_Strategy:String = "CarNet_Get_Strategy" //策略拉取成 const val CarNet_Create_Task:String = "CarNet_Create_Task" //创建定时任务 const val CarNet_Get_Picture:String = "CarNet_Get_Picture" //获取图片,type=1 调用, type=2 成功, type=3 失败 const val CarNet_Get_Video:String = "CarNet_Get_Video" //获取视频,type=1 调用,type=2 成功,type=3 失败 -const val CarNet_Cos_Upload:String = "CarNet_Cos_Upload" //上传COS, type=1 成功, type=2 失败, type=3 开始 +const val CarNet_Cos_Upload:String = "CarNet_Cos_Upload" //上传COS, type=1 成功, type=2 失败, type=3 开始， type=4 成功返回视频和缩略图，type=5 成功没有返回全视频和缩略图 const val CarNet_Servers_Upload:String = "CarNet_Servers_Upload" //上传服务端, type=1 成功,type=2 失败, type=3 开始 const val CarNet_Voice_Search:String = "CarNet_Voice_Search" //语音搜索路况,type=1 成功,type=2 失败 const val CarNet_USER_SHOW:String = "CarNet_user_show" //情报展示时长,showtime 加载列表时长