From 3041df4b78720d82d24634733b9306745e2539dd Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 25 Nov 2020 23:39:58 +0800 Subject: [PATCH 01/54] update callchat --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3298ec9f05..c78f4fd98e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.6.8-SNAPSHOT +CARCHATTING_VERSION=1.6.9-SNAPSHOT # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From 72560c347ace21583f0fad39073aecd074c8dcc7 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 26 Nov 2020 00:23:24 +0800 Subject: [PATCH 02/54] update CallChat --- .idea/gradle.xml | 4 ---- gradle.properties | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index b59a552525..6249850d4f 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -31,9 +31,6 @@ diff --git a/gradle.properties b/gradle.properties index c78f4fd98e..e09bccbad2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.6.9-SNAPSHOT +CARCHATTING_VERSION=1.7.0-SNAPSHOT # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From 882f5597745adb8aa43812c0014fd469e36828d3 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 26 Nov 2020 00:36:20 +0800 Subject: [PATCH 03/54] update callchat --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e09bccbad2..89cce34043 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.7.0-SNAPSHOT +CARCHATTING_VERSION=1.7.1-SNAPSHOT # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From a39c3bea0acaf1e103bbb6ffd54a073995682196 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 26 Nov 2020 03:25:21 +0800 Subject: [PATCH 04/54] update callchat --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 89cce34043..f78b89d5e8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.7.1-SNAPSHOT +CARCHATTING_VERSION=1.7.9-SNAPSHOT # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From 7ffd512fc6ddc2a490d48cc5fb5a1fca1d967a6b Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 26 Nov 2020 04:41:16 +0800 Subject: [PATCH 05/54] update callchat --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f78b89d5e8..d061357f81 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.7.9-SNAPSHOT +CARCHATTING_VERSION=1.8.2-SNAPSHOT # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From 074d913f3caaf44d023712a9d70bc91de7a3a593 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 26 Nov 2020 06:04:17 +0800 Subject: [PATCH 06/54] update callchat --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d061357f81..9dd831faa7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.8.2-SNAPSHOT +CARCHATTING_VERSION=1.8.5-SNAPSHOT # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib From f93c478cbab80b08754266cad6d3a5922bc05014 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 26 Nov 2020 13:28:37 +0800 Subject: [PATCH 07/54] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E6=8C=89=E9=92=AEUI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_ext_shadow_bkg.9.png | Bin 3929 -> 4012 bytes .../res/drawable/module_ext_shadow_bkg.9.png | Bin 2110 -> 2160 bytes .../drawable-ldpi/icon_event_panel_more.png | Bin 995 -> 1436 bytes .../module_ext_shadow_bkg_light.9.png | Bin 4372 -> 4425 bytes .../module_ext_shadow_bkg_light.9.png | Bin 2287 -> 2322 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_ext_shadow_bkg.9.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_ext_shadow_bkg.9.png index 627be6d3ccdb96a234e1e87004f7857f5a21d746..a562d17b935bf45d8cb3ce003033c1bd380237d0 100644 GIT binary patch literal 4012 zcmZ`+XH-*J*A65E!oXN4QXGY$2oXde^q`0sA(BE!08udxQi38_28g1xhyzkonuHhv zm_iX9iYP?_2n>NlAz-0sqzXa=;-FIBMBn$5$o*_Gxz|!l~+Fm69VADkpw*&Z?!MTENv~IU%@>ign_N0c@^XP_#@Ux1# zqoCLp`%@94v=VDa$G$B*;QVHHGUap+&B5TE-ob$Qp7iIH&+uQ%2<2y$Dx+>UA)$o) zQ_I5U_1c*iJL8^Ii^&g%8)Ftm+iz~O2>3q_m;ZFE-qy|&GyKGb8oZ{6cI1ZtaK!Vq z$M|UrW#+r9MZ?V&$qiczr$2v;Xz1Nzv}>5j3%HzH_I3}n`8}e+lQuD<_jHrE+vZWu z`_IKE^aaSZtFhbIRcGEd`M=*bwSKj>h;9=R=k;%L-N14Simw~+di8_d!b-)KG{q0i zZJ(NG!f$ z^!E#hX?*o$X(++_!O}0I1}71zIGkJxI+ESbQcBQA zZY9vGobc)#*o=Uo-_HUkbn$K%TN&5(#=rILXBOu`{lnd!BE@av^n0Rf(<@`G)r#zZ zosH@{SB|?xZabL8>ABN)|65*_m^8XlDSyX@T6TqZv|_fXx!ER+N_JuK^K*Z!6C$t-=+9Q)h@l z2|>!yXl(e$U&Bs1l$-8-Z%Sh{`Kqtw&4CNKk9fb(VaI3sC$gzDQkT*qd?N{^&BV^^G4`KbdRvsYcQ#Ww_EG*ghZ?-a9;`A zG761Z{V1hxsgubF$-1-_6o*G_31P5 zt)e|;HLXg!=P8klJ-qP{9tcioSNVJfqujA46|2SDY+>E%cPh+1eAGEbMWR#xfSsVm zC%JW_1fjfs;wJtX=+zOS7BZ{r_320sfE0ltK`tL@+}{Lz$(^D^FUNvcwu6v^&NiHu zcU7c$Xsx!n!gZXkJT=sAwQXk-n@^^L1wK#Xo-tj721oE^W=y*68-pnuq%OMI+4O}H zXm563s89r5viqkE5Xxi8okS_Pn;!vC6~9yU@4h95_5i%N_l=;}5el4M8a)C;bN!O0 zca>i@mGo?sR0FZJEbNU{iMi5uvXMVoN2xbyf}1O{iZ7vzBdS-wb760iQcL(DI_1aa zg1G$}#P~tbBD_)JRPDMh%8uS+jX8MtkI}glyw(J{MP(Dy7C97--9G0~gjD?o?hupm z2l2g0M%R#jOxqYPTl+%?_DloGnszTZro$1=Z|gqZk`nM#m4OZZR(O})5*%~1JKfIA zW4`k7yD_6{;Ibb3>xVchc-l(+n}9Pu-KyJ*Y`5jh1+0g5k*O10ylxvaGq;@Qt+LsN z3OUM}IS|#c84^Pk-aO8Q9Q32HkDjC>%smYLef9^J4HZ29NV?BEjm%nGqTcu=E_$8k zXg@kuc!A#GPw(K^{uxIgSzXa7-HRoOmZ(DS6;XCnr9CFl0#jX+w1_hHyKW@0RJ*_L z#(rLoslr%1MW>|XF?3M50N>QxlRI#j(jKX|@|WoO&+bOO$2NnqXeoP#B7 zuX>I#T&b7Q{6fp zvh}*hXYLSJz}sO@W1lz1WW56lW5M!30(dw2v3a6&BzqB71vmdhr!wXc^OQ$0>SB%3 zuT!MqZlTtIvH5`;re=LYY}i=sS=r#Pi!cDgk!i&@ErmteEt(LdL3d-4-qRSZr;#Pm zxO|V?RO{+;8I}bG7y`>4T6cm7==!?nQ(U4)|9Yo|f(@`26x^Yo4pcslM5tG?CbH+AfGNG2-M z9y4~1ZX8~hWJG7#cn?PGYzh2ryFmCPkL__J`#^YX`)hZ0Cv{73oO(0=6ZJ;;fQVY~S^6omlr1MU`p4FSNn=zODY=fE~FK0$$M?stQM0vmzk?^Ljn^_ zl0+p&Vn+5WT~pL*UFQGhEArTT4TtTSkD3g3tz8J;Ez^oGG$mJ|=k{i>uD>5rF9 zhQ=;Rkehn^Yi1z_CEg(oC>|$$)aIux!62|I&!bDSY#cDarnCsC7gzX=fmaynTsop5 zjn*UlXKCozWcaO4$OTiG!j3X2shJ7MT5@V-=>!>nQFL&#^X+TkXm7HKECYe?)(Z&8 zP}}V9KG0m?$`8Cr(ifj&=9rhSiM0!oc^RIx6#*p)6hm*?nBV!q&c`yi<9s1@#G7UN za`Vp4kQJ@FfdwKdC)4os%fZ2ZbMy?4TGHc<8kL`7i*gHQXt?;TL_L=%nX^>?Z|j#$Z0%D;V}@&PT-(e{a7;Uh21JinQZ2Ma|uCFYZt3 zz2?~@sh^z$_GHb6At&PA8JHbs%BE?HDak1TX=brK1`c!n$Cojvjg2Ho!vo=uTcq{e zK-O7wkgFNaf9REC?D*inWtAe=t9o8p1>o+Qb#qk8!yH`IwoNMykpDr8-aPw5Y=My5 zNBNKdIP{2%8_1BW+9ac+pH0N&$3m-LNvu@BCKc{lRf; znbZ_U2k-WD$tNlud6p{8-d6%cDjxdvdwd@wT>EF)bm>{v42PaGIG|ia8uXFb3fKt% zg_JzVW)pMOyR$XmpMrzlfZ7%*t7(__cfFOBaVb0m+Qp4R%FWZ;V6b@66#*IKg*T)d;7G%uMC39POzqGhSe77zj_?s8CF_GR{Z4$ zvSsbi=DQ!?IeQQg%LQ}duGRqG3DpP(*$M{l+f{>A)NoDYN8X2xd>a-EBFrC;DcVUD zu)_codWRxFSR9?&b+zH*g}{gSflZY^+>C*T3VU7L@$D(m4NlFE6*Km)c93 z4@FG+WVt@4l9niG9j%%B*DKbYG0whV&~Ug4?%h|HuBiFxv)}k3RbrW z=9NDxiO#aIx zf6D)y=y{p-vvGL(F|tnB@58Q8HM&>I)?*z0gvGV>lTx@&g@xYF(uim}!tQx}orm0I z$#kV~BU(Q?a_hs30x4IEFoc>49Ch}u>w~jBFAC?U3zY<-@gV7cvIx$flrD%77LuTZ zI{jDlz6~vv^^FUGBFb*1;D_y<>(ajhzO*q+Q5>MCl)lFNjoGLT$#P2J+O){+M6TW7 z%{6It+2*i|98Hu^yKyv3^vJu|2-U(^XVLRbj4TTp`|WXh2gq~q(Dg9k+Uq=&?Ur%*U4j|*Z)i}yxb&mpV+dJA%T6LB*BP%WInqgDk2;ixQP~11=pZY z&F_+a^t**MHFg{&TH%>R*!OsYh6l-U-;yM-B?)Y^W~uF|?xtk1X^GqV zA(@v3Tv~)Za;uG=jGhy(uBKe1@)NV1F+Ixilp_M6A5VDNn%cb!Ztz4AJ$W_QMy~BT zmZ303dX>lC0=?L~T3d=l zaQ;9fY(BBXTCOX)nS9Ay@9Dy^!*yHm8!zD~j^WTfOkFW(gtBoI9lzK#uokPi9zi(_ s?vBGm{y*E@*VZS$HpYEg6a8yf4l_+lT0ildbQccrID~eqbR{PK2dl=xc>n+a literal 3929 zcmZvfdpMK-8^;|NizurYif;!^eQTIGO_3sp895Y+mE*`cF{ezm%CQo$%`B&7_zJPo z0WCx^OvM~BrS>T-}yrn?ElfMR+5)qM8vpi+$7{#3;vu)j4cQmhw6dVzNT`vFLpm=&3^~!5t zWtx?I?u1uNPfl8$J0#a&rZ&D^J7DpL%N)q%rKwyW+1Tmd zQTkMrZnyCUC6@W9%(a%~6!3!|Q|?k0IKPapn*8V*LNmHy3BdCt<5pqB&w+-)L-1u$7qYhNr{~x%H67-u&ANG#$h6&V2*ZXk^Ww60#{L9`G^4` z7q&96jb3^!P>-VmS_I~XU7;Zuuaw^k}EAQI^?L{3{7 z4*kBq2aU;~{*pgq9^gM+5cjeY^X9r|FuGm30{Q+cHi{aERzay&>+0s&lYMUArteho zUUh_Z{-{*lbFoH)e=Oe051Oi1Q5#TD;pXb?zYnBH)7JgwYu?L2zz<2ni=~G;)Dz8@ z(EsR1&`^%v2*raY!Qo9flX20B-I_9i=iYyi$3nd@y9$tXr|q%b;gtb*xQ#yoAb-2B zId=B=7sM@$UjJ~3py}Z23Ykar)c0~7CGnc7h4M40DY4R{-9Y4(nc4GJ64cw&4lvCZvl z#t&ETBYQNq5OXNQ61UW=QU-b;%pvtmEmWGMVt5iM-hym+`P@LAVb`2S#bbMH>`)@u z%r!&Wx{GmdMA37x7v4arfOQ1V_R0>Ih@ZJ9ZSGDysjW5btMB2!gz_T4QHv82vxkwn zl;RhY*-uqOC6h!=pBDPo(0ywxTJl~yk^aUeFx3!QmPuls*;p`okU~>~_di9)vG<=Q z5Mna&3R93xFj;8L*UH_oslKTpT?|)Zn@#l$94-Y72?|Jvb)bIaph#9`J;mm33JZvd zH5(c0b}lI!#<1i9-_nZQew$txm`R^cBMJ}@NWWy>C(e0#u^H<_wm+-(z}1dV2m75q zM9V}A;)09mJyP_92AF?xfPFJW_oRCY28ZMU&&)k$2`WgG8Jxlh*$x|6f2#A-=kY6zP8 zgW?0clC=9d(O9UTe-)m*z}`}uZ2UyOdCi8uY#*Zv50sFxBcGYkNatbg*9E6)-o!XW zL7O2u!I-kQG`^$}io&H;_UG$2ho8)NIZQrJr$_j6_RD3>!*~WYk9Wrsw@=%oR+9Bt zO+mMPecp16U%)mp`^CV%#ErXns6X*b>cG{;ED3hhJhgmI$Ijcw;E0tsZ3I>G2^^j5 zoZ}yUQE_-7J?jD8Mb4&L=i;j0@`V^H(R{1$kF_P&9Dl%0fvMBK>z>JHjp5eoP_jXm z7E8ZBO73;0c$U(;G#w71=M274%ig{o|FEOSCsrK~^~FO=xzAX9*Nj1q-z|cb__@wp zkB4)6A`auBk$6&#f}@{Kqhi+E78QjBgVxBY&>bPsbmjqx4;F`8InUXg+4za~Vm7tP zG!+HAwC(U*KPo}T!$7v7Wg}G$Ptq13bOOl!w{}HI!71Itx)|r46S>dD>2G3Scv6@E zK^f_Fx*hEBV&tYqA-a83dCW^LpJRP{IA#4Fs-5@~@!5!^v=t0}QPSr1^qcd}>)T@J z9s>ji<*$}hpBs26NR2G&?n_iRAvjZ}zvr4YDSfr3`h?@5qbJj~8tsb|CF@6lq8-^{YCe#XvaOF-!*Y zP%`)C`!9ayhkU0d6QyU-W7n7JI{@R9tn$auxvjnTeX4?Bs_dDADtqr4{qd->p zD6|Qr*lt(H7q2{>sQg?H)x$srU$t`@EUXPpA9s-tp;rbg(v1HMc9O9xg$W;LZFzy0 zYospQX!of?gK0DMQ){ z`F#bFzW8oM$q=3SSg6Yg!#b`3zXy3*Xr-{g9uPuWBGa`j0tcwHipTy6Sv=u-zEt9t z3FEDnkM(^^M&{WUHkTvOdByaTfi(5w*1y)3;4Pc^`GSYO+U=u=!T6SOuddb`fB*qQ z6S!~h+tIcLCQ5L5HKvd-Fmy5>9un5ZBRu`aE;{rFQLk}(1+k81Z189^d`~Kfxvva4 zt8+`kS(z`agRdyG*M(WaV$X?DLLcm!uW)PzmHJrUYk(L}WT0U}Uck=mRFzeEd0(B# z5V*MrZTP76NF|=k4%rmv-09)SU&1jqN>;UgJ3>UIx2o<&735ExDc2r0UKSu;tQ@Kd z1q(CO!Fh+hd7*UD?1U$wMOR2nPe?4`{>xe2^SB3tFIoVoOgsr9&ynXhh$J8on_>Vz zI~|+GJ9m_9dCP;ZM>gY>y@H19k+Kupdc|oCqP7{t2UIGuaVaeQnMTcD=7G^S1YyEJ z*2e*0skFyQ8KMQBif=j}z(YL*2**o*bx4?Sz~BWft_; zAfyKkfFm0?p02LH!3|1I3rIJDQXX&;1F55Q#9>_BS)T zazrwn za`-0a*rrRtjL$u;Obs{NM{%0r6c_r1k@&r6v${G}b8nkmy2C9@63lfg>F4?(|6p11 z>#Io_EO}dacng1_<*rT$=tk4ADQq2ZD(2y#W|u&xyq|Q-ge5rNXxfM`d0yrdauw)Q zCj^Do#lL=4{`_c>{%#-y9gKsGb)l|llu2ou+vn+)t^DDeyg6&h_rOjE za*2Rn42r(oV-7=i7cVZZuU4HkhkXtE8xP(1iTF36EB>JJYXZ#O{ahP^rWXL5NcE`H zwX}&FTJZr1?)B@vjE63hEpLFpJ@C+J^XC?h2Zu6t6=j_zldbx85~~?2U3(8;MlsZ8 z#JgfTI$sY%LCeRv{;meSnrR}pGd78(w5{Ih+>kK-t zIY@#XvixEsys53=bHNy{t(~LTF!oD#@1E6tn9Sx^F4V*9@So_Pi1Be;bhEOfScl#W zs{NOZTkh;w=@@Q+k5fD18aQ&lpZxv1MSwOSLz;gsce)jrYG53PO`e=Nx_6Z|{;7Ee zw@%{UJ?%sY*@uT(;7KEC6F#17si4>F{37ggXYjKJsCJJ>bbHP4!NaSWG5f&Jn6V|a z=XU=(mjit#{s^YPwM#QCrn&WX_sR2boKzCh^EsCCx$c^0)}>z3Bf$?=pGL0SGg**p z=e)D3(pj3Nxpv0=W`}_vo``0pKbpI~PhT#}+VcNjnGV;*sx6SATd&>q0DhT8EKl2> J`sXAz@jtiZi17db diff --git a/modules/mogo-module-common/src/main/res/drawable/module_ext_shadow_bkg.9.png b/modules/mogo-module-common/src/main/res/drawable/module_ext_shadow_bkg.9.png index 2e176bee54a582c6e1bf45c112fd620ad3a32290..afb16dbbaafcea1914834f97f658bb68e8c3469a 100644 GIT binary patch delta 2060 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 delta 556 zcmbQk{g~aTGr-TCmrII^fq{Y7)59eQNLzw12OE&=k!WrOQjEnx?oJHr&dIz4a#|)P z#_KXKU}Rth$p9h40wx9)FdL|C0W*RP6k~8%{e1DnhvH0(krRJ?pRB=TG1-h+uiod7 zdL&TuWKS2zkPOzh)AxEYJBqY!PEyYd2?@Dy>Xh4s?*cXK@&~{M1l~**I6e8W$+pj~>fu2* z#e>-Df5+CfFM7M@%%XYgCi%QgnVs-EgWJ>2>l4rH3ibGa`F?fjM>ej8*?FK|LBUu5 z%sTc17Vgy^vaIPR-%o$Qd?oQwrH5(|f2I3^!yy~kzP-165~#KQR{hkiAq(2RE!`z{ z^wGHuyWPAO{k1t$=TWp!B}o4IiyvlDu9NyF*&J5OQPG#d z$-7tXd8MoJ?1<3xkmCaUzpVpmZ@i~A%%Tx`R8lK!fKFRsZ4N&}f My85}Sb4q9e04XEmSO5S3 diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_ext_shadow_bkg_light.9.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_ext_shadow_bkg_light.9.png index fa3346c89dfb577757df58139dcb6f6bad78b5d0..c0eb68efbb357462dbc4fb4f3d26739c05eee0ab 100644 GIT binary patch literal 4425 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 Zc`|skPsvRk_(cLbb;9v@ouyCQ{{T^jO>O`H literal 4372 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 diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/module_ext_shadow_bkg_light.9.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_ext_shadow_bkg_light.9.png index ad8e52773a8ec907c87efa77df1d92a933b11ecd..299a38cfd4fe7619417de296d3f2ef1a8cad893c 100644 GIT binary patch delta 2310 zcmV+h3HkQ#5t0&+B!AgSL_t(|+U=d+YaCS+$D?hMrkfv4f7(iGeQfJf`zn1Y1yKY= zpZbsVF(?!REv-g_)_){cNf(U|(ia6=Xe>&g6frF^$^QQBIpev@nKS3!ncbZ=d)FN} z%$=n_?)}X7{FuYe-LbL$AFTng(J?wk$LJUx|D)q2&uw5KzJKhQ?K#{yi2KO)3me~K zlk+k2+*7zVkoyF*39?DD0|R1aK4yL#_C5#LzQfc&PAn`eOmA*(zLn4CKP{C?E5%~* z7qGuzoL8)XRxXz#XJJKV?dwXV5*Un2X3Vb5XTi8ytp*0;7hu1__*?jMOEA~Ban1~` z3vAMdn66-Qkbjd89y~Y=;1J@UU^%jU49Gm18Czhsp#q4402u;n05ZTOX#};5W*~z- zhrjdr+S=L~Qm+Kt3Dj0EFj0}SJ3BiIg+gHyAp%qbEdrFFsS35Iv#m-4lN(p03nDWP z5zT-#wgv0>2-if4?FMSA8<>GA@s0w7`$CZsbsCV08h`U-5tsx}g(y`iU=|gyWv)zV z45+amR##VFV`}XLYO5=lPo6xv2oTmuk#R2Wf~u*KyEu=T1qG@NV#L+CGTB*LrB$D1kgYY z6bfd>Yq(~Dx<3KbL_qgbke1R!%ZkXlA(v65dWaraP0k1LHtCXZxv2C`%WYShWj z6-ZPcKLfz>IYUqyZ1Uh7{s}LD~UQ$?gyb*|I7x`rc6sM#!RJf?>J_P!o8#v?anOjN<^AEIZUZeuqvHjAOnj^ zoqs^J*m)32h<7ARSX@p(%*%M`0x1i48`uO1$Uv0ING*%_na4__OvUXHYW3N(XYZ0q zU9r>&betrffn>B~E81P^i~(BIYD`PPZgcOlOhPFC~eaB7gbV5>Y6Ni!lc&p;qa$Rb&z4_AN=31D&99 zVHWPr&x)J3Atub|)@<$o87kP7?onBZnPr!|iv%Pyx&+y_Mx*fvS+EkSBcSd02{xy+ z;36@Tt1?LvQVRHzC2kfqS5NRr8G8Cr6lrtyQ0#;!CNusUSy& zr=UnSH;UxyG-Go4RDpWc&y-I-B7cjk#k&Msql18^r%;dknQBJ2)tVe6cXx!DDo~&M znXYVZb9d(I{ZpvN{Y+kGR%P-LAh|L_>get)Lo=DdLC z0IO1&{c?G)`|)#ZKdXDZ33 zF4f78e#cPn`UAmQ5lntv;_k!B1XihiamqYGuKmbyZH?`PUdBSn?L`QMNF0CZUT znG7C>swN=r>V0#0-}{*kkVcW3%l8ea_x()i;u=8V=E1nxY^Dx$DEgT^0g2eDCL;q9 z4;-fr)cbxWf9l}?1Cs=wwhozqxlYh-sRWhil$58M4 znKGl>U>Zeom}x6?DEgVogu@fkcf-)nOp?hh)`Wj1oAfK; zaX{w^g~AuZ(9aaH(tnxJnK}c7f~dYq`qIK!+-o)K>+A0gLqAi2+K!nPH*cReHa6Z* z`dZCc+>2jVu3R|*cj&qA{Y(NWlTRoKiDVQUtyXIr86WJ%f9zB1wG^H zO{UPM02z!yOm`{6Cwet8_T^a&#&_=AIfq;E_}tGVh;^et?tkivGR--^yu5r)B&3dB zp4H+gO8v;z*47Q5`p9hPyI|yq4GdC zzkU1m1zaO@^`5pFvTlS$vY#K&ARCbrG}O zX*vdGS3u*SPEoL)WokW2cli~tlVGQqy}HN7=W>$fc%0^JR5?p)n(A`9%bs?(ouJHT z)M~)aGk>^8>CPV?5Ie@^b%f?>KpIsZ=wUcs6oZ)7rq-iv*Y|SU_0bOljDEVpkDspS1n%g^ gRU8HD$Pyg?01m5h*m_rd`v3p{07*qoM6N<$f~f<5g8%>k delta 2275 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 From 0b53e0e5d9abbc1f9264f2cf726977d8d697c1a8 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 26 Nov 2020 14:57:02 +0800 Subject: [PATCH 08/54] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF-UI?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml | 5 +++++ modules/mogo-module-main/src/main/res/values/dimens.xml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml index 99b72ae3db..327e0c3010 100644 --- a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml @@ -31,4 +31,9 @@ 1920px 0px + + 2px + 2px + 6px + 6px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml index 89a3dc55f4..7662141351 100644 --- a/modules/mogo-module-main/src/main/res/values/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -33,6 +33,6 @@ 2px 2px - 6px - 6px + 2px + 4px \ No newline at end of file From 7e3c9a4a63e1534e1e9b5af10919342afb886ba1 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 26 Nov 2020 15:43:42 +0800 Subject: [PATCH 09/54] =?UTF-8?q?=E5=91=A8=E8=BE=B9=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=AD=90=E7=B1=BBtts=E6=92=AD=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/adapter/V2XSurroundingAdapter.java | 2 + .../entity/panel/SurroundingConstruction.java | 38 +++++++++++++++++++ .../v2x/fragment/V2XSurroundingFragment.java | 7 +++- 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java index fa111adadc..9514f894ce 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java @@ -10,11 +10,13 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import com.mogo.commons.voice.AIAssist; import com.mogo.module.common.entity.MarkerPoiTypeEnum; import com.mogo.module.v2x.R; import com.mogo.module.v2x.adapter.holder.V2XSurroundingViewHolder; import com.mogo.module.v2x.entity.panel.SurroundingConstruction; import com.mogo.module.v2x.listener.SurroundingItemClickListener; +import com.mogo.module.v2x.utils.V2XUtils; import java.util.List; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/SurroundingConstruction.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/SurroundingConstruction.java index c52d204fb0..2cd7c87742 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/SurroundingConstruction.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/SurroundingConstruction.java @@ -1,6 +1,7 @@ package com.mogo.module.v2x.entity.panel; import com.mogo.module.common.entity.MarkerExploreWay; +import com.mogo.module.common.entity.MarkerPoiTypeEnum; import java.io.Serializable; import java.util.ArrayList; @@ -35,4 +36,41 @@ public class SurroundingConstruction implements Serializable { public void addMarkerExploreWay(MarkerExploreWay item) { construtList.add(item); } + + public String getTypeNameTTS(String type) { + String typeName = "请查看周边的"; + switch (type) { + case MarkerPoiTypeEnum.ROAD_CLOSED: + typeName += "封路"; + break; + case MarkerPoiTypeEnum.FOURS_ICE: + typeName += "道路结冰"; + break; + case MarkerPoiTypeEnum.FOURS_FOG: + typeName += "浓雾"; + break; + case MarkerPoiTypeEnum.TRAFFIC_CHECK: + typeName += "交通检查"; + break; + case MarkerPoiTypeEnum.FOURS_ACCIDENT: + typeName += "交通事故"; + break; + case MarkerPoiTypeEnum.FOURS_BLOCK_UP: + typeName += "拥堵"; + break; + case MarkerPoiTypeEnum.FOURS_ROAD_WORK: + typeName += "施工"; + break; + case MarkerPoiTypeEnum.FOURS_PONDING: + typeName += "道路积水"; + break; + case MarkerPoiTypeEnum.FOURS_LIVING: + typeName += "实时路况"; + break; + default: + typeName += "实时路况"; + break; + } + return typeName + "信息"; + } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java index 58ee3fa1a9..571707afcb 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java @@ -34,6 +34,7 @@ import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.anim.OnMarkerAnimationListener; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.MarkerLocation; +import com.mogo.module.common.entity.MarkerPoiTypeEnum; import com.mogo.module.common.entity.MarkerShowEntity; import com.mogo.module.service.ServiceConst; import com.mogo.module.v2x.R; @@ -382,10 +383,14 @@ public class V2XSurroundingFragment extends MvpFragment Date: Thu, 26 Nov 2020 17:27:53 +0800 Subject: [PATCH 10/54] =?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 ad8973773cdafab5b7437a8e2c3d52c9dec91c66 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 26 Nov 2020 17:36:03 +0800 Subject: [PATCH 11/54] =?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 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 literal 0 HcmV?d00001 From 47f2ea2d9ec4780b61dea1c33182928caff651e0 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 26 Nov 2020 18:23:10 +0800 Subject: [PATCH 12/54] =?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 14:45:28 +0800 Subject: [PATCH 13/54] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=AB=98=E5=BE=B7?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E8=AE=BE=E7=BD=AE=E8=87=AA=E5=8A=A8=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E5=90=8E=E5=BF=AB=E9=80=9F=E5=8F=98=E5=88=B0=E7=99=BD?= =?UTF-8?q?=E5=A4=A9/=E5=A4=9C=E9=97=B4=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=81=E8=A7=A3=E5=86=B3=20e=20=E7=B3=BB=E5=88=97=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E9=9A=90=E8=97=8F=20adas=20=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 22 +++++++++++++++++++ .../com/mogo/launcher/MogoApplication.java | 1 + .../com/mogo/commons/debug/DebugConfig.java | 12 ++++++++-- .../map/AutoNaviBroadcastIntentHandler.java | 7 ++++++ .../module/map/MapControlCommandHandler.java | 4 ++++ .../com/mogo/module/map/MapPresenter.java | 8 +++++++ .../mogo/module/map/OnMapControlCallback.java | 3 +++ .../share/dialog/GridFixableShareDialog.kt | 2 +- 8 files changed, 56 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c505195521..ee51cfe30a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -121,6 +121,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // f系列-分体机 @@ -144,6 +146,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // e系列，采用Launcher方案 e8xx { @@ -166,6 +170,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // 同上 em4 { @@ -188,6 +194,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // e系列-2+32，对标D系列2+32，采用独立app的形式 em3 { @@ -210,6 +218,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // e系列-1+16，对标D系列1+16，采用独立app形式 em1 { @@ -232,6 +242,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'false' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // e系列-1+16，对标D系列1+16，采用独立app形式 em2 { @@ -254,6 +266,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'false' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // d系列 d8xx { @@ -276,6 +290,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'true' } // d系列 2 + 32 d80x { @@ -298,6 +314,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'true' } // d系列 1+16 版本 d82x { @@ -320,6 +338,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'false' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'true' } // 比亚迪 bydauto { @@ -342,6 +362,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } qa { dimension "env" diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 3bfce8ee6e..e1756677c0 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -129,6 +129,7 @@ public class MogoApplication extends AbsMogoApplication { DebugConfig.setSupportLauncherCardRefreshStrategy( BuildConfig.IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY ); DebugConfig.setMapBased( BuildConfig.IS_MAP_BASED ); DebugConfig.setNeedLoadGuideModule( BuildConfig.IS_NEED_LOAD_GUIDE_MODULE ); + DebugConfig.setNeedHideAdas( BuildConfig.IS_NEED_HIDE_ADAS_WHEN_SHARE ); } @Override diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java index 1c5d3e4307..3113c05d9f 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java @@ -1,7 +1,5 @@ package com.mogo.commons.debug; -import com.mogo.utils.logger.Logger; - /** * @author congtaowang * @since 2019-12-23 @@ -318,4 +316,14 @@ public class DebugConfig { public static boolean isNeedLoadGuideModule() { return isNeedLoadGuideModule; } + + private static boolean isNeedHideAdasWhenShare = false; + + public static boolean isNeedHideAdasWhenShare() { + return isNeedHideAdasWhenShare; + } + + public static void setNeedHideAdas( boolean isNeedHideAdas ) { + DebugConfig.isNeedHideAdasWhenShare = isNeedHideAdas; + } } diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java index e4257b5efc..964039e1f0 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java @@ -26,6 +26,7 @@ class AutoNaviBroadcastIntentHandler implements IMogoIntentListener { // 接收高德 public static final String AUTONAVI_STANDARD_BROADCAST_SEND = "AUTONAVI_STANDARD_BROADCAST_SEND"; + private EnumMapUI mLastAMapUiType = null; public void register( IMogoIntentManager manager ) { manager.registerIntentListener( AUTONAVI_STANDARD_BROADCAST_RECV, this ); @@ -131,11 +132,17 @@ class AutoNaviBroadcastIntentHandler implements IMogoIntentListener { // 高德改变黑夜白天模式后，传递给launcher，顺便改变其他 if ( extraState == 37 ) { // 白天模式 + mLastAMapUiType = EnumMapUI.Type_Light; MogoApisHandler.getInstance().getApis().getAdasControllerApi().changeAdasControlMode( EnumMapUI.Type_Light ); } else if ( extraState == 38 ) { // 夜间模式 + mLastAMapUiType = EnumMapUI.Type_Night; MogoApisHandler.getInstance().getApis().getAdasControllerApi().changeAdasControlMode( EnumMapUI.Type_Night ); } } } + + public EnumMapUI getLastAMapUiType() { + return mLastAMapUiType; + } } diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapControlCommandHandler.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapControlCommandHandler.java index 94d8c5d59a..9d0bf3daae 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapControlCommandHandler.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapControlCommandHandler.java @@ -103,6 +103,10 @@ class MapControlCommandHandler { return; } + if ( mCallback.getAMapLastType() == ui ) { + return; + } + int KEY_TYPE = 10048; int state = 0;//2黑夜;1白天 ;0自动 switch ( ui ) { diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java index 3ff064cefc..9e34462381 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java @@ -296,6 +296,14 @@ public class MapPresenter extends Presenter< MapView > implements mRegisterCenter.registerADASControlStatusChangedListener( TAG, this ); } + @Override + public EnumMapUI getAMapLastType() { + if ( mAutoNaviReceiver != null ) { + return mAutoNaviReceiver.getLastAMapUiType(); + } + return null; + } + private void initBroadcast() { mAutoNaviReceiver = new AutoNaviBroadcastIntentHandler(); mAutoNaviReceiver.setCallback( this ); diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java index cd6263370d..0d866efc2f 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java @@ -36,4 +36,7 @@ public interface OnMapControlCallback { // 缩放地图 void onZoomMap( boolean zoomIn ); + + // 高德地图上次类型 + EnumMapUI getAMapLastType(); } \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt index 59658be08a..03aa7ed0ae 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt @@ -106,7 +106,7 @@ class GridFixableShareDialog(context: Context) : BaseFloatDialog(context) { override fun show() { Logger.d(TAG, "onShow====") - if (!DebugConfig.isLauncher()) { + if (!DebugConfig.isNeedHideAdasWhenShare()) { mApis.adasControllerApi.closeADAS() } gridBtnManager.showShareButton() From 9cbd9fa69ba07c7367f2314528b3c5bd06ef288d Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 26 Nov 2020 14:51:41 +0800 Subject: [PATCH 14/54] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/mogo/launcher/MogoApplication.java | 2 +- .../src/main/java/com/mogo/commons/debug/DebugConfig.java | 2 +- .../com/mogo/module/share/dialog/GridFixableShareDialog.kt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index e1756677c0..f18f22db6d 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -129,7 +129,7 @@ public class MogoApplication extends AbsMogoApplication { DebugConfig.setSupportLauncherCardRefreshStrategy( BuildConfig.IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY ); DebugConfig.setMapBased( BuildConfig.IS_MAP_BASED ); DebugConfig.setNeedLoadGuideModule( BuildConfig.IS_NEED_LOAD_GUIDE_MODULE ); - DebugConfig.setNeedHideAdas( BuildConfig.IS_NEED_HIDE_ADAS_WHEN_SHARE ); + DebugConfig.setNeedHideAdasWhenShare( BuildConfig.IS_NEED_HIDE_ADAS_WHEN_SHARE ); } @Override diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java index 3113c05d9f..aa08c2fec0 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java @@ -323,7 +323,7 @@ public class DebugConfig { return isNeedHideAdasWhenShare; } - public static void setNeedHideAdas( boolean isNeedHideAdas ) { + public static void setNeedHideAdasWhenShare( boolean isNeedHideAdas ) { DebugConfig.isNeedHideAdasWhenShare = isNeedHideAdas; } } diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt index 03aa7ed0ae..c91a4a13af 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt @@ -106,7 +106,7 @@ class GridFixableShareDialog(context: Context) : BaseFloatDialog(context) { override fun show() { Logger.d(TAG, "onShow====") - if (!DebugConfig.isNeedHideAdasWhenShare()) { + if (DebugConfig.isNeedHideAdasWhenShare()) { mApis.adasControllerApi.closeADAS() } gridBtnManager.showShareButton() @@ -115,7 +115,7 @@ class GridFixableShareDialog(context: Context) : BaseFloatDialog(context) { override fun dismiss() { Logger.d(TAG, "onDismiss=====") - if (!DebugConfig.isLauncher() && mApis.statusManagerApi.isMainPageOnResume) { + if (DebugConfig.isNeedHideAdasWhenShare() && mApis.statusManagerApi.isMainPageOnResume) { mApis.adasControllerApi.showADAS() } super.dismiss() From ac28b024d7bd5b94fd7319b8d3932c909af16344 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 26 Nov 2020 16:38:52 +0800 Subject: [PATCH 15/54] bugfix: D80XCD-1598 --- .../src/main/java/com/mogo/module/main/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2379b3e458..d20907333f 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 @@ -371,7 +371,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme AIAssist.getInstance( this ).release(); mServiceApis.getOnlineCarPanelApi().clear(); if ( CallChatApi.getInstance().getApiProvider() != null ) { - CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", 0, null); +// CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", 0, null); } ContextHolderUtil.releaseContext(); MogoModulesManager.getInstance().onDestroy(); From 586d33e32729aedc60ee5d0e4d96befdccdc4d98 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 26 Nov 2020 17:23:13 +0800 Subject: [PATCH 16/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A1=8C=E9=9D=A2?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E6=8C=89=E9=92=AE=E9=97=B4=E8=B7=9D?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9adas=E6=95=B0=E6=8D=AE=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml | 2 +- .../main/java/com/mogo/module/share/StrategyShareProvider.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml index c335dd18d9..c91b026b20 100644 --- a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml @@ -23,7 +23,7 @@ 160px 160px - 30px + 10px 100px 100px \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt index ab742b4709..2a15148a56 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt @@ -48,7 +48,7 @@ class StrategyShareProvider : IProvider { // adas返回前车距离，单位是米 val frontDistanceItem = GsonUtil.objectFromJson(it, AdasFrontCarDistanceY::class.java) frontDistanceItem.result.distanceY?.apply { - blockStrategy.refreshFrontDistance(it.toDouble().toInt()) + blockStrategy.refreshFrontDistance(this.toDouble().toInt()) } } } catch (e: Exception) { From c0a1cce3289e6c2624a6f4acf424613789083912 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 26 Nov 2020 18:25:01 +0800 Subject: [PATCH 17/54] =?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 From 53cdcdf3e6f239003c72314cfe0a6d5cb71c9b5e Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 26 Nov 2020 20:47:23 +0800 Subject: [PATCH 18/54] =?UTF-8?q?[rm]=20=E5=85=B3=E9=97=AD=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E7=8A=B6=E6=80=81=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-xhdpi/module_common_icon_close.png} | Bin .../module_common_icon_close_press.png} | Bin .../drawable/module_common_close_selector.xml | 6 ++++++ .../res/drawable-ldpi/module_services_close.png | Bin 434 -> 0 bytes .../res/drawable-mdpi/module_services_close.png | Bin 434 -> 0 bytes .../res/drawable-xhdpi/module_services_close.png | Bin 1188 -> 0 bytes .../main/res/drawable/module_services_close.png | Bin 434 -> 0 bytes ...module_services_fragment_online_car_panel.xml | 2 +- .../src/main/res/drawable/v2x_selector_close.xml | 6 ------ .../main/res/layout/item_v2x_push_live_video.xml | 2 +- ...dule_v2x_event_panel_fragment_event_panel.xml | 2 +- .../main/res/layout/window_road_event_detail.xml | 2 +- .../main/res/layout/window_road_video_layout.xml | 2 +- .../module_common_icon_close_light.png} | Bin .../module_common_icon_close_press_light.png} | Bin .../drawable/module_common_icon_close_light.png} | Bin .../module_common_icon_close_press_light.png} | Bin .../drawable-mdpi/v2x_panel_close_light.png | Bin 1581 -> 0 bytes .../v2x_panel_close_press_light.png | Bin 1628 -> 0 bytes .../drawable/v2x_selector_close_light.xml | 6 +++--- 20 files changed, 14 insertions(+), 14 deletions(-) rename modules/{mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png => mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close.png} (100%) rename modules/{mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close_press.png => mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_press.png} (100%) create mode 100644 modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml delete mode 100755 modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_close.png delete mode 100755 modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_close.png delete mode 100755 modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_close.png delete mode 100755 modules/mogo-module-service/src/main/res/drawable/module_services_close.png delete mode 100644 modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_close.xml rename skin/mogo-skin-light/src/main/{module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png => module-common-res/drawable-xhdpi/module_common_icon_close_light.png} (100%) rename skin/mogo-skin-light/src/main/{module-v2x-res/drawable-xhdpi/v2x_panel_close_press_light.png => module-common-res/drawable-xhdpi/module_common_icon_close_press_light.png} (100%) rename skin/mogo-skin-light/src/main/{module-v2x-res/drawable-ldpi/v2x_panel_close_light.png => module-common-res/drawable/module_common_icon_close_light.png} (100%) rename skin/mogo-skin-light/src/main/{module-v2x-res/drawable-ldpi/v2x_panel_close_press_light.png => module-common-res/drawable/module_common_icon_close_press_light.png} (100%) delete mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png delete mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_press_light.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close_press.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_press.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close_press.png rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_press.png diff --git a/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml b/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml new file mode 100644 index 0000000000..72ab058d93 --- /dev/null +++ b/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_close.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_close.png deleted file mode 100755 index c1381dc44c160b4fea26e24f9a9401e435a8ae61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 434 zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!3?wz9Rv7~+zW|>QS0MfW|NogYXKvoSdDW^_ z>%d^^)~!2s?AW+*wya;je%rQfKoOv_GiT1+x^?UN_3Llmy!rR<-`~G~ zfg}(B&3W7Btq(L&vLwhan1PX%i$_>YLQ+ajUP)P5Mb*g8KIh@1N1u;dsjvVQ{ql5i z46!&pb?R-QW(6LXk9E^EqMrV*-y*g(*Ft1|IHUE;M9c^>6=Gyr(lh>De%F;@tWj0By**bag z*)2Nl&T@My?(VqQC%fBOvbc_m-8b#`hrKbODi?*kr>^o`q&h8YssHzz`%|WEVOYP= zRl8y;j@C}ATZqgPe^2a|) Y`#(zJziIr|3m6Ivp00i_>zopr07u@*r2qf` diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_close.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_close.png deleted file mode 100755 index c1381dc44c160b4fea26e24f9a9401e435a8ae61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 434 zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!3?wz9Rv7~+zW|>QS0MfW|NogYXKvoSdDW^_ z>%d^^)~!2s?AW+*wya;je%rQfKoOv_GiT1+x^?UN_3Llmy!rR<-`~G~ zfg}(B&3W7Btq(L&vLwhan1PX%i$_>YLQ+ajUP)P5Mb*g8KIh@1N1u;dsjvVQ{ql5i z46!&pb?R-QW(6LXk9E^EqMrV*-y*g(*Ft1|IHUE;M9c^>6=Gyr(lh>De%F;@tWj0By**bag z*)2Nl&T@My?(VqQC%fBOvbc_m-8b#`hrKbODi?*kr>^o`q&h8YssHzz`%|WEVOYP= zRl8y;j@C}ATZqgPe^2a|) Y`#(zJziIr|3m6Ivp00i_>zopr07u@*r2qf` diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_close.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_close.png deleted file mode 100755 index bb3e2b1195d085154afcb2ea9a72cde9367202f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1188 zcmY+Ec`(~)7{`B!qZ-vHOB`{RtTV&1Nr6}pZwJI&VB30l=f z+;s&(h;=v4R@b(5WQA%s(b}?$RFX!JeY>66nSEy7@B4Yqci#7p_m01xml8q?0YQ+G z_bEak*!@2(1sR~dGjJ*d!Q}jXgFS!?Oe&RTW@Z9yYH9*dT3R|iJq@_KyPHa-4h;D}=-qFzk0HnYKz+eaf(Dk_n#Cv*rz_h`^L2w+4#hRO&o1dTOa5xJK3tTRDb#--Z zZEbyh{lmYuv$G=<3W4(Ze4qk>Kr9xEL?WOPiDZ9&|KR@yF8iPD{+&?n98p3dm5-^YsH%RUrlyY4(9qP>(njm(>gnkl7#bNJH#WhT znOk6;oKLz0goIqWmGx6jegWlPRV`zLy~5qt+7a&UFE>QnLJ<6;H^DVHghhK09=_Ui1S!))D=pl#os~{G%=-UBc(K*?_4y6zA2y87T-9( z_$SAGLNkQe6KZAQ@{=WX{hf|PuVN*FT1e1=Txtq=udz`Zsl0U3 zhbcA(i(vCIwvD6m=qTj&ed}?ys^$^|U45TC4Ie#xmrk9~mB=4w)&7`_f|%Gr=-c zcvybAm|F#_e)8HlhZF+)-m(l+V2mhWF6Up6F6S!xoq>OxuuD*XgQl@uDlqOXFB;L0 zi}de%SRTx4+qqrzPVi1l6=4%c;kI=ouGoS%P~{q0Ku#oRSGrJNfk-aN4fzeE7_DEC zxyxr6I~NWsLF~Gtn{e^hMj7aU&6X`I!-bK(a+MWiY77@Cp@@@V)_1gN@oe=PwV&-L$(x~$ zH!k7J7iAgT-ygl~YoeVvc$$<#p#+Uj^F`^us97KUc;)g{oX?=94esT+SR>rSr9k_L zk|*v#B`Y}WH3Wrdx=6$aEx$VxS$;8Zb>P*Jl=_$ESCoT#8Nv#T&0nv^eY6Tq8Ns$@ hbBk$=3udQ6gnBk}u(QOt&|9BA8*dLkLaSS3_CMJnYxw{G diff --git a/modules/mogo-module-service/src/main/res/drawable/module_services_close.png b/modules/mogo-module-service/src/main/res/drawable/module_services_close.png deleted file mode 100755 index c1381dc44c160b4fea26e24f9a9401e435a8ae61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 434 zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!3?wz9Rv7~+zW|>QS0MfW|NogYXKvoSdDW^_ z>%d^^)~!2s?AW+*wya;je%rQfKoOv_GiT1+x^?UN_3Llmy!rR<-`~G~ zfg}(B&3W7Btq(L&vLwhan1PX%i$_>YLQ+ajUP)P5Mb*g8KIh@1N1u;dsjvVQ{ql5i z46!&pb?R-QW(6LXk9E^EqMrV*-y*g(*Ft1|IHUE;M9c^>6=Gyr(lh>De%F;@tWj0By**bag z*)2Nl&T@My?(VqQC%fBOvbc_m-8b#`hrKbODi?*kr>^o`q&h8YssHzz`%|WEVOYP= zRl8y;j@C}ATZqgPe^2a|) Y`#(zJziIr|3m6Ivp00i_>zopr07u@*r2qf` diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml index 1a5729e252..d4db9fff7c 100644 --- a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml +++ b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_gravity="end" android:layout_marginTop="@dimen/module_services_online_car_panel_close_margin_top" - android:src="@drawable/module_services_close" /> + android:src="@drawable/module_common_close_selector" /> - - - - - \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml index abf4977234..016747c2d4 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml @@ -18,5 +18,5 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20" - android:src="@drawable/v2x_panel_close" /> + android:src="@drawable/module_common_close_selector" /> \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml index 9355cd3b51..2834ed9e76 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml @@ -87,7 +87,7 @@ android:layout_width="@dimen/dp_79" android:layout_height="@dimen/dp_79" android:layout_marginRight="@dimen/dp_50" - android:background="@drawable/v2x_selector_close" + android:background="@drawable/module_common_close_selector" app:layout_constraintBottom_toBottomOf="@+id/rgTabSelect" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@+id/rgTabSelect" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml index 79f85e14d1..30bf5d605f 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml @@ -26,7 +26,7 @@ android:layout_height="@dimen/dp_88" android:layout_marginEnd="@dimen/dp_32" android:layout_marginBottom="@dimen/dp_40" - android:background="@drawable/v2x_selector_close" + android:background="@drawable/module_common_close_selector" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml index 705e37e58a..e86b7068cd 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20" - android:src="@drawable/v2x_panel_close" /> + android:src="@drawable/module_common_close_selector" /> diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_common_icon_close_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_common_icon_close_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_press_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_common_icon_close_press_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_press_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_common_icon_close_press_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_icon_close_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_icon_close_light.png 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-common-res/drawable/module_common_icon_close_press_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_press_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_icon_close_press_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png deleted file mode 100644 index 0bbb52b4880f28af273db8c9b4ae4da1a141461e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1581 zcmV+|2GaS7P)Px)=Sf6CR9FeUSxrb?M-;yI`W7N_Q4wvkQJ+hfM%qFwT_jK_WRXx8g@T)=Ain-A z-mVmB7hSkWTSbUnNk|rkxF{3~DWuduTTGWOTJUcpQA8mYapBW`-{hX@%-p&6-Ftm@ zKxgL6`T6GDGiT1dF9_ncv9a;S`uh44nTH&#t*xC2f&Jj%U>K2;ld-X}U~g}aL&X@K zot=Hn$=uvrFflQ~p=w@LTu}=gn09D`G}VCUFQ`?75M0+leH^c;E;0#3#73fOBrGm2 zsxif_&5)XaM(f(V&!EzUe*!b1K^S~}#QnGn1S!a^HEx`sjnDL|EUv7q z1e24KYU;X<-p~O+j**cO&B)Mno5jq<-QC@wr>7^FnwoNX{|hay?C2KDGXTpaP4GawY?pd=)(E2e6+7@>E2=kj37bcZTWw5WWZ=H0_>@wkT z{|f((x^#CQMbVo+be3Wu`38cYxWakoW?*W?e3*F^G~ru1~W4=YR&ggJ-jR*`-F1PuIs1(@_itGC5KQZ ziyRWISh!)}1O`;%5n7&}#}k=N`zE2-R01ROF!G^ElQFXg);>VY{wy@J&r}RSW}Yu0 za24Y#P_~W!8IJLc?-(~#oHvcZ&@#6FmZ?z23B)BI;&s<0R{Cbxp_Pe@$B<&W!EFIo&E zPa|l5ZV;^D;o+gWg5-{)TSWQs@v+5gPLTP&;KNJ2LYPct#w=VSH!GD?v`TpJxv6R_Q9bEWmv9jYi`cJX)s25}hsU0s5e=t?h~#DjIO!sDOZqY2dAjK~-1;pJagSRF#>QV~HPuMar+S^?Cs_YX_VZG%v1m0=w*fldCuF2 zl^*5?ruWMz^8po)QlA^YvL-QJ!sdhAA3t5?d~ckdW_j_lrGfEnD(kgS^!a+`V|8)h z;N8W+OD*Yq!lW@h;RyvpLqkDFM@Jf)qVx4GD-b*S2_f>ol$2uE?SY{I4DYx_ zegd!v0{FSU&WoOs{kH)6sZTZ)urS9SU&L-NwB&?G4`5@=^{C*GzA0c~WFMEH%w_tw zD|5ZX_$g9VU0&kz$QJ_aDuhSE&CSi%(Z7qoD!giGwbWPM2$00000NkvXXu0mjf`w;*E 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 deleted file mode 100644 index e5084551a3231f00a3b829f7bf15602d214a05db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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@ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_close_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_close_light.xml index e2ee5fc07c..72ab058d93 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_close_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_close_light.xml @@ -1,6 +1,6 @@ - - - + + + \ No newline at end of file From 8e11522b5cae9bb3ed3541a1281351fe69ecbcb3 Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 27 Nov 2020 10:02:10 +0800 Subject: [PATCH 19/54] =?UTF-8?q?[add]=20=E7=99=BD=E5=A4=A9=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F-=E5=87=BA=E8=A1=8C=E5=8A=A8=E6=80=81-=E5=8F=B3?= =?UTF-8?q?=E4=BE=A7=E8=B8=A9=E8=83=8C=E6=99=AF=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../icon_heart_unlike_bg_light.png | Bin 0 -> 6150 bytes .../drawable/icon_heart_unlike_bg_light.png | Bin 0 -> 2575 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_heart_unlike_bg_light.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable/icon_heart_unlike_bg_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_heart_unlike_bg_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_heart_unlike_bg_light.png new file mode 100644 index 0000000000000000000000000000000000000000..76868e80f52c47a1a1c048c55485f55d9b1b7426 GIT binary patch literal 6150 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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/icon_heart_unlike_bg_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/icon_heart_unlike_bg_light.png new file mode 100644 index 0000000000000000000000000000000000000000..aee65ace998b9298f23df3276a3f7c5d196b64db GIT binary patch literal 2575 zcmV+q3h?!bP)Px;$w@>(RA>dAnmuftR~^Q4Z|rQDLK&E7rK*V%CrV;xq)rAvkX{SOQJ5F(*!(7!178Ha9o#C&^-yV%I!owzjse?A^O} z&$JE}@kp_f(QYampam$5illI{U#zCwlUoAJsJT_GF2LaK-Md>kEq4&%GuIh?M-sL= zS$-q)j>s$81!rWpvpz=hN#rg*To{i1*|%@sYsZcqd*pmy%|q1%z}P2Go;(<4d z1i=6ZEvwv8$&2tWfnTpdbg1)=ea^p52LLsJn9X0#5x`hL#I_#Jdn1*ri-R1kICK5h zLn({+wH-UZlV~7ofYjIR`1rH+V8;S%#AnL%1UPRHK>Um?==jKyBUkz@piADOrgNp$ ztrOXpo16PeA^R(bj`9x$dY7F1$2!WtN^IMA$|Sx|6BhNJr%wHW zpte0K3u^E`HJWuUgnEc`nNJ^%a_4nT|7}mQRtD3WAc#dY`E|{)KBtc#KYq2~{nc%* zt&-?ANfI+(`;I+2;Ze}VeW0UHm+jGo->1F{G{6GRc#;o)QeF8=Grr_$W$5;H5~(E$ z2@V!)SAW+RfOj%E0a)-^gX4*k$5Jb#?#s2Iz$54h}@S z$@DYM7;&(zl_dt8>|;NJZ0q)Xju}w&1&Ul+>dtv2t|Ypz;h?#P@}#JqD*`b!A@FKAA@tn}W5k&3eX{ z_m*D28CykiK8W=6^uFv_HJnp^zdoPqb6NX)d47I=9qcqawVAFgZ;SkU3)HJ}oJXQo z^gtKhHda&dKaw5uqqKB_9Qyy(hAt+R8u(Tjw(l z%%(Q&K5E#pX1c{()TS9dXLaY1ffmV4hA6fdt2ll~p;mMVw0{=mm!l}frwJB;u0i6$ z-&DhXh51l5cDR}lq%tRBY8hu^eAQ=l`g~l-`YO$|pH=}-s4c>~Wg#E{dImmiw;40V`)00EnX%%zVI);0S+kZND?=;_Rl1T~?cyD!(W zj!=!M^U1NVlm2LVfQDED$aC0doft$e1jYm_apqC1YU}+ztA*=0 zh3tDm+B69DO%qpX{8{+n}zP1W)9S_JV;V7DT%wq=79&RC$IAd4<3AkX5Y*S z-Bo8H0LVCf>e#xbc=_<*!;@cgA?hc_FSMBsa2`2di;>HG_@}j>t{Ri$+0MzVeBJO) z>*Dz-0$9UZewSNQlZ8sE4<|MQasU4PH`Vkb#jiM*jlgINT+&JVL)AuiP70OXwONJV z5o&Y${q7r@&=1t?JBnYak5rR9$yOf0?n?F-VScBF+`sKMad?yLOD#;#vZp2Zb4_9% zVJ2={4{FY5J$*P8c1`h5d>Nqrymsd-CNR6_z*{~i#bkENS^7n=iI=~jKYo0d z--=wDHl{923)rg#{Zf-zVlh}IXz^SSF}OO;ylV{fY}0SyRbSR`Q$LpN-=ERJPFxu8 zXti)QMI^23^?>7i*2&j7^d(JMT~C5x~MFwuMvI>KM+XJX+w=Cda-uTKUsld2iREK5{ZA4#BprAxsS{ z`LuN{V|-iu7B_47HOH~%?VMYn(f;YR9{{i};Ijb0 zT_P0e^1^aoU_1W$xwgua=lk~vC2UqL1@?CC?MVZq-1WR~ZzcVgq)t}JB7M})nOg=3btZVo_ zj~LF8&z$|tYNdB*pz}!}yupsq3&@6zH(xN6UM)?Qg z|5S(CALaKKgw)*4f9Zv_guU4H_4Om#tBcyohh=?F`MN&)RogFX+L!YGtNOp?``-Bv l?TxG28-IV Date: Thu, 26 Nov 2020 20:03:27 +0800 Subject: [PATCH 20/54] bugfix --- .../mogo/module/service/launchercard/LauncherCardRefresher.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java index d1a58c38c1..84d831d711 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java @@ -129,6 +129,7 @@ class LauncherCardRefresher { switch ( msg.what ) { case MSG_WAIT_NETWORK: trtRequestNetworkConfigStrategy(); + break; case MSG_LOAD_NET_CONFIG: loadNetworkConfigStrategy(); break; From d41b0a8f49446888191bfedb6c79b870e79824e1 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 27 Nov 2020 09:58:14 +0800 Subject: [PATCH 21/54] bugfix --- .../launchercard/LauncherCardRefresher.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java index 84d831d711..a6bd55cd38 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java @@ -527,9 +527,18 @@ class LauncherCardRefresher { } else if ( datum instanceof TtsConfigData.NearRoads ) { result = handleNearRoadsTtsConfig( ( ( TtsConfigData.NearRoads ) datum ) ); } else if ( datum instanceof TtsConfigData.OnlineCarVsExplorerWay ) { - result = handleExplorerWayTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) ); - if ( !result ) { + if ( node.type == LauncherCardRefreshType.ExplorerWay ) { + result = handleExplorerWayTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) ); + if ( !result ) { + node.type = LauncherCardRefreshType.OnlineCar; + result = handleOnlineCarTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) ); + } + } else if( node.type == LauncherCardRefreshType.OnlineCar ){ result = handleOnlineCarTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) ); + if ( !result ) { + node.type = LauncherCardRefreshType.ExplorerWay; + result = handleExplorerWayTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) ); + } } } if ( result ) { @@ -595,7 +604,7 @@ class LauncherCardRefresher { String tts = mContext.getString( R.string.module_service_launcher_card_tips ); String info = mContext.getString( R.string.module_service_launcher_card_info ); speakTTS( String.format( tts, explorerWay.poiTotal, LauncherCardRefreshType.ExplorerWay.getDesc() ), false ); - notifyRefreshChanged( String.format( info, explorerWay.poiTotal, LauncherCardRefreshType.ExplorerWay ), explorerWay.poiTotal, tts ); + notifyRefreshChanged( String.format( info, explorerWay.poiTotal, LauncherCardRefreshType.ExplorerWay.getDesc() ), explorerWay.poiTotal, tts ); return true; } @@ -612,7 +621,7 @@ class LauncherCardRefresher { String tts = mContext.getString( R.string.module_service_launcher_card_tips ); String info = mContext.getString( R.string.module_service_launcher_card_info ); speakTTS( String.format( tts, onlineCar.carTotal, LauncherCardRefreshType.OnlineCar.getDesc() ), false ); - notifyRefreshChanged( String.format( info, onlineCar.carTotal, LauncherCardRefreshType.OnlineCar ), onlineCar.carTotal, tts ); + notifyRefreshChanged( String.format( info, onlineCar.carTotal, LauncherCardRefreshType.OnlineCar.getDesc() ), onlineCar.carTotal, tts ); return true; } From 45a3ab52a016688bd0007be4a9528909615989c5 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 27 Nov 2020 10:19:52 +0800 Subject: [PATCH 22/54] opt --- .../roadcondition/service/MainService.kt | 45 ++++--------------- 1 file changed, 9 insertions(+), 36 deletions(-) diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt index da2ff0c096..330de85af0 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt @@ -75,15 +75,8 @@ class MainService : Service() { private var mLatitude: Double = 0.0 lateinit var serviceApis: IMogoServiceApis - //发送主动上报结果广播给外部 -// fun sendCustomResult(result: Boolean) { -// var intent = Intent(customResultAction) -// intent.putExtra("isSuccess", result) -// sendBroadcast(intent) -// } override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { - Log.d(TAG, "onStartCommand -----------> ") //清理多媒体资源和sp策略数据 clearStrategyType(this) //初始化埋点 @@ -95,7 +88,7 @@ class MainService : Service() { VoiceController.initVoice() serviceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(this) as IMogoServiceApis speed = serviceApis.getMapServiceApi().getSingletonLocationClient(this).getLastKnowLocation().getSpeed() - Log.d(TAG, "onStartCommand speed = $speed" ) + Log.d(TAG, "onStartCommand speed = $speed") if (intent != null) { params = intent.getParcelableExtra("params") params?.let { @@ -105,18 +98,12 @@ class MainService : Service() { mLongitude = it.lon mLatitude = it.lat Log.d(TAG, "onStartCommand shareType = $shareType --fromType = $fromType --mainInfoId = $mainInfoId -- mLongitude = $mLongitude --mLatitude = $mLatitude --it.duration = ${it.duration} ") -// if (shareType == TANLU_ROAD_CONGESTION || shareType == TANLU_TRAFFIC_CHECK || shareType == TANLU_ROAD_CLOSURE || shareType == TANLU_ROAD_CURRENT -// || shareType == TANLU_ROAD_PONDING || shareType == TANLU_ROAD_ICING || shareType == TANLU_ROAD_HEAVY_FOG -// || shareType == TANLU_ROAD_ACCIDENT || shareType == TANLU_ROAD_WORK -// ) { -// takePhoto(1, false, true) - if (fromType == UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO || fromType == UPLOAD_FROM_STRATEGY_BLOCK_AUTO) { - // 如果是策略上报，isCustom = false - takeVideo(it.duration) - } else { - takeVideo(it.duration, isCustom = true, id = id) - } -// } + if (fromType == UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO || fromType == UPLOAD_FROM_STRATEGY_BLOCK_AUTO) { + // 如果是策略上报，isCustom = false + takeVideo(it.duration) + } else { + takeVideo(it.duration, isCustom = true, id = id) + } } } else { Log.e(TAG, "intent == null ") @@ -210,20 +197,6 @@ class MainService : Service() { // ) } -// private fun sendMarkerInfoReceiver(lat: Double, lon: Double, imageUrl: String?, type: String?) { -// Log.e("MainService", "sendMarkerInfoReceiver ------> type = $type ") -// Log.e("MainService", "sendMarkerInfoReceiver ------> fromType = $fromType ") -// Log.e("MainService", "sendMarkerInfoReceiver ------> isCustom = $isCustom ") -// var intent = Intent() -// intent.action = "com.zhidao.roadcondition.marker.info" -// intent.putExtra("type", type) -// intent.putExtra("imageUrl", imageUrl) -// intent.putExtra("lat", lat) -// intent.putExtra("lon", lon) -// intent.putExtra("custom", isCustom) -// intent.putExtra("fromType", fromType) -// sendBroadcast(intent) -// } /** * 初始化定位监听 @@ -290,7 +263,7 @@ class MainService : Service() { } //获取图片 - private fun takePhoto( isInterval: Boolean = false, isCustom: Boolean = false) { + private fun takePhoto(isInterval: Boolean = false, isCustom: Boolean = false) { Log.d("MainService", "takePhoto -----1----->") //判断是否授权 // if (isAuthorization(BaseApplication.getAppContext())) { @@ -388,7 +361,7 @@ class MainService : Service() { override fun onDestroy() { super.onDestroy() unregisterReceiver(mAlarmBroadCast) - unregisterReceiver(mCustomSendBroadCast) +// unregisterReceiver(mCustomSendBroadCast) CarCorderController.release() CosCallbackMapController.release() LatLngStickyEventBus.getInstance().unregister(this) From 5f10e884541e6b03637f9465a78cca43b39f055c Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 27 Nov 2020 10:46:37 +0800 Subject: [PATCH 23/54] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=9B=B4=E8=83=BD?= =?UTF-8?q?=E5=A4=9A=E8=AE=B0=E5=BD=95UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/footer_nomore_view.xml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml b/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml index b524ced9c9..0c6111bd2a 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml @@ -10,34 +10,32 @@ From 7f5fba2ca5c5d07561abd24d1012892619557530 Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 27 Nov 2020 11:03:08 +0800 Subject: [PATCH 24/54] =?UTF-8?q?=E5=87=BA=E8=A1=8C=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=89=AF=E6=A0=87=E9=A2=98,UI=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java index c392ecc22a..834de905b1 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java @@ -63,7 +63,7 @@ public class V2XScenarioHistoryRoadEventVH extends V2XBaseViewHolder Date: Fri, 27 Nov 2020 11:26:09 +0800 Subject: [PATCH 25/54] =?UTF-8?q?[add]=20F=E8=BD=A6=E6=9C=BA.9=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...vices_online_car_panel_background_light.9.png | Bin 0 -> 4427 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_online_car_panel_background_light.9.png diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_online_car_panel_background_light.9.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_online_car_panel_background_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..22f652a2b3752be4f14957991fe80244824e087c GIT binary patch literal 4427 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 Xu>GoR$a)>{kpyI6W^Gzy>>2le_h&Rh literal 0 HcmV?d00001 From e9e33c45c9cd19f92e091b116889b28fbfdeada2 Mon Sep 17 00:00:00 2001 From: wujifei Date: Fri, 27 Nov 2020 11:37:06 +0800 Subject: [PATCH 26/54] =?UTF-8?q?new#=20CallChatApi.getInstance().getApiPr?= =?UTF-8?q?ovider()=E6=B7=BB=E5=8A=A0=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/main/MainActivity.java | 210 +++++++++--------- 1 file changed, 107 insertions(+), 103 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 0f28fa8859..7438de342b 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 @@ -47,7 +47,7 @@ import java.util.List; *

