From 2e11b2e5684dc28cbd1fe16ef53929ceedfdcf66 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 25 Sep 2020 11:55:01 +0800 Subject: [PATCH 1/8] fixed conflict --- modules/mogo-module-tanlu/src/main/res/values/dimens.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml index af1c70909d..955ea90977 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -84,7 +84,7 @@ 45px 13px - 6px + 8px 7px 17px 3px From 3929d4e00a3fce48295fc58cd73d4ad1a5293da1 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Mon, 21 Sep 2020 11:47:38 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BC=98=E5=8C=96m4=E9=9F=B3=E4=B9=90?= =?UTF-8?q?=E6=A1=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_media_window_alert_bg.9.png | Bin 2497 -> 2301 bytes .../module_media_window_alert_bg.9.png | Bin 2497 -> 2301 bytes .../src/main/res/values/dimens.xml | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png index 24567d76fca7b0144b548487c5b9832bf9e5d6e2..8e6032a5f1daa97b1f867d94a1dfa22435f63d27 100644 GIT binary patch literal 2301 zcmV)C1vJhnkXl0AN*iCGaGVItrBBSuECcgOp{IfDb{o8L(bK(?Ke)5x_{NyJ;`N>ay@{^yW)9s%AUMh_% z#nR}!Sc)!7rRbX6ccfzS-{R6vBx=lRrz~s2@5&@DSN7Sz>0Q~Sbs$RoT|J0*t8Z9U zYk$VOHGa#g)!(YS)_51!MbW<-&G&cp#`|k>UpAXZ=dISXLjRu~KWH9*YPExxg;IDy zpxqXVA%j;aj@T_>76C{Il;0E}F9}ta2C6}-s%fwiq=G4`4xkc{tm@)!G!JRrdfwqh zw|o5ZmjkU8%vqh1c*wd z6ruvFK*miE*3sH)PtTUi<%?eel&X@zx_Vt0#vEp-U={$#VuH;}$m$ZLfVvByRyQcK zih(k9){~*u1<;079AtySY#mXcti0Cj>Je)FF`&ibbJQ#UDQfC{^a`Ldal}o2e07 zJ+f@BLFxc1SD-r0p1IFJQh3VZ4CEVRaTBHls%*}zZh|~SKqsY;mQ|GD!3?9+7m<)T%7+-k<0YsO*_Yl^YUWl?Q^T zrGa9YQ*QY-RVV`*xBcU@Cjlx#Xsuuhh!QAP=GaPet;!936DU(d1U)mMZzh4P!_mk) zRO*zfgjVMuMc>5AWH+%r0Xknl!1~(*Efm6w*C2q9G6hTybc{m?q&Xbe)qRgLnJTOH z;9hIIRU=W7GV4f{@6mYV!2oJ)P$q*ZfRgfq`Gr%U^fkeU_JlbTjz(oTv`-XF+%s|b zYy;D@cw)~qY~F-0>76d?JiG*cy&$zb|(Qpa)7TU49@rEhcHH}P1c z`exa*_!tlD=2Nn&`=(5D)8Z1|#(^EZez3*Wz@9V~sh&AA)Tu$zo5SSg`-}5!fyUog zXmpu0v`b~~7*kG~dTIuVJghITM0K&q-wSLu_?pa5vK&SzUn?P?KN=i#X^k zE?ok>M#~Q4ISFlEw%+Ep%{Prjrp2MXO_24Zu?T`h%G5T;AYnm};tn)W(nqhI0VN>O z3eJ8~PEeX#RyRP}m_1j!P)B!X@rTZlZ*@itc&^A|gCorD?Xj=A}$}Lb*Ru3?=us|B0U-{l-11uGS%7beRK;n z&HGIC0urwv2$CyvsRnonGXO9mkV|CeiprhA{M(%ev{pOEIv;y{_s6`F;8X423umDzz-2R82jbvjjO zHujlw`}NaZZUhOH*>epv3;RrHbsq(hR;WyKWOV_v=T@QF*k@v88hsP=Om1_oOjwSA zrhlI)L83Q$Hz9z8D!UNq;FCL`S=nb=?{gJAA2i6GR;C2nComlY&Bi{{vN?rms1t(h z36K)?i8AleWs~OW_4k6Y55+oc^{~=@7nTN*k_t) zPLtdO32ok!Fi8zuT0SfLOsP-=)PyOm&Q$qXDby*@tn4%KoGFw1qa8p3U?=a8t=xk9tB&rBMRSorimp;RA8 zn-4iiTEpBaLIaBB8D=T+EGqTUz2y&o7 zYK!X%DNvV|&&oa%E;{;PL^9JnNuA;7n>(Oc*=K5Xel~ihR_73ekOWD~spYe>&xG&t zzVWQIRH=Z9iX1AGsP8Td`%JTUN`P`aVh}~o429K)0_JFZ@}E0}dhD|jso!Txt0SNr z5?!iNRy1C@`_V$9@$NDU`%IMR5TXeZ1d#$7t+xJI&36y|;7JztnFCXmL(ne;R2e|b z<^m?MI{|uf?hGjXdQ2AfnSE>4gdlalgvz8aX^qGKxcg}${o!cCJGxE#KC_=R8ij_% zbqEoK@*@57_Vm=@k7w!eyy->S_n8ADeB=u#G?YmpVs)9}X2fAeNs7`>s(6_nBt!puQ;}a+|Mc-8{hRkNXf-5X@e+ z8Ps&`GtqNW^-SC99OmlhdlDZ9a;i&4D`iS64rv%*O+jJ(Ygfs2$AL zY1n5b4(>{oCuay@{^xToH(!TUP1o@ Xcha;YK!ns~00000NkvXXu0mjf88=oO literal 2497 zcmV;y2|o6TP)dR#?RW2f?OMEnDps+IRjgtat60S;t@4 zhuL|!sMKVQRHc89vN}{1)#?7HDtWFpjvlJ@@olX!{!wd=ud0o4U;dAtAEqx~Q8aun z0KOJL-*1=p7h9q<;HoqM3h=Bn5eoQ^2zUd&uBdOo*T7pM24+{lS5p!y>O8cd8}JXa z8j-&(_z^s-I#MMFSqL)jtIgxbklocgu(q<}-j9Rp8EAi$?LK<$nAoJNa4L8Chlu69sKD35lz9+BTs(x_gH(oUD)c9H7 zj+uGmCTzS|^%8WmXXi#T?fWA@W;Ni_3-N2(v@*b?zHiWYVZ7Ay@who*8!uneMMK^IvHP^3jmh)z>-Ojg zs^@J-H(#iH4ZJ4dsRS&ZU_qOh=jSM%f(~A}tp86_&xh)7$^FzL0UMm>SILY|J-;5? zku%S7Oyf1`KUIHwBVg0>e3Nm4KX|~XEwCWpX_k9C4KF_B_Sk>Ff2aK6u*S3R+ z@JK)~c|LsM0_Eq<`e5SGpsPww*VO|yKhI|;9)|=7yj6W2lHm0Qgp}uJ%4dOxR+E9R zfY&!5(csU-dFG#haPoX!^-%o~c!Js`9^Ur#zycj9Sb_0v+|D*`;;fDrS1 z_o0OwE>eA__yz#KnXG|;pz{2f88NBy6IcEE1~ij1{}vQfp3l5)A^2$G0l=r~Kl9v# zL(KEF^+4Nk=6wKsc2?Cs^LqnA%<~(0wgWxCWyemfdbz7=`y?RHJfDu2)OH%g^9=#s zZ$O}Ve!VqiXZ&X7^?KUTy9Pcb;j?E83NX({<0i2ksC-lcc)7=32?#XLN24aP8`yX= z>uFOG)<8gLd4An_=`ORJRP_>ky?Z4f#5~`=Y)>)ppy4)v?P&FTCm_^3KW((O@mk>V zxJiMJ+vn@*0b%9&@O4W^P7C~*X}XvM-!~w@Jl}XeH|;>xn{%pswRg^a-heRkd`I=P z;cEW}%2(&kxgx>y4G1sKN1oqa=J}vH=W8G!&^*8CDF3swYtXF)o%^?-Q1g7}fdxSa zfH#5fw>p2B-KzzKnCCmMTk7>->}&z+i8B(s-hdGEd{{BH9iVy&yi~v68xUxopQrv5 zaP0ZYdJGAIfbNAq0z%F6^|%>x6HmwWe5n4|=M4xo&u=oXTVy$HY(EfuuQwpnJU`B2 zW&Fx@Z-4R z<9>*FKJmwon=&AK6^)GgNbAO+$lpi6jHID8>%k!NXe|K5qo!j&N{C+n3*WZU* zvqpR!TAt67z*~+aK&oHvoxQo=PZ!H2KS(VIcnm4er!U(UP`qroZDc#?4G`czc8A~m zf4o~wL-FzVkn;S5^ZPFLeQiDZ26Xl>*Yo*$x#W)%)SBa)Q1W~3Kf)!ll5c%Aeo0d*6P|kNBXQ z5TD#^a-N@OImq*c?L0&IFDF3v1o@jO0@TM%%=2-$W*=E<+!WJ}Y`CxXLvHjo2(Yi^ zFGp-ro}Z4IbL{(j^ZU-;-`6ity?+AWi&_41M7?!#CBL6vPo}p5*oU{8=XZ9$J|uhd zTN$hgwO`42;fXKY*CC)-#VS^@idC#)6{}dqD%M7=MN!YHpRWG_Ve1~A6ne)Q00000 LNkvXXu0mjfufqh9 diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png index 24567d76fca7b0144b548487c5b9832bf9e5d6e2..8e6032a5f1daa97b1f867d94a1dfa22435f63d27 100644 GIT binary patch literal 2301 zcmV)C1vJhnkXl0AN*iCGaGVItrBBSuECcgOp{IfDb{o8L(bK(?Ke)5x_{NyJ;`N>ay@{^yW)9s%AUMh_% z#nR}!Sc)!7rRbX6ccfzS-{R6vBx=lRrz~s2@5&@DSN7Sz>0Q~Sbs$RoT|J0*t8Z9U zYk$VOHGa#g)!(YS)_51!MbW<-&G&cp#`|k>UpAXZ=dISXLjRu~KWH9*YPExxg;IDy zpxqXVA%j;aj@T_>76C{Il;0E}F9}ta2C6}-s%fwiq=G4`4xkc{tm@)!G!JRrdfwqh zw|o5ZmjkU8%vqh1c*wd z6ruvFK*miE*3sH)PtTUi<%?eel&X@zx_Vt0#vEp-U={$#VuH;}$m$ZLfVvByRyQcK zih(k9){~*u1<;079AtySY#mXcti0Cj>Je)FF`&ibbJQ#UDQfC{^a`Ldal}o2e07 zJ+f@BLFxc1SD-r0p1IFJQh3VZ4CEVRaTBHls%*}zZh|~SKqsY;mQ|GD!3?9+7m<)T%7+-k<0YsO*_Yl^YUWl?Q^T zrGa9YQ*QY-RVV`*xBcU@Cjlx#Xsuuhh!QAP=GaPet;!936DU(d1U)mMZzh4P!_mk) zRO*zfgjVMuMc>5AWH+%r0Xknl!1~(*Efm6w*C2q9G6hTybc{m?q&Xbe)qRgLnJTOH z;9hIIRU=W7GV4f{@6mYV!2oJ)P$q*ZfRgfq`Gr%U^fkeU_JlbTjz(oTv`-XF+%s|b zYy;D@cw)~qY~F-0>76d?JiG*cy&$zb|(Qpa)7TU49@rEhcHH}P1c z`exa*_!tlD=2Nn&`=(5D)8Z1|#(^EZez3*Wz@9V~sh&AA)Tu$zo5SSg`-}5!fyUog zXmpu0v`b~~7*kG~dTIuVJghITM0K&q-wSLu_?pa5vK&SzUn?P?KN=i#X^k zE?ok>M#~Q4ISFlEw%+Ep%{Prjrp2MXO_24Zu?T`h%G5T;AYnm};tn)W(nqhI0VN>O z3eJ8~PEeX#RyRP}m_1j!P)B!X@rTZlZ*@itc&^A|gCorD?Xj=A}$}Lb*Ru3?=us|B0U-{l-11uGS%7beRK;n z&HGIC0urwv2$CyvsRnonGXO9mkV|CeiprhA{M(%ev{pOEIv;y{_s6`F;8X423umDzz-2R82jbvjjO zHujlw`}NaZZUhOH*>epv3;RrHbsq(hR;WyKWOV_v=T@QF*k@v88hsP=Om1_oOjwSA zrhlI)L83Q$Hz9z8D!UNq;FCL`S=nb=?{gJAA2i6GR;C2nComlY&Bi{{vN?rms1t(h z36K)?i8AleWs~OW_4k6Y55+oc^{~=@7nTN*k_t) zPLtdO32ok!Fi8zuT0SfLOsP-=)PyOm&Q$qXDby*@tn4%KoGFw1qa8p3U?=a8t=xk9tB&rBMRSorimp;RA8 zn-4iiTEpBaLIaBB8D=T+EGqTUz2y&o7 zYK!X%DNvV|&&oa%E;{;PL^9JnNuA;7n>(Oc*=K5Xel~ihR_73ekOWD~spYe>&xG&t zzVWQIRH=Z9iX1AGsP8Td`%JTUN`P`aVh}~o429K)0_JFZ@}E0}dhD|jso!Txt0SNr z5?!iNRy1C@`_V$9@$NDU`%IMR5TXeZ1d#$7t+xJI&36y|;7JztnFCXmL(ne;R2e|b z<^m?MI{|uf?hGjXdQ2AfnSE>4gdlalgvz8aX^qGKxcg}${o!cCJGxE#KC_=R8ij_% zbqEoK@*@57_Vm=@k7w!eyy->S_n8ADeB=u#G?YmpVs)9}X2fAeNs7`>s(6_nBt!puQ;}a+|Mc-8{hRkNXf-5X@e+ z8Ps&`GtqNW^-SC99OmlhdlDZ9a;i&4D`iS64rv%*O+jJ(Ygfs2$AL zY1n5b4(>{oCuay@{^xToH(!TUP1o@ Xcha;YK!ns~00000NkvXXu0mjf88=oO literal 2497 zcmV;y2|o6TP)dR#?RW2f?OMEnDps+IRjgtat60S;t@4 zhuL|!sMKVQRHc89vN}{1)#?7HDtWFpjvlJ@@olX!{!wd=ud0o4U;dAtAEqx~Q8aun z0KOJL-*1=p7h9q<;HoqM3h=Bn5eoQ^2zUd&uBdOo*T7pM24+{lS5p!y>O8cd8}JXa z8j-&(_z^s-I#MMFSqL)jtIgxbklocgu(q<}-j9Rp8EAi$?LK<$nAoJNa4L8Chlu69sKD35lz9+BTs(x_gH(oUD)c9H7 zj+uGmCTzS|^%8WmXXi#T?fWA@W;Ni_3-N2(v@*b?zHiWYVZ7Ay@who*8!uneMMK^IvHP^3jmh)z>-Ojg zs^@J-H(#iH4ZJ4dsRS&ZU_qOh=jSM%f(~A}tp86_&xh)7$^FzL0UMm>SILY|J-;5? zku%S7Oyf1`KUIHwBVg0>e3Nm4KX|~XEwCWpX_k9C4KF_B_Sk>Ff2aK6u*S3R+ z@JK)~c|LsM0_Eq<`e5SGpsPww*VO|yKhI|;9)|=7yj6W2lHm0Qgp}uJ%4dOxR+E9R zfY&!5(csU-dFG#haPoX!^-%o~c!Js`9^Ur#zycj9Sb_0v+|D*`;;fDrS1 z_o0OwE>eA__yz#KnXG|;pz{2f88NBy6IcEE1~ij1{}vQfp3l5)A^2$G0l=r~Kl9v# zL(KEF^+4Nk=6wKsc2?Cs^LqnA%<~(0wgWxCWyemfdbz7=`y?RHJfDu2)OH%g^9=#s zZ$O}Ve!VqiXZ&X7^?KUTy9Pcb;j?E83NX({<0i2ksC-lcc)7=32?#XLN24aP8`yX= z>uFOG)<8gLd4An_=`ORJRP_>ky?Z4f#5~`=Y)>)ppy4)v?P&FTCm_^3KW((O@mk>V zxJiMJ+vn@*0b%9&@O4W^P7C~*X}XvM-!~w@Jl}XeH|;>xn{%pswRg^a-heRkd`I=P z;cEW}%2(&kxgx>y4G1sKN1oqa=J}vH=W8G!&^*8CDF3swYtXF)o%^?-Q1g7}fdxSa zfH#5fw>p2B-KzzKnCCmMTk7>->}&z+i8B(s-hdGEd{{BH9iVy&yi~v68xUxopQrv5 zaP0ZYdJGAIfbNAq0z%F6^|%>x6HmwWe5n4|=M4xo&u=oXTVy$HY(EfuuQwpnJU`B2 zW&Fx@Z-4R z<9>*FKJmwon=&AK6^)GgNbAO+$lpi6jHID8>%k!NXe|K5qo!j&N{C+n3*WZU* zvqpR!TAt67z*~+aK&oHvoxQo=PZ!H2KS(VIcnm4er!U(UP`qroZDc#?4G`czc8A~m zf4o~wL-FzVkn;S5^ZPFLeQiDZ26Xl>*Yo*$x#W)%)SBa)Q1W~3Kf)!ll5c%Aeo0d*6P|kNBXQ z5TD#^a-N@OImq*c?L0&IFDF3v1o@jO0@TM%%=2-$W*=E<+!WJ}Y`CxXLvHjo2(Yi^ zFGp-ro}Z4IbL{(j^ZU-;-`6ity?+AWi&_41M7?!#CBL6vPo}p5*oU{8=XZ9$J|uhd zTN$hgwO`42;fXKY*CC)-#VS^@idC#)6{}dqD%M7=MN!YHpRWG_Ve1~A6ne)Q00000 LNkvXXu0mjfufqh9 diff --git a/modules/mogo-module-media/src/main/res/values/dimens.xml b/modules/mogo-module-media/src/main/res/values/dimens.xml index a6fd4099f3..de1d893a59 100644 --- a/modules/mogo-module-media/src/main/res/values/dimens.xml +++ b/modules/mogo-module-media/src/main/res/values/dimens.xml @@ -1,7 +1,7 @@ - 468px - 581px + 467px + 573px 352px @@ -61,7 +61,7 @@ 2px 3.2px - 332px + 338px 82px 60px 18px From 610a8e622c679e513d09f5bd2a4d94ffa8e70d2d Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Mon, 21 Sep 2020 14:35:06 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=A1=86=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/extensions/utils/TopViewAnimHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java index e71a78f3cd..70177fc753 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java @@ -635,7 +635,7 @@ public class TopViewAnimHelper { } private int computeNaviMarginTop(int height) { - int result = (int) (height - (getDimen(R.dimen.module_ext_top_over_navi_height))); + int result = (int) (height - (getDimen(R.dimen.module_ext_top_over_navi_height))-getDimen(R.dimen.module_common_shadow_width_pos)); Logger.d(TAG, "computeNaviMarginTop: " + height + " result: " + result); return result; } From ce073487f4300ea436d2cb10856b497cf3be64fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 21 Sep 2020 17:11:19 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=BE=AE=E8=B0=83UI=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/window_road_event_detail.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c34c2ce6dd..4cfdc310fc 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 @@ -24,7 +24,7 @@ android:layout_width="@dimen/dp_88" android:layout_height="@dimen/dp_88" android:layout_marginEnd="@dimen/dp_28" - android:layout_marginBottom="@dimen/dp_65" + android:layout_marginBottom="@dimen/dp_35" android:background="@drawable/icon_window_close2" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" /> From a047055fc68180134cffbd739836d6348ee02108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 21 Sep 2020 17:12:15 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=BE=AE=E8=B0=83UI=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/window_road_event_detail.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4cfdc310fc..380e53446b 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 @@ -24,7 +24,7 @@ android:layout_width="@dimen/dp_88" android:layout_height="@dimen/dp_88" android:layout_marginEnd="@dimen/dp_28" - android:layout_marginBottom="@dimen/dp_35" + android:layout_marginBottom="@dimen/dp_40" android:background="@drawable/icon_window_close2" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" /> From 81760d096ecbc2e72c63b41b5af461c971910318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 22 Sep 2020 11:12:09 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=BE=AE=E8=B0=83UI=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/item_v2x_event_detail.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml index 022db7da53..a4df8026d8 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml @@ -67,9 +67,9 @@ android:maxLines="1" android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/dp_36" - app:layout_constraintEnd_toStartOf="@+id/ivEventHead" android:textStyle="bold" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="@+id/ivEventHead" + app:layout_constraintStart_toStartOf="@+id/tvEventTypeTitle" app:layout_constraintTop_toBottomOf="@+id/tvEventTypeTitle" tools:text="东城区北三环中路辅路小黄庄路口" /> From 33683c2f356850fe07583c55b02acc0fc8c6a034 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 25 Sep 2020 14:56:24 +0800 Subject: [PATCH 7/8] opt --- .../extensions/entrance/EntranceFragment.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 8a8b8804a8..71431b0b17 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -73,6 +73,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Random; +import static com.mogo.module.common.utils.SPConst.getSPGuideRecord; import static com.mogo.module.common.utils.SPConst.getSpGuide; import static com.mogo.module.share.constant.ShareConstants.KEY_CLICK_SHARE_BUTTON; import static com.mogo.module.share.constant.ShareConstants.KEY_CLICK_SHARE_TIME; @@ -359,8 +360,8 @@ public class EntranceFragment extends MvpFragment + package="com.mogo.launcher"> + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml new file mode 100644 index 0000000000..c99bf31c73 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml @@ -0,0 +1,82 @@ + + + 445px + + 18px + 20px + 190px + 250px + 190px + 210px + + 136px + + 82px + + 54px + + 64px + + 156px + 234px + + + 34px + 22px + + 40px + + 6px + + 150px + 550px + 200px + 200px + 100px + 50px + 90px + 36px + 40px + 15px + 150px + 48px + 32px + 28px + 28px + 190px + 238px + 170px + 43px + 26px + 12px + 8px + 2px + 30px + 34px + + 12px + 16px + + 24px + 18px + 20px + 16px + + 82px + 16px + 117px + 50px + 17px + 16px + 36px + 16px + 20px + 34px + 15px + 29px + -8px + 84px + + 16px + 20px +