From 2f4cc3e49380a20f15be6639a26c10d214981e3e Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 4 Sep 2020 09:23:27 +0800 Subject: [PATCH 01/10] =?UTF-8?q?wmdlg=20=E6=8D=A2=E8=82=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ....xml => module_commons_shape_dlg_round_bkg.xml} | 2 +- ...t.xml => module_commons_shape_left_btn_bkg.xml} | 0 ....xml => module_commons_shape_right_btn_bkg.xml} | 0 .../res/layout/module_commons_layout_wm_dialog.xml | 14 +++++++------- .../src/main/res/values/colors.xml | 5 +++++ .../module_commons_shape_dlg_round_bkg_light.xml | 7 +++++++ .../module_commons_shape_left_btn_bkg_light.xml | 14 ++++++++++++++ .../module_commons_shape_right_btn_bkg_light.xml | 11 +++++++++++ .../src/main/module-commons-res/values/colors.xml | 2 ++ 9 files changed, 47 insertions(+), 8 deletions(-) rename modules/mogo-module-common/src/main/res/drawable/{module_commons_shape_round_gray.xml => module_commons_shape_dlg_round_bkg.xml} (73%) rename modules/mogo-module-common/src/main/res/drawable/{moddule_commons_shape_react_blue_grident.xml => module_commons_shape_left_btn_bkg.xml} (100%) rename modules/mogo-module-common/src/main/res/drawable/{module_commons_shape_react_gray_grident.xml => module_commons_shape_right_btn_bkg.xml} (100%) create mode 100644 modules/mogo-module-common/src/main/res/values/colors.xml create mode 100644 skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_dlg_round_bkg_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_left_btn_bkg_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_right_btn_bkg_light.xml diff --git a/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_round_gray.xml b/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_dlg_round_bkg.xml similarity index 73% rename from modules/mogo-module-common/src/main/res/drawable/module_commons_shape_round_gray.xml rename to modules/mogo-module-common/src/main/res/drawable/module_commons_shape_dlg_round_bkg.xml index f4bb94cb0a..98f1fc7633 100644 --- a/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_round_gray.xml +++ b/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_dlg_round_bkg.xml @@ -2,6 +2,6 @@ - + diff --git a/modules/mogo-module-common/src/main/res/drawable/moddule_commons_shape_react_blue_grident.xml b/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_left_btn_bkg.xml similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/moddule_commons_shape_react_blue_grident.xml rename to modules/mogo-module-common/src/main/res/drawable/module_commons_shape_left_btn_bkg.xml diff --git a/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_react_gray_grident.xml b/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_right_btn_bkg.xml similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/module_commons_shape_react_gray_grident.xml rename to modules/mogo-module-common/src/main/res/drawable/module_commons_shape_right_btn_bkg.xml diff --git a/modules/mogo-module-common/src/main/res/layout/module_commons_layout_wm_dialog.xml b/modules/mogo-module-common/src/main/res/layout/module_commons_layout_wm_dialog.xml index bec43b7c93..b4aaabda53 100644 --- a/modules/mogo-module-common/src/main/res/layout/module_commons_layout_wm_dialog.xml +++ b/modules/mogo-module-common/src/main/res/layout/module_commons_layout_wm_dialog.xml @@ -4,14 +4,14 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#7f000000" + android:background="@color/module_commons_dlg_bkg" android:layout_gravity="center"> + android:background="@drawable/module_commons_shape_dlg_round_bkg"> + + #7f000000 + #FFFFFF + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_dlg_round_bkg_light.xml b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_dlg_round_bkg_light.xml new file mode 100644 index 0000000000..93887743bb --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_dlg_round_bkg_light.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_left_btn_bkg_light.xml b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_left_btn_bkg_light.xml new file mode 100644 index 0000000000..387c9ca303 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_left_btn_bkg_light.xml @@ -0,0 +1,14 @@ + + + + + + + + diff --git a/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_right_btn_bkg_light.xml b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_right_btn_bkg_light.xml new file mode 100644 index 0000000000..1b269d1650 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_shape_right_btn_bkg_light.xml @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/skin/mogo-skin-light/src/main/module-commons-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-commons-res/values/colors.xml index 51e1eac4ef..f7dcb3f6c3 100644 --- a/skin/mogo-skin-light/src/main/module-commons-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-commons-res/values/colors.xml @@ -1,4 +1,6 @@ #FF333333 + #66000000 + #333333 \ No newline at end of file From fa1e17cc658b27dbf23f63125d1c852f11f8972a Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 4 Sep 2020 10:38:26 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=8D=A2=E8=82=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/map/MapFragment.java | 8 ++++++++ .../module_push_message_background.9.png | Bin 0 -> 2460 bytes .../module_push_message_background.9.png | Bin 0 -> 2460 bytes .../module_push_message_background.9.png | Bin 0 -> 3936 bytes .../module_push_message_background.9.png | Bin 0 -> 2460 bytes .../drawable/module_push_message_background.xml | 6 ------ .../module_push_message_background_light.9.png | Bin 0 -> 2779 bytes 7 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_message_background.9.png create mode 100644 modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_message_background.9.png create mode 100644 modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_message_background.9.png create mode 100644 modules/mogo-module-push/src/main/res/drawable/module_push_message_background.9.png delete mode 100644 modules/mogo-module-push/src/main/res/drawable/module_push_message_background.xml create mode 100644 skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.9.png diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java index a563efc7da..353af2b392 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java @@ -63,6 +63,14 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements initMapView(); } + @Override + public void onSaveInstanceState( @NonNull Bundle outState ) { + super.onSaveInstanceState( outState ); + if ( mMogoMapView != null ) { + mMogoMapView.onSaveInstanceState( outState ); + } + } + @Override public void onPause() { super.onPause(); diff --git a/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_message_background.9.png b/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_message_background.9.png new file mode 100644 index 0000000000000000000000000000000000000000..a4c313e3539f580612c42321cdfe7a77c7a37284 GIT binary patch literal 2460 zcmV;N31jw&P)X zj}xjiuvnw2t`?uXetO;gK0I&UJnvb(f~Zb)s#BfnRHr)CsZMpOQ=Qjy7K_Diwc7Bo zRv%t%*M~nu+=_VEsSj7%GHS!sPW^+pe^6OP<3QvClxvMclWUQTk6ASAy{@A<5_yDk zbDZDDt42%4L`C-ZB#$E%QJdyJRLFZXK7MGnr?;(m`lHpEUNz(Cq5L2Jcfd!{_?-aw zS^#~&UE5!6iO_(n&;?L{=b;Osfd7DiH{k1t4h{Gkcw2~($qM*pR)mJSk1gm1{G&W3 z?c>1?4#`Lk3oO~aR{(k#ntQVl) z7{=#;*k31-(}1#rC5UBzbVxwwSU)Ocf1^1ez#lQJKXSl_%-6uH98aBSC9|7ne+{+T z{`;-^{@peJ-bf9U9JUBhaxn9))L_{`MQDyphM;S`hmwPe(1gsN0GY9`psCqzm~M*@ zF-2%~PDDNtvNXGkdyC(nQSbNfwj9R0h0rY5l4GRDu->vCH{Pt_);ZuQ>m#i9x&Tym zBEWvgdXD{CdNRNv@W%jnoLimQUFk1DYQB`6Ey{eT`GoPP@dEZ^%|CFOZK2*%?Ke!P z&2~~a@f1l81RgV=ksi%{kXy;=O{qO$OElcAojnXZoOEj0q@y#Mb_ymQZql(6&&Vl6 z4UU?y0D$#6M}^Z4!}|CbWehwm0s%gI0V>DI>G$%aM@&1Y+1A!*Jv(Ody1%oo;nMlu z(ftX20i@wZMWDBi5bODd>uSCR-hw|{HS^p~X7Uw0mLf%B#=qWznqMC}de2Evk?bJg zjqJ!fo^~?r$MVyF4HwP&y4eD~FOVNNVnW%m%;%*CXg-r?c_HT4-ZxymWFhGxfJ50? zCpkNu>>$188t<6A0$%eYuxLF+^DX-!&@TIN)gRor;dwA12eeLH3rjhnFXV%AI0P0sIeIzRMR0O{?3 zsb>c;-%1ZN>6j5y7lX(RH|@YVKf;W!Q@LqP$laA3miYv5bzd{>6fr;3e9Hbjx@TA3 z3XmIXxakrJ;PpSWoKoc$*(<6$9Ml>H()>DhzN5%g91`Dnh6 zsl6~=tND1`oUx6UkNGN=FF<6U60|XXKHhGRe}VP9?C9nTnXiG@Mfg>GSHB=Zo9O2k zFrI=Awp>>K=b7e1_IG7I^H_il_Vb%$#;2O!PVC58Bsr$>8up*5zr7V;)BSwt>u~Hh zvp#9IP;xZuW0QTqfQ|R_X(24@?c@W-Opvwg;6ivTKrntj+;9Q&3uk>W@o3Ohq-SOI zfX(;w*@?#~0tDW&z731u^#z3F=jY64frnC)gRg+sFCf+6FT{P}zX0L*`8?|(`yud9 z_hobh_?~+}Xnww)bms2F)5Ywkp}^Sp206xE~=$-q00U`SN zagppm&F|W=Q?p)X6+NE?2-MG~<0X}ym}tH!fcF;=sGr~N&e<8ilWV=6c68RjXGQqr zS%L!e^U=6TWCt=Ig#cdW#A^Wp_4CoFiR1=0-duWmvAT&R}?QFX1Bqw9N1Yc*b z1qjj4x0~%51|Brr7|4!hzxM)!>gQ*T);3-XJRUbG@Ja8YtR4`SpAWZNI&xaz&rQ?C zMezLs0`&8Z=5x~yWWBj(%vZU8;qwKA>E}DFrwv!@KVZJP_b*ftJimbO{CuSOy>*%o zqJL3B0Rr{&I}Y0$YS;Cp=mq5AnrZY$$0*L?v7^c?tZSrQbQpPw-H0&2WQ zdR+E*`@Rbhpr79X(@w`Jf(5+`*$={N0Ydci>1N9=(eNPb|Qjr$|spem>i9HT%g6Fu;Smw*q9pA|9Tf?`S?5GgG4Z3V0Dc zm6!keD?t1BHbg()`aGBHqGcNI085W5!roVZKiDLHKR-l2Ujv^4=}95z25?;f{Q{OU z`}@hVs6D+3(a)z^ZyPP1c61?nIs0YwcfVeF>;com5dD0p`*7Arg#e&u(xceF+8r+a z{cNTD5z@*h@67nS>l*LU-uIXHi^V^FKXoG5e;t~i&liE099aO#ewq7wOTRx| zERXy_YEgj4ko(ZrWy9?u*~wmj0RM3?{#MR+1mrhULh|!dPVWa;_qFus7tr7T zTF%ec%OgKd(CSQYLh4rhWlb4a-*+7fPF2$9I;7$el}_@vF`6J@B4dyUB4LXf3`8pFGsYy zr&sd#^V{kCRsj3(TK)X~?w5yjZ+RQtvX)u~Q(s#BfnRHr)6 ad;SA-9)l@a{r@Qd0000X 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 ad;SA-9)l@a{r@Qd0000 - - - - diff --git a/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.9.png b/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..245c2e855c00fc86809e0b4d0d5ff617f34d3db1 GIT binary patch literal 2779 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 Date: Fri, 4 Sep 2020 10:51:54 +0800 Subject: [PATCH 03/10] =?UTF-8?q?[add]=20=E9=9D=A2=E6=9D=BF=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/drawable-ldpi/v2x_panel_close.png | Bin 0 -> 1687 bytes .../main/res/drawable-xhdpi/v2x_panel_close.png | Bin 0 -> 1593 bytes .../res/drawable/v2x_drawable_event_more_bkg.xml | 4 +--- ...dule_v2x_event_panel_fragment_event_panel.xml | 2 +- .../main/res/values-xhdpi-1920x1000/dimens.xml | 2 +- .../src/main/res/values-xhdpi/dimens.xml | 2 +- .../drawable-ldpi/v2x_panel_close_light.png | Bin 0 -> 1369 bytes .../drawable-mdpi/v2x_panel_close_light.png | Bin 0 -> 749 bytes .../drawable-xhdpi/v2x_panel_close_light.png | Bin 0 -> 1878 bytes .../v2x_drawable_event_more_bkg_light.xml | 4 +--- 10 files changed, 5 insertions(+), 9 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_close.png create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_panel_close_light.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_close_light.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_close.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_close.png new file mode 100644 index 0000000000000000000000000000000000000000..23a53b903c89b5f3eb5e5b87dd2c996fcefb073a GIT binary patch literal 1687 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL1|)l2v+e>Z#^NA%Cx&(BWL^R}EvXTnX}-P; zT0k}j11qBt12aeo5Hc`IF|dN!3=Ce3(r|VVqXtwB69YqgCIbspO%#v@0S_Ps>W0$H z3m6e5E?|PIHe0}qV1u+VR5~vQlAHw|k;M!Q+`=Ht$S`Y;1kkj|%#etZ2wxwoRtc=a3djZt>nkaMm6T-LDnNc-DA*LGq*(>IxIwi8dA3R!B_#z``ugSN<$C4Ddih1^`i7R4mih)p z`bI{&Koz>hm3bwJ6}oxF$`C_f=D4I5Cl_TFlw{`TDS*sPOv*1Uu~kw6Sp)|Vca~(P zA#BPkhI$L=L4A;nzM-ChKHO}eRvVD0m48uYD$r(-`F4gjV3jChPEalY!TL7pymv^TNZqv*Zf${bBOcSsE-hO)e+hR@ z3W#~ae`%_h=C%MSuakuuOJc4pYTZ&aQO|9QPlr(3f@z)s(wZ&{rJ5EPaTvGHG@qLv z=f3{DdH%e8)@J1|4n6&6_5R-b-S>AsziYlK^Z(>1>wrf>?=q|IxmVght<`(Jsp^k) zsnY)Ce{P*ph`wLeVR|{GeUtAF=D+=!z1w$QEA)C}<@@A{+4WgQ$Kx-ioL{4MC-rLP ztJTZO6elsAnLNdI#f)IR1K}?lgFZX6-jGxE=~h~IH|cQ5`{mp2?l}2pzFGg}SNk>U z(?o8@2zsrYc23{{7hA3?Pr4WD_hi1Ln zqEPVHn8+?5WhfLi$w+(JRga^LVQ&_6J$P$iyfL`UO{>q)u*P3BG$|?7^=Q`#1H;Tc zt5&VzJ9GA|`-J9$3m)^XUY~Cv)4jLn%o&^h3LCl4M-xx~SR%x{GUJP4Z003Nh2UU+ zCqDsG6BD-Ex2~*HbJFB*Ci`&Bx zJ>ikhY@xDEnm2Qn2t9UXFq-L;wKBx3+fChR^X7b|Mu&vS(N3B>5eg*;jLuco_l9a*B?<~dPJOl;chS?BmWR~b46x~@B|()v}me)8dl zo-I3eOepjY>-02mj6ELdqa3iqE;wyZWpIzUl-xe^E&)EH0{fJf(#3ssheL11h0QEa zD!bS}_4Ch~+4l~6Kx5Y~DhxSwOqMQqI>U&JMSN)G0gFD{^7`%GPv7%0Yc_50UQ{x9$=(Iir|nZ^ za4T`XvUZ9PgEKDqJT^`X{`#^ll4(m(x z8->*GH~wN-YnZc@YTtCwWia$I?my{GICvTJK& y;!L_DP#87Wuy9Y4)Z8R@#%mAjzMtLkkKy>-C$A@e5&%{X3=E#GelF{r5}E*v#gy3q literal 0 HcmV?d00001 diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png new file mode 100644 index 0000000000000000000000000000000000000000..289028afee7f8c915aac3a19b20c5edd2d7d036d GIT binary patch literal 1593 zcmV-92FCe`P)ciYk?xyn%Wer@htQ~lS`;X zlvo>RDs80@`bTL`fuhwnc>-e9AUv3+m|SZ))I|AnYks#3%~*%xbPk4XLB09?{)ORRv_184*g>wQ}75n1m?0AEMz zFqVOq0C+K4gGpHaK7fUAc54N60szIERJ|?$m{J>@7C`T%Diy`JJOD zcAo+GLkTFEXUOpaQM>!0aYi-s$A#;5Ks?0js5=^m1(GDe;V6k2Qf1}tyqcQ& zDgr}4)DHdLv7^`!NJ0SJxiir$g8`(a=PVD-kJ3`Rdva2nk_gVhgNLdJ3IoIambPy% zYSLRph6AFQbL-ak?=a=?PhEBq3FYMu_vGYcM0ewr!=S9RC9BA8FFu)cfXHB`AW{$S z8Z^+w#l?UcDl5yvLXwqJUqwJy;E;-BHzUZB{}rh=8k+=>Ry-@mvhyC?&;bLXoksa)^Na2I0+6QsVrFI6EiP&C-;>fOtb)M5@_ zmjN>h4%sdY5OtQDn`iCqy%K<=5@eSZvVVV-d+XM1PgAzy-B9g5BjE@KBty!zc6awF zAjxrr2e1@Zg8rt2YBZdL0Ai3XUhD~iq^6EwU~+t6L0tr#gaM+Cb8>R6U0q*M@`3sGa;*ng&+|Lh@a1stkhLmmX?Cfe}>WDDU5f0~(07OO% z5C6~{ZjQu&&CSjKTV8JeK<{}@wDyFic{O7O2fuS!ES7a@8BCeteZCp*fdhL#jy5Pg z%M%Jn9nSL7fh{4p<%J(JGd^!^?LJ|U5(X$doZxiM2XL0+XJ>uhy1LhdKuQRpP&oX; zb45YQ?8e6_Qj*hIYd9p~fQE){yCg|k$M5MV=RRX&qa#^aSsQJ(^bEFIr|lBFMbivJVh~w;`gB`q zet!N7YS}8*5xLzTI&C)FldLU|=c{gy=f=;mwxgxKFhFEXQBmtz(mQ9;BKY#9A$Mt*n?*1K5TaoT%fZj~N@kyh`q-(q8`$17~ns1nC1Z2LW z7zUL2ma9euQ8n`|GZk3ooAxm%$ULhN3M=TWhUsRZfPzl@P_cPlEErPAc`+(BPaMjS zR8JgIfq7RqSgweReigIK}vOZ ri|gwz3{t8FZe6|~#2~G?FHrpt6)zUzGP%K;00000NkvXXu0mjf`JwR} literal 0 HcmV?d00001 diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml index c5f6baf569..bf2f16368a 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml @@ -2,9 +2,7 @@ - + \ 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 3270297d56..8d61e6c0b5 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 @@ -84,7 +84,7 @@ android:layout_width="@dimen/dp_88" android:layout_height="@dimen/dp_88" android:layout_marginRight="28px" - android:background="@drawable/icon_window_close" + android:background="@drawable/v2x_panel_close" 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/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml index a81b6217db..a3bd47781b 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -50,5 +50,5 @@ 18px 20px 16px - + 30px 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 ca2c085464..b52dd520b4 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -53,7 +53,7 @@ 16px 16px 4px - 30px + 16px 120px 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-v2x-res/drawable-ldpi/v2x_panel_close_light.png new file mode 100644 index 0000000000000000000000000000000000000000..5bb2114ce2c149c9cd7f2413f6b1f5ed636f86eb GIT binary patch literal 1369 zcmV-f1*ZCmP)#FL8T^4?4?nO$8mUQBkG>5?~_8RoCM>vi|*>BQ~hbXC2ouj|#T zH~kvn-c=)j_c+`o&@&LlV)0$qb)Q7UJOErKq6ZQ22mpQtfHERpFBA%2C-tBb1EG|9 zfr!2j8Q2{mga&mdq<)~9br4cY3iQH2018&Mq!see10%@#&RM#>@e<0+Pd1q2aq2qAJN_CkY@QeFpu7fl9BQZ}2-=1rzbC=g1iDiLLp3@pr8i1?Ne;!}>U z5r|^3IOMwS-yFkflHt@2Hi+{I;p~C@>Nw6beh-HQf{3z8sY;rjvZ*hK_>BN!o-c^Q!^10;O65D#!O|?RA!rzE5K5`Pi0I)o z2NlJ)_C1PcMqH%2&z+q1V9b zFgie7^xDv|S|GkJgt*oMLMb&zM4P>SN=c8ev!Vrrt!&ua+k;A_0%K!ip<~?H*@4l~ zQ5YH;3T?wj@i*%rrl+SH<1Z{M!1(yMaUe4@GvK;+o58`sLD<;XFt!n-kSGZ4%>4X3 zOiWA!`PI1J46^>?*47qVpDWk^5%Il4*YS3DcVTU9t?NBbFx?<%V;o&BfVx~Wh#!dP zc~b*H@?OEr&CS8&mW=ZXlOw_hAkM) zAU*_u4>)Pgl_{6Yu(Y()RXnIi@B+7LF_)RIRAoRd-*NNlf zV^~~V>;S>-;Hh_bJ16W>OuGv^!U4>lE=)fF{hjkDv zFM2G5i0`z&;7M#d-s9L?hVOX6b53H{fbaeFS$;ru|mIqIT zc|`nI2=Rb+#_L$XDFED`3U4hs(cj0K_KFn zLWo!E@p>K|QcAr>L|=r)opQzY^Ol@*ma%?{lmb2p3P$(31ThR3ioEptqNxuk+3sNSN$rTEP8-DhT zK%CcU66=R6b(-hx93}^XZ)X{lmin76{cTr}T(9nP0R%QwoB*Vh`V)pL9N8pg5b=@_ z;-<-%#xB8|AgZk1O852kJyG99 bhPC$}AWR#+&o}0P00000NkvXXu0mjf;PHRw literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..1680352bfda88557b5833c87ceaed916b4d4f902 GIT binary patch literal 749 zcmV|FaR}cq5!O6iv!P%*E|AAM0K{r9@&{3%V0WO`o*;SpyO+lr& z<(e)9h5EeWDBEIL-~%bwBC)83TKs$8{$Y*#DxGo>z^f4O}AV z79%2lCWKs>7#y%e~r6p+Cq z;yXgf?W|oP@V;PUNJM-^2)Unz76R`&4Md6~;ypsh>tqpmhO^o1?rODqBYSMS8c%P; zT!r_Y3VA}r&}V?_2pcZIah!*)>kbYEID`&W-U6~$^sTCorP_;+tBa#rB6h7G@Am40kbe! zXxX?9b(F)K*P5?7j#*m~RGF~Jrt>`SB>;47fJI7YW2$V-B92I5&-11C%6D#~40B+d?ihc8PR;A>r&K&_W#-4M|k5!#Sc15sdK}W!x^CQMs zm=?yromPp>#xw3S$V!)NTt}tkE@66bsKTh)$>2)|7L~5?cnrhgaEr&J%q75#v2UF7 zi?S7F$GhDwEEbFCZy7)udN3G3v)R<0?*H}DHjlMuHgq_&3;fS5;Q4%hVYyuXFkF1) zZfD-!}!A9n(0AO0rV-QG%2^W?p}tA&o;Pg z+aJz@Eli2@quob(h&~-i6^_Ao*e~u;N}r1Mf--Ozpz4D~_CZEDC9r6*rPf|00000NkvXXu0mjf(w1T8 literal 0 HcmV?d00001 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-v2x-res/drawable-xhdpi/v2x_panel_close_light.png new file mode 100644 index 0000000000000000000000000000000000000000..c18352b4fa6ac1c012efed7e517951ef46fc75ce GIT binary patch literal 1878 zcmV-c2dVgpP)-Q+Nv#DJTCyBpW;CpAt_dUvL$t7~eydv>}nbC_4} z=c_k0Rozvu5i)!^j`JW9J@0wm1Bh56qEh|yc0{ZaQB{5dz$_x3E|<&SBH}+;3JJ5~ zj1b}p060KIj~ntyg8qOpHjyUuQ~}$z{gLN+uNeZ`Rt+LvM#SeTmCE@f?D;kl2P}km z834W@qC%2^25lkY%(`{!wwFq!`EL7=7+@j9`$V*_+X2PYe{FDZaJW<|U5(jJS-k6j zIp?1Oz#e6f(hAq0TU70wtba| zHkfoYNnMCI${0Ij!lqHcj^jM#y6z7q97|gVB3@#Q4Rz{=F~FSj(*W>frw(PUeX&?9 zbuu;^0W5@Y)0}p7yHgPHRmRvSI(9k&OhiQ?#J@U*d#w#3PBX@K$Mstqux;DxJz(VoY+(#D+6{MXUKJ3d2>6zZW6d+S=K%6fG7jzoKsG= zC4q6vvfd6IuT`K4AubV7+n!R;+i3n9)E(W7c6aw*2x03y0U5}|T(>Oi4kf^x^F;u-MaxVd zH(Il1&3zj;Zfs0vTV`;zTD@ywVd2j{=A<1uBF;0$Zu1qi1k5>~1At|zu5GbD8?Lu3 z>zWL`32?Pqy>($>;qU(BVl3*bmSx@D60i_rhKRNrGu5Yx{CROx2Iuo$GZ}%1uQSFb zmjSkId$Z?xznC$hre$(+63(4FR}&r{9)^jD3AKh1QWq{3_8JP1QW9X}+F z<(tgnWq^~u=P)ud0`v3D+ry3>I~FUDmBJ@ZoPZ-ojx^~=8ggyn5%eO-;bCrW4n{{u zLqY074uk6(($%Zku53W^)#D&}oa2tRf$Jy?>?pG#%8aldEAm9A!5Pa2pvcg!qz(UW#%$sqZ_5oE5l1z-NhQOHu$;?C3(y65JqQn~2IP zfhQ>w7jo9%HUOuw$WZMlRmfR{8_ZyND(Fttpp%kQor?MXM6LLe^1Epk!8!j803J@m zfiRnK;bs-GKTZ3Nh@Q;~U|qObgj@s6IX?^lBUu34Dcr0<_5r^kYb&G;SoN-$s-IaH zlWTxwWf9kP|4?(3TcXBTNh&cxlcxN!Xr?ghxH1J;GxE09wKeDdT;IDA~G+FhDh<;RU*s0u^GiP9G zs{M&DRk(2=C;g|FKeq2QQ`)p&_Sn9@;7IJjXP<05d2>~6oeEp9q`q}3-~4BGylC3| zm-H}UHk@o}Yq@<@x+sJ=MMTeJ%iZ4dCUgUKeuThCXNDgks1FnQA(+lMhaZBGdh=sk z`gE0!an-XpKZvNoS?M66)SDlr)u0QYew4O8qsR|~$KV|6Fu1Qb$#WYqV#%DSRyl)u z7Uu;y6uMKpAV(c?UQ(w0T{HcXGWk#unZEB@mL(4mwY(xr%J{AFSw%~J=E{22hl;!~ zU4XOE!gRjgytLx~Bvjx^IprZD_ybAf0cqq&n4mzRP#COKDsrV8d1(QbTC=z#GcsBO z0);|hs8Xq1QdOl5xIQL-O++uK8tZkrIGO9m+7aM7_C&3L~dt?c6j1SQ?OTA+T+GX_dW=plxMUmHsyd*f+*G{~iFIRxzGsnRXRbH5}H0Jd$9d7k&Nu5$^uyUrNfu(G&kr#^HQu_gMzt4b&R2P>sysi6=p QLjV8(07*qoM6N<$f - + \ No newline at end of file From 161ed348f12af8ebf93f37da72c95533ade3de94 Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 4 Sep 2020 11:18:16 +0800 Subject: [PATCH 04/10] =?UTF-8?q?[add]=20=E5=88=86=E4=BA=AB=E5=88=97?= =?UTF-8?q?=E8=A1=A8item=20=E5=9C=86=E8=A7=92=E4=B8=8D=E6=B8=85=E6=99=B0fi?= =?UTF-8?q?x?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/module_v2x_event_share_item.xml | 181 ++++++++---------- .../drawable/bg_v2x_event_list_item_light.xml | 7 + 2 files changed, 91 insertions(+), 97 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml 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 4af60c1787..5e93414bf9 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 @@ -1,113 +1,100 @@ - + android:layout_marginBottom="14px" + android:background="@drawable/bg_v2x_event_list_item"> - + android:layout_marginLeft="20px" + android:layout_marginTop="12px" + android:background="@drawable/bg_v2x_event_type_read" + android:gravity="center" + android:paddingLeft="5px" + android:paddingTop="3px" + android:paddingRight="5px" + android:paddingBottom="3px" + android:text="道路类型" + android:textColor="#FFFFFF" + android:textSize="14px" /> - - - - - + - + - + - + - + - - - - \ No newline at end of file + + \ No newline at end of file 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 new file mode 100644 index 0000000000..24460bd967 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file From df7a0df7669d988c75635f5905d18f04e61aeb5a Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 4 Sep 2020 13:29:01 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E7=99=BD+=E9=BB=91=20=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=20=E9=98=B4=E5=BD=B1=20=E5=88=97=E8=A1=A8ite?= =?UTF-8?q?m?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .../drawable-ldpi/icon_share_empty_light.png | Bin 21126 -> 0 bytes .../res/drawable-ldpi/v2x_panel_close.png | Bin 1687 -> 1574 bytes .../v2x_panel_list_background.9.png | Bin 2779 -> 2460 bytes .../res/drawable-xhdpi/v2x_panel_close.png | Bin 1593 -> 1574 bytes .../v2x_panel_list_background.9.png | Bin 4657 -> 3936 bytes .../res/drawable/bg_v2x_event_list_item.xml | 2 +- .../res/drawable/v2x_shadow_shape_view.xml | 1 + .../main/res/layout/item_v2x_fault_help.xml | 201 +++++++-------- .../res/layout/item_v2x_scennario_history.xml | 194 +++++++------- .../item_v2x_scennario_history_other_help.xml | 240 +++++++++--------- ...e_v2x_event_panel_fragment_event_panel.xml | 11 +- .../layout/module_v2x_event_share_item.xml | 1 - .../module_v2x_event_share_recylerview.xml | 2 +- .../src/main/res/values/colors.xml | 1 - .../drawable-ldpi/v2x_panel_close_light.png | Bin 1369 -> 1581 bytes .../drawable-mdpi/v2x_panel_close_light.png | Bin 749 -> 1581 bytes 17 files changed, 308 insertions(+), 347 deletions(-) delete mode 100644 modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_share_empty_light.png diff --git a/.idea/misc.xml b/.idea/misc.xml index 21e99e2dc0..cd77a1f062 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_share_empty_light.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_share_empty_light.png deleted file mode 100644 index 03da771490f76a24a3dc5346986135fab700690a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21126 zcmY(q19T?Avj_UcwryJ*XJb2GY}>YN+jg=W+qO2gv$6g5fA4+wzBhCFRCRULuexUD z%xP3dD#}YBz~aIJ000CjNm1p0)b&3F8WI2ifdb2;{Z|1u7m^bK02<@rJ`5rL)rpNI zmE`~cFG>I)AOrw-`zH!G{b$1r0Gt~D06ZB00G2~ehZ5hvh7eN?DKj}az<+R{0T3Xl z0I+`?$iEu^f(!T$+CL5;4TAT-yfO&&|LA}M0O6JZ@c+@#`bYnBN&YMUvH5QbRsiyU zhy|ektL<6<_J90;%ut^6<^K^F2T4t5000i{KLrGkm4p2cP16#n;i4fY%VTVB%V=m~ zZ)D2oVe9Z8D*&Gd&p+1I)Wwk4!`8;mna6{l^uIKC{_+12Gm#Simx_xuKdFYCBC&|Q zlPNI=BReBAsQ@f7F)^Q$i5ZWwsQCYw|EuwnTDZ74@GvpCySp>GvoYE`nKQ9)b8|B> zvof)=GW^qEaQ3uwG4x=tb0+(5kpCA))YRG7$s{{m$CPYV+ZBQw+gV*fMc`;U}I!O7C}pXdMJ3$XD0m*)RZ_CJ33 znEvDZ|I?ZOj`Y8z|3Vdjq{QS201_}5 z7??~E$c5aJ#oUrnHr4KH_u6jvW$vv&aL1Pebt&~r!)fbF-A=d5_0fC8J?O!?Yor>5 zy_vKYeTZRYcN%y;oo;2AKZ5mWRB@fG@+I&%5v{PoKO@orb@fvjEVpW?QX0|>kd9kn zv1GK|Bgi!4Fqjev?k!E;#t;8Z-5SPWVuIbweac%L@c^Wz*r z^ROUag;`MgASsYVhvwl}rOJ4k2 zTicOT`G>A2cL-t;0`4<^^CMQ-*Q-?V>>8o9TWsn&zwoxJY3HKj@K}&;)bdh&Q5M@3D43te=001+KkuJDYtX+l6v&A9HD-)rejU zdY;U5x26S=KA4zbbdzqP?!yL`&y)YeqS{TEulj=87ZMds5CUF65eGnr%yi9UxYbxM z?w|a7Re4q@$>T0UT-mE}WWS6xewj2kQA-n#MTWR%9=(M6e|*=~O{hJi&XKGWie=f3 zdmGM2&7!XP-%s-s38VV~(!}}(32v=(0O!zX=#B_7+h^su9u$Mmd^9m6MS+seAM365 z?Li%W_u4z110pg_5nV}+pb;=mFPoncc7V zYX$NSr%K0|ygFekS#<$llS1s0XyP9}OD_vOGY(TD(|BPeNi_EJa7=IQ!pn-R<50`N zD>a&EZ`nU=zqyStziVb_Az+Yi_M@5Fjn-q5yCRdRyrI^gFJH%?P6VdzoM-tzCx%{b zC3J*ln(D4!`w5=;{2)+7042(m%C4@t=@*x`cduQX2PMg25vM{4B?~leBGqd4A-bSM z(2)xM`=6~_UX#j`^Y-j*V(x4n<2 z(h*ewtmxBgAVHW{3jH)x3Y}Sdvd3{OUa~HJAa@gUR`f4(*k2+ydyFDpb8YdF{lo*I zVt}BYbSGR82eGrtazdu5(rXbcH_i^Md`i>!$xeppDZXs3(I2O&4*C-QV|+Q&O;7PA zMF&Bmq)KgL{I{raWM)sXqR-{w_IUZ9@7{Y zPQR2$ghYcY*7iMd&gT5MG!%NJWW-Rygd_dG&p8EtdfXuU-z1Q1H=vMpC7a3icncb< zaN@u=6(W=dInQuETE+Exs1$z-1|-6}Q5*}U;`T6uu+X+hmc$Oi7x@RZuKi!T3M&7oty8KtJ zsk={QW6%5#nR*WI^GC7iHEA)sWn0#(tE%RE&vEO455X5bw?`W&10=6^}LjHlq^G3fs6O#Co_s90*? zQ`npE#hz6Wse%a&x}W`dPitr(?~DE0=ka`bu+zKyLJVL`%JNGCu=KLS9D*XXaYW|+ zI6KFBo!(e$vdf^?<@5ve#0Wvyw69LcS7%0%gPw#Pbti-OImYkZLgt+TN4sExZi9r! zzyBxz)D!oS$z9O;%z>60zorXy=6FX<8+8b5T`98UTdwUF*s&b*!txF?mp8=^x!LNc zfz6+C8O()?+u-!c6Bk06K{376&7WXGBrkvgvVK9QFOz40gg8HLhoa&S5R4+aZo~5> zm<_tjwGW}pmZqj}{P`$(IbBSaA?Q9BKx}E2k~NtYgdmd=zv)ECtf2LTird3vQ+xX* z=3_Ey6m*n;FSe-MNRvCXU_Y?~v+;1FEXJ9wC>WWExdsU*?UY=W&CjsrY6emP6F zdWJ@a3kL?Z$_xtyfRgwtT%GmM-|Z%QdzA&WXOMU%YYrBWzy;ROB#?#}28ulTJob`~ zyu;!qtL@gh18q>tj2k5X5=^xH*1vJ(aSDeXkaZtVH5rgd-}sk3?hYISWT4>rC|x~o znjUGCojw$S9{EfZjO57oiY?z`KXw`~$o_k$vqumuI*$di4>@+23q7EXm716(xjaG0 zgM=6J4taWaG}~asW+U<~OBT>arv`!(?(CbBQ48-zF(cTEzA-{#W%yj=y1xs)93fef zqd>()P$UIwM*^Rt^|zcIf8>s<*o0C9aIhrlC75^0+3fVZ`#_n@<2C5sMW(<(=9}jM?idak%ILiE+fk5*0#K z+W~2;*sK+VK8Nuq_#9UewXa43VnS;+M-|;`!wR)9JX+%o@^g^46>185$2Cf0CCa16_=N{?T`^w z-nHG?6$to^R;{I#Emi_N#x%7H!e^mHP(o6R+MfS@oKPtS@LsD9Pw{M3HSs)&%^x;LZs%FX@YXJ0;;EXg{39HYqZF4$gr(hLi0>6IFyqJfn2HzS*>HlA*V(^u)B)@Gki2Quy3>#1QW^dC9p=Tv z#4rq85wXXgwFcPYl%ZT-U?;imBW!7AAL~quTz%0@-ET535#4{G$*IQzC|hxdv4u5e zhA{g6`VU(I%XZQ##XP=VDauKFDJq@<*lT7ZlFocArH4&kcCe+~$WJ}8*| zW9A_@nsI~(A=5=x9uzH7B zpbYOj9*FZn;c{2QF91B<<9^C$R^yww{)BWC2ohh7Efg@`o{x=3qW(2hoS5sXHNv*f zHbFc*hrn780z>^Bo=g?5IoMA(ngs4m6^?eUm{_?RN5Gq@1Vbx*=Mb!#q)}3ooV56X}66YmSg; z{~bMqya}sYS0YaIF0-ta>cAuEm?>63F2vx|ULJ}|+JBowdB87VyWSX&A5|2>O>UZ< z{rm;G=+50lh$B_er$#*;SwOu|EIii=t*%O1N4}VdqSHOEtT}WplD~*?p}^<35KsRc zth=MUrrY`S1(me}O`QqUGa>lR*e%#|XTu=Ew1O%c=cMo(nnIcCoZ1e)N1sBjyD0L! zp!lWhLQDNO_+oYIR1UXg=_UC%iyuBvGvsgXDTlYGcWd~iPKl^6?Sp!)9gW_j#sxOGTdd2WowxWm*qmBMFGDz_hl%2UV1z|c{8 ztGr|h>NlyNI6x$w6wkgu?Od2Cd-|BE`$NADXAXE>x?pL48lkiuKAZbFSCKgQe1~a_ zAnKKv7}D`}Qk&u;Jw#e4D^;q+n2uZ{aFl|RPMd!EHzic+<6pe-!}$H`8nvurng#C< z2_d^G1k?^*J;wg#$Md84Jk6%+)&~WFas(%{zB>yf!I1dGzb-s7P?A#f#2cF{Am*_# zz${slCVEAllY)XZE-=wboGU_|RoXF$jmFx;!0|S6m zqsIDAJkU%MN*E!5DdZ?DGadd#*T#CfkUjM(p~4+`_o{k$Fjy-EGo6%Jhj0?R#cP;d-AWV4MY zf?z$ZrbCmtuzBIqNP8}PfHw2 zCpVxWi}2(jG7;^mS4+!(blw}!tKc1~y3TRs4VS%{dYe9~h;|-ovpYIFs-WqlVUzOU zVOCPcW2s?b4f{r$-%EqnTU`I-dO$2#XQFoJV0TX`6Q0x9;%Ny(D%%EFfU^Ylqrme$ zkSC85Cre@Rc6O357bp@Xabg$f?1?a&tHk&6)R(oaRM*u#RasjPymfSZ;FRaQ zz_qQyt4|_q{o%fY1f}EYI;ySZwM&1^*P)pb+2#>-&3K5`rEO!sVJ3P(css2iWF?b@ zmIfA+i=Y=*02g=xWF!wu(51|YrYr~|Ld@=`j|PPazHWUX0&`qAXRpm1l}|KmGaY7| z86ev|-P0LZLwF`#Vs#_d7d}0^m)1Mi=B%oj2=(?aL*-1bOGKd%M3#w?9>e&k6KNQ2 zy(c2Qkj^{E{DGyGev_eCdej6!r|Ga2*G!`a06RDH}2u;jRTXZcKA1n z6}+#`&^vhqcWs^vX)oTQ1S-ug)-h}*ivhVnn1U$+g#JxqjFPdA^mCZ%_%^|}&*i_V z|HnhIFn#b1cl%aL>+;3v>5$U|yt<^yZ*By0z&LG{A$zAnrxy? zM8VWG!wP(I54_XwTC<=9XW1wRYDt^*hvUn!6H9Ed6!hTf^_UyVoMIjj&blQBQy8Q} zQB_I|JHGiG z?>xyc4?#~vO3p*5rw}9m%2D=oKB+4+*Vnj(+0+vZ4&GH}_Bk#1_qXG|eAeir@(olh zR0T)imXJOp;+o5Bf13Pu!wDTb@fK663zjl^B^l%#{y7Ea%w2R{Oe1(!76{grEH5yh z&F&f{x~Wtg_JJ+)#wyH9$;o3lvt!S7-SzuR8@#VlRui*M_kBcHv90_k1zl{w5$&)9 zp|{b>q>P$;IY?D?wX_N)(f!*Lnt2T&tHrM0!tXulM`f5A%@LcoF3;JR@BI8P3+2xM zmf}-6Z-eQSkV-gXw1H-5^RT86j(TYG?KF#nl56)ET%KLdQ_&mP5U3es!s2qm8vd`O z(rIfVQ_VK7>Eq7bDngXt?TFU)G5$seinJEICmlstTJUY_YIOvkw{a@*)~hwuTiqF)&;>d<9X(qHv+n-;Y?qMkqyTrueM=q9ql~7G8zRp9E1;3F&XscVW zqo~7O!P$0)huxnIloo|=6eZ{~a*(R%BkOhAe~sK%`-7Hx5}_%e(#;5t_9)}tH{B)v z&Y25#lq@&kBa6*JXMSFJtl$Xd9ad`M>It#M-TvUKB>2l!@e30~no7^t^IXR+GFAE3esU4p~dp47?I6K3jS()+NPsOzplCz!Q#A4F3MJ zxAqritn_UDH3cs2$_ISjWhgNW3_mE4nk3K2b1HkJp0tA2(LsTiqB2#9o)G3Q@?6ie zLH{b}*s)@~h+0e1?)@wiLE=nF4??K-e3r?hiodk7Rw5RaQcwuuxztLdHCO{Nx6Njf zh?{}!&A$5fnaL}!+6t{g{BJgo+hL5+gQJJiwoZhA<1PB|!O$L6WizCSROC_}{%s8< z-MkyULfqhK4v*@u-|f!k%>>dJsMob|KegAsBDBF8;+TqXC1PuDhQ^rNBIsh; zWck8PYZXaf%?cA%UA|t+$9yo(ePloO>h0~Nz5LUmFa+@Xp%tzP5NG!Kda6Tgd5h*4 z7`zoiPG*Gfvjd*gj~sU?-PI0tN}QSnBNX(5x~aAEWhuXy{XWKOfdTAqoeG3;PL8WT zwUwaBb@}UGGIoWj-5GhMHg6pi%DT*$_ftgf*}H#SxAPVJ++Ee3uNIOcy?HKW{n|Ph ziS^S2Y=aMu`+R-M?4W3u&W~M=MXxxp>}CT09gUV7k3-slG>Hz z{W;}{hux6hh4hhzrVb503nj&0Odh?(2?F$DwOI3CjHA15m?={t=$E9i2}NlzQWsLU zN@CqA#O1;zZPzw34dRS?FgE%&sUGY_rLXH?C@u z=&Ng(R9Gi0bVm4epAtxhgy2@hoVS1Yo;U88%@-1emr$n;b>^`s?(@{-o`cYF)~l3( z`;Zyya_+{a{N>bnS6T2-PAS1`$k->9+BxV&I5}I4Yo8Kd+o1VqdFI(>y(vABBL3!p zuktPoR!Xvo1@4mOm53@SWm3Jn@R4SM@{$cXgvKGb12iZiN6Lk`dfbPjntQ!=1ED;= zeYN?w7mCRnyxliwGS1rQ10kK}97?d|rJe}6Y7)@@67NYe6Z%XRNOnc2QM(G5wvC)? zmQHy<-eyS<<-TOv`=Pz{4x>#AVU#9qv|baXPo(rj@hJyjw_0U9mTtC@JFpu0irc70|&pMcx%Wl4i zL&EticnpO%6@%GiV|^Xhkzb9dMk*i#fy%5&k}m+}e5rv1tTUZS8^7i98r$jM-+BRp zp70)>C~jDvnm7##(2cJ}o?mVpBcr7BfaL=orVuTZP5MB30C~u``(=p9r@MEwi&YHg zmxucUf0K+4Mz>vWIHl;l!@tYKh@ z%$S!IbAz(D4RWbZCRb^}Q!CM-dY_Z=%bU)gLtY7J(1ZTl|CrfGY6gXkThE3+t+3qB zaU=F;e;N@}3_f>PDP{KdVvD=G9Bu#hIzGHQWp2Tb>8CiClHY-7kBac%+U9)rk_lQs zCf8fsdh5M`qr2uZz&`o2Qb&7xyJy0Qs^N#ln@m4iCmoxJ1V0K&^MC<2@AhtaA^x)) z4JFD9C~)mPsqrzVLPRVFbxM)Eg|{F&sSVf7sWGool@eR|0#T{u6qm<{^%BzEW{HN~&~)aJA8*)H^|K{*)iBvLfz8g&o~^Firo;;cc%PYrtpa2sv=!BoLbMT6IB zYk667NBcNBDK*kCvbqmX%;U10Y1TagngXu*;tU+gykJXOPY5BikoXjG!%qov1a;Vn z9M)#b{dq~{qw`vmFvfF?zJ06ie;)<>_h|mhfu`!3OM}_;n{l6t@oJ(n;e>FTu-S2p z4syhIgBMAw!`^@waCfV-EAdVN%8^eJY!wyFRY{m3rHEF_iL$sC+q$T%EM`hUGYkER@?=9jE@t!64xTKcbDw zCM9Z>>96!UEQ4?ZR7Ej9&B79j7$d-37#DtBvW^_(BZ%Imx%0EY$CAW#+kGAqj{-_O z6tr@Mm`oaB`gBPF#CJGMjc~Qvy0p$~P!Bh}3~GWuE!eZZU_P4H;+d>c$`BAYI!chZ zrH~lYcty#?7hEt++4TG|OkQhcQET?On)Cak-`~r4^0*(Hb;V&i$wL~xX6($S<>u!4 z%K`C}Oh@&Pn2cIi{^WHE>1)3=!}tgCItowLidMD4pOvrbyGs8rG5>sQac&!2Fo z;m!5+BcL*j8+%wqu6rLR`Z?V9LkH^T{J6?hZSrZIdj1DZ=~&%Ue~|i9^S=-68+{nfBjLm(rr$ep*T@f6G5dsHxF5q(9lUZj zZ~>?Lcy7__Ndagq6sd_7yMPG?jIJ0>#P?6%^8;tQ*9Wnaq>`Pjgg@-b$UKuGRi03j z58_Und{gRFIz*ks$FJYn823DBuj7yYeRU(g`AbBip7A1}-q#+lragZ7+1i?pB#e26~YgqT5)e39eqyi*n3c1CxH<1c9l?8?KK^J0CCl7$)Abwz!l zznajJN0v~Y2Kkt%5>Q4Z2Q@N*cG;@R8L2)#Ru`(bUsD2M9@z1Lh(>9Jg8*WI6j`tC zT3g$9Yw>t&`U}uCeTNfDzH>tm7ooHsCwqRrRqsWGj4LD}ZW|lQR9ZohIod*JP%7BC zpDhQ%if|N;4)bUs!&xFtmeAuWu2s(*0=g`6M-k~yaGeXsm#{DqB8Mg5{B@NBfwV0b z)HVe;_}kHb&UBWyyZbcC=5bAznH1Fb_U%V2?HYRoMT@uLhLIMLsV09j zex0VQntAg)zceqe>3aB|NLIEaY+S6#6ir>|(QmVQ>7(44u7^8$NEK(-m$EEit`w6iCuum%F*mjCqov;zz-m}#R4l&9w$MI5bcsm}WGsk8D(%_D)xA)) zvW$`CqCz_zJ8on%I2+1VXH%C3MW4ajzMxIQ+_pXMKmO5Y@C6?`fTPlHgYA+U6$!d<7$I^LF%NO zAG>qyd(J*@Z_7Wn^Mt3}dp}i&vNQU}iEl}KR2j!|_@6gbjutH}YDeER?%Jq=*~W)6ShUMZ02VlqFRwUMInL7|Fu?#3rhO!5 ze4F@9-Pmfr+cadu{1o}fz3jQthP}%2nN6R!znQbYXlP}0jC>5Kdkkc!_@5u>H0;+Y zN?~{%!i+WX2|j5fo4ayzx0avz?;gtSy6@+!{ckTu>n(Qt3*z>urz$eP(r?gUBp2q) zT(L1f9`QI43zMFZnT&p8F&d00A_;;l&``%voVP6?Km4fsnozZlA9&H+CI@;YJ={2g z9(+0SW-@FcfXgqZ0&b;$9S z$@94Vg>^gc`b3W2Zh$Hdfl4Lk-+T$asC!=-1qph`*W%$DAD)bXsT+|eNBMO_{(Xux z#U%*2BT|2n%jO=(X*&Y!^YUh^BqsomBCeq)M}Vnn_#BMAKhb9rZkwaH>2S5*gb;aP zo(>joTs^l8!!qsvw}bt4PPFOrUOpOwheQC{i)$!0T!zo;*JdVh#8Ha4CWH=Xm)Q1ef+IB_*Pg{AX^Cn4hV)Er4S! zF8V+m{!R12GEymnG_6bCru?}+tp!dOhIiH<7dBFtHnn7U39ldsU~5%#{o2Z;>!<$b zYsGhCd-boaPUrf?W^4H}5}fW_tE|*K7CuVQFz1fX@2BveFIV0IPxJBmgz8D4w-7ZU zOzYH76~hQw`l_cZ|5QJQ%Z5nWvGS&BB3@V`d|s6`PB1)GZn2G-o&n+pc2|%e!GvpgrZ@Vrwh+2fk)jZFxLABoSY- zF&xC#*$~4yLeSB?v9ia^PsMhbN7k}TjGPP$KcTJ)wyv~g#8bFMRtbpw;a;t7{{p@L zdrnLcJoIsI@@4qzU@Gn!%P}LPOKaAoPLFYN3tPD&f9MKMk$KxhD z7NNOwj)lT-H-#4Fix#v=$8`lq16WBwdOFds$i!(DZijvEx=40I5<=I2aFf2NBc5M_F`*oPe8B#C>KrD3Jyi(_&SNtcat5 z8^uPctRRPjP?sMQm3aL(zkW=3U4cQPM1NCB0=}s(CFS!xo?fuP?y+)38H6O4phX=q z=4hG@NC(Cm8t3s;B$0;ENqHz9XM|{hy3@sH4dtz|rp!ic1CwFPGKz2{M_;d*BRt z5{Id&>p}!U81*m}HoPWmQ<>K@qeE)2CE*ThNc!_q*N}I5Kgdk_e-HL=kaG{mkMZ6v z1edH8^WTk;O;gS0xWVYz^+Hm-mcTc9+<>yskpDhLFD+fc1}Rk*62zyhB|wrZfN%;+ z`WruoS#8+YSwXIZC?OSia+Zs4aP==eiO09#_lxSkbfQp%7hcM@*JA04{i-Q;5O#*= zy2q*|C1@5@E#Y;Q=0fn%#U*bU&eiTN1UOnSND7E&I;dT=?kb=4&4@(aCUt6 zCnbgShc|U?4KN6kj935q`y&V0D|oXoMmHQ zz*NLM{`bGXDTKf9kM`g2)y&Z)_%yOszK=P3rE2$pv)*^(RMyp1xN$>(56P)Jq<$|9 zzpLmyqlnqgE?o_^hO>yz=1xj|cFp5z+FPWNlk2*iydVC*(usc_{PKoXrdbg>b>G@e z4SR`Zt1x+yzhfQ|+BhwfvyD|%H3TDc!CgE<^?Mm6il8Fxx_>;M<7v=@Xw|%Jh(vt8 z8y)Ff#m1P1`IIa|14I0H5D$>EUhuwq&GXIp5=fYBy*$~7Zp(3jOm8y&4fndht@r$# z@zv>66?^DG6!PouOzu0Sq2`g2!-&U&nekk!p)x{eR>SqE4QicO6UYm4c%J8PT5DAN zQOV|q8=$rqiVCIcU(F;B))6}z*8YLIl8Aw=zO4}ARnU`qoS%NHj6$Rk2tWQ%tljlK zKH8rHu|q!$ISJ+*U!nEVbE7V4;v`-*UMgV)`UrRrlbF~Anz)-V$X}^if>n-~d)SAy zuv6PpKo97V-Iijz1XBVtvkNz|VHjH_|0V}+HF`S3cVk9;dHvGx*sG9|ux$uAv#5?| zc(>O7K9`TB+uGb@0q=~>i470YY}gV+tY_|zSOGy>V9g+DWnf~B(dwDX#F!zj;i;?{ zNOY)ONlOV7Bg3nWqm}!R6m_5v#}%j0zfnEVl?KuMz>WAUKZwKYO=|P6PWw=IwAxI3 zIW(btYmPrye)WK-Yxt&)?LQ;1Y-SdF6$!vqn>DgC*Su)c2sFThZ?g90iV(5PWa(n{ z5gC#+&(MZ8yB!LalHtk@F12D;w=p0R=(bkBi~K!HNcD4H(t>L%63wu;v$8isr4aj2 z9pa|g$;0wQH^`gRE#SFhPXOH2W`E#xskh&P5r3uvah04D@0P*%sIb{aMT-m>kv?wH zOMP!lls~BQ0xsxXSd>a!M2j^D>*CK1`^CFLy)OS(Pc&na;kSNMwBMgxEA68m-*-rt z6Y2cnqHvsyp#BMBcCn^0C$OP^yN+7ET4i97cqnFnXEWJpn%N41&Tq!CmNHM;I_yh} zGSe>Sbb?+)FJv~Qj;jJfzM&luyI#UPf4+Q~y*(J~QO0`QuzlO%UuUV*vNhJ;n^@e4 zNk*$e`!V51KKt+$P>gb}AWJ^(u)@GOb6*gj#Ng181A#*1+~B0!(>ywA5-%uLID#?t zX%Y_7y_<>j(Ko5Bp=?J=%|K#0gVW-@-J#^gGJ;QQwHt0se~dZl3y0ae5BD}nM-SLR zADPJ>Hn*0)pWLLkT207xl*21dBZYtSM0L&w!8fI>Et5{?QjS^ui&`o%`9gQsAccDo zQxRu{0V{j7J*MStKSp_)*`XApV%e$=UetI1L$nznjE5N0@I75M%uMw-bcmoy#qTqeUWffrK@o$g5Wh)LgZ8zyAreepKq zTjN~GCS+plZ%V+zn?kN+*p4xCN;l|mzg(OXgb+Vcn)7W{Y7V~`uET3>Od909=hRuD zN3>OWR&r7nN1AsTBDLqqI*=`^fR)#?D&_NU10U_s zKzeiMLtQZw-YEIRGejMZvzJ93$8e)*9YVN&xqy*Vxva$aKO$Mtc)|5$3-(Bt5yht| zE$E{|P+@CS!zD|BaFX!)C5u+55uY@Sx2kM8bcblH>(jV=I)GYMGAW&4A{MNUoVh+& z()!Qc0k}WA+JxOZcU~2vB+bAL3V3iIsZ#fLEPV}^hhl{;hpV>6;>Jr;w?B>&@!q!kL&ZPL8WNe^2xnJE zN%x1qge-4tkSJ=zO*Mx$8_=&e&9PUe{AJiY*ic~H?BU@doF72|PoAM)%-t)m??cAD$yA_^|WYzk$ zHVBS@xs{B1YcCwj%dhI{wS>Z6?Q;4u@ot_+N4h=AL9zs~pb`7FB}WVNjOlz;ya8h#6-G%!5y;Cgv@meu6) zUV)kHA)83aSl!@*p5Tx;i zrYyXE_#6+n+q(A!=@}kRz$D*qIIyvZo7B8bFjHIk!5b=oCY-5(LC%hg}B$dr0nzLP#8uZ;lm6qwem> zZPKAE@*Y**Uv9^)&KY15Vkk%wG^m5B zs33O3&r+vR-nWe#{<)4LFy1x2Ar0KA+!%nnv0ufdkKK{Pw>S}2TBrRvIAWC)xMvv2 zxT&8=M#PTrvIxdBw^mx}JFpn9w}&wEi52pQSx@-m^6fm zPJsqzPsU7Y!wwV|^0L(abP!MqH)uWI4?q5Hwx5keGj>Sk3)2%b%fg99I#NT587CR; zqj?zhcgpp2kNlLrDxo4%4hT3jX+se=jfTaDeK{Hf6*33z^Dr0Mz0hJ9TCIw`;M!mu z(qw+XfE1oVM^DkVT0llsL|0La*GxrlmvcqYvVr%Z0iNFbdf*fH5!KPexf9oRqjx9d z=f|`&;S~0&Nx8)#iLlUbjUleiCS7B`8jHo{+7zQ)8v_Gw4s#}?ATW2GXmS*X|15IR z>M3jQ0jx|g4Mjc4SS%_6xS|hB&if33`?%%>o2TT=u%_DO$}AX8jWZ4}7{oIV$}?z4 z-KgqfYUF#>QeZ-of{Iutvcp(>DpU3$H#F{cYf-9b_T8WA>8+O=`m_17VU5jyoLi8O zQS}BgUes_$bqs;R+T*Ny)NMuxX0g+f;5ECgsQwBjGr!@m4$7@w2syn{Y2=$BRwo~T z1u-H5NVrG3Y^s?1CRX6+G^zm=@S!Z`zjPqTdZL)j`%M{;1pBa+$=hJdU2BH(cSp3$ zxFdE)Ys{3y%o6b^bgJi&JOh{0Ea!n-(k8BEFpxHW7=E6Pm+P*^dD;!9@HXd1{GWgC zPh6jm7hXuvk=3;;GGls1_-5jh6a^+AETwi)6gW7{(LvM6OV>fr)Gq@RqHf3@Bird4 zW0NeoRQ1fDWYQVs4tUF+&#&G9MhxTq$m<;?#3O=Yf0PBEtQmG;W2JSDF?Iy80n&s7 z3mvDjJYd7h+K5JnBn)suQDHo2$BM6tc3LTS7_A^2pzIW;Gr*p}ba~UL>FH@OLf?<^ z_78Mye<2A8^~H}9JuZn@t7Z^LNuJ0Q0D0s?L{v=^Z3UcOFjFZdX#~SJIF10U&)+p< z{MLWRRCGdi*Jh(w9$mU$>>o~V(O8Obk!;)eP-kHi9V2#qC?OTeD&`E(q6G%-kbTJP zL#jEns-;Jv;qro!F@gO9YvA{^x-L5^3<$g&)U0X(e&pfywe21ZI&G(^IBL0u?$L>I2EuI5+%r}Ovsp~8^j2X@I1wr$Sp7pr12`rH`3`B@@A zso!s4H1mdju<$FE1aVuYQh@z|tUtBeGino#2Y0x^$de>8iyj8`(%@0GFRc7`dMHxm zHdrwMDD`Si@;7tcDtSs6B#5`4gwAoyv|0_1;o8LGH4Qr4c3$pAH%V}omO_Srshq7XhaXjS2uu9@ z%$`aBwk;Q|0K?XEpZ(6x`ua9dMP-_V`g6kn&i12>f!7S)!fMldYF?st`dQq0B`!*a z8f{S8s;aywmfR!Nj5hlWh*$Ny+EmNM(Ff`_%@L=m%=9l8So{ z$J~ikkw4h3gL=gKGX|bG8BHLeZZ9Z;L?0E>4o$NWi!p#2m-S#P?wu!xok~x*^xS5{ z$(iwtF=#Juo`ID#Oh*s_`2OdbA#gs%ILLPHS0Dr~P4dLCzwd1QPN&sl$NbBa`jxuJ z(}6F%KaAVp%fQOBp3iIQbE(SNOz{YQdogGJ1R9^kF6U7UY^eCU3iyb(;RvlCTh&vK?S+3=Pm#1n(M8X#mG^7URIq>FNhWd zsl8a`+`kk-?N;;gy$BHq<6XHMZh8L8SWKPuJ#~=P-`u3GN#d0rU=B6LKMKI>bZ!YS zq%<^Q%o;sV`ZDn3<3LxOe6IJ`6pF3(#=P2ee-NV9PF4O4)jYcTDGBFK6|!=NpDK}> z=%96Mr9)b#P!m&%seXmvcm$vGkl5xgaR2cOshHzOSNmnG!A_4G&-(S*wD+>=+Jb4i z&qL&y3T3xYcu`xt2!qU3K(Kz!rLW_B^r+5vZhoH20}C1GhldHM^Wq&|#HMt}=MQbV zGA>gYl%}r+TYU+yz3AwZsa)r$;s(^xm@GP{G=WPr)0pH5T9|@Q7!^K~(nfLzR(B?v z;GhEH?9SbLWWSDp*ow|5OHurlv71H9C~3dlxp0`_7+76t)RjX)x_V-6#|WN5RoYkT z=&ml7irs2}@K(dFfS1#d!hd2_~Bagr;*SO;vDsKWd1)PIRAhoM$wtidD_l)`W$xUXq6- zu{$ICOg8;uYEyn{YK0^4ES$MyNS1~(_}fmeQOV`sk+;xJqE0ukI!WN?!ZH@J;;5?1 zSvx}o8+4eiulttE z+Jkuf<|fYk^!yIxbFUw15#WL>8x&yrm!(OXuQ>%3OoJHp1E4R$f;8EeW)9h-_3RM3 zr!ibg^41B=OdV%ovFK_%j0C(IUI$d7G@6dfr5!+*br#%c%!haC>dRr$nduCG;D*QwB+EUZy5ypE!E=} z-}l-?n)msxMu$eD)~GTXQ5WNLzJmSu@qKSP zO8tssmBhbW>V1>ALp--X{R0Ui`ApQ&of4-7gzBl5z3?%BP^c#bKZofR>`d7!2==~b zWFE7SI#`qlykOn~>0lX_mH{53jR^#KL%ToohUxj%8id0Orvq%wl6nl8Ept4z>h`y< zfIIk*1v#hzr@1GzZ$aNOwK6t09`;)nx~Jk7kTm@N31ktQ?k&LleLw#3PcC?A$*KWk zju;%`6`!B$-Rte$yGOLacC^$Hx^PE1d=SlUIEmjF#;%nav}FFMvhGusObi}e?>+U@ zf?2~yO$bJgJfbyM%wyt7+X;h^dc$xCk5Vq>_tMspCXq^zPRmPSO;a&QU|kr&_<0Aa zxIH~Kctn{v^?DTHyG?mB)3$oU?l+*?SU9MoDp_cTaq%rDSJVTl>=6GYyNk)u7+9rX z80-g%tsy1)(ZQk%f|QUCX$lTP7}|q^wif4AD5ud17_OlMV9L+8rW2)okd=G%Xw=5| z12-s!X(*P&vIr1Igt9r?PKzbcy^BVZN}OT`U|3G#yh2I1CoH5B-L2TbvG?HzA3ph! zC!QZQ?#Q75eqvZWK^(+(>eq$T0DRBfObfRM~)rsx3;#-7&3J5 zbAZTW?>6o|G{yh`5Bo_(K~(h56d550!$9Zuq*v(XM7>BE)0cT}0gB(>#*cqgHBk}x zP=*w;Rjeq?wQBg8bbOpe_;11}cJ#~qvQ#phl1db|gGv%#_Qz&hXcnp!gxI0JCLg8- zv-d+@HnhPwkacVk{5?VX4+hh2idIH@A^~v&A$iECO-hjgr?l6-m%{N^P0RXtfd)M2 z6uj&ZI2$7tEJ-DIsY61^+hHc;(C#0cm9L?}3wS^_>Ens!r~Og~etNpIy0$()f8M;~ zZocJLCr_Mk1Sc&LjZK5FX&zf9x((Q}Sm3Vw&npn(`L z)q72iO=gd6{H)q<>qE0C=37|$Pfk>hPjsEtSPCKGTG)7U7kRb zhY&%|@x%PAKw8`g#sTZi1Wi=|`PK!S02W_+ZPkdIZoch(qecvn-&RPa^=<{P$ewvM z>{`*qa_>ADByrPS88~T|%QCG44AKnR5_U{P7mWzQj!eb;(7k(`j~zL9!1MWHAuFDx zcxFcoN)zjRtpd=t(8E9K3W1n{+B;ocnE*N z)x0TDsuq`Uq;3BUsBjT_F-AgBwPM3&H65DGq_J<{&c+*V_&*omr3**@MAEoq|I7?d z#9`RMRwl27I7=DJS*0g!G3=sAsI#*(@!G2^!(aa5o@uYVy6U9rs_LGg$o&gRoQJW2 zCRI2oH#`mB$W}lEJ2ZO4aH9D@t^X{+%?ook`9N{dbgTY^&njo5i>XCa;Q8IgGi&t_ z!I2b4u*eCf_2ec+u3QZ%wZcW=#2HA!7_OZ~(`qq5!@!oP$$=<=qO^F9u|v*6YrRN> zqH-8+VeMg(z9)Ip%{QO7cW+x3+x}sDLG;#B-+%88oQ%h*2ZAV%KR* zB^rx5;jGM&4sxr~;z$Y358_LEjAfp>Xx6Nr>tgGIBZKOIDOkUG>l_S_FNIS(VDM-y zknnJ>R2EJU6+p7C%q7&sMn;zM=b>OQ>{Xo4w(M>j)ZNovLxN3BjqQU6H16X-i+d`v zp$MA81$IPMWN=yMZ7H^)CH{?Iw9XR2y|MHoIP{Nye0J=R!HprhOY~;8HJYnI;eAve zVPHm#bTF>Ny_J7<@WjzD{&){I<@)HOWdfJNBQF}t;K73mpZw&99vaYCzqgPtrP*7O z4SBl*$uesjC3vCjFinrWj{P@YemS_|y6euC?IJC%8z>1Nhhz9ScH_pa6A=bn7TN== znmb>Ng|iYF3wKKoSFJQsO83J^L+_8SE?L;HdHWFyURpILUo2KLqTsl)gPlV|ebwF% z&YATH_izRrWQ5WXsPd2!ab`IY(^rT?1;?Qp*`Oyj%kBNmJ@?Lj?D6?y$BY^r;zuOJ zp%D+zBw5ptR3ADTMSzTRlrqSHo&Cfy;!G$8Te2te3b?lx^1a@Gfdl;GCLI$VH|eU4;5XD&x4q}YN%O}ZIpR&syW)#%9TKT5hJkXUG@6PPD;$eW9a8wMh(v8o zZSLu(|1|jrKf3L#;lrAQmm=$#-LJG7Scl^V$;ar@Y>5Pptx#IlQr_= zf|zHfCh4c{Jontwo`p?0E;0ZDUhY&DS;ubPylYr4*YzKuj_+CcjI6NIG70F&xPn;%3L#^uJyn5!lrUJX%1Z7<%JI z4c>IdtmB`<{jI>AW2F)&vZJ1CEj&aToG_UoFpOaC^NmS@QfF6Zdheb+)z3cr?6H4* z`ni+wqgpU>nYWY(&g?FEKh#kzA6q!8<>;4bmfMlAopjJLj);lFou&yRcm|$$3el<=6QaL%3xP<9Aj35Mc$(R9YbSTc2T0GF%QH?=Gbw_7cwup_KYwK!z z>uRd<*zLN2z0z{2s!R!kic~R=O`hGs@PgWmZ#WrFz_VovEda0H@;SeyWoO;yO&bTi zvTW(_b?aVldVTrQ>Omt%Cu(YIf>d_EVBoUlL+Z*KfHGh!qyy<7=R`WpI@dT)-`WsH zVIv&mF@TcC99st`ldd_yn>}N~8`@O=Kvg!m2M?_7{u=M$2oFF$d}DWh|FQGVJN<#T z`pmIkr;>4Mg~Fgf1^2M&{)B%yp<4En<$Mdxr&qN7+swvBnC_%*ebs6vdC;< zOvhW2v_?R1-)BU5P{hujn0U`_+`Or2(}oRA>tA2p*uK9#i&1F;zmP$6{Q6Wb$)B{u zC>6gz!z;E!FX1Ei5WQczt}dCz3;_%)-K}lzxaw~$SSPaeRklp)L{n!RZl?-07&4)@ zbPJR5*^*&f+!DREhT5tn4K>+Ka1^Fz;?2}rges^*fl>!UKZ2eAABvB36{7s?21@0{ zLI`~19=mh(>hQ~9u;uI61?~uFn}bxC##0Q5C??D0Fx{X5a>PyN?Qn?~Av#CW#3)8o z!zfAky5M(obfkCfYOdb0Wm5xwy`yGtYb!>7A|LxKzfj2IHkJ088U_>#xNqX;brWB z)r@Lo@S`yd+sI=NgHG?cxUvi?(Kf20U%)H6F7!6-*lT}lU2RPZc2M63M9d0$Y2b1i zmb*_H3jv!1$`6nYssVe`2R?B2(zj}%7R|K`ThQMXRB4xR_3DjRqW(145Zm6Cbc2ox zAwwC2{Hq<})h zMO&G0uGEIEs!`!khhpxzygyQ99&yDj8rL92^#Z0RK~bCW2auG6_)sXx?@K$`mm6O6bXqO;8lZlmyKq7(RZY}~_0ryt;sziuM7r%&K2Kny$-gny8 zL+NfUe|vR9FxI2jF#eDfvW^*Lb<17Wa~W{`$Y%(B~s7;AL`}La;jxw zo%`ymYscY>*lRH87>E%Jrx@kA(&;0KNLEduP>f=zl>%eOQILH9pmWN{p(qVSC?j@TO?F>9=4IK880tSEvfNt}!`T-IT!VI`|& zuEr&Z-8~Dh%4`FOxV(F*zlc-g z;#uM6&6}61sTs`QG{x`5h4pl>yu-kKnefh*E}_n3ouuN<=m$a294-NPC=D1EhckPO zSy^dWIZ+^=;cctHAjTs~nv`CkvY=tk9Q%~`iRGA)d+_}8&)z{P7|`!V7fV_PI}SRd zbTEX&Er$Z4>RD%<#b>WSApd*PSiE@oOe{M5Ao`>+P?W!viJ20EMpY?JD}qN{P^4N@w+6Q zAnc>(aytE`9ZE$UGpE&GDFH{iS4M2bnarS>cro@qh%}xCLKmBZbo!%r{JsZMF_oif zF{`yLf4euxMxek4VMW_TUJQ`fZqjd=cvc=i^n_Zc^jz zC;l5Q5r@A{>Tl-MO7-GSX5E4X3kD<-wNr7soe7tYLs281Vlm^!cWSaBGOuV$G&2&g zuBGW(VdM;{a^=jKI_F4I!hz5catI)f+%eJaqYDkt3jI7#c48iKRlcXRTEN`f^HI>JBDg#hM>uLUfkX}V~oENwnXs5J!pk3xGiA0W$;E_ zoxgeZ?AfwN+8PD$q(+%o2HE+EP)Px);7LS5R9FekSxrx*MG)S3`3UQP?q-2mWS1FVn0r>m>0tE+qN z+$nxDGc$LWmzN(&Jw;++Vc|nzupA#B|2aiTe2>P)#(vt^*!X07d;5@$L1Sa%0}^ER z_V#{Dnx7ZSHjvQca18Ryx3aSG$YHcc=%V%klAnoqobqW>o%hX8QPRu zKF@8qByELR(I4%v z&8pipeRg*Cn@_tCFoH+R)z#HK-LVpyHV}CWoWzx+Q(Rdn6mk<26Th3~ivy)+xj>mr zCe5XG`K;6SSc6Q8TL_~x`Gm-$yNY9NZf<@i0h0bB5!BZ=1@sRviZzK(sJpwnO#tb+ zMThi>S{}n`GivuOM-iOzz`(!{WQm4q274IbQzafEjizxn4oN4k99R>;)whMLcj#5(2Jv;ixgpb%Jxu z#8=j>d))+-K#YpOVD4f*1I)lJj2o6VAu_XH$Sb%soWtH`!5*@BiAI-O3x7Yocl zuE8bXmy5@+LPIPtH6S>HyJ*8xMChpU;^LyVEU=zFfy69Ppyb!p)t$!z1N3V>eQg$> zx5!|OApygmFg)dbn1M%-IjObHu|SO;dBZ}U_^0;@5!E3n-z0BtR7%=8N{%TP+l-BQ zPDKe;!pE*F$N^x0nITF_SqYFUE9pP^p?JKyx_a;Q^t8q8kfct#YPk?F8`js?>kbbO zpJ<^tT9QClrUY077_{Mv58-Y#!qX)H|3+4Mq%|V$+VzJUu1G{~s&V7R~ zhj{X`8jnn*FwK5&aL|H5N@Bh!a+8wF)ZX6yT&^#1Sg{J<#QEX|jcao=Kv&kQ@Y_(- zRV+&JkiuO0WE_YO~@+Df%yP(TPb9<6JzShXJY9eQkcyD*)bje7$&n|dDGW< zja4a)10wXWru&yzST~ZU#R1TE+bJhgNsMt=?%GsVVLbt+pa|a00Jr~L>Gn!#ZYDhG zWaSc{q<=*UyMTzjsoB}t2K?Wf#%8U>Az^-eSE4LWCdil{HcuXLG&eOhbq=}8QbRTH Yzn}sAvV$Wrz5oCK07*qoM6N<$g0!~*)&Kwi literal 1687 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL1|)l2v+e>Z#^NA%Cx&(BWL^R}EvXTnX}-P; zT0k}j11qBt12aeo5Hc`IF|dN!3=Ce3(r|VVqXtwB69YqgCIbspO%#v@0S_Ps>W0$H z3m6e5E?|PIHe0}qV1u+VR5~vQlAHw|k;M!Q+`=Ht$S`Y;1kkj|%#etZ2wxwoRtc=a3djZt>nkaMm6T-LDnNc-DA*LGq*(>IxIwi8dA3R!B_#z``ugSN<$C4Ddih1^`i7R4mih)p z`bI{&Koz>hm3bwJ6}oxF$`C_f=D4I5Cl_TFlw{`TDS*sPOv*1Uu~kw6Sp)|Vca~(P zA#BPkhI$L=L4A;nzM-ChKHO}eRvVD0m48uYD$r(-`F4gjV3jChPEalY!TL7pymv^TNZqv*Zf${bBOcSsE-hO)e+hR@ z3W#~ae`%_h=C%MSuakuuOJc4pYTZ&aQO|9QPlr(3f@z)s(wZ&{rJ5EPaTvGHG@qLv z=f3{DdH%e8)@J1|4n6&6_5R-b-S>AsziYlK^Z(>1>wrf>?=q|IxmVght<`(Jsp^k) zsnY)Ce{P*ph`wLeVR|{GeUtAF=D+=!z1w$QEA)C}<@@A{+4WgQ$Kx-ioL{4MC-rLP ztJTZO6elsAnLNdI#f)IR1K}?lgFZX6-jGxE=~h~IH|cQ5`{mp2?l}2pzFGg}SNk>U z(?o8@2zsrYc23{{7hA3?Pr4WD_hi1Ln zqEPVHn8+?5WhfLi$w+(JRga^LVQ&_6J$P$iyfL`UO{>q)u*P3BG$|?7^=Q`#1H;Tc zt5&VzJ9GA|`-J9$3m)^XUY~Cv)4jLn%o&^h3LCl4M-xx~SR%x{GUJP4Z003Nh2UU+ zCqDsG6BD-Ex2~*HbJFB*Ci`&Bx zJ>ikhY@xDEnm2Qn2t9UXFq-L;wKBx3+fChR^X7b|Mu&vS(N3B>5eg*;jLuco_l9a*B?<~dPJOl;chS?BmWR~b46x~@B|()v}me)8dl zo-I3eOepjY>-02mj6ELdqa3iqE;wyZWpIzUl-xe^E&)EH0{fJf(#3ssheL11h0QEa zD!bS}_4Ch~+4l~6Kx5Y~DhxSwOqMQqI>U&JMSN)G0gFD{^7`%GPv7%0Yc_50UQ{x9$=(Iir|nZ^ za4T`XvUZ9PgEKDqJT^`X{`#^ll4(m(x z8->*GH~wN-YnZc@YTtCwWia$I?my{GICvTJK& y;!L_DP#87Wuy9Y4)Z8R@#%mAjzMtLkkKy>-C$A@e5&%{X3=E#GelF{r5}E*v#gy3q diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png index 245c2e855c00fc86809e0b4d0d5ff617f34d3db1..a4c313e3539f580612c42321cdfe7a77c7a37284 100644 GIT binary patch delta 2451 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 RDGUGr002ovPDHLkV1hA%`Tzg` delta 2772 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 Yzn}sAvV$Wrz5oCK07*qoM6N<$g0!~*)&Kwi literal 1593 zcmV-92FCe`P)ciYk?xyn%Wer@htQ~lS`;X zlvo>RDs80@`bTL`fuhwnc>-e9AUv3+m|SZ))I|AnYks#3%~*%xbPk4XLB09?{)ORRv_184*g>wQ}75n1m?0AEMz zFqVOq0C+K4gGpHaK7fUAc54N60szIERJ|?$m{J>@7C`T%Diy`JJOD zcAo+GLkTFEXUOpaQM>!0aYi-s$A#;5Ks?0js5=^m1(GDe;V6k2Qf1}tyqcQ& zDgr}4)DHdLv7^`!NJ0SJxiir$g8`(a=PVD-kJ3`Rdva2nk_gVhgNLdJ3IoIambPy% zYSLRph6AFQbL-ak?=a=?PhEBq3FYMu_vGYcM0ewr!=S9RC9BA8FFu)cfXHB`AW{$S z8Z^+w#l?UcDl5yvLXwqJUqwJy;E;-BHzUZB{}rh=8k+=>Ry-@mvhyC?&;bLXoksa)^Na2I0+6QsVrFI6EiP&C-;>fOtb)M5@_ zmjN>h4%sdY5OtQDn`iCqy%K<=5@eSZvVVV-d+XM1PgAzy-B9g5BjE@KBty!zc6awF zAjxrr2e1@Zg8rt2YBZdL0Ai3XUhD~iq^6EwU~+t6L0tr#gaM+Cb8>R6U0q*M@`3sGa;*ng&+|Lh@a1stkhLmmX?Cfe}>WDDU5f0~(07OO% z5C6~{ZjQu&&CSjKTV8JeK<{}@wDyFic{O7O2fuS!ES7a@8BCeteZCp*fdhL#jy5Pg z%M%Jn9nSL7fh{4p<%J(JGd^!^?LJ|U5(X$doZxiM2XL0+XJ>uhy1LhdKuQRpP&oX; zb45YQ?8e6_Qj*hIYd9p~fQE){yCg|k$M5MV=RRX&qa#^aSsQJ(^bEFIr|lBFMbivJVh~w;`gB`q zet!N7YS}8*5xLzTI&C)FldLU|=c{gy=f=;mwxgxKFhFEXQBmtz(mQ9;BKY#9A$Mt*n?*1K5TaoT%fZj~N@kyh`q-(q8`$17~ns1nC1Z2LW z7zUL2ma9euQ8n`|GZk3ooAxm%$ULhN3M=TWhUsRZfPzl@P_cPlEErPAc`+(BPaMjS zR8JgIfq7RqSgweReigIK}vOZ ri|gwz3{t8FZe6|~#2~G?FHrpt6)zUzGP%K;00000NkvXXu0mjf`JwR} diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_list_background.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_list_background.9.png index e69d3fbacb536b0a648c9df7bb377e52efa1ba65..1de561aa65d4ba931973e4ebc98e31b8b6614d24 100644 GIT binary patch literal 3936 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 - + \ 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 8d8ef310db..12e6ec50cf 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,5 +1,6 @@ + + android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground" + android:background="@drawable/bg_v2x_event_list_item"> - + - + - + - + - + - + - + - - - - - \ No newline at end of file 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 cabc198172..7bd7a12d7a 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 @@ -7,117 +7,105 @@ android:layout_height="wrap_content" android:layout_marginLeft="10px" android:layout_marginRight="10px" - android:layout_marginBottom="14px"> + android:layout_marginBottom="14px" + android:background="@drawable/bg_v2x_event_list_item"> - + android:layout_marginStart="@dimen/dp_24" + android:layout_marginTop="@dimen/dp_24" + android:background="@drawable/bg_v2x_event_type_read" + android:gravity="center" + android:paddingLeft="@dimen/dp_10" + android:paddingTop="@dimen/dp_3" + android:paddingRight="@dimen/dp_10" + android:paddingBottom="@dimen/dp_3" + android:text="违章停车" + android:textColor="#ffffff" + android:textSize="@dimen/dp_28" + app:layout_constraintLeft_toLeftOf="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 cc9e7d8fdd..70bb272cf3 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 @@ -6,142 +6,128 @@ android:layout_height="wrap_content" android:layout_marginLeft="10px" android:layout_marginRight="10px" - android:layout_marginBottom="14px"> + android:layout_marginBottom="14px" + android:background="@drawable/bg_v2x_event_list_item"> - + android:layout_marginStart="@dimen/module_v2x_surrounding_item_bottom_image_height" + android:layout_marginTop="@dimen/dp_24" + android:background="@drawable/bg_v2x_event_type_orange" + android:gravity="center" + android:paddingLeft="@dimen/dp_10" + android:paddingTop="@dimen/dp_5" + android:paddingRight="@dimen/dp_10" + android:paddingBottom="@dimen/dp_3" + android:text="求助信息" + android:textColor="#ffffff" + android:textSize="@dimen/dp_28" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + - + - + - + - + - + - + - - - - - \ 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 8d61e6c0b5..91a0af3bb2 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 @@ -89,11 +89,10 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@+id/rgTabSelect" /> - - + + + + + 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 5e93414bf9..fc1e9abc1e 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 @@ -37,7 +37,6 @@ android:textColor="#FFFFFF" android:textSize="18px" /> - + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/> #FFFFFF #B3FFFFFF #1F2131 - #1F2131 #FFFFFF #FFFFFF #10121E 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-v2x-res/drawable-ldpi/v2x_panel_close_light.png index 5bb2114ce2c149c9cd7f2413f6b1f5ed636f86eb..0bbb52b4880f28af273db8c9b4ae4da1a141461e 100644 GIT binary patch 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 literal 1369 zcmV-f1*ZCmP)#FL8T^4?4?nO$8mUQBkG>5?~_8RoCM>vi|*>BQ~hbXC2ouj|#T zH~kvn-c=)j_c+`o&@&LlV)0$qb)Q7UJOErKq6ZQ22mpQtfHERpFBA%2C-tBb1EG|9 zfr!2j8Q2{mga&mdq<)~9br4cY3iQH2018&Mq!see10%@#&RM#>@e<0+Pd1q2aq2qAJN_CkY@QeFpu7fl9BQZ}2-=1rzbC=g1iDiLLp3@pr8i1?Ne;!}>U z5r|^3IOMwS-yFkflHt@2Hi+{I;p~C@>Nw6beh-HQf{3z8sY;rjvZ*hK_>BN!o-c^Q!^10;O65D#!O|?RA!rzE5K5`Pi0I)o z2NlJ)_C1PcMqH%2&z+q1V9b zFgie7^xDv|S|GkJgt*oMLMb&zM4P>SN=c8ev!Vrrt!&ua+k;A_0%K!ip<~?H*@4l~ zQ5YH;3T?wj@i*%rrl+SH<1Z{M!1(yMaUe4@GvK;+o58`sLD<;XFt!n-kSGZ4%>4X3 zOiWA!`PI1J46^>?*47qVpDWk^5%Il4*YS3DcVTU9t?NBbFx?<%V;o&BfVx~Wh#!dP zc~b*H@?OEr&CS8&mW=ZXlOw_hAkM) zAU*_u4>)Pgl_{6Yu(Y()RXnIi@B+7LF_)RIRAoRd-*NNlf zV^~~V>;S>-;Hh_bJ16W>OuGv^!U4>lE=)fF{hjkDv zFM2G5i0`z&;7M#d-s9L?hVOX6b53H{fbaeFS$;ru|mIqIT zc|`nI2=Rb+#_L$XDFED`3U4hs(cj0K_KFn zLWo!E@p>K|QcAr>L|=r)opQzY^Ol@*ma%?{lmb2p3P$(31ThR3ioEptqNxuk+3sNSN$rTEP8-DhT zK%CcU66=R6b(-hx93}^XZ)X{lmin76{cTr}T(9nP0R%QwoB*Vh`V)pL9N8pg5b=@_ z;-<-%#xB8|AgZk1O852kJyG99 bhPC$}AWR#+&o}0P00000NkvXXu0mjf;PHRw 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 index 1680352bfda88557b5833c87ceaed916b4d4f902..0bbb52b4880f28af273db8c9b4ae4da1a141461e 100644 GIT binary patch delta 1572 zcmV+<2HW}V1+5H_9Df06gKC!m0004VQb$4nuFf3k000H&NklK2;ld-X}U~g}aL&X@Kot=Hn$=uvrFflQ~p=w@LTu}=g zn09D`G}VCUFQ`?75M0+leH^c;E;0#3#73fOBrGm2sxif_&5)XaM(f(V&!EzUe*!b1 zK^S~}#QnGn1b->Wtu=0(pyh9Pcvz1|M@RLT>n7&JE={e1+oaL|_wn}v@V>GZFlnke z48wzJwc16&T;6~{0|J!@CYN1v?i@~NBaP4Wsw}RotOS#jlWOX^j^5A#K#q}-5zWZZ zbeqM@#ogWApr@xNn3|e$dH)M7uI%sct6-msO=OK^E>FMcj){1AshY}48 z4E*j{vq;eTF$vlhcKZnPn-&))l}cr>udi>Nbj|EC;c@>8|BkwJcOFI2n?7`wVj%ej zf}gm;dFN(eYQ=n*c@;F_TY`aG>RD$gWn{VS=;%m2YL_0*Z^Dgt8O!%m7!-M7VL_d8 zhAp!u!+&;sd^|vSq>AC$+-3%N0gld8E-X-?WL!or1F~5QdDvm$a~~tOOmu8KGu_?Y z>cH`6^!D}!Gcz-4&G%0|yeuF4gmTcX>!<+oeIS1&hfpSq91^WqxMAP~22|n^TArTA z6PZo>CZX6=0weP<@}WtSF|!BOK0wU=EHtyvRDTRXW}Yu0a24Y#P_~W!8IJLc?-(~# zoHvcZ&@#6FmZ?z23B)BI;&s<0R{Cbxp_Pe@$B<Q3p>Xd515{M_r)wN8-SJvlj9Gntx2 z5?g$E2K>+m&xiMlT41Hfw@MavtbY$!Dy229kw@N>DOZqY2dAjK~-1 z;pJagSRF#>QV~HPuMar+S^?Cs_YX_VZG%v1m0=w*fldCuF2l^*5?rhoU#DDwdo zk5Zo-zp^GVUc%;s+#f$(<$Q0Po@RORvZaCXZ7S=vQ1tnF=3{kn;NacG!AmXae8QwL zJ>dxjLqkJBM@L5*o1*jeXLWUzKOqENU0s>HzD0z?JZg-O^i2oQxxVB2lwC9pVD&d4 z{lW9h5E zeWDBEIL-~%bwBC)83TKs$8{$Y*#DxGo>z^f4O}AV79%2lCWKs>7#y%e~r6p+Cq;yXgf?W|oP@V;PUNJM-^2)Unz z76R`&4Md6~;(t9t$m?Vgd4{vu?Cxr{dLw&myBbe##9W2j)bzz;T?1 zuImmC1~`NcRo()wtGcPG@#LU@L+}LH^wu?*OrY26MIwwwBWdC2bUMnmg(sb9I>Z2R z@FHj(TVY*}2g(8#DV>FFx7*O~_oYuncr=>=hXJ!NS$}BRxDIuc!<*NduR4xdTM<;5 zu*s(LJntm{bZvk|N@ruLY|J8#NMXHG;7bPyWK7<7K`X_89*9( zFc?6y+0>ox|Mk)~kF{qubU3sN{Ld}m`Fwt1xm^A*TzutjXWr>*o)*6;rRNU6FR?kQ zjVeY}If00m2qE9Y_`=?r=|NHf^eLq@DYv!mURH*S&o;Pg+aJz@Eli2@quob(h&~-i z6^_Ao*e~u;N}r1Mf--Ozpz4D~_CZEDC9r6*rPf| P00000NkvXXu0mjfRUTu^ From cda3099c0c8658d85596a52a97058ec6e2fcf923 Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 4 Sep 2020 14:10:39 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E8=BF=9D=E7=AB=A0=E5=81=9C=E8=BD=A6-?= =?UTF-8?q?=E7=99=BD=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/item_v2x_illegal_parking.xml | 7 +++---- .../src/main/res/layout/view_video_layout_normal.xml | 3 +-- .../src/main/res/layout/window_test_console.xml | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml index 41be2d9bb6..ec8da8c971 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml @@ -1,5 +1,5 @@ - + android:paddingEnd="@dimen/dp_40"> - + diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml b/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml index 7ec4ead5fe..5f0253cabc 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml @@ -4,8 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="@dimen/module_v2x_event_window_height" - android:background="@drawable/v2x_alert_window_bg" - app:roundLayoutRadius="@dimen/dp_40"> + android:background="@drawable/v2x_alert_window_bg"> Date: Fri, 4 Sep 2020 14:43:36 +0800 Subject: [PATCH 07/10] opt --- .../main/res/layout/module_event_panel_fragment_surrounding.xml | 2 +- modules/mogo-module-v2x/src/main/res/values/dimens.xml | 2 +- 2 files changed, 2 insertions(+), 2 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 c3e82ff512..687ebeff9f 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 @@ -20,7 +20,7 @@ android:id="@+id/tv_brief" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:gravity="top" + android:layout_centerVertical="true" android:layout_marginLeft="@dimen/module_v2x_surrounding_margin_left" android:text="周围5公里，共15条交通信息" android:textColor="@color/v2x_white" 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 5d2165aaac..f70fea10a3 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -31,7 +31,7 @@ 200px 200px 100px - 40px + 50px 90px 36px 40px From c8fbce4de87ac0a2cb8897e7537d6cb464eb2268 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 4 Sep 2020 15:12:00 +0800 Subject: [PATCH 08/10] opt ui --- .../src/main/res/layout/tanlu_item_main_media_recycler_new.xml | 2 +- modules/mogo-module-tanlu/src/main/res/values/colors.xml | 1 + modules/mogo-module-v2x/src/main/res/values/dimens.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml index 284ab8bac6..81c7cc2c7d 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml @@ -90,7 +90,7 @@ android:gravity="center_vertical" android:maxLines="1" android:text="东城区北三环中路辅路小黄庄西路68号" - android:textColor="@color/white" + android:textColor="@color/tanlu_white" android:textSize="@dimen/tanlu_module_full_title_content" android:textStyle="bold" /> diff --git a/modules/mogo-module-tanlu/src/main/res/values/colors.xml b/modules/mogo-module-tanlu/src/main/res/values/colors.xml index 48a00d3b8d..24181bdd65 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/colors.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/colors.xml @@ -39,5 +39,6 @@ #999999 #99FFFFFF #59FFFFFF + #FFFFFF 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 f70fea10a3..20a458fe66 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -39,7 +39,7 @@ 150px 48px 32px - 90px + 80px 10px 20px 190px From 227a8da7fb3e59dfd857d539d9997736c8638515 Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 4 Sep 2020 15:20:40 +0800 Subject: [PATCH 09/10] =?UTF-8?q?[add]=20=E6=95=85=E9=9A=9C=E6=B1=82?= =?UTF-8?q?=E5=8A=A9=E5=8F=96=E6=B6=88=E5=BC=B9=E6=A1=86=20=E7=99=BD?= =?UTF-8?q?=E5=A4=A9=E6=A8=A1=E5=BC=8F?= 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/drawable/v2x_dialog_right_bg.xml | 2 +- .../src/main/res/layout/dialog_v2x_seek_help.xml | 6 +++--- modules/mogo-module-v2x/src/main/res/values/colors.xml | 2 ++ .../main/module-v2x-res/drawable/v2x_dialog_bg_light.xml | 9 +++++++++ .../module-v2x-res/drawable/v2x_dialog_left_bg_light.xml | 9 +++++++++ .../drawable/v2x_dialog_right_bg_light.xml | 9 +++++++++ .../src/main/module-v2x-res/values/colors.xml | 1 + 8 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_bg_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_left_bg_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_right_bg_light.xml 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 10fe9e7433..a7d161b299 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 @@ - + - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_seek_help.xml b/modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_seek_help.xml index d82d598dd3..624445d9d6 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_seek_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_seek_help.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_75" android:gravity="center" - android:textColor="#FFF" + android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/dp_40" app:layout_constraintEnd_toEndOf="@id/ivDialogBg" app:layout_constraintStart_toStartOf="@id/ivDialogBg" @@ -35,7 +35,7 @@ android:layout_height="@dimen/dp_130" android:background="@drawable/v2x_dialog_left_bg" android:gravity="center" - android:textColor="#FFF" + android:textColor="@color/v2x_FFF_2896FF" android:textSize="@dimen/dp_40" app:layout_constraintBottom_toBottomOf="@id/ivDialogBg" app:layout_constraintEnd_toStartOf="@id/tvDialogRight" @@ -48,7 +48,7 @@ android:layout_height="@dimen/dp_130" android:background="@drawable/v2x_dialog_right_bg" android:gravity="center" - android:textColor="#FFF" + android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/dp_40" app:layout_constraintBottom_toBottomOf="@id/ivDialogBg" app:layout_constraintEnd_toEndOf="@id/ivDialogBg" diff --git a/modules/mogo-module-v2x/src/main/res/values/colors.xml b/modules/mogo-module-v2x/src/main/res/values/colors.xml index 06de29062d..7adad41988 100644 --- a/modules/mogo-module-v2x/src/main/res/values/colors.xml +++ b/modules/mogo-module-v2x/src/main/res/values/colors.xml @@ -18,5 +18,7 @@ #FFFFFF #555A75 #000000 + #FFF + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_bg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_bg_light.xml new file mode 100644 index 0000000000..210df32190 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_bg_light.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_left_bg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_left_bg_light.xml new file mode 100644 index 0000000000..49fab59997 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_left_bg_light.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_right_bg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_right_bg_light.xml new file mode 100644 index 0000000000..e348dafea7 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_dialog_right_bg_light.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml index dc220b6993..acfa530deb 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml @@ -15,4 +15,5 @@ #666666 #F5F5F5 #FFFFFF + #2896FF From 03fdadd800aa4dce7835790eee069fa000801d3c Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 4 Sep 2020 16:15:11 +0800 Subject: [PATCH 10/10] opt --- ...odule_event_panel_fragment_surrounding.xml | 67 ++++++++++--------- .../res/values-xhdpi-1920x1000/dimens.xml | 1 - .../src/main/res/values-xhdpi/dimens.xml | 1 - .../src/main/res/values/dimens.xml | 1 - 4 files changed, 37 insertions(+), 33 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 687ebeff9f..6806e32aa2 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 @@ -3,9 +3,8 @@ xmlns:androud="http://schemas.android.com/apk/res-auto" android:id="@+id/clPanelContainer" android:layout_width="match_parent" - android:layout_height="match_parent" -> - + android:layout_height="match_parent"> + @@ -53,9 +52,9 @@ @@ -101,34 +100,42 @@ android:textSize="@dimen/module_v2x_surrounding_top_textsize" android:textStyle="bold" /> - + android:layout_marginTop="@dimen/module_v2x_surrounding_empty_bt_margin_top"> - + + + + + + diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml index a3bd47781b..68b7d93098 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -36,7 +36,6 @@ 150px 48px 32px - 110px 10px 20px 190px 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 b52dd520b4..09a571b944 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 @@ -37,7 +37,6 @@ 150px 48px 32px - 110px 10px 20px 190px 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 20a458fe66..949dfa9098 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -39,7 +39,6 @@ 150px 48px 32px - 80px 10px 20px 190px