From 2cac9cadcb5cbbefe09d4b439b96a39c28c8282f Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 16 Sep 2020 14:58:34 +0800 Subject: [PATCH 1/4] change the 9,png --- .idea/codeStyles/Project.xml | 15 +++------------ .idea/misc.xml | 2 +- gradle.properties | 2 +- ...e_carchatting_launcher_calling_bg_light.9.png | Bin 0 -> 2793 bytes ...e_carchatting_launcher_calling_bg_light.9.png | Bin 0 -> 4669 bytes ...e_carchatting_launcher_calling_bg_light.9.png | Bin 0 -> 2795 bytes ...ule_carchatting_launcher_calling_bg_light.xml | 8 -------- .../module_push_message_background_light.9.png | Bin 2779 -> 0 bytes .../module_push_message_background_light.9.png | Bin 2779 -> 0 bytes 9 files changed, 5 insertions(+), 22 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_carchatting_launcher_calling_bg_light.9.png delete mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml delete mode 100644 skin/mogo-skin-light/src/main/module-push-res/drawable-mdpi/module_push_message_background_light.9.png delete mode 100644 skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.9.png diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 0d156937bb..663459aa50 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -3,18 +3,9 @@ - diff --git a/.idea/misc.xml b/.idea/misc.xml index cd77a1f062..21e99e2dc0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 57bdb8d90b..c2009768d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -65,7 +65,7 @@ MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22 # 探路 MOGO_MODULE_TANLU_VERSION=1.3.1.24 # 车聊聊 -CARCHATTING_VERSION=1.5.3 +CARCHATTING_VERSION=1.5.6 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.3.4 # 视频引导 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..c7879ce453b3db077f6cd1a886668b8350054b57 GIT binary patch literal 2793 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 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..8956d3ae1380b658eceb93d8c5cff06fb987ef16 GIT binary patch literal 4669 zcmXw7c|6nqADzL2t*iWX<}p_G5)P6IMv=?tUL1(W#TOC)|)as`!;QCu??s!(-@ZwMtS2p z=T5iplHVx3W>~GX&l}K46cs^g1dK?sAW6u%UCO~REZ(7@2w zuc}{GaE#e2-&L`OE2YH-7cOP>ip~4Qi}WL zltk<1)u6@oyrv0R9CY%SlBHzzS5J9tupk^YwMDP6 z5|?%{m8(%WS%ugh>i`^!SkDq@6y<2vnY9HOx0x8tAZ|9R#KnGQ-IUh95*BVy9NluN z`fJ^2;Pv^{jgx3J`e<54#`}HRvXer|-fq(2$oY#)6r&;u4rNg$N(Y8$&C|w7U+?_+ zQn#2+&si|%Xy{64dsWNp(gJg8s;iZqmw!gfrvDM^j!xcqwjSmFmnh;MT{qMV$zx|O zXc&CDn8LfVHW3nXG}r3AxWshoqZT1kOUVn%Oj)V;S(FU&CJbsQ0)ZKp_Q3{kLQM|x z20)ZvAaXq6f-s9BtcTfD%s!&1@8^qY(kqAR+#`vHS#o8;dR)>d)RvONvCd; zEtv@6s}Hc?_$$COsA#37;XYycrKkf73k&ZNF0Rss1?|};zQ(K@2j{b)`64J$Yf}zC zZyZNKh}G+wgRV=&2gZ$a;HM<)B2lF=a-0f_M&`|NNNz(ej0x!LZ+(i}CFG_KnW-@- zz>3%wcz37Q9@xMCpO$5nQKKM%UW>hSN$=s<0pjq14J8{aP^#Go?ueWDe!sw4a?>0V^t5eq1(T_b*h+t1%27k{n}FeBJ7*+rBr8NWNjsl;r`} zaA9nD4*Gfy+P|=5uX^k&rb@neR6v6S)B@!ZOjRb&9G7{L)H$inhb-06>6Gd`v7b{@ z{|hOo!9$e76BMA5wd(s~4(l$%bNrt#4rsH>YU`QNW)hSia6i?_{ zz%=YjhrnWuX0eH;?r_<_lW{+RN2a!nL|WO*GE!A=jNjZvlt}Aw98))yisexeQ4*{G z9v?QGzsl{)RdrQkbo0shlS`!blpGJ68@Uq7`v-XmI6mPeRN#Tpw#^WsOGE~kV+|sW zO=Gr z`pw4&DsMA65HE9E^jh84_EAzS%Uu&wDM1gMzxxk#y6++x7@%TX`=7l9CR>^{qXT z$!1~xWL&nrNpQOK@nykTk_!!#rrM-YA^V>4geboXa{aCq#NOcA=DL>^F;>nn>@KiUH6kT@? z_w%cKS+}NL0B?4z;pWkC&I% z-Qinc0``d}H4fi!xWRS3@F1CiUculy@84;&HuwTFW!bUKmo^##PZz~oUV`o-*!7P} zxH^MH463v?Ln`Sb9%}ZyAnz(dL?H?Is|)5c`extyW-i|4#*gPPg#=WFFEA>jD5%D{ z7c8O`_Ms9ym1@EGV?8;Yf60`}yM_0mWx3nGTkNM-k%AcfCqJeK5qyH6HFmt=uCZAB z>9JYeSa$XEF_qjWA29gH6@bHQZROd8Gjlp9hnd=pqGV(ahw^vNh0I8Z9rKA<0o-Ot z@@%`*@c;{Xt3#8=tbQ9Hq$P@{VK#XiUU!ZYrU{I$*9;ikyJIHaRm71_d)htkc3E3s zNLWOdUbTcKc&};^Jv|D`M9rnUk8ss25jFv3!cB=Qz_pJgX7;!QXx;qdFEm^4<#I zlR{;ctmsjz7`aoR;XMp8v4Y?HeB7&e6#=p?VcL_?H4{`n9+xkf$XAJfQ@Gm&v&;q5x4fL7sUL# zRB1agLjo`edN0r&I>e5kSCvAjEJ#H)w#inzU`K=pn6x(bO*1EzR7X@41GSCh1cBEu z$&fb+xpu6&S!Ia5UR0H2C*_l<*cPfe>evYeeg%lwFF49y=*eddFX4!R0$lqAe z;mCElXzNZeX4fgGKx&y;2oeEPa@bw~)x51Pmm6Dyg#Zew!P|P180e&Zl`6p*AX>t< z9GdOCva~*^^nXwV4B)Bf@Njyy{dQh~X|VZq_b-}7Q2V0KP8j;wdxwi<)kQIT>0#R_ zet#l)J;gx;h%^YzJVVB}a+{7C7^z_Ily=sCI(s`UX4dY8mQPllPX|kgwB5-BuO(9b z^-{Lk39SIPUITnTwVg;lzAtNbaCVK9S$L2u{@#89LjxJe8Jy@5uTWLpX68>p^)nJr z6_RR!g6-Vf9AuB(ihOj$v#HlA6g2Q;pku2@G0@bdu$rB^SpoJ+w)Y!Wv_Z60{x3wA z&V{(?MgwE=sSpPc^D%cgSL!6rsX>?*|aJ>!dp@XO+N~4S7}5+UJy&Pj5i_A&f+)MO!!Ysf!mc zYHe+8x##_K`uoe#@P#}yUsW8`e|D&d&_AF7f*fGSSRzzYNLe(8Ze>ack{bpH*i>zJ zZM24Oitp@8a{SPB9bfe8wcV<}Q{>42<^XFpti5{=7K?okvMQ#a1XKAK&SbjSOVyw&#w}M^y&oW@)TbbE60P%p1 zwuF6tCE-x$@@*~zN*0$RiytD_4`*gQw8@`ggGZ_oylqkM%1{c=Gaf9v)kG$5Az}Uv zs=5u|=HInkEM|X82CHy}6jmq?L9kvPvHHC+IXOA37+~i}K9|B8aXK0p1vcn7ut;V| zaH2fJEN@P-HS_0)W@6!Hnuu=KXDh3B=?6|Q#L9p9f=Q5Bm4veu78gv7_$#9soZMH{ z0_-YDDjK@>PY}VGP4jfU@Ojfv5gD)_exsnk`+m~z$B)nKV*bFm=FZUIK6pCmahbjO zS~oH(D(YU18W^4Nyec_YQ6j3^fZZJOeiFS<@c44hxLTTR;a=TAX8M}msqZ?UR(|~r z_D**O`aCtuK}|ebX(9Kq|H#B)+rplH{ymNdbUjy<-cC5xIz|ufv}`qYw$6*|qCmar z2g~GBg(lp5`&~9pk9>PW0-VnVXk| z1=nTt#Idu_uBz;Rf&S zhspcjf&&9?86bL6Gyj?C%`WB{x%Io?igCF#TssUM5et+#49P^BiJ{im3eoNRWOGucp{_qqApRx>0Mg9s330df0 zM%@Ye1|7Wbh{eWEBZSs4_2I$x(ZV_lZy)$uAI+OMa(?XuLVk#SxSx$n)^k@9b$buS zLYyzvQEH4Rl_}lk*=-G6E*7XNp-rS3}cGH3gz|8Ilz5`ojwhD0cNdF84 zz+4%Q1Kl?6HaM%T;KTz(q9Xt!q)iZK>4FwIt$}%Tz14kSRf3?Sr`YRA+MNCk)k#J^$ z%c9HOX4ZWKgpF^k94NI!5VRmhHvkJ1y6%sAh78PFi{*pB3rFDQ%O@nxdG3`*3MckD z>StJXZqfHGX8?}!6$xlA|BFvBp;D2$Je&soJSsr`Fp0*lPpltlmjw?QUrL?C<;Pt6D{} z*Tlq&zjj{X*t_#D5@Gy4~(F ztQafwbsBKLDp!bA6>Bnjy*9MU@Dw%rIu}63BK+Pf4<0-?LD`{+2u^|v zd{q2wqtW;gseB0@e8~Vkr+f`O1I`4%ngbplc2z2011|u7s(_cOmtSYVv*JnhIrVGc zA?omFbs(TdfzSIB#DFrQ5)v%%Q`O(TeftD_fX|fTbLwZ+8=z|fwDshGm&!LH@u+_Q zbXL1q*9+8N7poO_@87?FQe;Cg5}e>adi3a<0O;Q=&;{^05-1~lmSfq?nkGS7jzjrL zk@6+@A_HoM>IX;w0M3La+}}fth=hG5NZ2Vu zz&4;X-se0;o)Kj8Nayrp{W z`@Vu}dA?GAQ>+*(w{G3~DsAM7tZ1i<`Z1l}fX&q}t%57T=hoAudPTyT?s%l~wd#4J z{k&pVMRj|kW>G;bLWnVP1dr*b_QC_vYv0* zjsd=RgQdG11N@rH^NYa8EHEr51zjkgqlJ3}#LSTeUIHxdf8+7v$KSJj-_>SX8!cm# zrMsPhu1Ad*d?X;?iEpE&!8f{{0qc>)mJ6*YxS8$1+TxY(7Z(@5Pg&rr1v{DrNx&4P z&@>d^OW5g%ov!Y3mK}xGTX02}v*xiJuiZF6f2Qol)$i90@EfAg)|KKL+HMT>rvW&i z4NZ%-v@`)Z`++zNmHiK{O_m^HRa;L<%h4T9PWeW!@7iRo>j9f8y55bJD7LviU#Y(- zY$qdvRG$m@{eMF23T((rz=EPtor8`+rC5L`ymp0h#|p9HI8pyU~&b*D=}Dz~?qvmi0JhI|CNv=yqzJF+;tm z+YuYAfuhSkZ&{CsRm9Fw2TBoefIRHTsLu1P4Hk7gb(iPsO_ox85$LJZSi$KrRADn=Q=J`#Z-&+OO0v@76H6W-3MKRC!bUZDi z@aBrHCLw4BL^RKD8kS=fTDG2!@c#}G&T?CxD!i2t5aB$3D9@)X=uif9 ztH^-p=K0$1LO8woc2#9K)uQyuS>kT5hQvFpC5Y0Sa zx0>2^WCm#9s~{l8dH%p`M{l$Y@FfYoN(hK)o^L3=U8H&jzsd}VW}a`gn+^gx68K6o zAjWyVEVvf%qU%Yc-|wfu;|dYnf})$}i}un~J%HR%;7bb%M?kFed1KW}ZAXGHfrr=#o&hn=^W|X8)A95q_-sF+i*S_l z`~uJK3c$NWz=l{if)fziJl{h=Pg;*wK7x-V1S25UdA`eXT%OP1bA-%*DChZBw_~-O zf`AQHe^3Hqo#*QoQ!1Z3N}6&4iLJl`5GI8>igKY|}R1EQSgyEa;upWkpUbUKAmhvgKtH^-p=J}%7mhya7esBU}o#z+%y(B;r0kIvNfY|2w zWtA`Pw`GJTAi8K9|2=eu^fmgf`r9DRt|ZV1S|tOH-+9^*XU zQoqmhRm|_^WgWTK)c^sX#W>HGpv!hsbvssI2He~2>uRzWHZ_~gPh*_tJCrZIUV48D z{Lao!dJoV0>#{Fwnkaf@*}}rY4`Q6>yL{haIjsCNo;-Q-aoJavO%%Pf@64Gq@8Zc3 zvCZ>6n=BK2R6k`v4KXYG(!PnJ*H&URZ?#&V#x~D)s9(04eMLa3et7oZPzO}%wUrY^ zFK)$Ra_!o+uYm>B z;9~}~+wGqtR)krpR~MJDp>#iR_UzgBd%fPhSmycG?$$%VbND@+4IO9dnTP1ejiT?%eq{knpc@ zpXV2JJbkf#F*i5&9kL$o{mUHSP>O_oq9vW7^g4F&;>C{u{JC+S=ev4*X*+Oze);m{ zj}Q}KJ!OwD8SW4tN~^<6!s*kePpq%6V_{w$$9cZh?NG0uc016T{{k@(;2&1j6Z9md zDT4$|x#O4(&1Umgcyh!z&GQ|~uXVfK-(9+N=^Oa$gnq;%t&HkCAEE*APx$xd0QBF^&(Hr5pAnyxp7|}pV5R{4 z@TcjK&rMUs=WIAes`wJbdl2u7`0|K_{Os@1GaaXAWYy0S28XHuzwj_ms`Q)JL_Vm}jZuYy}b1ufUP!E)rf-2i;E!LS#&hSm@6`sX%|- xfyE2GipUtpc - - - - \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-push-res/drawable-mdpi/module_push_message_background_light.9.png b/skin/mogo-skin-light/src/main/module-push-res/drawable-mdpi/module_push_message_background_light.9.png deleted file mode 100644 index 245c2e855c00fc86809e0b4d0d5ff617f34d3db1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2779 zcmV<13MBQ3P)9FNA1feAvV%{t@)Skoce|31nf(s{aF;5H|=3 z%mdL)NHiKA92p~IGiH8KO#kklo@vH&E9X?cI(=?cH(dpE->Kx}R?lX)yT0!`-#Pbe zQg_#`mw#=)#<6qlTszm!wR7!U6M20luy}1je`Ctym6MSN`fiRrDrP1u^zWDFdZlFe zfZwe^-pjF%WB-JP{C;^JBxiR95v7A~0l)Xcg$oB)R#wh7o6TRh+wDJ4{FUOr6f2!h zXPH(PEBrYQx?jbWVpYW&Mz`CIgYKWY*x1-eR=$sDjrem!pP$hx5y^e8*NcPh*D>gC zZmqhNzUO~*|F_M}%|Fro9Uly&%93_M4bKc|AoSfua0^5DUP6Pz8Ih{8$m zf$tPQTd&uD$|_%?2VXKkPbpsmFMtaHw5EWkhh0VGYv2L!rwVvfJ$_Dr7sa#cQ|i~i zQ`G36)rf#9hkM?iI}A7@N+H1lKUV$i+qX~95BOXuKBaz9y#cx=KwD1=cvQX-QHJ^l zKo_;cx}Kx{8mv~_y?_7yNyvu6NbrLH=+UF^5TJjzKnLJcBydJ#S&n5lYnlYK9FOv& zJmn+!kO5Ug^#df3@&)+11pT}73kwV1Et&)q{F^s#o@DS*^#b;iA^>e?6|x{vJrg0e zvntBhexCvSQw4sc3ockrO7*CI$pA$}qI3bC*ScC86!UlQ-u)nhgt5SP{V8PXIXx)yPXWrN5vx%btHiakW6UM{XK^fldxwT5|DsB zTx1SZtJR+wp1*9UexT#YX*GTJlVkuAU;wYdkCfd!L+?l6LH$1K8OQe*;z*E4Oal`UY?0UdW2H`dvD`Nt>(RSOpism)6s#dPTyT?s!o7TJ^Hg@_4=p zzV3J+H1O`e=23oK6JP)@84w5k_Nxvvu%eL(NU8taxpPNgleO%zoq<+!SkJd?#{fTb zgQdG11N^Gb^Yg%WSzuUB3_2)ZqUrVs4l_>{jO_hyK7Rc8hnDaA+DvPsWo)u^w=>Z7 zsPRG;2@dcmYon#XH@ckx>%n3xg%%2KVmq`pWtIEI#l;_S7K~I2kboIZp$Zk>ORm#_ zov!Y3mOX_wv*1FPvzB2wnRep={h6{GU%y{7z^_B0ttrLVwcQx%kArY~(`PwsH%$cI zslRXnrhT68^L*%da7D{$GU$o=3nw6;d440y@2!Gs0Z-B98c?VO1u@Uh=y;k&;Y}4? zO+uj=5YRloVOWk;XvKQk;QwtVpj|itAkT40sQ$7D2xgwITTN{{ zm;oC2G6)E9oDP2mze><%=4{w(?dWTfiEQkLY(Jg z!L@*gt|yLuzaIndR*J$cD7bk(w3nvp3FNi{A1$aj0z#eVdr0VbyuT~q)L&=@ggVd9 z>2gr@Vmor*ExHB-InRfkZsPZ7I|x1kPq9&W281}z$H7`g$J0gd#eRw|!a>gSb3DHT zfOnXH4Olk{Cm^(Weg*+uv>vT|2fibrFakoI=ld+j=lKG@M3ET~H_!L=_}J-K*27s)xCI3_&&PtR zx}B~DU2Mkz&wtx2!-9gE=Ud|ikLpwEci*=lOYlj|6BUD7FeGAhdb@ zu*!$~EsUZG2yULQffw-c9>EvuDVzXO{bGpoeBUnD@_YtgqEAsBhk(?}I@~MVL!9SZ z>d*3g74ze~tRwZh8Y1BH5a;;_I<}jt+p)rBz`b!_SChQ3snKYB65>4HqkQyw^!^z5 z?d|ROo}Tx!abMV!ys~UzVd2Li&hve~@39SC*w-+IQy6nRngE5uwfV zGd5W!_)h(t0ab_DI4|u>y|&U-^JcU8NoezYkNUCI>?;Cd_0zNemOG#qdTr&vi(6eW zxpwW^H_3vQLYn7i0KcUO=tDHFU%&pLD!?PXxYeoyE|rc(QS^(D=J|Pk&vui5?=qm( zYW>n-#h8u!>SCV_#ruJ?XV1Rh?RM{lGS9bmw;2RHr|+7v7sBl|#^v<0--y;(KJ?-=SoQ|gt z>z8wLbKhs{k>3A>4{-1vVIo#UaqQy7iysmAbJIM}_x1Q_J9K?<`SRtD9425rV;y1Q zJ;aC8>X49d`t<1&>+9>TFt1MIJm2bexYv)n9cs;gg9BxNpL>`mS9-|?A>s&-ag3F6d_vh?%62-!0EE%g9FNA1feAvV%{t@)Skoce|31nf(s{aF;5H|=3 z%mdL)NHiKA92p~IGiH8KO#kklo@vH&E9X?cI(=?cH(dpE->Kx}R?lX)yT0!`-#Pbe zQg_#`mw#=)#<6qlTszm!wR7!U6M20luy}1je`Ctym6MSN`fiRrDrP1u^zWDFdZlFe zfZwe^-pjF%WB-JP{C;^JBxiR95v7A~0l)Xcg$oB)R#wh7o6TRh+wDJ4{FUOr6f2!h zXPH(PEBrYQx?jbWVpYW&Mz`CIgYKWY*x1-eR=$sDjrem!pP$hx5y^e8*NcPh*D>gC zZmqhNzUO~*|F_M}%|Fro9Uly&%93_M4bKc|AoSfua0^5DUP6Pz8Ih{8$m zf$tPQTd&uD$|_%?2VXKkPbpsmFMtaHw5EWkhh0VGYv2L!rwVvfJ$_Dr7sa#cQ|i~i zQ`G36)rf#9hkM?iI}A7@N+H1lKUV$i+qX~95BOXuKBaz9y#cx=KwD1=cvQX-QHJ^l zKo_;cx}Kx{8mv~_y?_7yNyvu6NbrLH=+UF^5TJjzKnLJcBydJ#S&n5lYnlYK9FOv& zJmn+!kO5Ug^#df3@&)+11pT}73kwV1Et&)q{F^s#o@DS*^#b;iA^>e?6|x{vJrg0e zvntBhexCvSQw4sc3ockrO7*CI$pA$}qI3bC*ScC86!UlQ-u)nhgt5SP{V8PXIXx)yPXWrN5vx%btHiakW6UM{XK^fldxwT5|DsB zTx1SZtJR+wp1*9UexT#YX*GTJlVkuAU;wYdkCfd!L+?l6LH$1K8OQe*;z*E4Oal`UY?0UdW2H`dvD`Nt>(RSOpism)6s#dPTyT?s!o7TJ^Hg@_4=p zzV3J+H1O`e=23oK6JP)@84w5k_Nxvvu%eL(NU8taxpPNgleO%zoq<+!SkJd?#{fTb zgQdG11N^Gb^Yg%WSzuUB3_2)ZqUrVs4l_>{jO_hyK7Rc8hnDaA+DvPsWo)u^w=>Z7 zsPRG;2@dcmYon#XH@ckx>%n3xg%%2KVmq`pWtIEI#l;_S7K~I2kboIZp$Zk>ORm#_ zov!Y3mOX_wv*1FPvzB2wnRep={h6{GU%y{7z^_B0ttrLVwcQx%kArY~(`PwsH%$cI zslRXnrhT68^L*%da7D{$GU$o=3nw6;d440y@2!Gs0Z-B98c?VO1u@Uh=y;k&;Y}4? zO+uj=5YRloVOWk;XvKQk;QwtVpj|itAkT40sQ$7D2xgwITTN{{ zm;oC2G6)E9oDP2mze><%=4{w(?dWTfiEQkLY(Jg z!L@*gt|yLuzaIndR*J$cD7bk(w3nvp3FNi{A1$aj0z#eVdr0VbyuT~q)L&=@ggVd9 z>2gr@Vmor*ExHB-InRfkZsPZ7I|x1kPq9&W281}z$H7`g$J0gd#eRw|!a>gSb3DHT zfOnXH4Olk{Cm^(Weg*+uv>vT|2fibrFakoI=ld+j=lKG@M3ET~H_!L=_}J-K*27s)xCI3_&&PtR zx}B~DU2Mkz&wtx2!-9gE=Ud|ikLpwEci*=lOYlj|6BUD7FeGAhdb@ zu*!$~EsUZG2yULQffw-c9>EvuDVzXO{bGpoeBUnD@_YtgqEAsBhk(?}I@~MVL!9SZ z>d*3g74ze~tRwZh8Y1BH5a;;_I<}jt+p)rBz`b!_SChQ3snKYB65>4HqkQyw^!^z5 z?d|ROo}Tx!abMV!ys~UzVd2Li&hve~@39SC*w-+IQy6nRngE5uwfV zGd5W!_)h(t0ab_DI4|u>y|&U-^JcU8NoezYkNUCI>?;Cd_0zNemOG#qdTr&vi(6eW zxpwW^H_3vQLYn7i0KcUO=tDHFU%&pLD!?PXxYeoyE|rc(QS^(D=J|Pk&vui5?=qm( zYW>n-#h8u!>SCV_#ruJ?XV1Rh?RM{lGS9bmw;2RHr|+7v7sBl|#^v<0--y;(KJ?-=SoQ|gt z>z8wLbKhs{k>3A>4{-1vVIo#UaqQy7iysmAbJIM}_x1Q_J9K?<`SRtD9425rV;y1Q zJ;aC8>X49d`t<1&>+9>TFt1MIJm2bexYv)n9cs;gg9BxNpL>`mS9-|?A>s&-ag3F6d_vh?%62-!0EE%g Date: Wed, 16 Sep 2020 17:37:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=9C=86=E8=A7=92=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/drawable/bg_v2x_event_list_item.xml | 2 +- .../main/res/drawable/v2x_shadow_shape_view.xml | 2 +- ...dule_v2x_event_panel_fragment_event_panel.xml | 16 ++++++++-------- .../drawable/bg_v2x_event_description_light.xml | 2 +- .../drawable/bg_v2x_event_list_item_light.xml | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml index 6209e34978..c77894055f 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml index 12e6ec50cf..2b616f3e68 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml @@ -1,6 +1,6 @@ - + + android:textSize="@dimen/dp_36" /> + android:textSize="@dimen/dp_36" /> - - - - - + + + + + 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 b41bb1f336..48d0b7deb6 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 @@ - + - + \ No newline at end of file From 592d2b39eb7cc4f736bec485b99543f394cb7681 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 16 Sep 2020 17:44:26 +0800 Subject: [PATCH 3/4] changed the 9.png --- gradle.properties | 2 +- ...archatting_launcher_calling_bg_light.9.png | Bin 2793 -> 2812 bytes ...archatting_launcher_calling_bg_light.9.png | Bin 4669 -> 4686 bytes ...archatting_launcher_calling_bg_light.9.png | Bin 2795 -> 2813 bytes 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c2009768d0..bf71905280 100644 --- a/gradle.properties +++ b/gradle.properties @@ -65,7 +65,7 @@ MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22 # 探路 MOGO_MODULE_TANLU_VERSION=1.3.1.24 # 车聊聊 -CARCHATTING_VERSION=1.5.6 +CARCHATTING_VERSION=1.6.2 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.3.4 # 视频引导 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 index c7879ce453b3db077f6cd1a886668b8350054b57..5d2560955c145412e22fcbc67956e7b1a0b3a6b8 100644 GIT binary patch delta 2804 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 literal 4669 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 Hu0mjfdk=>h delta 2787 zcmV<93LN$Q73&p{B!99=L_t(|+U;Fik5yR_?wO{!OgGIi!!XV$jE|1vgN8>9FNA1f ze3-;1{s{VDBt9r331mRx#D5@Gy4~(FtQafwbsBKLDp!bA6>Bnjy{;ykGTYrT6%Sn=a7oSm(;Ul6_ z@FnmE=H}+U0stcD|AttiV8E9Vd?G*sZxNw^A0U8%XCf2<2@)VkNCfB!15aQxDeK~U zDex3E`Z^at#v=UQD-Rw#I6>K=i3m=D3w%`kY@^Zm5r3(C2_AgO06nLC4Lk$R1i+dD z9v*g8DqjOH0Dr20m#UXvXTY=KN%cAPYv3X3@Mm=(phkhu`xC@~GNKX^Ebvp+-@bkO z1bl$cl;U&hXVn{^YXY?OLogDY;6Hlw z=$ioO-+wI71@Ji%C?kB9W7*A`CP7+`L-|RO@+J5p18Roq2S@ZSTQ0~8UN z(iwPK8)|Jr%-_9x_X7_Jy8<8m?ZEl-=Z`4cS$}c?FYU+C@i^7biuZLq(r!csJoEXz z?shz$FBLC|Xh;%>0M3La+}}fth=hG5NZ2Vuz&3@h;)2Vvuc-BPWl^I}KkL-FxpFiOD47{a!?fbrhYk9s>e^aa&E4Oal`YLVYimYg- zjQTO1-hj>3FRg+r!ROY~rFuoen(la{^0n%Dqvh~?6MWtAh|s{}echq_h9* zk;Rq^tthye?ZDdNmG2i97r#$g;Hw2YngvO~6s6EK6yHnO>4=@K?sAqLh1OeeMSqvG z=CK^F-8evhrtHSm@7E3R8=}zGmEs%PZVdIO0XU!yO^dd)GyysLfjA76{SU59mLOtP zTTe;L(H%}s`9`nr+GMTk0h=ni-i?+hwz)oEslO>~CnJJXp9}c?e?sgEY{*N%erl&? z0fayMx}5^xeZ#e<+Vfo-ELXQv1b@88cC7J2L-+U`Mz>=EPtor8`+rC5L`ymp0h#|p z9HI8pyU~&b*D=}Dz~?qvmi0JhI|CNv=yqzJF+;tm+YuYAfuhSkZ&{CsRm9Fw2TBoe zfIRHTsLu1P4Hk7gb(iPsO_ox85$LJ*uw@A7=n@yJzL zPK!X#)E}IHi01iCpWj;r*M9;YqC+(xs0Bqa&-ZjZEu-+}imoOhXa+q(>E@29}y z3K86bqMPT7_R>^6fZS2wOA87|K&Ad=essqmgPv`ajhZ)qMPS)mt&|u*YOD3*{q6yDChac zh+)&EehEC>r+*PN17e)#dpaHsd}cogJd+SS17e%!E8sUhs^65#Cla=U5fJM9gDYmP~favD=qS%)5d{%yN0%D!#7x}#;KobG69h`vJ=J{onFYdQxgeD-mdAI|zt8hk%i)Q&GS8*EE9ZGKV?7- zF)RDhzJH0L*H&URZ?#&V#x~D)s9(04eMLa3et7oZPzO}%wUrY^FK)$Ra_!o+uYm>B;9~}~+wGqtR)krp zR~MJDp>#iR_UzgBd%fPhSmycG?$$%VbND@=i#(d+9=pB;0M_XL<;ckbNzHjwbIai8ZGbUb~rela&U z_Z_kx?)}Rg;82Q$eWE3uq4YX-@#4jg0Q|Xep69!Id}%vyeSZ1!<&O{(VLfG!Fd6O; zAAd@#!%V{I)2C0YudicaULD7IzSZqeub*~1(3<}OF%aM%R@M{rB&8{X1WdW(m<`Ql z^H+Fs#5m3K9m=nDyWQVix^(Fq`0Rv%27lMbSa}a}qhB;beuqWp9f)^NojP^$;lqa? zBN@;w-3CDa0RXLx>O3E!0r5}x_vQff-+#`}&;Jmg5ucTw`7Od=rU3l#r|FT;O;g3^ zY&b@$_!7i>5bull@`#1}?C;St9j9kx)z1Di_Q@Gs;z+tLR*3tTb| z2|}hxEu$FI0`Nlu^cQ}h^WKr>ufUP!E)rf-2i;E!LS#&hSm@6`sX%|-fyE2GipUtp pcjEVpN From 38cb5a70e466eec47547e99f931321d6de9f43a2 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Wed, 16 Sep 2020 17:58:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?ui=20opt=EF=BC=8C=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=85=A5=E5=8F=A3=E6=8C=89=E9=92=AE=E8=BE=B9=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/values-mdpi/dimens.xml | 3 +++ .../src/main/res/values-xhdpi-1920x1000/dimens.xml | 3 +++ .../src/main/res/values-xhdpi/dimens.xml | 7 +++++-- .../mogo-module-extensions/src/main/res/values/dimens.xml | 7 +++++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml index 9fee93b7e2..bfb7a65b60 100644 --- a/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml @@ -2,4 +2,7 @@ 26px 66px + 10px + 2px + 2px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml index 4d5d931a5b..d34d1a739a 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -147,4 +147,7 @@ 40px 45px 120px + 30px + 20px + 20px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index ce413ccb95..8147d1eef6 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -145,8 +145,11 @@ 20px 34px - 175px - 30px + 165px + 10px 45px 120px + 30px + 20px + 20px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index 4c65427b84..5e019c6b21 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -60,7 +60,7 @@ 32px 32px - 90px + 82px 22px 28px @@ -151,8 +151,11 @@ 10px 19px - 16px + 0px 26px 66px + 10px + 2px + 2px \ No newline at end of file