* 描述：加载各个模块 */ -public class MainActivity extends MvpActivity< MainView, MainPresenter > implements MainView, +public class MainActivity extends MvpActivity implements MainView, IMogoLocationListener, IMogoMarkerClickListener, IMogoADASControlStatusChangedListener { @@ -69,16 +69,16 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme @Override protected int getLayoutId() { - if ( !DebugConfig.isMapBased() ) { + if (!DebugConfig.isMapBased()) { return R.layout.module_main_activity_main_no_map; } return R.layout.module_main_activity_main; } @Override - protected void beforeSetContentView( Bundle savedInstanceState ) { + protected void beforeSetContentView(Bundle savedInstanceState) { init(); - installSkinManager( savedInstanceState ); + installSkinManager(savedInstanceState); } /** @@ -86,118 +86,120 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme * * @param savedInstanceState */ - private void installSkinManager( Bundle savedInstanceState ) { - mServiceApis.getMapServiceApi().getMapViewInstanceHandler().createMapViewInstance( this ); - mServiceApis.getSkinSupportInstallerApi().install( getApplication() ); - mServiceApis.getSkinSupportInstallerApi().onCompensateActivityCreated( this, savedInstanceState ); + private void installSkinManager(Bundle savedInstanceState) { + mServiceApis.getMapServiceApi().getMapViewInstanceHandler().createMapViewInstance(this); + mServiceApis.getSkinSupportInstallerApi().install(getApplication()); + mServiceApis.getSkinSupportInstallerApi().onCompensateActivityCreated(this, savedInstanceState); } @Override protected void initViews() { - getWindow().setBackgroundDrawable( null ); + getWindow().setBackgroundDrawable(null); - mApps = findViewById( R.id.module_main_id_apps_fragment_container ); - mEntrance = findViewById( R.id.module_main_id_entrance_fragment_container ); - mEventPanel = findViewById( R.id.module_main_id_event_panel_fragment_container ); - mFloatingLayout = findViewById( R.id.module_main_id_floating_view ); - mLeftShadowFrame = findViewById( R.id.module_main_id_map_left_shadow_frame ); - mCoverUpLayout = findViewById( R.id.module_main_id_cover_up ); - mLeftPanelLayout = findViewById( R.id.module_main_id_left_panel_fragment_container ); - mHistoryMessagePanel = findViewById( R.id.module_main_id_message_history_fragment_container ); + mApps = findViewById(R.id.module_main_id_apps_fragment_container); + mEntrance = findViewById(R.id.module_main_id_entrance_fragment_container); + mEventPanel = findViewById(R.id.module_main_id_event_panel_fragment_container); + mFloatingLayout = findViewById(R.id.module_main_id_floating_view); + mLeftShadowFrame = findViewById(R.id.module_main_id_map_left_shadow_frame); + mCoverUpLayout = findViewById(R.id.module_main_id_cover_up); + mLeftPanelLayout = findViewById(R.id.module_main_id_left_panel_fragment_container); + mHistoryMessagePanel = findViewById(R.id.module_main_id_message_history_fragment_container); // 避免事件穿透导致地图被滑动 - mLeftShadowFrame.setOnClickListener( view -> { - } ); - FloatingViewHandler.init( mFloatingLayout ); + mLeftShadowFrame.setOnClickListener(view -> { + }); + FloatingViewHandler.init(mFloatingLayout); - mServiceApis.getOnlineCarPanelApi().initContainer( R.id.module_main_id_message_history_fragment_container, this ); - CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", R.id.module_main_id_message_history_fragment_container, this); + mServiceApis.getOnlineCarPanelApi().initContainer(R.id.module_main_id_message_history_fragment_container, this); + if (CallChatApi.getInstance().getApiProvider() != null) { + CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", R.id.module_main_id_message_history_fragment_container, this); + } } // 隐藏布局 protected void hideLayout() { - mEntrance.setVisibility( View.GONE ); - mEventPanel.setVisibility( View.GONE ); - mFloatingLayout.setVisibility( View.GONE ); + mEntrance.setVisibility(View.GONE); + mEventPanel.setVisibility(View.GONE); + mFloatingLayout.setVisibility(View.GONE); } // 显示布局 protected void showLayout() { - mEntrance.setVisibility( View.VISIBLE ); - mEventPanel.setVisibility( View.VISIBLE ); - mFloatingLayout.setVisibility( View.VISIBLE ); + mEntrance.setVisibility(View.VISIBLE); + mEventPanel.setVisibility(View.VISIBLE); + mFloatingLayout.setVisibility(View.VISIBLE); } @Override - protected void onCreate( @Nullable Bundle savedInstanceState ) { - super.onCreate( savedInstanceState ); - ContextHolderUtil.holdContext( this ); + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + ContextHolderUtil.holdContext(this); mPresenter.postLoadModuleMsg(); } private void init() { - if ( mServiceApis == null ) { + if (mServiceApis == null) { mServiceApis = MogoApisHandler.getInstance().getApis(); } - mServiceApis.getShareManager().resetContext( this ); - mServiceApis.getAuthManagerApi().showAuth( this ); + mServiceApis.getShareManager().resetContext(this); + mServiceApis.getAuthManagerApi().showAuth(this); mMogoStatusManager = mServiceApis.getStatusManagerApi(); - mMogoStatusManager.setMainPageLaunchedStatus( TAG, true ); - AutopilotServiceManage.getInstance().init( getContext() ); + mMogoStatusManager.setMainPageLaunchedStatus(TAG, true); + AutopilotServiceManage.getInstance().init(getContext()); } @Override public void loadModules() { final long start = System.currentTimeMillis(); - MogoModulesManager.getInstance().init( this ); + MogoModulesManager.getInstance().init(this); loadSplash(); - if ( DebugConfig.isMapBased() ) { - if ( mServiceApis.getMapServiceApi() != null ) { - mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostMapListener( EventDispatchCenter.getInstance() ); - mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostNaviListener( EventDispatchCenter.getInstance() ); - mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostAimlessModeListener( EventDispatchCenter.getInstance() ); - mServiceApis.getMapServiceApi().getHostListenerRegister().registerMarkerClickListener( this ); + if (DebugConfig.isMapBased()) { + if (mServiceApis.getMapServiceApi() != null) { + mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostMapListener(EventDispatchCenter.getInstance()); + mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostNaviListener(EventDispatchCenter.getInstance()); + mServiceApis.getMapServiceApi().getHostListenerRegister().registerHostAimlessModeListener(EventDispatchCenter.getInstance()); + mServiceApis.getMapServiceApi().getHostListenerRegister().registerMarkerClickListener(this); } } - if ( DebugConfig.isSkinSupported() ) { + if (DebugConfig.isSkinSupported()) { initAdasControlStatusListener(); } - if ( DebugConfig.isMapBased() ) { - EventDispatchCenter.getInstance().setMapLoadedCallback( () -> { - Logger.d( TAG, "map loaded." + Thread.currentThread().getName() ); + if (DebugConfig.isMapBased()) { + EventDispatchCenter.getInstance().setMapLoadedCallback(() -> { + Logger.d(TAG, "map loaded." + Thread.currentThread().getName()); resetMapCenterPoint(); loadOthersModules(); - Log.i( "timer", "cost " + ( System.currentTimeMillis() - start ) + "ms" ); - } ); - MogoModulesManager.getInstance().loadMapModule( R.id.module_main_id_map_fragment_container ); + Log.i("timer", "cost " + (System.currentTimeMillis() - start) + "ms"); + }); + MogoModulesManager.getInstance().loadMapModule(R.id.module_main_id_map_fragment_container); } else { loadOthersModules(); } mMogoFragmentManager = mServiceApis.getFragmentManagerApi(); - mMogoFragmentManager.init( this, R.id.module_main_id_search_fragment ); - mMogoFragmentManager.initMessageHistoryContainerId( R.id.module_main_id_message_history_fragment_container ); - mMogoFragmentManager.registerMainFragmentStackTransactionListener( ( size ) -> { - if ( size == 0 ) { + mMogoFragmentManager.init(this, R.id.module_main_id_search_fragment); + mMogoFragmentManager.initMessageHistoryContainerId(R.id.module_main_id_message_history_fragment_container); + mMogoFragmentManager.registerMainFragmentStackTransactionListener((size) -> { + if (size == 0) { showLayout(); - } else if ( size == 1 ) { + } else if (size == 1) { hideLayout(); } - } ); + }); } private void resetMapCenterPoint() { // 右移地图中心点 MapCenterPointStrategy.init(); - MapCenterPointStrategy.setMapCenterPointByScene( mServiceApis.getMapServiceApi().getMapUIController(), Scene.AIMLESS ); + MapCenterPointStrategy.setMapCenterPointByScene(mServiceApis.getMapServiceApi().getMapUIController(), Scene.AIMLESS); } private void loadOthersModules() { @@ -211,66 +213,66 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme } private void initAdasControlStatusListener() { - mServiceApis.getRegisterCenterApi().registerADASControlStatusChangedListener( TAG, this ); - AdasConfigApiController.getInstance().registerAdasSettingUiListener( EventDispatchCenter.getInstance() ); - AdasConfigApiController.getInstance().registerAdasSettingSkinModelListener( EventDispatchCenter.getInstance() ); - AdasConfigApiController.getInstance().init( getApplicationContext() ); - LoggerController.setPrinterLog( DebugConfig.isDebug() ); + mServiceApis.getRegisterCenterApi().registerADASControlStatusChangedListener(TAG, this); + AdasConfigApiController.getInstance().registerAdasSettingUiListener(EventDispatchCenter.getInstance()); + AdasConfigApiController.getInstance().registerAdasSettingSkinModelListener(EventDispatchCenter.getInstance()); + AdasConfigApiController.getInstance().init(getApplicationContext()); + LoggerController.setPrinterLog(DebugConfig.isDebug()); } private void startBaseService() { - Intent intent = new Intent( this, MogoMainService.class ); - startService( intent ); + Intent intent = new Intent(this, MogoMainService.class); + startService(intent); } protected void loadContainerModules() { - MogoModulesManager.getInstance().loadEntrancesModule( R.id.module_main_id_entrance_fragment_container ); - MogoModulesManager.getInstance().loadEventPanelModule( R.id.module_main_id_event_panel_fragment_container ); - MogoModulesManager.getInstance().loadLeftPanelModule( R.id.module_main_id_left_panel_fragment_container ); + MogoModulesManager.getInstance().loadEntrancesModule(R.id.module_main_id_entrance_fragment_container); + MogoModulesManager.getInstance().loadEventPanelModule(R.id.module_main_id_event_panel_fragment_container); + MogoModulesManager.getInstance().loadLeftPanelModule(R.id.module_main_id_left_panel_fragment_container); } @Override public void hideCoverUpLayout() { - Logger.d( TAG, "隐藏遮罩" ); - mCoverUpLayout.setVisibility( View.GONE ); + Logger.d(TAG, "隐藏遮罩"); + mCoverUpLayout.setVisibility(View.GONE); mServiceApis.getAdasControllerApi().showADAS(); } @Override public void loadCardModules() { - List< IMogoModuleProvider > providers = MogoModulesManager.getInstance().loadCardsModule(); + List providers = MogoModulesManager.getInstance().loadCardsModule(); } @Override public void loadSplash() { - MogoModulesManager.getInstance().loadSplashModule( R.id.module_main_id_splash_container ); + MogoModulesManager.getInstance().loadSplashModule(R.id.module_main_id_splash_container); } @NonNull @Override protected MainPresenter createPresenter() { - return new MainPresenter( this ); + return new MainPresenter(this); } @Override - public void onLocationChanged( MogoLocation location ) { - EventDispatchCenter.getInstance().onLocationChanged( location ); + public void onLocationChanged(MogoLocation location) { + EventDispatchCenter.getInstance().onLocationChanged(location); } @Override - public boolean onMarkerClicked( IMogoMarker marker ) { - EventDispatchCenter.getInstance().onMarkerClicked( marker ); + public boolean onMarkerClicked(IMogoMarker marker) { + EventDispatchCenter.getInstance().onMarkerClicked(marker); return false; } @Override - public void onMapUiModeChanged( EnumMapUI mapUI ) { - switch ( mapUI ) { + public void onMapUiModeChanged(EnumMapUI mapUI) { + switch (mapUI) { case Type_Night: - mServiceApis.getSkinSupportInstallerApi().loadSkin( SkinMode.Night ); + mServiceApis.getSkinSupportInstallerApi().loadSkin(SkinMode.Night); break; case Type_Light: - mServiceApis.getSkinSupportInstallerApi().loadSkin( SkinMode.Light ); + mServiceApis.getSkinSupportInstallerApi().loadSkin(SkinMode.Light); break; } } @@ -278,26 +280,26 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme @Override protected void onResume() { super.onResume(); - mMogoStatusManager.setMainPageResumeStatus( TAG, true ); - mMogoStatusManager.setMainPageIsBackgroundStatus( TAG, false ); - if ( mCoverUpLayout.getVisibility() != View.VISIBLE ) { + mMogoStatusManager.setMainPageResumeStatus(TAG, true); + mMogoStatusManager.setMainPageIsBackgroundStatus(TAG, false); + if (mCoverUpLayout.getVisibility() != View.VISIBLE) { mServiceApis.getAdasControllerApi().showADAS(); } - if ( mServiceApis.getLauncherApi() != null ) { - mServiceApis.getLauncherApi().setFloatButtonVisible( false ); + if (mServiceApis.getLauncherApi() != null) { + mServiceApis.getLauncherApi().setFloatButtonVisible(false); } } @Override protected void onPause() { super.onPause(); - mMogoStatusManager.setMainPageResumeStatus( TAG, false ); + mMogoStatusManager.setMainPageResumeStatus(TAG, false); mServiceApis.getAuthManagerApi().dismiss(); - if ( shouldCloseADASPanelWhenPause() ) { + if (shouldCloseADASPanelWhenPause()) { mServiceApis.getAdasControllerApi().closeADAS(); } - if ( mServiceApis.getLauncherApi() != null ) { - mServiceApis.getLauncherApi().setFloatButtonVisible( true ); + if (mServiceApis.getLauncherApi() != null) { + mServiceApis.getLauncherApi().setFloatButtonVisible(true); } } @@ -311,18 +313,18 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme @Override protected void onStop() { super.onStop(); - mMogoStatusManager.setMainPageIsBackgroundStatus( TAG, true ); + mMogoStatusManager.setMainPageIsBackgroundStatus(TAG, true); } @Override public void onBackPressed() { - if ( mMogoFragmentManager == null - || mMogoFragmentManager.getStackSize() <= 0 ) { - if ( DebugConfig.isLauncher() ) { + if (mMogoFragmentManager == null + || mMogoFragmentManager.getStackSize() <= 0) { + if (DebugConfig.isLauncher()) { doWhenBackPressed(); return; } else { - if ( doWhenBackPressed() ) { + if (doWhenBackPressed()) { return; } super.onBackPressed(); @@ -337,14 +339,14 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme } @Override - protected void onNewIntent( Intent intent ) { - super.onNewIntent( intent ); - mPresenter.handleSchemeIntent( intent, true ); + protected void onNewIntent(Intent intent) { + super.onNewIntent(intent); + mPresenter.handleSchemeIntent(intent, true); } @Override public IMogoServiceApis getApis() { - if ( mServiceApis == null ) { + if (mServiceApis == null) { mServiceApis = MogoApisHandler.getInstance().getApis(); } return mServiceApis; @@ -357,18 +359,20 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterHostAimlessModeListener(); mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterHostNaviListener(); mServiceApis.getMapServiceApi().getHostListenerRegister().unregisterHostMapListener(); - mMogoStatusManager.setMainPageLaunchedStatus( TAG, false ); - mMogoStatusManager.setMainPageIsBackgroundStatus( TAG, false ); + mMogoStatusManager.setMainPageLaunchedStatus(TAG, false); + mMogoStatusManager.setMainPageIsBackgroundStatus(TAG, false); mMogoFragmentManager.unregisterMainFragmentStackTransactionListener(); mMogoFragmentManager = null; mServiceApis.getMapServiceApi().getMapViewInstanceHandler().destroy(); AdasConfigApiController.getInstance().release(); mServiceApis.getAdasControllerApi().release(); - Logger.d( TAG, "destroy." ); + Logger.d(TAG, "destroy."); mServiceApis.getRefreshStrategyControllerApi().clearAllData(); - AIAssist.getInstance( this ).release(); + AIAssist.getInstance(this).release(); mServiceApis.getOnlineCarPanelApi().clear(); - CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", 0, null); + if (CallChatApi.getInstance().getApiProvider() != null) { + CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", 0, null); + } ContextHolderUtil.releaseContext(); MogoModulesManager.getInstance().onDestroy(); SchemeIntent.getInstance().clear(); From 32c9bd83c20f2e8f9b96e65053cd6f8a1aa2f87a Mon Sep 17 00:00:00 2001 From: wujifei Date: Fri, 27 Nov 2020 11:39:45 +0800 Subject: [PATCH 27/54] =?UTF-8?q?new#=20CallChatApi.getInstance().getApiPr?= =?UTF-8?q?ovider()=E6=B7=BB=E5=8A=A0=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/module/main/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d20907333f..2379b3e458 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 @@ -371,7 +371,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme AIAssist.getInstance( this ).release(); mServiceApis.getOnlineCarPanelApi().clear(); if ( CallChatApi.getInstance().getApiProvider() != null ) { -// CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", 0, null); + CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", 0, null); } ContextHolderUtil.releaseContext(); MogoModulesManager.getInstance().onDestroy(); From e1a07f66f72ae3f946a06ce533893c30063695a1 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 27 Nov 2020 11:48:50 +0800 Subject: [PATCH 28/54] opt --- .../v2x/adapter/V2XSurroundingDetailAdapter.java | 10 +++++++--- .../module/v2x/fragment/V2XEventPanelFragment.kt | 9 +++++++-- .../listener/SurroundingDetailItemListener.java | 15 +++++++++++++++ 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/SurroundingDetailItemListener.java diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java index 08c4d3abe2..69dac71345 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java @@ -16,6 +16,7 @@ import com.mogo.module.v2x.R; import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.adapter.holder.V2XSurroundingDetailVH; import com.mogo.module.v2x.entity.panel.SurroundingConstruction; +import com.mogo.module.v2x.listener.SurroundingDetailItemListener; import com.mogo.module.v2x.utils.RoadConditionUtils; import com.mogo.module.v2x.view.HeartLikeView; import com.mogo.module.v2x.view.HeartUnLikeView; @@ -39,10 +40,12 @@ public class V2XSurroundingDetailAdapter extends RecyclerView.Adapter list) { + public V2XSurroundingDetailAdapter(Context context, List list, SurroundingDetailItemListener listener) { mContext = context; markerExploreWays = list; + mListener = listener; } @Override @@ -77,18 +80,19 @@ public class V2XSurroundingDetailAdapter extends RecyclerView.Adapter Date: Fri, 27 Nov 2020 13:10:55 +0800 Subject: [PATCH 29/54] no message --- .../mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml b/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml index 0c6111bd2a..9fc434c82f 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml @@ -31,7 +31,7 @@ Date: Fri, 27 Nov 2020 16:11:32 +0800 Subject: [PATCH 30/54] =?UTF-8?q?[add]=20=E5=85=B3=E9=97=AD=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=99=BD=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/module_main_activity_main.xml | 12 ++++++------ .../src/main/res/values-xhdpi/dimens.xml | 8 ++++---- .../drawable/module_common_close_selector_light.xml | 6 ++++++ 3 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_close_selector_light.xml diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index 47c99c83a9..0e76264f15 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -25,9 +25,9 @@ android:layout_width="@dimen/module_main_apps_fragment_container_width" android:layout_height="match_parent" android:paddingLeft="@dimen/module_main_apps_fragment_container_padding" - android:paddingRight="@dimen/module_main_apps_fragment_container_padding" android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop" - android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop"/> + android:paddingRight="@dimen/module_main_apps_fragment_container_padding" + android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" /> @@ -58,15 +58,15 @@ android:layout_height="match_parent" android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft" android:paddingLeft="@dimen/module_main_event_panel_fragment_paddingLeft" - android:paddingRight="@dimen/module_main_event_panel_fragment_paddingRight" android:paddingTop="@dimen/module_main_event_panel_fragment_paddingTop" + android:paddingRight="@dimen/module_main_event_panel_fragment_paddingRight" android:paddingBottom="@dimen/module_main_event_panel_fragment_paddingBottom" /> + android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft" /> 20px 20px - 15px - 15px - 15px - 15px + 18px + 18px + 18px + 18px \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_close_selector_light.xml b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_close_selector_light.xml new file mode 100644 index 0000000000..328ea41398 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_close_selector_light.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From d627d182ff92c9fe1a190cc957cce6fa2a53705c Mon Sep 17 00:00:00 2001 From: wujifei Date: Fri, 27 Nov 2020 17:57:27 +0800 Subject: [PATCH 31/54] =?UTF-8?q?new#=E9=80=82=E9=85=8D=E8=BD=A6=E9=98=9F?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=E7=99=BD=E5=A4=A9=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._carchatting_launcher_calling_bg_light.9.png | Bin 2802 -> 0 bytes ...hatting_team_fragment_close_normal_light.png | Bin 0 -> 3091 bytes ...atting_team_fragment_close_pressed_light.png | Bin 0 -> 3064 bytes ...tting_team_invitation_head_default_light.png | Bin 0 -> 10820 bytes ..._carchatting_launcher_calling_bg_light.9.png | Bin 4686 -> 0 bytes ...hatting_team_fragment_close_normal_light.png | Bin 0 -> 7119 bytes ...atting_team_fragment_close_pressed_light.png | Bin 0 -> 7219 bytes ...tting_team_invitation_head_default_light.png | Bin 0 -> 22054 bytes ...dule_callchatting_user_pop_call_bg_light.xml | 5 +++-- ..._carchatting_launcher_calling_bg_light.9.png | Bin 2806 -> 0 bytes ...le_carchatting_launcher_calling_bg_light.xml | 8 ++++++++ ...odule_carchatting_team_fragment_bg_light.xml | 5 +++++ ...le_carchatting_team_fragment_close_light.xml | 5 +++++ ...ule_carchatting_team_invitation_bg_light.xml | 8 ++++++++ ...tting_team_invitation_head_default_light.png | Bin 0 -> 22054 bytes ...odule_carchatting_team_teammate_bg_light.xml | 5 +++++ 16 files changed, 34 insertions(+), 2 deletions(-) delete mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_team_fragment_close_normal_light.png create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_team_fragment_close_pressed_light.png create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_team_invitation_head_default_light.png delete mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_team_fragment_close_normal_light.png create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_team_fragment_close_pressed_light.png create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_team_invitation_head_default_light.png delete mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_fragment_bg_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_fragment_close_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_invitation_bg_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_invitation_head_default_light.png create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_teammate_bg_light.xml diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png deleted file mode 100644 index a4979dd265b4784303b33e6fda6ea16cb27bac2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2802 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 Eg29=KAOHXW diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_team_fragment_close_normal_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_team_fragment_close_normal_light.png new file mode 100644 index 0000000000000000000000000000000000000000..b9dbf0d3b5c5117a929dfa0e53471ec036d589a3 GIT binary patch literal 3091 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 literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_team_fragment_close_pressed_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_team_fragment_close_pressed_light.png new file mode 100644 index 0000000000000000000000000000000000000000..6717a937ec55a26572d5be41943764460cd6b988 GIT binary patch literal 3064 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 literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_team_invitation_head_default_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_team_invitation_head_default_light.png new file mode 100644 index 0000000000000000000000000000000000000000..866e774abe133e32039a17fc2cea1cd1ebc00215 GIT binary patch literal 10820 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 diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_team_fragment_close_normal_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_team_fragment_close_normal_light.png new file mode 100644 index 0000000000000000000000000000000000000000..50ebd6ee07853bcc653bc822e23fcd9b1ae1222e GIT binary patch literal 7119 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

{qn8JsQ2%Aw{tq&&PT37@tNj1~002ovPDHLk FV1kGcm;e9( literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_team_fragment_close_pressed_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_team_fragment_close_pressed_light.png new file mode 100644 index 0000000000000000000000000000000000000000..04dab00b7b4e5d6663e882d17b086749b255ca75 GIT binary patch literal 7219 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 BTR8v# literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_team_invitation_head_default_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_team_invitation_head_default_light.png new file mode 100644 index 0000000000000000000000000000000000000000..9a95ce565ff860fcc263ce3f56c397ba59261432 GIT binary patch literal 22054 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 Hu0mjfU%t@( literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_light.xml index c28d17cd1e..4a594f5e40 100644 --- a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_light.xml +++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_light.xml @@ -1,8 +1,9 @@ + - + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.9.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.9.png deleted file mode 100644 index 9947fa9c1a6cfa2b3edb125a0f5da7d9600ef969..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2806 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 IM6N<$f^Z;viU0rr diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml new file mode 100644 index 0000000000..045e0686d6 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_fragment_bg_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_fragment_bg_light.xml new file mode 100644 index 0000000000..f3dad33abd --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_fragment_bg_light.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_fragment_close_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_fragment_close_light.xml new file mode 100644 index 0000000000..24a1efd3b6 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_fragment_close_light.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_invitation_bg_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_invitation_bg_light.xml new file mode 100644 index 0000000000..20b19e2b3a --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_invitation_bg_light.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_invitation_head_default_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_invitation_head_default_light.png new file mode 100644 index 0000000000000000000000000000000000000000..9a95ce565ff860fcc263ce3f56c397ba59261432 GIT binary patch literal 22054 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 Hu0mjfU%t@( literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_teammate_bg_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_teammate_bg_light.xml new file mode 100644 index 0000000000..830309ff21 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_teammate_bg_light.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file From c279a641be40e098a131c6542a1f50e3da65bbdd Mon Sep 17 00:00:00 2001 From: liujing Date: Sun, 29 Nov 2020 10:45:52 +0800 Subject: [PATCH 32/54] =?UTF-8?q?[add]=20=E5=88=86=E4=BD=93=E6=9C=BAUI=20?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=9B=BF=E6=8D=A2,=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/values-xhdpi/dimens.xml | 4 ++-- .../src/main/res/values-xhdpi/dimens.xml | 4 ++-- .../src/main/res/drawable/v2x_nav_normal.png | Bin 0 -> 4418 bytes .../src/main/res/layout/view_heart_unlike.xml | 2 +- .../drawable-xhdpi/v2x_nav_normal_light.png | Bin 0 -> 7564 bytes .../drawable-xhdpi/v2x_nav_select_light.png | Bin 0 -> 7238 bytes .../drawable/selector_nav_history_light.xml | 6 ++++++ .../drawable/v2x_nav_normal_light.png | Bin 0 -> 3236 bytes .../drawable/v2x_nav_select_light.png | Bin 0 -> 3181 bytes 9 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable/v2x_nav_normal.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_nav_normal_light.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_nav_select_light.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable/selector_nav_history_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_normal_light.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_select_light.png diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml index 1e3dc1ca7d..5229524945 100644 --- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml @@ -28,8 +28,8 @@ 20px 20px - 18px - 18px + 20px + 20px 18px 18px \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml index 316b89ce91..5f796f82a5 100644 --- a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml @@ -23,8 +23,8 @@ 120px 20px - 13px - 13px + 18px + 18px 13px 43px 28px diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_nav_normal.png b/modules/mogo-module-v2x/src/main/res/drawable/v2x_nav_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..dad9f9ebad526230c0110c383c87c7d2af26092c GIT binary patch literal 4418 zcmV-I5xwq-P)Px_{7FPXRA>dAT78sN)pbAjz6WN-5M#weY5hP^yBdgKfHb<)f%y=S8Hmj=)EJ@y zl1MbINt3P`UC|`{Bdu#iWe_V$iZw=t0lR=1Bp-aF5+xX$fU659f=x_JqY`B>I>XF+ z{r!IX?0fGUMl>Gg-LudB`t7~Xx%ZxXFQrgujZJO)$DKQ|^4u@?>>@kiVS0UQHBHly zBxy*~68a=;?tTy>Gz!S%@2)#mPgZjp{ zF4S-)u~~c;gDN2LOEnoZVzV?022`ezgpszfIU~JkF*cI z*bYfpxaiA5HJ@<8N@H-+a0p+&{fmq-eC@Vx%O2`Br{JaE-}2qjLW^_hb!Mf$ednt1 z+%KP}x=nrwGsf`CXeYsci)Ux(4t&w`~6IbU3NH>?k9iM7|PO5Gk+-$Z16RxU)8FSc%gG=aVEj zXsJS&x-#>M26Qk`IkJD&?5me$MrL42TnAhk$_q4GfnKU{eM9TBn2d9vDj^OLEeRhu z;r(INsyk%($$6iH2+lAn(?ILb!$N=m%6|>za!JaE4)tp8qyr8O%f%eNdh-q8lv6$! zUjO48GO*x6*t>V1MG>PZ7jyXLKQEJz6&z76hg)y`0)3kSBH%v^7#^8&ETJboFgO?v zy>>XP?d&o`H%4EUQmhtDZEW6qdk=?S|N3`Gn;3D42@#4jW-YMwC!<(y!JDx=VyNke zk<(?KmP((cFOQQ-q>H^9u3K~0)|gEQv*#|Vs}5Gg$R^j(EWB6NuUkG^DezEiEpr#& zkMXsh1J1FRa9Vt@sFNWTnNIUmX=t3k4=2qzb!HPeOHs+(;v;p`&Ag5-^V02cR0?`ULgu+OX>0A}H0emV(vDUEO~ zHD2w?q*u<#jvY^iL%qGYWNy}2^W;FZkE<0sAo=0dB!(VBbMvCH1B3nhAt^=^SEC?g z6yqVJ#+0xrV}jT)$~a2i`WhE+hf8xac`~5rN{%ByaZW4%qFErNw65IIF>jC@HV?!` zLypZj88N4m-8m5H239c?rWxl%&d4v1n9j@l5LX%=6U+^`h#D`u^7GilTmhsBNm?BR zkl!R}X-hc`?Ok0D?Qz{>^~VIOuWxNb7T==-pA*l7V{GhoYZNa{dNy}Gcpmty?67TE zu%@Qgu>+N4zYDF580jx^y_760%ZbJwzwYj?)w6~}%l1+(#726_z+e~x6df5F2c*zy zfyhBxGqLCFCq1;qFpXW`IBywBgO!LThk3+RxZ&=IH6nMoY&}B{qHEK4YW!z|hKBid zmFnQuSPD5Mrf|(e%R+K)5pVn2P2s9feF8YfkJjvF z^3)+wCV`vhWP)UhuJ0g}h=+szOrfQvF9(eA^xt&L-rFi0kJnghG;pUrf3@5yQ6wPq^$rs)|EB-?~n+|gp*G;+m|D}KE*6@xiA5fU zWbx+72G$sD)K#D2`<#*IHDf&e2Sf5xFe!aX{v=|G@l(s>3h zrJN^m5_a$26M+m+x0>j~Z4HgSWFFE|vW~B7UaD5AClj3lRi1#*Ce39lp5h}ngh4zX z_G5cTjlIu2D;{mV2~f`DLF~?s<;%E-YR#h|NNz=1QPa@b(JN18?kBhJ*cB^b3Yjn9 z7#&}o;ij5)cR#qD(3ujPMKb}2PeXDuSqS?N{3`VI+i8(y9s`lKoWRPqbn}J5!{wJR zm^N6c{wM>aYZ~fLR#b}t<$Uv9l-s>nd>j-Y?EJ-yq?CS!{lkQ;p3z-%WWuv^79#8(m71&vtYy zJ3t?7mbcO2V^hYCfLa`}a|a^hp(vMz>G4<);l|s(cJ1oOayTFf*q?Yrp z605&#-n39jzJ)29Z0_L3D+&fnsUgdZfh8C<#j`7zX-UD&-BQXpvvwolFY7X3=I{6z z!+Cps?w6}!a4kYQ$%8d33$o^N?a64Z)NLc>JZ)5*4EO&gUOxP%r3PPD!<2jfJ~C*&X!lCBU>I_mte++c0~5ELuUy) z1AT699`IDqe*E#XzEFIAE~tx)?uWAVv13WKT3O+9HVA3I)~zt%j9vnDSGI7 z5-!hXmkhQn3QJgi<80@NM+(mTyv2!m)GJ1FSa9hKKHUyh0$vc{6A7Hu1WzRe8Y4lM z$(1CN0MjD3cnf34pp9B)pWA763dI;YE*J_M?q9(tx+(re!ZB*@WV|TwNt#J1z^KK& zl{e>mpH&YEnI80W3kHo1mHx#9pi6uH(>z4~?$d_!U|#I@ZR70z5@n3F8Y=r+TCSbu zF|s#H5cN&-+wg+@d*zjC~Oh1$hScK0itn6SjB*K|=GNc0UC-@!J>20*$vqBIXOByw2e0sAwamG+C6~Ui zENxc)q6?>li!YfP&OGBUJc_J8a)gfvxm6|*Q4NnjzB@eq^fOSY)yb1$Twan~X8=1F z%=U+phNiX~P^i1OdSpbMNOL*ljtrV()-~f}FlNjt;i8K^8ZP|!N5cvDj`t_Gi0RdQ z17GUC^bgWyXWAg-ul+m!`M(;>lUW5|>goPQBtpT~_m zGmasMt@tv;d8%wImV0m+doLh+#(nR74`=T-91lx}fyrF4Mw$kml%FtF>x_INVok1t`2 zu7Dl@ZN2loe**7Nc5HuAK8ab3!$QiqfVHTyUa>OXbW|CyCPr1_l4Et0g_XdZ@<}O< zDOLsH@bKZ+!`5v(=_=zt=`nWmm)lrAHs<$@BCh$aj4GWqZu~+7_W`=`*zk@x&7}V-?J<&yr>rv-}a>b#6kXZAA<9%&bOl;wiJ``2lwj|mlAJahrU65P1y zM_972o0co1r=|Pmd6xMUNg20l;5t5ZaLzr@xwid2m0@$&>P5H@_n0BAOj(!DVx@*8 zr5MaJEa=tjvL0NWx3aS!_w75NBs5!ChQIjv|AZG`{69ikfLSs&Ls?PfJNl;%LDbAI z6UP$l;cEl3U5X1!HJLeU!7lLPQ?aacpmP??oJA@oX^WkxP+)H4^XHewqMi65j2?Yr zm^}F-;pLYP>Y_pr!?69RX!)W9E!q{`x{isJ+-}U&RPY&Ko)`ygNRA(6_^l*@Q7J}E z3f{9DVKEt5TYw}j{fuc03~BGpf;)P1U}3q3VjOZ13rH`~R}#9{civO;F)&AQH1xA) zUtNdynp@yugn=`lf&v}tFJ~5m^pL2OSGlN5UvV52avbub2aqgkR>&9vb=lAz!GADp z`jg(j(Qwu*{LiqYy40d0ht2>LXVW;wGunfaVytYQ9CbV>^T`B;^2CxjQqczKLEY_f zm2Ah-%m3emDQ8DZJsS>BG&f(f1Q)TpkrV#65E?5+6p`-2l2YR2o79d&iebf(C`-V3 z7I>U7Q^}Hnnq?d`o9%`x@9K{|jl3g+$!PMbV=))-edD!5b zi3~^K3>if*jC--^J_McrMFRVf{4;p6-nM4V-Fx3{62k@c|EV`6Y9~L=i~s-t07*qo IM6N<$g4(`=#sB~S literal 0 HcmV?d00001 diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_heart_unlike.xml b/modules/mogo-module-v2x/src/main/res/layout/view_heart_unlike.xml index 3f1ffbd440..ad319c6998 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/view_heart_unlike.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/view_heart_unlike.xml @@ -3,7 +3,7 @@ android:id="@+id/llIllegalParkingUnLike" android:layout_width="@dimen/module_v2x_event_button_size" android:layout_height="@dimen/module_v2x_event_button_size" - android:background="@drawable/icon_heart_unlike_bg" + android:background="@drawable/icon_gray_back_heart" android:gravity="center"> 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 Upx_9ENB{r;07*qoM6N<$g3W|nZ~y=R literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/selector_nav_history_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/selector_nav_history_light.xml new file mode 100644 index 0000000000..7da0550b0e --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/selector_nav_history_light.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_normal_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_normal_light.png new file mode 100644 index 0000000000000000000000000000000000000000..a37dc6a948f5cece381ce060b9d640019a9857b2 GIT binary patch literal 3236 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 TQ Date: Sun, 29 Nov 2020 10:57:55 +0800 Subject: [PATCH 33/54] UI --- .../v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java | 2 +- .../src/main/res/drawable/bg_v2x_event_description.xml | 2 +- .../main/res/layout/module_event_panel_fragment_surrounding.xml | 2 +- .../src/main/res/layout/module_v2x_event_share_item.xml | 2 +- .../module-v2x-res/drawable/bg_v2x_event_description_light.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java index 834de905b1..214c4a0764 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java @@ -63,7 +63,7 @@ public class V2XScenarioHistoryRoadEventVH extends V2XBaseViewHolder - + diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml index f656dd22e9..6098f58094 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml @@ -39,7 +39,7 @@ android:layout_alignTop="@+id/road_case_style" android:layout_toLeftOf="@id/road_case_useless" android:gravity="left" - android:paddingRight="@dimen/dp_28" + android:paddingRight="@dimen/dp_35" android:text="100" android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/share_item_text_size" /> diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml index 79c69fb8a2..c4deeb0b6a 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml @@ -1,7 +1,7 @@ - + Date: Sun, 29 Nov 2020 11:09:56 +0800 Subject: [PATCH 34/54] UI --- modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml index 5229524945..d04fe284b7 100644 --- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml @@ -29,7 +29,7 @@ 20px 20px - 20px + 18px 18px 18px \ No newline at end of file From dbc50ee7a5083bb887acb1d0d861a858bc31fe43 Mon Sep 17 00:00:00 2001 From: liujing Date: Sun, 29 Nov 2020 11:40:38 +0800 Subject: [PATCH 35/54] =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E6=89=93=E5=BC=80?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF,=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/module/main/SchemeIntent.java | 1 + .../com/mogo/module/service/unwake/GlobalUnwakeManager.java | 1 + .../src/main/res/layout/module_v2x_event_share_empty.xml | 2 +- modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml | 3 ++- modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml | 2 +- modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml | 3 ++- modules/mogo-module-v2x/src/main/res/values/dimens.xml | 3 ++- 7 files changed, 10 insertions(+), 5 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 09839d91eb..7c959c2012 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 @@ -7,6 +7,7 @@ import android.text.TextUtils; import android.util.Log; import com.mogo.map.MogoLatLng; +import com.mogo.module.common.MogoApisHandler; import com.mogo.service.IMogoServiceApis; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; 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 691fbe525f..36f6a706b2 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 @@ -96,6 +96,7 @@ public class GlobalUnwakeManager implements IProvider, IMogoIntentListener, IMog * @param type 面板位置索引 */ private void showPanelByStatus(String target, int type){ + MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false); if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageOnResume() ) { MogoApisHandler.getInstance().getApis().getEventPanelManager().showPanelWithSelectedItem(type); } else { 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 d3bb0f90c1..edaa337156 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 @@ -9,7 +9,7 @@ android:id="@+id/no_share_image" android:layout_width="@dimen/share_empty_icon_width" android:layout_height="@dimen/share_empty_icon_width" - android:layout_marginTop="30px" + android:layout_marginTop="@dimen/share_empty_margin_top" android:src="@drawable/icon_share_empty" /> 22px 16px 20px - 34px + 15px + 34px 15px 29px -8px diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml index 3fabb9b780..a211bb52c0 100644 --- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml @@ -65,7 +65,7 @@ 22px 16px 20px - 34px + 34px 16px 29px -8px 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 c9d80ab227..190ceeba56 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 @@ -62,7 +62,8 @@ 48px 28px 40px - 60px + 30px + 60px 22px 54px -10px 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 79bc217c51..c371aabb58 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -60,7 +60,8 @@ 22px 16px 20px - 34px + 20px + 34px 15px 29px -8px From 514c31f4ee07226771363a44eb0cf35220530fa1 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 10:33:54 +0800 Subject: [PATCH 36/54] =?UTF-8?q?[add]=20=E8=B5=84=E6=BA=90=E5=90=8C?= =?UTF-8?q?=E6=AD=A5,=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D=E8=B5=84?= =?UTF-8?q?=E6=BA=90:=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF=E5=92=8C?= =?UTF-8?q?=E7=9B=AE=E7=9A=84=E5=9C=B0=E5=A5=BD=E5=8F=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=90=8C=E4=B8=80=E8=B5=84=E6=BA=90=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-xhdpi/selector_call_btn_normal.png} | Bin .../selector_call_btn_pressed.png} | Bin .../res/drawable/module_common_selector_call.xml | 6 ++++++ .../res/drawable/selector_call_btn_normal.png | Bin 0 -> 4524 bytes .../drawable/selector_service_car_panel_call.xml | 6 ------ .../module_services_online_car_panel_item.xml | 2 +- .../src/main/res/drawable/selector_call_btn.xml | 6 ------ .../item_v2x_scennario_history_other_help.xml | 2 +- .../drawable-xhdpi/selector_call_btn_light.png} | Bin .../selector_call_btn_pressed_light.png} | Bin .../module_common_selector_call_light.xml | 6 ++++++ .../drawable/selector_call_btn_light.png} | Bin .../selector_call_btn_pressed_light.png} | Bin .../selector_service_car_panel_call_light.xml | 6 ------ 14 files changed, 14 insertions(+), 20 deletions(-) rename modules/{mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_normal.png => mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_normal.png} (100%) rename modules/{mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_pressed.png => mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_pressed.png} (100%) create mode 100644 modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml create mode 100644 modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml delete mode 100644 modules/mogo-module-v2x/src/main/res/drawable/selector_call_btn.xml rename skin/mogo-skin-light/src/main/{module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png => module-common-res/drawable-xhdpi/selector_call_btn_light.png} (100%) rename skin/mogo-skin-light/src/main/{module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png => module-common-res/drawable-xhdpi/selector_call_btn_pressed_light.png} (100%) create mode 100644 skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_selector_call_light.xml rename skin/mogo-skin-light/src/main/{module-services-res/drawable/service_car_panel_call_normal_light.png => module-common-res/drawable/selector_call_btn_light.png} (100%) rename skin/mogo-skin-light/src/main/{module-services-res/drawable/service_car_panel_call_pressed_light.png => module-common-res/drawable/selector_call_btn_pressed_light.png} (100%) delete mode 100644 skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_normal.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_normal.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_normal.png rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_normal.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_pressed.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_pressed.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_pressed.png rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_pressed.png diff --git a/modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml b/modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml new file mode 100644 index 0000000000..edc0ec8bc3 --- /dev/null +++ b/modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png b/modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..361ea198656c7bc05a67f3e808c0ab557646313e GIT binary patch literal 4524 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 KMNUMnLSTZg^Sjaj literal 0 HcmV?d00001 diff --git a/modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml b/modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml deleted file mode 100644 index f24ebf2862..0000000000 --- a/modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml b/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml index e11c589602..13915be41a 100644 --- a/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml +++ b/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml @@ -62,7 +62,7 @@ android:layout_width="@dimen/modle_car_panel_call" android:layout_height="@dimen/modle_car_panel_call" android:layout_marginEnd="@dimen/modle_car_panel_call_margin" - android:background="@drawable/selector_service_car_panel_call" + android:background="@drawable/module_common_selector_call" android:padding="@dimen/module_services_panel_item_detail_padding" android:textColor="@color/module_services_panel_item_detail_textColor" android:textSize="@dimen/module_services_panel_item_detail_textSize" diff --git a/modules/mogo-module-v2x/src/main/res/drawable/selector_call_btn.xml b/modules/mogo-module-v2x/src/main/res/drawable/selector_call_btn.xml deleted file mode 100644 index bae6d6289a..0000000000 --- a/modules/mogo-module-v2x/src/main/res/drawable/selector_call_btn.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index 8d055540e7..bb00ca4b09 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -112,7 +112,7 @@ android:layout_width="@dimen/module_v2x_event_button_size" android:layout_height="@dimen/module_v2x_event_button_size" android:layout_marginEnd="@dimen/dp_40" - android:src="@drawable/selector_call_btn" + android:src="@drawable/module_common_selector_call" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi" diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_light.png diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_pressed_light.png diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_selector_call_light.xml b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_selector_call_light.xml new file mode 100644 index 0000000000..44b5570c79 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_selector_call_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-common-res/drawable/selector_call_btn_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_normal_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_light.png diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_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 deleted file mode 100644 index a0367b590f..0000000000 --- a/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From abea2fd9dd923d906a522b0b2f4e165bbb55f226 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 15:11:03 +0800 Subject: [PATCH 37/54] =?UTF-8?q?[add]=20=E5=9B=BE=E7=89=87=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/item_v2x_scennario_history.xml | 2 +- .../item_v2x_scennario_history_other_help.xml | 5 ++--- .../drawable-xhdpi/icon_heart_unlike_light.png | Bin 0 -> 2540 bytes .../drawable/icon_heart_unlike_light.png | Bin 0 -> 1137 bytes 4 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_heart_unlike_light.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable/icon_heart_unlike_light.png 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 43783d6c62..a1722dc529 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 @@ -97,7 +97,7 @@ android:id="@+id/llIllegalParkingUnLike" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="26px" + android:layout_marginRight="30px" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index bb00ca4b09..8fd4be0d32 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -14,18 +14,17 @@ android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_40" - android:layout_marginTop="@dimen/dp_21" android:layout_marginEnd="@dimen/dp_31" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent" - app:miv_borderColor="#4cffffff" + app:miv_borderColor="#3381A4DC" app:miv_failureHolder="@drawable/icon_default_user_head" app:miv_overlayImageId="@drawable/icon_default_user_head" app:miv_placeHolder="@drawable/icon_default_user_head" app:miv_shape="circle" - app:miv_shapeBorderWidth="@dimen/dp_4" /> + app:miv_shapeBorderWidth="@dimen/dp_5" /> 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 DNj4>e literal 0 HcmV?d00001 From 1982a1793c276cee19401fe630c1e6165bb8a2ec Mon Sep 17 00:00:00 2001 From: liujing Date: Sun, 29 Nov 2020 10:57:55 +0800 Subject: [PATCH 38/54] UI From 637dfd2ff223731076c13d0dd662fd2b3ad0df01 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 15:39:46 +0800 Subject: [PATCH 39/54] =?UTF-8?q?UI=20-=E5=9C=86=E8=A7=92=20=E9=97=B4?= =?UTF-8?q?=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/drawable/bg_v2x_event_description.xml | 2 +- .../src/main/res/layout/item_v2x_scennario_history.xml | 6 +++--- .../drawable/bg_v2x_event_description_light.xml | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml index 1885f84bd4..88fd3e48c6 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml @@ -1,7 +1,7 @@ - + diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml index c4deeb0b6a..fa6ccf5b22 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml @@ -1,8 +1,7 @@ - - + Date: Mon, 30 Nov 2020 17:45:18 +0800 Subject: [PATCH 40/54] =?UTF-8?q?=E5=87=BA=E8=A1=8C=E5=8A=A8=E6=80=81UI?= 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 +- .../main/res/layout/item_v2x_scennario_history_other_help.xml | 2 +- 2 files 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 f2a8033f4b..1dc06f0ca5 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 @@ - + diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index 8fd4be0d32..c975f7af0a 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -121,7 +121,7 @@ android:id="@+id/ivFaultHelpEventNavi" android:layout_width="@dimen/module_v2x_event_button_size" android:layout_height="@dimen/module_v2x_event_button_size" - android:layout_marginRight="26px" + android:layout_marginRight="@dimen/dp_40" android:src="@drawable/selector_nav_history" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" From c232935eb555f7df79ef12d85ebe03ae0666fd37 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 18:01:11 +0800 Subject: [PATCH 41/54] =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=89=B2=E5=80=BC?= 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 1dc06f0ca5..e46aa1dcdd 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 d293b21d2d2fd63bfd2710a473a0f2e67659a338 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 20:20:13 +0800 Subject: [PATCH 42/54] UI --- .../module-v2x-res/drawable/bg_v2x_event_list_item_light.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml index 534a55cc22..77ada92145 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file From 884586ce35ce309cd7c6c3ab5fffe2b4db89b8d4 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 21:11:31 +0800 Subject: [PATCH 43/54] =?UTF-8?q?ui-=E5=88=86=E4=BA=AB=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/module_v2x_event_share_item.xml | 55 +++++++++---------- .../src/main/res/values-xhdpi/dimens.xml | 4 ++ .../src/main/res/values/dimens.xml | 3 + 3 files changed, 33 insertions(+), 29 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml index 6098f58094..4c820d67c7 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml @@ -9,50 +9,47 @@ android:layout_marginBottom="@dimen/dp_14" android:background="@drawable/bg_v2x_event_list_item"> - - + + + + - - + android:paddingLeft="@dimen/num_padding_left" + android:text="10009" 26px 25px 2px + 82px + 55px + 95px + 24px 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 c371aabb58..a4124c9e9f 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -66,6 +66,9 @@ 29px -8px 84px + 67px + 45px + 52px 13px From 690706fa2d34bafde3c152acfdbaad7f76e11b4b Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 1 Dec 2020 10:37:21 +0800 Subject: [PATCH 44/54] =?UTF-8?q?ui-=E5=8E=BB=E5=88=86=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/module_event_panel_fragment_surrounding.xml | 2 +- .../src/main/res/layout/view_history_empty.xml | 2 +- .../module-v2x-res/drawable/bg_v2x_go_to_share_light.xml | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index 57fd474a50..d9a199c6aa 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -104,7 +104,7 @@ android:layout_marginTop="1px" android:gravity="center_horizontal" android:text="你可以试着分享一个事件给其他车主" - android:textColor="@color/v2x_FFF_333" + android:textColor="@color/v2x_FFF_666" android:textSize="@dimen/module_v2x_surrounding_top_textsize" /> - + \ No newline at end of file From 29ce6687a0ede8ec52c2a953e4752017e6b218de Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 1 Dec 2020 10:39:48 +0800 Subject: [PATCH 45/54] no message --- .../main/res/layout/module_event_panel_fragment_surrounding.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index d9a199c6aa..b9b2ecf8f1 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -92,7 +92,7 @@ android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top" android:gravity="center_horizontal" android:text="周边5公里，暂无交通事件" - android:textColor="@color/v2x_FFF_333" + android:textColor="@color/v2x_FFF_666" android:textSize="@dimen/module_v2x_surrounding_top_textsize" /> Date: Tue, 1 Dec 2020 10:49:51 +0800 Subject: [PATCH 46/54] =?UTF-8?q?[add]=20D=20=E4=B8=8B=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BFmore=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-ldpi/icon_event_panel_more_light.png | Bin 0 -> 289 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_event_panel_more_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_event_panel_more_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_event_panel_more_light.png new file mode 100644 index 0000000000000000000000000000000000000000..62e3039df2fb1c69853bdf8379f9eadfc6736607 GIT binary patch literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFY^SUU<4VhD5l(onpw>YW+Vi`g{Z8=I}#DDl{4Y02XDpnbWw`=|f@H6^WV+LmRGQ;r|q)v!q?T(O0f zSNfE=YvHQbzdoM({ej=~$0La5`_{>!p}8u5b7G%V*5%B4)^)9QW~_?t%UsQV@tmH* zX+gU#E1Y_qWRl>sul(3C9_92(!=%;8cW=~77;kP~qPti3=|?%^&2yL7@-DK`b7MaC i Date: Tue, 1 Dec 2020 14:35:35 +0800 Subject: [PATCH 47/54] =?UTF-8?q?[fix]d=20m-=E5=87=BA=E8=A1=8C=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E5=AF=BC=E8=88=AA=E5=9B=BE=E7=89=87=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable/v2x_nav_normal_light.png | Bin 3236 -> 3176 bytes .../drawable/v2x_nav_select_light.png | Bin 3181 -> 3128 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_normal_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_normal_light.png index a37dc6a948f5cece381ce060b9d640019a9857b2..96bcc0308cb71320991f9b08cd00742f1e96e963 100644 GIT binary patch delta 3158 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 delta 3219 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 B1AhPj delta 3164 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 Date: Tue, 1 Dec 2020 14:35:35 +0800 Subject: [PATCH 48/54] =?UTF-8?q?[fix]d=20m-=E5=87=BA=E8=A1=8C=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E5=AF=BC=E8=88=AA=E5=9B=BE=E7=89=87=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable/v2x_nav_normal_light.png | Bin 3236 -> 3176 bytes .../drawable/v2x_nav_select_light.png | Bin 3181 -> 3128 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_normal_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_normal_light.png index a37dc6a948f5cece381ce060b9d640019a9857b2..96bcc0308cb71320991f9b08cd00742f1e96e963 100644 GIT binary patch delta 3158 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 delta 3219 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 B1AhPj delta 3164 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 Date: Tue, 1 Dec 2020 14:44:23 +0800 Subject: [PATCH 49/54] =?UTF-8?q?new#=E9=80=82=E9=85=8D=E8=BD=A6=E9=98=9F?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=E7=99=BD=E5=A4=A9=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...e_carchatting_launcher_calling_bg_light.9.png | Bin 0 -> 2803 bytes ...e_carchatting_launcher_calling_bg_light.9.png | Bin 0 -> 4690 bytes ...odule_callchatting_user_pop_call_bg_light.xml | 12 ++++-------- ...allchatting_user_pop_call_bg_normal_light.xml | 9 +++++++++ ...llchatting_user_pop_call_bg_pressed_light.xml | 9 +++++++++ ...ule_carchatting_launcher_calling_bg_light.xml | 8 -------- 6 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_normal_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_pressed_light.xml delete mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..05cc876e70b46a2a11411ad44a0b3ad4e756c22e GIT binary patch literal 2803 zcmV(Wg<2R#Zr`oC9n7+*bB?Z3mY2=WC(JS|3I=Jh=2sM zA+dxM%NC1F7|S4Qta(vPzq_Yrn$EeUb4y>HKKE8Xs=?iNN;)q?m?=% zZQHZI+CSsiy0)&ZYwOy&wyu%9UI;9HwxGW_=JDLg$O3(WW4nmS5exbG?Q=a>GF-q< z2#|Mh?Bv)rqG3P3eI6ud!b8N+!PkJ_arW%lJ

rz(}o=e1hxZxsKg_<>@%Uav3F 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 FV1hsPfOr4^ literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..56d420a75d4120df05d8f98722b5fcb8666eff51 GIT binary patch literal 4690 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 - - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_normal_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_normal_light.xml new file mode 100644 index 0000000000..5f061fe6cf --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_normal_light.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_pressed_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_pressed_light.xml new file mode 100644 index 0000000000..23d84302eb --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_pressed_light.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml deleted file mode 100644 index 045e0686d6..0000000000 --- a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file From daaf2fe35ccf951a531dc69f2de7a42ec85d29d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 1 Dec 2020 14:45:14 +0800 Subject: [PATCH 50/54] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=91=A8?= =?UTF-8?q?=E8=BE=B9=E9=81=93=E8=B7=AF=E4=BA=8B=E4=BB=B6=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E6=92=AD=E6=8A=A5=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/fragment/V2XSurroundingFragment.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java index 571707afcb..ddb5c38c6b 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java @@ -198,6 +198,8 @@ public class V2XSurroundingFragment extends MvpFragment 0) { + if (!hasBroadTts) { + if (eventCount > 0) { AIAssist.getInstance(V2XUtils.getApp()). - speakTTSVoice("发现周边" + poiInfosList.size() + "条交通信息", null); + speakTTSVoice("发现周边" + eventCount + "条交通信息", null); } else { + Logger.e(TAG,"周边没有发现交通信息"); } } } From add563af69b164e7120d757748597d649de2b2ee Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 1 Dec 2020 15:13:30 +0800 Subject: [PATCH 51/54] =?UTF-8?q?ui-=E7=A9=BA=E9=A1=B5=E9=9D=A2=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E8=89=B2=E5=80=BC-=E7=B1=BB=E5=9E=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9(button=E6=9C=89=E9=98=B4=E5=BD=B1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/adapter/V2XShareEventAdapter.java | 6 +++--- .../java/com/mogo/module/v2x/view/V2XListEmptyView.java | 4 ++-- .../src/main/res/layout/module_v2x_event_share_empty.xml | 4 ++-- .../src/main/res/layout/view_history_empty.xml | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java index 53f0c88824..6828c691cf 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java @@ -189,13 +189,13 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter { + TextView share = itemView.findViewById(R.id.share_event_button); + share.setOnClickListener(view -> { V2XEventPanelFragment.Companion.getInstance().hidePanel(); mApis.getShareManager().showShareDialog(); }); - Button refresh = itemView.findViewById(R.id.refresh_button); + TextView refresh = itemView.findViewById(R.id.refresh_button); refresh.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XListEmptyView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XListEmptyView.java index e6c4717760..4301964bd1 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XListEmptyView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XListEmptyView.java @@ -21,8 +21,8 @@ public class V2XListEmptyView extends LinearLayout { private ImageView mIvEmptyView; private TextView mTvTrip; - private Button mBtnShear; - private Button mBtnRefresh; + private TextView mBtnShear; + private TextView mBtnRefresh; private OnControlListener mOnControlListener; 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 edaa337156..b8d06d3216 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 @@ -31,7 +31,7 @@ android:layout_marginTop="@dimen/share_empty_btn_padding" android:paddingBottom="@dimen/dp_10"> -