From 0728aadf6b0747613b29ecae423769489af1974e Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 13 Oct 2020 20:52:27 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=88=86=E4=BA=AB=E5=88=97=E8=A1=A8address?= =?UTF-8?q?=20UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml | 2 ++ modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml | 2 ++ modules/mogo-module-common/src/main/res/values/dimens.xml | 1 + .../src/main/res/layout/module_v2x_event_share_item.xml | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml index 64b2c248b0..73cc314845 100644 --- a/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml @@ -5,4 +5,6 @@ 120px 150px 48px + 17.5000px + \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml index 50629b57dc..6e9f52e0a4 100644 --- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml @@ -1059,4 +1059,6 @@ 300px 281px 90px + 32px + diff --git a/modules/mogo-module-common/src/main/res/values/dimens.xml b/modules/mogo-module-common/src/main/res/values/dimens.xml index f84dd453b6..d613e69033 100644 --- a/modules/mogo-module-common/src/main/res/values/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values/dimens.xml @@ -1050,5 +1050,6 @@ 120px 150px 48px + 17.5000px 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 b3103c0ae9..542ae74669 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 @@ -80,7 +80,7 @@ android:lines="1" android:text="东城区北三环附近维多欧美" android:textColor="@color/v2x_FFF_333" - android:textSize="@dimen/dp_32" /> + android:textSize="@dimen/share_item_address" /> Date: Tue, 13 Oct 2020 21:08:05 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF-title?= =?UTF-8?q?=5Fsize?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo-module-common/src/main/res/values-xhdpi/dimens.xml | 1 + modules/mogo-module-common/src/main/res/values/dimens.xml | 1 + .../src/main/res/layout/item_v2x_scennario_history.xml | 4 ++-- .../src/main/res/layout/module_v2x_event_share_item.xml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml index 6e9f52e0a4..8f60bbf8ef 100644 --- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml @@ -1060,5 +1060,6 @@ 281px 90px 32px + 28px diff --git a/modules/mogo-module-common/src/main/res/values/dimens.xml b/modules/mogo-module-common/src/main/res/values/dimens.xml index d613e69033..bd36dac4cb 100644 --- a/modules/mogo-module-common/src/main/res/values/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values/dimens.xml @@ -1051,5 +1051,6 @@ 150px 48px 17.5000px + 15.3125px 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 e47f51edc5..da50969a5e 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 @@ -21,7 +21,7 @@ android:paddingBottom="@dimen/dp_3" android:text="违章停车" android:textColor="#ffffff" - android:textSize="@dimen/dp_28" + android:textSize="@dimen/panel_list_item_title_size" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -38,7 +38,7 @@ android:paddingBottom="@dimen/dp_3" android:text="待评价" android:textColor="#ffffff" - android:textSize="@dimen/dp_28" + android:textSize="@dimen/panel_list_item_title_size" app:layout_constraintBottom_toBottomOf="@+id/tagEventType" app:layout_constraintStart_toEndOf="@+id/tagEventType" app:layout_constraintTop_toTopOf="@+id/tagEventType" /> 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 542ae74669..f6aa04154c 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 @@ -23,7 +23,7 @@ android:paddingBottom="@dimen/dp_3" android:text="道路类型" android:textColor="#FFFFFF" - android:textSize="@dimen/dp_28" /> + android:textSize="@dimen/panel_list_item_title_size" /> Date: Wed, 14 Oct 2020 11:47:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF-?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E5=8A=A8=E6=80=81=E7=A9=BA=E7=99=BD=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/module_v2x_event_panel_fragment_scenario_history.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml index d02313fb49..0857b59d79 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml @@ -10,6 +10,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone" + android:layout_marginTop="@dimen/dp_50" tools:visibility="visible" /> Date: Thu, 15 Oct 2020 18:25:07 +0800 Subject: [PATCH 4/5] opt ui --- .../tanlu_icon_logo.png | Bin 11251 -> 3670 bytes .../res/drawable-xhdpi/tanlu_icon_logo.png | Bin 11251 -> 3670 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/tanlu_icon_logo.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/tanlu_icon_logo.png index dabf25dbbb0f0e88dce1b50178e924de851ecf55..957c298fd60c5480e2e1f40811fb826187752056 100644 GIT binary patch literal 3670 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 literal 11251 zcmWk!Wn5HW6TWmw2uQ7j(h?%EbP1AzgyfP6EU~-PA|ObIN-rG?NGc7BOE)OFAV@6D zACMA35T*C!{c!L7bbjZ~oH;YkJkPu{GSsG}=AZ@ufL2#W)8yv6`2UBJ{N@d^9uEfq zkyc$z_2&We`?fS$d}e<6woJtW9M7d=bo!fH<$5PinoqKfLaql=;A@`O+>CZ^%x#&pWSi#_uzqcK>gl~j)4w#)j<*3CC` zot;lL#t!yAo-r-KmaBOWG7nGs4$r^=E1$BL^G~UuioxT>hl|AHifciLh<_fdSCXgs zG%_0nW%mxYbM|X1KPX7vA~a1W+2VC__gcqi{KhAY*Wogl-`>DP6JV)IatL_k1l3c} zcJ8^Zaf)^AW&Qj0`*r@1zh@=lwXADK*X{grKqBe;$(PFYF5tVTK7Jxl%(k}no6)*! z^M*aC!xeLWn+&GDDJbWYwl*_C$@@Hfn;)2^X#DdsZ~-|&;0oyXUE7mo*IM_Vt~Irq zhDFzO;Q$A;^g)Y}@1A7y>t_nd8Gz=YkM1+@_V07$>@UQP&l%4B`&#DeE{mCg^z;`o zk1!86G(02pLm%1v9192&i-;$NSvfiryGE|Plp>NgbO0&&0`0l9-<2R5>Pr&w_GV4$ z*%HY+E>~!V2iJ;Wt`^{KpD;Sd-eJ}Cjw zI8~OH7eFvM+CBUPFuRl6as88Ag{hrSpebM=*t z38pRYb3DR2b(-rfyPP?7pF|`ADt**k(lEk??rdmyYxK(=Fjv{E(Yg=t)n+?O)ddwW`6Gq}Ed2wQn3TfndH|_%VEXMp38Svr>HL4~!2G2s0N$kG;grHgqiT055fW8X=({5r>C! z?{hXg?f_o)>FQrfC?}F={(ZkD*}%|H#Z+oH)K-e) z**h9;@4}ItB`-iq7Y@#=Bn0ll_$HhKno45#C^&!2^(=XJl(p{Mkyt{=C6_OWvbf&5 z$6tv9C%2^_u|JG9;96jj>~r?p$lw3wdIsK)i4M8AxP*|k&&Rg*`q?s01Jn8U`19;9U?SdDf4~@=5__wEb13o zJDkN&KGq{o<{!^;+ihRzzs#b~@SJ zg|Xjr_M>8aR)iA}PO~Al9=}kcjPw=!u5{;?yh*M+(0zi*L5|N1TBPMM8cuG*N;BYA z@y?L9=FkxV9ptw)rvqOiWErR3-Ev`SXBwBB9{1+$f1;69b|_rNcw6Z%OtYaMR9WOC ztOlVI40=2|01f!$jz~}jxz7}Wf{rJmQf`jWs#IdKnEU+Y?`_XL&!!ZRp@8}fiIQ9^ zXNcgklXPdJsx%wU1J>bKau2eI*Z4f^XuP~k+ut+eB(3sHxN#BV&ORI8n((q zMy=@%;_g=~N`vvs?FO$pX9l$iPy?fyDBO?DNj#EHA$Ov^`k}pkRO*epR=j&hzP`8^ z?`5uT^XO2MiqV1UXQ$a1psS%a5zoDCo*s(YH!1;G$Ox~_ zX$E5FQ?8D#rY^44Z(_S5Re~ zoGsEVB*w4J&X1m_tm1!E6k}wvkl@8`?#pX1y_9fZ01}MWg&ylq;!mSfXmV`+Q*Qsq z&~&BPH>$(6xOCro1tK-P$0J!SN}+RySVr-4 z*-1ZaD_`Na@I-ScuWZU|#w|k7jshfcO_iJ+=HrLu>B4;(Xp25B-?|#>OKoCLV7lnA zwqgXh!IBWDhxs!olU>%`!J##ss**4arCc#hGiMn)r!?s_!H=}?bxsv#ntvCT(5sLe zvkyOhyASq}T?k-Af@3%VNk4FMA5kGF<~vR8nES3w2ZQp0~?mvN{Q zlQ@*HAmYOd1<0rT>RJ@vAiB0b2)jAqBixVd^%eQK#8L2&!YS`B)_4cjFqjgd0ioH0 zJIACDX&ZwMmY&92Kyd5lYO)lg&XuqC!RE(@&gWgDJ*o*dWJ9m#ufdx44V-?$j)x=x z3-p-aF05CJZ>~D6X1`EE{e??Zif&Q=HW7pv*`*W!|8rTP3v^XoilX8rZY)p5yO?%Y z8aJR`yPR~DaOmFEy&v_if6GJeVWyJAs{@)l6#{N{&5H{Ht;jf%s{#$^lpZ~Q$DiN? z@A?j0vzLbG6}Qeb{;+^H;PXbd27)b(9$alzE0&IssZhM6D6LBB-GK?{LPe-xEY58S z17J4~hUX|jczVfAx}~L25j^jjp2Cca(ZYVKv1IA`KwC({sG0ehs8cIHU^e-5nzvz{ z8}g`ub`E+l>MxI?LR-Ih*cai=H2CHeKI?DOhpH?1jsKH$p~YmD=a!20|5>($d9=}@ zaWlP)d|Ke`e67LI1Y{j&RQuIh?}3muv5<nX1lZ8K) z?op#Et|TwBjX)P?o{DT##Zyk{GELK65y8w{@_jWB-6`H4*QX-~y z`xzbCzHKGJ{I@Kjs+U3c3s;iDx3t%6s0lR-FX~WV@I%x1Q*g>;Y)W;nUA1ae)VkI| zrn#|6&EQz4Yh-g*!bc3%otCXz3k0gLy(u6M;U3<#T7JU zas+ORE-<*yW6!$-i+-$MK0cyM89H=THlZRr_xY-86U7(buVaW#kOjH%5Y+pQ#H0Sn z@-TOnP)DL~%_=g8p9S@R>}a7)dEQhn-lN)p?pfUzaj0WpOg9X1joH5CEgAMLpxCB% zW(t#8ZEB%FRfDIX(myiM%A%YJ#l9Tb#0R z!3DiepN+>4k#@_~q3Gz4Zw`{C-S_^j>1SjmfMUyP6QrL>`d)d~95YlcDcnPJqS+iV zRflFkVgkO~W9Xl|fLR`a_pvgw1oG>)|HJ!mj#Z!-7}=L#Pzxa&;XAD%4GKsFYd&%ZSrP$PVt*ji|R60W4=kIM4IvA z!+eX&3v2vV+D*FYW7UZ#-kotIkcN?<2~!%QF=eZ!VbAL$UJ@}Vp6$V^HIId$Xxb4Y zt*gQjIi4u)%yKg5*u*wWKy1*pLg#Ws%hoj2SweG~Ty0Uz(39ru72vcB|GqV&w7mcF z2s;sy}?ueExmFT`Y0l&GrITlkhg`EpHV5NhsKpz0W?xyR;=L`BJf*s;Nro` zik5BiQ__W3gLpbq2BGjCWQ6Y#BVR8KiYDN5&y-4RQQ8P*fPpXJg#ri>3VDyqxaZ|5 zJLaHed&Q^@ZBj{9aTG!GJc`omg(nCL8b(qBo8IdHE+)0J4Ma(x($NzDgPh z1Y1>xzT2wQ`(9Hv{qwH~kxmkIWlG}|5^F>`kwL_&%>J;WhY$-oiHmx;C{%?h-Gm#M zkPUHGeyNfQI@L*gMOip+D))cqlg6Yf+tEE#R)_xE51u77?7;djZxW|-kSy(h86p2e z%^!(DvTwT02_=_E@KfUkUM?iiEJbnslD=WD%d8!fYrkVY8RsU?3I}wLpt}#~6RN|= z{?1Yg>-{iNHdzhkPVJJhdsxi`l*XpMwjSd%hxSF%Z4+ugDJt2xSfMi`ZR!%*a2a=# zco+f(-2}TrUO32-+WhjZ_z&OA%%3}^eLE-cU2AV26lg9UVByyuP$2RF7{1)fq3V_i z;c>>$Cg5Dk_F&JaQmR*NcX#Q0UD@BncHvm`NU~ctHd*o!7fWvl;Xn>N7zsX?>E=Tl z=(Bs2e|xv!Jz7P6eXHKhbZrC>Qq0oEuTi7;8ToX_V={>T(T|+v{;I7g!j*02Hhex# zmV6~4vW}1#J4LEs_;^35-C&beC|3XiX=>P8V&!UFl(@~I?;QwA@F!tkwed64?)%S} z6-c`{+lGB;42DaT#1qYi_>hS9?@%whtfyTnfH=30c3~XGP|)R5Ogr3LzpJ&Pcw=)u zv=^(Q*NFo&sE8}2+TpwuDPFBRe?NUcani*OE6K1@er%f++}c`H>;lRs%KR7V8=W>u ziK0B1W_;F{02Y-@%N?G?OT#>KW7(6EJ7FY`hhm@9hMJk9o;rM;*FCYSniN>lI>7gv5uh|n@S<3$C0z8enEcOsPQ`PU zq%LSN43k5w;*SNG*3whiV2f6qISX$#msU|eiM>4;Q)`X@$ar$lEV-(DEdA~TKBr25 z|DlnEPoo&ZJ3Ov~43hlxb*4^Qa_?ZLf77w=+oW7jRJ;xk5Fd%lQ1bn)C+5fhwfm-S z2=7#eI`6@Z>ANN7Z%~{UA}k~CN5Rw%jJ8Grl#O0)=A>`IkC$2Q( z$~>7x*vqJrPK~Yd==>ZUx`{Wj!e-HNaB_rk1 zViHsNJzQ$&eLK4)>ooB?${AK=D+x`%d^|OE-Y-miG!dK@1=m0jwmR}xHQ-0v;FpE8T zdvgoKC=tanS=eEkE1Fgf3&L&wcG{-mDn62#TF^ju8Q+jm)aYtp`{@CCcUU-*F2eKO zp%2ZtfyC)n0Q~hURl`vApEQJJ{cWYYMNUGdNU&kPm`c)&yVS+Uy|U3fMC{$KDI|ON z>w8M7u7=|^KhCxq7jdtF1(L%>P7*}WFNw(#{OlK6SMOg~ZA>KZw3#W^6-e$Hr)rP~ z=Bmp;Z{{0|dBye)S&yzU1IjstV^=S20w%;A4#Xi;lQj? z$%l)iy?_1Ju0)KCeYpPoE~JkMsDEh_{z86VHFmOAHB$eY-13$rtw^Z-gVb;2 zwelpZt={-bvAlrAmIeG>i=0I>*U$wu?XXyWea0i3j#{dd038`aI zKfg5E;+7lJNIatcdfr10sAnc92hzNEm`e7?X`NOCDL z;_ookl6!EX_4XHk*a~A%LqKH3dAbnjN#x=vF%O!eFp%`bA360JJFuk%gf_{|l zS`@+3L^JLbPXF)%#>pP#y8exL_ve>ObQ(IOTYlfPyHAFGoCC@lx1L;puJDm^E_N)h z(foMKG4gJidhNdzBAsid?m8yNAG$9(K)7Ogr*Z5lT`}u2*^~5qgGv1A)w{W3;X+{$ zI5#`{?9NxKP{8Kz3WZSz8O!}^nddn+l&l2R)&D&E#st_8-Q5a#BWg7$Mb=4d*Or!u zNfZ|D2LCOUu}!zj8JOmi`Cc_($Evhjul6OFl$;Dr-+P+r0R3n2p?%Niqe{#D5Q?5) z-r#Gi(|lj`EybzE%YUwh5)ci?v4-7;&n;?lSUl>CtUu3q^>#)0RMLF#z1TZ8BV?B+ z1bT*ggs?VGb&`w!_47LOBsE&1x+6&6cY(NUj!JW^wo>z*>K!!ft)vZ^!Ehr!pgfhOo*CHzE=pX>-muJQ{8J6@yrR5ReM$Zd0aGQ+)Jl;C{$z{g$NBu@f+B z_Pbw9!Qr+_lOzD;SAobK652@eEwaqLs^&?=zg1d&ixHo=FFXQfaN*L;f$q71m-G!X zZRDuwC-e8dtK}1no9_Fq$nDSBc zPi~eDo<}2n#&GOVdhOZ~mTu=#ZIqrZ%!7yUGrA&_OWEtn0b`QS%p>)7e02pmYhTLK z%LH3n8MJnJmXr8&Zc2+@a#x}u^>x)J9JJ-iVI9TV-0T^@C)g$iUbYKy(5K?{26)3J zx+5NLlPv}>mvh+2Kar~&Z(Z2P&P%+jN5gAu&ZbMvi4Il(-Al7^5?Zl1jpcauaMFNq z1-!LCB4HPf|1)@I?XoRL*=k2WOW*2{6dv)C+39`#nAaLNs^eT%-Z@SI>2#;5-qA^M zq>s~_!F9PFh`1Oa9^)lRILz(=6qFcx_V7K3ZSe!4?G4-lZreV~5?7>orT{u~jm6rf zZ9!X1Fqf*)ablFND%pJXCP%V*2U^1`8GR$0B>9NAvdxQo2~F^uPVo)nb_qThSw*Lc>y1uW2002G4$9>eV~w@4~n`a9Zlg+axX41VtjRXI$;z z*PRi!HLhJ^3mDLt(mfcnWEey`@23Q@=ikV*h*IuwwoWUK30Gy1Yy;mmzdm{IaP;^} zse`7ck-1-xyaFVx0+YS?9+k>dOuTdeow_Xhr`yS_3a87wkB|zBuWBQEg9=msf5WBM z^A-ndyVCm|v@rk48IsLY{0%=>sWaKWF!f1aRk}@uDqT?ZhirR#v{296MY3LE*4C5Zr^mXmdT@8T?T$3XtXeMHu(wN4qpI*z_%K<_C3SG=|r=xxVJ2^1&0-#`i_9O-NwaOzMbjwZoH-qS^21 zh!4OP=Aj@~Fv?#DKep1TenLVzxsf=$3;XyHm%-$9TzG6>z8WpI*&0A;kZyoKz(+WL0p7d0Wx7i9}-Z5`F3)oV{I~DlncD&o%YDPU9Nhq+p z8ZX4`JXL_8gw`nJ`Vh*6;5zZ|1`7Md8w~t^Y!_Tuj3o;(n;uO=qbp^Kp+hVWcy3h4 zoLo7ySm}8|K_;f}VWP6gyP17@wScGQ_k6_7C)XA}kMU8cP18a?0xw6;c42ns0MGD* zWZO!D=W@(%uj6NI?|u8(*5Uj)+|L9xpmB10Fh;enY=+`ybb#8g4Xup2UD(@#|I?}X zp>gY^8A}2ShwM5O0b<&G7m;Q(ZUt zH}Iu^m%jtm71!?*)c&RBJ3e&6#08e-FZ0jLy;uk)x7KNot?+J=ktK9w1<}WwXY=}1 zX@tlZ=WbX#ma4nXAQ8uMqZ|mt;bPDzQF3HP+poRokU_8TT1H84nmbc?y%X3{vJX{& z(PFS}-fX<|Tv_DwDxNEC%E-Ddf={fU`RCftPq@|>VH(%BAID%>W)^M|Qc!+%J~Y5s zY5XN~PnqJk${vv=5j#(h<8KQe{lLpDkge<9)RA?scS_PiH)7hhA6QfMl%gEtEvSQ9 z)$4>P7w!>p1++eVW{3#*;cA9z^aJ`?0u>}X`!gXZq!wvwemxs|4Pa|ojljd_{UB+%OI3;3~|9JCJivIZ1+8E^ zJ~K2k@7t^RGiz&&Pmloh`{j%9zp4Y1{cr3HwOTUli*PKf>I0;bd0#!2NLCf=MZu;` z5V~!5!W>!7=!a_f&t>eQBcIG*e^|8$vPrpK_w%$gk(%#K)INU>J>HB?`9n%YJLvV{ zN9w90xR)$1A@<{E?xq|p)z?h-)Qyj+>Sy>+Z%5B81Y8bDOsOfhemizGa&nqPsdlC zV02&}Xq-14h%@W6ff4=8KqY z_O%U%>o1gYg6qcvSFoXRzJ0hxpfk|a&k3Zh@kwVP63_oI;Q+UOON?H#8WhOdOV^&d+TX`>BbI{4nV^F;p1&VjNu zYsF|vZvJFmflZ{--H)U9Zt=4EG!cXs55DLM%;`+xC(C&$G$S-wIkW`cq2gz9djqXs zvki$okL!_f0=4hWga9zl!c`f%$;^9m=X927 z>A}T1Z1QS}t4a_{TeO(}NhpL`q-Db9e8}A_XJI)-R3SIfO(0za@$x;2YzHPcCf1bc z+i)EiMI}7&aK2kiPx^S0AjyiDFiX267VuVXdcA*|5h}c7>0=LLavM^}HLk#!)9FT- z{77M*!N1)LEluY0{rmm3XVLo@qf=Dlgijt4%&2}pPbh_2`mz)3f*y0^*KrDmgY$d+ z5T6B=KA2O4$$XXM3RhKsEblEMsD9t(Mn;)ayJpc9(fbmfSc1t8L}F3%aF)k|16yJ> zZEN^x?n)Pm0zF>+_{sMu$m2mqC4g)XW;t%2P~;@N@nk4YBmBR2&Ki$c`}~%mePmtP z7xVU91|<cCJC61%7`wdG|bF@pT@jZEQW=Aa*cR}`zt@6?!mHKAjGaFzOsf2 zxu%?GI2FvvRO4_ilvDV}_X0t~EuOhuICCvIJYKwGKc;Em zGt_IROGGAkL*+7-&Xq68<&gM>g`yd`QQrmlw_{qyFf(E?5jQ!CujYu(TfD@!|qW1;~4tx{Yo+pwJ-+; zJyL+M+b-zKpy(~Tg`dXf?wId+HX{*`s0WPtX}B3wIVOF=MdQAH77Kzw*|vPqdgv2g zyZUo1x8$RmGR2;+cx+M`(o26DZ++R38_9mn`$jYnx2B5FyEYFm+Gr*LJ`%K_`gh1Y z`b92HXlap_?a`!a`H&_Ba?7m7tnr5}Mh`t#$hFa81pX!aZYMt{=o2qxkLJSV#szeF zb($L&N^bKFk(-2f^Cs|WH)3=b*VvQlc-%d)`*;~@=g30E+iKF+46#iRejV^Q6F{_ar3YsksW z^^4v?T=o3(Q_1KGQ8eA(QlgJo`dwIXpH8Z`f~4_JcsCPLmwkKLG#iNEO?`h zD9_X!E6<+T7fxu>D9kqT^e>85oOcDI4X#B|f0nU#t4d6jYq4``*3)lx)4?OV?RUiq z0{;OP;R?CoLkqVY6(B-za^7wYMg285XHh|9tiW!-k)yn4`icS!fO>5WxcKukd zhnO2^Ds`0;ZeRNHflWi40r}SFKNeZ^*iZ$}?fHej1|tfW(bSv~Pj65FMOce@29)V> zMjH51@Wse%g>729uVdO0bu{%itYe=Pz*A0i`0CDy&k+*az%~@&cw-lucDV6Z-E564 zGlNsyhM{ZUW=FL&daUdl-eg&%2y@#*aA`O?#n-js_)HJczz&*VM{fagDrAM(BW)Pk ztnBTg{i@KJr&o^CFZw-d3kO0s5Y?AW5*XhT=-)JNj z46OwR^%&7ZInCl?d-_|@j?s#4GX(0J9R>O0$T@VsCz{*!8H?~VZ zD`K+|TWY}fbn?CkO;a|Im7OO95y6)bohGqN_db!ksSKJVdu!cd8qRfJ3hglCW$mB* zugNS?10Yay_C`u%kWZ{H$EZEoV>!yNMJgd>SyL8KhgGVEs!Mq5!dsz_D!3;`<*i&XH{S1hsaU zFUdK_VHxGC>1-Ac0IwhK_h6C=z&yzs|BD?!s03pi2Cu*j=H?V#BgAc{i#&$b%vfFDB8vRT3Z?(<(RoK1f*zrDYgE3ha&mb^8GgCGmQU z?~67TX&9xHKvh8z=GjTvzpBa*ZzUaBo<&LSzoHDB4g?y5oElI<&WU`(ZCzufyxQGy z`w=%`q5{x7vMWVIG?+ZaKvIEj|M4JI!Ph#P>XP>dflnY^+YAYxL!kQ=Ni!m9>+9GJ z=>J?-X?ulDHybn0GX17r2I}C%L6bpCq^olS<88*furqUl3b2)nl?r;T6yF5Kgm9ni zJqIIyw1V>Ca_}YOf+x|l(?`Hp+0}>@x^Xm8VWDtVqeK}HH)HK)k(<5Y^-?yG*OKI! zd)QFztFp9&*6R4#O)FV&#w*f8K=?v;~Jty#^LYRu%Y WMB&2n@0(#>K=+BEX3b-Vi2ng-qw_ET diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_icon_logo.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_icon_logo.png index dabf25dbbb0f0e88dce1b50178e924de851ecf55..957c298fd60c5480e2e1f40811fb826187752056 100644 GIT binary patch literal 3670 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 literal 11251 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 WMB&2n@0(#>K=+BEX3b-Vi2ng-qw_ET From 3e1c8afbca9544c55e78eed0374babc05e0a3266 Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 16 Oct 2020 18:51:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[add]=20=E8=87=AA=E5=AE=9A=E4=B9=89ratingba?= =?UTF-8?q?r?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/common/view/CustomRatingBar.java | 298 ++++++++++++++++++ ...deules_commons_layout_custom_ratingbar.xml | 7 + .../src/main/res/values-xhdpi/dimens.xml | 4 +- .../src/main/res/values/attr.xml | 35 +- .../v2x/adapter/V2XShareEventAdapter.java | 5 +- .../module_v2x_event_share_description.xml | 6 +- 6 files changed, 343 insertions(+), 12 deletions(-) create mode 100644 modules/mogo-module-common/src/main/java/com/mogo/module/common/view/CustomRatingBar.java create mode 100644 modules/mogo-module-common/src/main/res/layout/modeules_commons_layout_custom_ratingbar.xml diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/CustomRatingBar.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/CustomRatingBar.java new file mode 100644 index 0000000000..f896e216c6 --- /dev/null +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/CustomRatingBar.java @@ -0,0 +1,298 @@ +package com.mogo.module.common.view; + +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.drawable.Drawable; +import android.util.AttributeSet; +import android.view.View; +import android.widget.ImageView; +import android.widget.LinearLayout; + +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; + +import com.mogo.module.common.R; + +import java.math.BigDecimal; + +public class CustomRatingBar extends LinearLayout { + private Context mContext; + /* + 是否可点击 + * */ + private boolean mClickable; + /* + * 单元总数(心形/星星) + * */ + private int elementCount; + /* + * 单元点击事件 + * */ + private OnRatingChangeListener mOnRatingBarChangeListener; + /* + * 每个单元的大小 + * */ + private float elementWidth; + + private float elementHeight; + + public float getElementWidth() { + return elementWidth; + } + + public void setElementWidth(float elementWidth) { + this.elementWidth = elementWidth; + } + + public float getElementHeight() { + return elementHeight; + } + + public void setElementHeight(float elementHeight) { + this.elementHeight = elementHeight; + } + + /* + * 每个单元间的距离 + * */ + private float elementPadding; + /* + *单元的显示数量,支持小数点 + * */ + private float elementStep; + /* + * 空白的默认单元图片 + * */ + private Drawable elementEmptyDrawable; + /* + * 选中后的单元图片 + * */ + private Drawable elementFillDrawable; + /* + * 半颗单元图片 + * */ + private Drawable elementHarfDrawable; + /* + * 每次点击单元所增加的量是半个还是整个 + * */ + private StepSize stepSize; + + @Override + public boolean isClickable() { + return mClickable; + } + + @Override + public void setClickable(boolean clickable) { + mClickable = clickable; + } + + public int getElementCount() { + return elementCount; + } + + public void setElementCount(int elementCount) { + this.elementCount = elementCount; + } + + public OnRatingChangeListener getOnRatingBarChangeListener() { + return mOnRatingBarChangeListener; + } + + public void setOnRatingChangeListener(OnRatingChangeListener onRatingBarChangeListener) { + mOnRatingBarChangeListener = onRatingBarChangeListener; + } + + public float getElementPadding() { + return elementPadding; + } + + public void setElementPadding(float elementPadding) { + this.elementPadding = elementPadding; + } + + public float getElementStep() { + return elementStep; + } + + public void setElementStep(float elementStep) { + this.elementStep = elementStep; + } + + public Drawable getElementEmptyDrawable() { + return elementEmptyDrawable; + } + + public void setElementEmptyDrawable(Drawable elementEmptyDrawable) { + this.elementEmptyDrawable = elementEmptyDrawable; + } + + public Drawable getElementFillDrawable() { + return elementFillDrawable; + } + + public void setElementFillDrawable(Drawable elementFillDrawable) { + this.elementFillDrawable = elementFillDrawable; + } + + public Drawable getElementHarfDrawable() { + return elementHarfDrawable; + } + + public void setElementHarfDrawable(Drawable elementHarfDrawable) { + this.elementHarfDrawable = elementHarfDrawable; + } + + + public void setStepSize(StepSize stepSize) { + this.stepSize = stepSize; + } + + public CustomRatingBar(Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + mContext = context; + setOrientation(LinearLayout.HORIZONTAL); + TypedArray mTypedArray = context.obtainStyledAttributes(attrs, R.styleable.CustomRatingBar); + elementWidth = mTypedArray.getDimension(R.styleable.CustomRatingBar_elenmentWidth, + context.getResources().getDimension(R.dimen.heart_ratingbar_width)); + elementHeight = mTypedArray.getDimension(R.styleable.CustomRatingBar_elenmentHeight, + context.getResources().getDimension(R.dimen.heart_ratingbar_height)); + elementPadding = mTypedArray.getDimension(R.styleable.CustomRatingBar_elenmentPadding, 10); + + elementStep = mTypedArray.getFloat(R.styleable.CustomRatingBar_elenmentStep, 1.0f); + stepSize = StepSize.fromStep(mTypedArray.getInt(R.styleable.CustomRatingBar_stepSize, 1)); + elementCount = mTypedArray.getInteger(R.styleable.CustomRatingBar_elenmentCount, 5); + stepSize = StepSize.Half; + + Drawable drawable_empty_default = ContextCompat.getDrawable(context, R.drawable.icon_heart_unchoose); + Drawable drawable_harf_default = ContextCompat.getDrawable(context, R.drawable.icon_heart_second); + Drawable drawable_fill_default = ContextCompat.getDrawable(context, R.drawable.icon_heart_choose); + + Drawable drawable_empty = mTypedArray.getDrawable(R.styleable.CustomRatingBar_elenmentEmpty); + Drawable drawable_harf = mTypedArray.getDrawable(R.styleable.CustomRatingBar_elenmentHarf); + Drawable drawable_fill = mTypedArray.getDrawable(R.styleable.CustomRatingBar_elenmentFill); + + elementEmptyDrawable = drawable_empty != null ? drawable_empty : drawable_empty_default; + elementFillDrawable = drawable_harf != null ? drawable_harf : drawable_fill_default; + elementHarfDrawable = drawable_fill != null ? drawable_fill : drawable_harf_default; + mClickable = mTypedArray.getBoolean(R.styleable.CustomRatingBar_clickable, false); + mTypedArray.recycle(); + for (int i = 0; i < elementCount; ++i) { + final ImageView imageView = getElenmentImageView(); + imageView.setImageDrawable(elementEmptyDrawable); + imageView.setOnClickListener( + new OnClickListener() { + @Override + public void onClick(View v) { + if (mClickable) { + //浮点数的整数部分 + int fint = (int) elementStep; + BigDecimal b1 = new BigDecimal(Float.toString(elementStep)); + BigDecimal b2 = new BigDecimal(Integer.toString(fint)); + //浮点数的小数部分 + float fPoint = b1.subtract(b2).floatValue(); + if (fPoint == 0) { + fint -= 1; + } + + if (indexOfChild(v) > fint) { + setRating(indexOfChild(v) + 1); + } else if (indexOfChild(v) == fint) { + if (stepSize == StepSize.Full) {//如果是满星 就不考虑半颗星了 + return; + } + //点击之后默认每次先增加一颗星，再次点击变为半颗星 + if (imageView.getDrawable().getCurrent().getConstantState(). + equals(elementHarfDrawable.getConstantState())) { + setRating(indexOfChild(v) + 1); + } else { + setRating(indexOfChild(v) + 0.5f); + } + } else { + setRating(indexOfChild(v) + 1f); + } + + } + } + } + ); + addView(imageView); + } + setRating(elementStep); + } + + private ImageView getElenmentImageView() { + ImageView imageView = new ImageView(getContext()); + LayoutParams layout = new LayoutParams( + Math.round(mContext.getResources().getDimension(R.dimen.heart_ratingbar_width)), + Math.round(mContext.getResources().getDimension(R.dimen.heart_ratingbar_width)));//设置每个单元格在线性布局的大小 + layout.setMargins(0, 0, Math.round(elementPadding), 0);//设置每颗星星在线性布局的间距 + imageView.setLayoutParams(layout); + imageView.setAdjustViewBounds(true); + imageView.setScaleType(ImageView.ScaleType.FIT_XY); + imageView.setImageDrawable(elementEmptyDrawable); + imageView.setMinimumWidth((int) elementWidth); + imageView.setMaxWidth((int) elementWidth); + imageView.setMinimumHeight((int) elementHeight); + imageView.setMaxHeight((int) elementHeight); + return imageView; + } + + public void setRating(float rating) { + if (rating > elementCount) + rating = elementCount; + + if (mOnRatingBarChangeListener != null) { + mOnRatingBarChangeListener.onRatingChange(rating); + } + this.elementStep = rating; + //浮点数的整数部分 + int fint = (int) rating; + BigDecimal b1 = new BigDecimal(Float.toString(rating)); + BigDecimal b2 = new BigDecimal(Integer.toString(fint)); + //浮点数的小数部分 + float fPoint = b1.subtract(b2).floatValue(); + + //设置选中的单元 + for (int i = 0; i < fint; ++i) { + ((ImageView) getChildAt(i)).setImageDrawable(elementFillDrawable); + } + //设置没有选中的单元 + for (int i = fint; i < elementCount; i++) { + ((ImageView) getChildAt(i)).setImageDrawable(elementEmptyDrawable); + } + //小数点默认增加半个 + if (fPoint > 0) { + ((ImageView) getChildAt(fint)).setImageDrawable(elementHarfDrawable); + } + + + } + + public interface OnRatingChangeListener { + void onRatingChange(float ratingCount); + } + + /** + * 每次增加的方式整颗还是半颗，枚举类型 + * 类似于View.GONE + */ + public enum StepSize { + Half(0), Full(1); + int step; + + StepSize(int step) { + this.step = step; + } + + public static StepSize fromStep(int step) { + for (StepSize f : values()) { + if (f.step == step) { + return f; + } + } + throw new IllegalArgumentException(); + } + } + +} diff --git a/modules/mogo-module-common/src/main/res/layout/modeules_commons_layout_custom_ratingbar.xml b/modules/mogo-module-common/src/main/res/layout/modeules_commons_layout_custom_ratingbar.xml new file mode 100644 index 0000000000..ac3fb54105 --- /dev/null +++ b/modules/mogo-module-common/src/main/res/layout/modeules_commons_layout_custom_ratingbar.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml index 8f60bbf8ef..9692e54e2a 100644 --- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml @@ -1054,8 +1054,8 @@ 48px -10px 10px - 36px - 30px + 40px + 43px 300px 281px 90px diff --git a/modules/mogo-module-common/src/main/res/values/attr.xml b/modules/mogo-module-common/src/main/res/values/attr.xml index 2bb191d2d9..c18d5a5d09 100644 --- a/modules/mogo-module-common/src/main/res/values/attr.xml +++ b/modules/mogo-module-common/src/main/res/values/attr.xml @@ -8,9 +8,36 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 9412e5dc79..aacc3f1457 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 @@ -12,6 +12,7 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.launcher.ARouter; +import com.mogo.module.common.view.CustomRatingBar; import com.mogo.module.v2x.R; import com.mogo.module.v2x.entity.panel.V2XShareEventDescription; import com.mogo.module.v2x.entity.panel.V2XShareEventItem; @@ -90,7 +91,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter - + android:layout_height="wrap_content" />