From 49b9ffddb0d7fe48c7859f1852cf4d4a6b27b774 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 16 Sep 2020 20:19:52 +0800 Subject: [PATCH] opt --- .../mogo/module/tanlu/view/RoundLayout.java | 11 ++++++ .../tanlu_top_bg.9.png | Bin 0 -> 1156 bytes .../res/drawable-xhdpi/tanlu_top_bg.9.png | Bin 0 -> 1156 bytes .../main/res/drawable/shape_tanlu_top_bg.xml | 6 ++++ .../tanlu_item_main_media_recycler_new.xml | 34 +++++++++--------- .../layout/tanlu_main_media_recycler_new.xml | 10 +++--- .../src/main/res/values-mdpi/dimens.xml | 8 ++--- .../res/values-xhdpi-1920x1000/dimens.xml | 8 ++--- .../src/main/res/values-xhdpi/dimens.xml | 6 ++-- .../src/main/res/values/dimens.xml | 8 ++--- .../v2x_surrounding_bottom_bg.png | Bin 0 -> 659 bytes .../v2x_surrounding_bottom_bg.png | Bin 0 -> 659 bytes .../v2x_surrounding_bottom_bg.png | Bin 0 -> 1565 bytes .../v2x_surrounding_bottom_bg.png | Bin 0 -> 1565 bytes ...odule_event_panel_fragment_surrounding.xml | 4 ++- ...module_fragment_surrounding_event_item.xml | 4 +-- .../src/main/res/values-mdpi/dimens.xml | 6 ++-- .../res/values-xhdpi-1920x1000/dimens.xml | 6 ++-- .../src/main/res/values-xhdpi/dimens.xml | 6 ++-- .../src/main/res/values/dimens.xml | 6 ++-- .../drawable-ldpi/tanlu_top_bg_light.9.png | Bin 0 -> 2803 bytes .../drawable-mdpi/tanlu_top_bg_light.9.png | Bin 0 -> 2803 bytes .../tanlu_top_bg_light.9.png | Bin 0 -> 4690 bytes .../drawable-xhdpi/tanlu_top_bg_light.9.png | Bin 0 -> 4690 bytes 24 files changed, 71 insertions(+), 52 deletions(-) create mode 100644 modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/tanlu_top_bg.9.png create mode 100644 modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_top_bg.9.png create mode 100644 modules/mogo-module-tanlu/src/main/res/drawable/shape_tanlu_top_bg.xml create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_surrounding_bottom_bg.png create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_surrounding_bottom_bg.png create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png create mode 100644 skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_top_bg_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_top_bg_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_top_bg_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_top_bg_light.9.png diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/view/RoundLayout.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/view/RoundLayout.java index b0b4162176..5912f8c56a 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/view/RoundLayout.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/view/RoundLayout.java @@ -8,6 +8,8 @@ import android.graphics.RectF; import android.util.AttributeSet; import android.widget.RelativeLayout; +import androidx.annotation.DrawableRes; + import com.mogo.module.tanlu.R; import com.mogo.skin.support.IMogoSkinCompatSupportable; import com.mogo.skin.support.helper.MogoSkinCompatBackgroundHelperDelegate; @@ -65,6 +67,15 @@ public class RoundLayout extends RelativeLayout implements IMogoSkinCompatSuppor postInvalidate(); } + + @Override + public void setBackgroundResource(@DrawableRes int resId) { + super.setBackgroundResource(resId); + if (mBackgroundTintHelper != null) { + mBackgroundTintHelper.onSetBackgroundResource(resId); + } + } + @Override protected void onLayout(boolean changed, int l, int t, int r, int b) { super.onLayout(changed, l, t, r, b); diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/tanlu_top_bg.9.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/tanlu_top_bg.9.png new file mode 100644 index 0000000000000000000000000000000000000000..f5010b2c44529fad5f11ced629725b0d6a605e58 GIT binary patch literal 1156 zcmeAS@N?(olHy`uVBq!ia0vp^eIU%i1|*;VHQ-=iVDa{JaSW-r^>((c-)jev)<_1Y zlsWUyO=fX%bUrFH!Mr)b;hTV_^@FP~gO{J;yOhd&LA`3}{g~q({8~BZZ_Jzh-eY;& zoZp%6{=~$`es#87m(n8O#Gwc$YOiN}smMKJBCS%E==00Ypv>Ik(&4om<(VhT&HW#@ zqTiKGkNf136U$Cy%<@c=oxXNi10vjf)yp&$MGJdUh)}`!%9?x)*RqI##?|P+b z@zl$CVpUGRw*R|af9LA1r$?Tqo}XN8X}eLdFZ=MDhg+ta$7H_Cw6}WOytj3Je}Fz*z#w90ool z8S*$V8xjsMLhVX8pcsS1VU)qf`QX}6tdg+Rj*a>GwHy3Q*D_b;?hsY?%T5@ zvQ+Nq(rpJ1Xx_d$ZNb&8D|20WvKl{o-FS7Nl9%sXN|E`p*q2$sL6;vqnBvc$%@qE) zl$YgI<7Ac3=}gxXSEgn^n6mwZbW{JoZ56?r|9m|t*`MzJu75sWjmrftR_bqk%_DOWlmx%j1@&Zv&GKIvd3cjK`|~}Y&cxk# ze`MqOiBXjrJLL<`xqtc6d+5vG7jySjYHhbKI8`}Ul=aoyJ!elPul(Ee`Ti;A+phwv zKkc~G!u&k@{Nc8p^3sX^)w9YD{Itp~40-?U#M_5ouGm?`f46z6sw7a(@+_m>zsVZnS3F4 fSYLE;!Cz)A{>8Ds*VfttOBV)DS3j3^P6hnM literal 0 HcmV?d00001 diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_top_bg.9.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_top_bg.9.png new file mode 100644 index 0000000000000000000000000000000000000000..f5010b2c44529fad5f11ced629725b0d6a605e58 GIT binary patch literal 1156 zcmeAS@N?(olHy`uVBq!ia0vp^eIU%i1|*;VHQ-=iVDa{JaSW-r^>((c-)jev)<_1Y zlsWUyO=fX%bUrFH!Mr)b;hTV_^@FP~gO{J;yOhd&LA`3}{g~q({8~BZZ_Jzh-eY;& zoZp%6{=~$`es#87m(n8O#Gwc$YOiN}smMKJBCS%E==00Ypv>Ik(&4om<(VhT&HW#@ zqTiKGkNf136U$Cy%<@c=oxXNi10vjf)yp&$MGJdUh)}`!%9?x)*RqI##?|P+b z@zl$CVpUGRw*R|af9LA1r$?Tqo}XN8X}eLdFZ=MDhg+ta$7H_Cw6}WOytj3Je}Fz*z#w90ool z8S*$V8xjsMLhVX8pcsS1VU)qf`QX}6tdg+Rj*a>GwHy3Q*D_b;?hsY?%T5@ zvQ+Nq(rpJ1Xx_d$ZNb&8D|20WvKl{o-FS7Nl9%sXN|E`p*q2$sL6;vqnBvc$%@qE) zl$YgI<7Ac3=}gxXSEgn^n6mwZbW{JoZ56?r|9m|t*`MzJu75sWjmrftR_bqk%_DOWlmx%j1@&Zv&GKIvd3cjK`|~}Y&cxk# ze`MqOiBXjrJLL<`xqtc6d+5vG7jySjYHhbKI8`}Ul=aoyJ!elPul(Ee`Ti;A+phwv zKkc~G!u&k@{Nc8p^3sX^)w9YD{Itp~40-?U#M_5ouGm?`f46z6sw7a(@+_m>zsVZnS3F4 fSYLE;!Cz)A{>8Ds*VfttOBV)DS3j3^P6hnM literal 0 HcmV?d00001 diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/shape_tanlu_top_bg.xml b/modules/mogo-module-tanlu/src/main/res/drawable/shape_tanlu_top_bg.xml new file mode 100644 index 0000000000..7ef399ca1a --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/res/drawable/shape_tanlu_top_bg.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file 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 40d6946339..622a231939 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 @@ -2,19 +2,17 @@ - + android:layout_height="@dimen/tanlu_module_card_height"> + + android:background="@drawable/shape_tanlu_top_bg"> - - - - - - - + + + + + + + @@ -138,16 +136,16 @@ android:layout_width="@dimen/tanlu_image_size" android:layout_height="@dimen/tanlu_image_size" android:layout_marginRight="@dimen/tanlu_module_margin_left" - android:visibility="gone" - android:src="@drawable/selector_chat_btn" /> + android:src="@drawable/selector_chat_btn" + android:visibility="gone" /> + android:gravity="center"> diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_main_media_recycler_new.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_main_media_recycler_new.xml index e4c7898356..6bafcfdbbb 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_main_media_recycler_new.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_main_media_recycler_new.xml @@ -1,14 +1,16 @@ + android:background="@drawable/tanlu_top_bg"> - + android:layout_height="match_parent" + /> + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml index a1e06f3f9c..2daeba4505 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml @@ -77,14 +77,14 @@ 642px - 170px - 234px - 156px + 186px + 250px + 172px 45px 13px 8px - 13px + 7px 17px 3px 18px diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml index a3ea0c5760..35ac4ea9c3 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -77,14 +77,14 @@ 1233px - 300px + 326px 480px - 270px + 280px 80px 19px - 13px - 23px + 12px + 12px 30px 9px 27px diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml index caf019b61c..205767293e 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml @@ -77,14 +77,14 @@ 1060px - 306px + 326px 421px 280px 80px 19px - 13px - 23px + 5px + 0px 30px 9px 27px diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml index caa0a414c4..2daeba4505 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -77,14 +77,14 @@ 642px - 194px - 266px - 194px + 186px + 250px + 172px 45px 13px 8px - 13px + 7px 17px 3px 18px diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_surrounding_bottom_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_surrounding_bottom_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..5a9ca34e56443ce391804906c5b688446936f5c8 GIT binary patch literal 659 zcmeAS@N?(olHy`uVBq!ia0vp^?|@jFgN=cKk>gCuW*~>LILO_JVcj{ImkbO{zMd|Q zAr*{o=WYyScI0vOm#)-kY+1;XE^wKfb%$(~qWXgs4c5Eai;A<;{Ze0Mr^(M`e);;I z^-a07=Q;l8e}7i_k==C0TjgNpliP(eRd@96w({O|B!B;ogH31cQp-!P?Jb$D99(1V zaV=ZVqI-*0y2WAVy_vkJ)4N0WcDg)IGMlwwm3><1lf}h`(!LQ_>oqnz*T#n24P13+ z;ky*klu*5*&?mx06K69-iZ;fG{%nbPqUI3hsu1pKrzpOYb3&-#iO`AuCvwehhCA^I zGBLf~aZdklg775PFUm@}zp~HX^MBp{@%?d*1Flt{W=6ZX9FaKDyC7rhXnIZ z!I17RE_s52g2@WzO<5D?ozPWMO5%Cq7NC1cc&Dq2OHbn+j#aKzO4~a+It(XBJ8t#x ze;p|jKR~@&t;ucLK6V>1QK%q literal 0 HcmV?d00001 diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_surrounding_bottom_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_surrounding_bottom_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..5a9ca34e56443ce391804906c5b688446936f5c8 GIT binary patch literal 659 zcmeAS@N?(olHy`uVBq!ia0vp^?|@jFgN=cKk>gCuW*~>LILO_JVcj{ImkbO{zMd|Q zAr*{o=WYyScI0vOm#)-kY+1;XE^wKfb%$(~qWXgs4c5Eai;A<;{Ze0Mr^(M`e);;I z^-a07=Q;l8e}7i_k==C0TjgNpliP(eRd@96w({O|B!B;ogH31cQp-!P?Jb$D99(1V zaV=ZVqI-*0y2WAVy_vkJ)4N0WcDg)IGMlwwm3><1lf}h`(!LQ_>oqnz*T#n24P13+ z;ky*klu*5*&?mx06K69-iZ;fG{%nbPqUI3hsu1pKrzpOYb3&-#iO`AuCvwehhCA^I zGBLf~aZdklg775PFUm@}zp~HX^MBp{@%?d*1Flt{W=6ZX9FaKDyC7rhXnIZ z!I17RE_s52g2@WzO<5D?ozPWMO5%Cq7NC1cc&Dq2OHbn+j#aKzO4~a+It(XBJ8t#x ze;p|jKR~@&t;ucLK6V>1QK%q literal 0 HcmV?d00001 diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..ef5069632f920174b3b41b8f21b0507109ba1ac4 GIT binary patch literal 1565 zcmeAS@N?(olHy`uVBq!ia0y~yU_1w82XL?fS^;{XW6>Rt--^b5xiIV6 z3O8rgnwM>2*L!WZR)0UY%b)*+<7ex|%vr@dyXqxnBNj^8ZgDbQbupyT==IVw?|Xvw z3)!2L&s=|pzt!_^P3tnV>nGP<;PZKPo69$M-Q?(nvNNu17oBx0Mt!@JwZY1KZIi7# z{oZZc6aVzMo@{e-~L*xet>8?I@^3E${w*t&C~(h-FXVg_@v1=n-txEv_RTf$+;v4)lBdDM|? zCTT%~IntU=JWSb)hj)s7oOQsBh3C0jmq7D@r~?J-T=%GL5Clq4YDDA8t>3bgBabLJ zJg{Z_Up@P~!JkP7!dPyZ*zT7-r+UHW{M#odUw-}f_<1y^276-`)9HY?{dV;m@7%6; zUJ>>CowV`;X(z)_&M4ml1!38DYLi)b(tSdk!h{XxT$L)nFTr?NGI;8Ot3c7M$L^ZD z9Vj>!qMBjKcsO!x;rCvk2Zw`Jp^UYAjpj_1D!(q%nE9(N>+%;H^^HqdvN&Sm|9yL0 z^7q#t*V|jWrNYa+nQn_$6nyzm;d%3(Ywe#WUvB?=_N={peXWYagFM!6_2+7ezyA93 z@!#V;bMDB^wb}jm=-p!lQjAP290DgqKAgRE=H3!DhX#g5M<%i73KhqN6dW2HmNgum zd2{v^pb`ZGj{}cnSl&lK)NimbuAV%L0jQgeGh$Bj16l6|AZI3%SbAE1kT6i|0R_hH zVu3x$oB|3C3c&{+oq6M%1=1>^l2FLkRIUTEH-#%=&dj}@z96m5EIQ{LKlG`BT;Rjl zZM@lhB}i++godM*9QQVYTrfd1p)l>6nkh&tkI)7S_Jh{bKrS$1)j2mz9RK_1&3k-S zx53_ZQ1Dr>cW%_}zcSOJVn9KsVBnH)bLQp0FE783%Fb_7DbN6ggaC(NMA_4~=VCsc z`+Uc5pGB?Z`)BK&KXrS8LY3v6&w{tN{KM<#%zr!mdCl+X&C}vz;{X0T3o0{CAGY>> zqyRQ~Ltn-fp3i&?ZS?%s0${l8w^zk5IaU0&X~Z}W?-&hI||t={bKj_*J3 zsRQGPk!dH>+qeIoPp^ObdH(xlFQ5LstG+)j?%${L|L;Dx|63FFt1L0V7Fgahc)I$z JtaD0e0st|7q}%`i literal 0 HcmV?d00001 diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..ef5069632f920174b3b41b8f21b0507109ba1ac4 GIT binary patch literal 1565 zcmeAS@N?(olHy`uVBq!ia0y~yU_1w82XL?fS^;{XW6>Rt--^b5xiIV6 z3O8rgnwM>2*L!WZR)0UY%b)*+<7ex|%vr@dyXqxnBNj^8ZgDbQbupyT==IVw?|Xvw z3)!2L&s=|pzt!_^P3tnV>nGP<;PZKPo69$M-Q?(nvNNu17oBx0Mt!@JwZY1KZIi7# z{oZZc6aVzMo@{e-~L*xet>8?I@^3E${w*t&C~(h-FXVg_@v1=n-txEv_RTf$+;v4)lBdDM|? zCTT%~IntU=JWSb)hj)s7oOQsBh3C0jmq7D@r~?J-T=%GL5Clq4YDDA8t>3bgBabLJ zJg{Z_Up@P~!JkP7!dPyZ*zT7-r+UHW{M#odUw-}f_<1y^276-`)9HY?{dV;m@7%6; zUJ>>CowV`;X(z)_&M4ml1!38DYLi)b(tSdk!h{XxT$L)nFTr?NGI;8Ot3c7M$L^ZD z9Vj>!qMBjKcsO!x;rCvk2Zw`Jp^UYAjpj_1D!(q%nE9(N>+%;H^^HqdvN&Sm|9yL0 z^7q#t*V|jWrNYa+nQn_$6nyzm;d%3(Ywe#WUvB?=_N={peXWYagFM!6_2+7ezyA93 z@!#V;bMDB^wb}jm=-p!lQjAP290DgqKAgRE=H3!DhX#g5M<%i73KhqN6dW2HmNgum zd2{v^pb`ZGj{}cnSl&lK)NimbuAV%L0jQgeGh$Bj16l6|AZI3%SbAE1kT6i|0R_hH zVu3x$oB|3C3c&{+oq6M%1=1>^l2FLkRIUTEH-#%=&dj}@z96m5EIQ{LKlG`BT;Rjl zZM@lhB}i++godM*9QQVYTrfd1p)l>6nkh&tkI)7S_Jh{bKrS$1)j2mz9RK_1&3k-S zx53_ZQ1Dr>cW%_}zcSOJVn9KsVBnH)bLQp0FE783%Fb_7DbN6ggaC(NMA_4~=VCsc z`+Uc5pGB?Z`)BK&KXrS8LY3v6&w{tN{KM<#%zr!mdCl+X&C}vz;{X0T3o0{CAGY>> zqyRQ~Ltn-fp3i&?ZS?%s0${l8w^zk5IaU0&X~Z}W?-&hI||t={bKj_*J3 zsRQGPk!dH>+qeIoPp^ObdH(xlFQ5LstG+)j?%${L|L;Dx|63FFt1L0V7Fgahc)I$z JtaD0e0st|7q}%`i literal 0 HcmV?d00001 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 423d2f4831..c09cc9f93d 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 @@ -22,14 +22,16 @@ android:layout_marginLeft="@dimen/module_v2x_surrounding_margin_left" android:text="周围5公里，共15条交通信息" android:textColor="@color/v2x_white" + android:layout_marginBottom="2px" android:textSize="@dimen/module_v2x_surrounding_top_textsize" /> + - + diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml index 23c2a7b011..179a600a5d 100644 --- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml @@ -39,10 +39,10 @@ 150px 48px 32px - 10px - 10px + 28px + 28px 190px - 173px + 170px 43px 26px 12px 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 deaa4519ee..93b3fe83b1 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 @@ -23,7 +23,7 @@ 80px - 10px + 15px 550px 200px 200px @@ -36,8 +36,8 @@ 270px 86px 58px - 10px - 10px + 48px + 48px 349px 306px 77px 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 2c8f472e72..29c98cc629 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 @@ -24,7 +24,7 @@ 80px - 10px + 15px 550px 200px 200px @@ -37,8 +37,8 @@ 270px 86px 58px - 10px - 10px + 48px + 48px 349px 306px 77px 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 a6544a61fc..861e240354 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -39,10 +39,10 @@ 150px 48px 32px - 10px - 10px + 28px + 28px 190px - 173px + 170px 43px 26px 12px diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_top_bg_light.9.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_top_bg_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..9954c018dba2b05ee33f333698cf3ab57fa3302c GIT binary patch literal 2803 zcmVc3f6UGY2nrL1W)9>!-nWl4Y>DPRZe*0X{l?)f~ z69VKN96LF7jcC~4Z=VOrneY%XbnrFccbq+YcF*$i@~KLt@>#7``zyu2DE>>aT(8%c zXf?6SpW~qW6vwik;4MMWWZ+v z5O|FU348|u7I;g9Aiw|~0SOU+9$DZSY)i@-{4EBaqrjh2L1Zk@_g=hr@7@v44oO5W zB(w(s-za{jR4Vv9!cjxBk=YQP?30)D80{_~zYeyM;RJ{dzQ4oN( zvjSO=sGfFS{L&=cD40h!T>(1lUX{)BPQT z5tFdJ3lh2_U^^F?sY0RfC&lxZ6xDZhJQ=N~%YKp!KmrutCHRrBnOXz@^a0ppEjetb zqt)!z^EKO1!1r#jWS66WUvPPT7WgI$6w8T02j$zSm_35Q%#j6N0yOX6{qW(#-)X+@ zYBRNsma@r`-A+f>BgP9p5)9yxZ=)r_SGt`J>%n4c3oR7f#CB+{*wx-IEG&G;S>US$ zUIHdLg{G~v+9v*akW-hvBV&Z@_9ymsRN{fV#}SHE9Wz%N0eEege#q}?d$ zkArY9HZ%=wY1ag#?1y46RrbHRHd#Q#inN|CEk|}ZDdj7@zH5`UCI@Vy=z2F=P;66u zzEFP|Y$qXtRi6s_{(l(kGHl38zz%MwW(b6T`nsJA;C;ij$I|m%8!T71lLfrTcC_(A zN%r_Qlx{}_o}=1owSF+zK}*^b0g3-p?Bn*+yV1ge>zHgx;8Pnd&3YWOoem3fbUOvl zn4y@}?Z5`Bqv%?n*Q^I(#bD>C16>iYlRa$TsLu1X4HkDiMVIHxO_or67U;41O>Ay% zR+xZkr5){wfc@h%&+le;o6&Aspfw^A@F}VWyFmyr#l!sHpZ#Mx&o2tgDJr9d4&Rr+ z8?YJpgaD2j6R?M|?1_L$AmG55&+|*T(ZW98*JcU=Qs5i)a|Rp$0w!Gqw7Vf-oagy+ zyr8w3F3VxNsUYx1{kan`?(=+?=R?PXD_Ty4K~L15I{^XB^UFTJ*9xu%JVlLbK&}=P z#5~{A@l=$;n<~1Jgj_Qqpm}~-u^g??TI;ES|JRs+TJ8jdG|%^_K2>nF!aEcK0-Wdf zf)K9bNF3IQR_^A*Kcvs7=vA7%ywGtbxB zO$Pxr1b!$P5aK)^3$6w{bUksjTCEs(vr^=4LBY-Qp}ka9PaxL>_-H}-5fJJ;-$6p% z;r$I8M*X>FK&bQlj4lUNZ*9lkH}b9lLC*7Gr3A9l zzO|pci*S(h{0z^p1K@QgU>(-=+zAM6p6?-`fz~6HZ@@PszHtH;Mq zN3$Nzg4``AxOqMnT+!_`BrMO8o}>yfYxkdA@6-rCAOF zZ`NUCKydSX+vOPO(|K8{>7AjEmTr{j^pC-!52wYJ#1CSfx-0z#eVOVx{3b3;=;$L26HAh>xx6x*&m-zvXX0=9LL0YT35 zv-}1^5n_a%*hd<&GS8*EERmCe$Ie`!EBJ1_N881X{vdpQu!jZdA>va*lM-}0kQh& z*}vuvsIS*ncD%UN6qC!BFTX<;v>4Jn-vj)nAfN?NzH;TtyP^R1^x{^n4wzIr7)8;? zARY7*=RKGgfh?9cDEh^p3?VxYcLZ1 ze@`#(cD}xz8GYsA#f$HnGgCsC=Q}JXX*JRJY5n=qrAzM_j6nT;zrJ3}f@yB64&J(T z>o-Kgf5v^DpV9HOVEuV^cJ{YyJ+}An`v3>$5hm7(C=Q)FckX=xe|DVb`K}%xZHKOJ zFI>3rzQF{nXP_fYoQL>uTJ5zYoH%jf$lBVPDa_4;4VpFjUg^X!a)1b^UTth@)g@fYo3 zzcWSWRf^Y+A3uKd{{8zO88WC_x=Dckn*drK)phmbWflgB0 z!Ij=-gC*hska38Wa(G1JRd|kr{A?C@tNL979OgMN36pSO^KMqdUjBjmIQ9cEqZIac z+vk|!XPXA#2R+U<-vgb2j42>wn$L!c3f6UGY2nrL1W)9>!-nWl4Y>DPRZe*0X{l?)f~ z69VKN96LF7jcC~4Z=VOrneY%XbnrFccbq+YcF*$i@~KLt@>#7``zyu2DE>>aT(8%c zXf?6SpW~qW6vwik;4MMWWZ+v z5O|FU348|u7I;g9Aiw|~0SOU+9$DZSY)i@-{4EBaqrjh2L1Zk@_g=hr@7@v44oO5W zB(w(s-za{jR4Vv9!cjxBk=YQP?30)D80{_~zYeyM;RJ{dzQ4oN( zvjSO=sGfFS{L&=cD40h!T>(1lUX{)BPQT z5tFdJ3lh2_U^^F?sY0RfC&lxZ6xDZhJQ=N~%YKp!KmrutCHRrBnOXz@^a0ppEjetb zqt)!z^EKO1!1r#jWS66WUvPPT7WgI$6w8T02j$zSm_35Q%#j6N0yOX6{qW(#-)X+@ zYBRNsma@r`-A+f>BgP9p5)9yxZ=)r_SGt`J>%n4c3oR7f#CB+{*wx-IEG&G;S>US$ zUIHdLg{G~v+9v*akW-hvBV&Z@_9ymsRN{fV#}SHE9Wz%N0eEege#q}?d$ zkArY9HZ%=wY1ag#?1y46RrbHRHd#Q#inN|CEk|}ZDdj7@zH5`UCI@Vy=z2F=P;66u zzEFP|Y$qXtRi6s_{(l(kGHl38zz%MwW(b6T`nsJA;C;ij$I|m%8!T71lLfrTcC_(A zN%r_Qlx{}_o}=1owSF+zK}*^b0g3-p?Bn*+yV1ge>zHgx;8Pnd&3YWOoem3fbUOvl zn4y@}?Z5`Bqv%?n*Q^I(#bD>C16>iYlRa$TsLu1X4HkDiMVIHxO_or67U;41O>Ay% zR+xZkr5){wfc@h%&+le;o6&Aspfw^A@F}VWyFmyr#l!sHpZ#Mx&o2tgDJr9d4&Rr+ z8?YJpgaD2j6R?M|?1_L$AmG55&+|*T(ZW98*JcU=Qs5i)a|Rp$0w!Gqw7Vf-oagy+ zyr8w3F3VxNsUYx1{kan`?(=+?=R?PXD_Ty4K~L15I{^XB^UFTJ*9xu%JVlLbK&}=P z#5~{A@l=$;n<~1Jgj_Qqpm}~-u^g??TI;ES|JRs+TJ8jdG|%^_K2>nF!aEcK0-Wdf zf)K9bNF3IQR_^A*Kcvs7=vA7%ywGtbxB zO$Pxr1b!$P5aK)^3$6w{bUksjTCEs(vr^=4LBY-Qp}ka9PaxL>_-H}-5fJJ;-$6p% z;r$I8M*X>FK&bQlj4lUNZ*9lkH}b9lLC*7Gr3A9l zzO|pci*S(h{0z^p1K@QgU>(-=+zAM6p6?-`fz~6HZ@@PszHtH;Mq zN3$Nzg4``AxOqMnT+!_`BrMO8o}>yfYxkdA@6-rCAOF zZ`NUCKydSX+vOPO(|K8{>7AjEmTr{j^pC-!52wYJ#1CSfx-0z#eVOVx{3b3;=;$L26HAh>xx6x*&m-zvXX0=9LL0YT35 zv-}1^5n_a%*hd<&GS8*EERmCe$Ie`!EBJ1_N881X{vdpQu!jZdA>va*lM-}0kQh& z*}vuvsIS*ncD%UN6qC!BFTX<;v>4Jn-vj)nAfN?NzH;TtyP^R1^x{^n4wzIr7)8;? zARY7*=RKGgfh?9cDEh^p3?VxYcLZ1 ze@`#(cD}xz8GYsA#f$HnGgCsC=Q}JXX*JRJY5n=qrAzM_j6nT;zrJ3}f@yB64&J(T z>o-Kgf5v^DpV9HOVEuV^cJ{YyJ+}An`v3>$5hm7(C=Q)FckX=xe|DVb`K}%xZHKOJ zFI>3rzQF{nXP_fYoQL>uTJ5zYoH%jf$lBVPDa_4;4VpFjUg^X!a)1b^UTth@)g@fYo3 zzcWSWRf^Y+A3uKd{{8zO88WC_x=Dckn*drK)phmbWflgB0 z!Ij=-gC*hska38Wa(G1JRd|kr{A?C@tNL979OgMN36pSO^KMqdUjBjmIQ9cEqZIac z+vk|!XPXA#2R+U<-vgb2j42>wn$L!`*S`(a*O-QoI6`x(TD`x_{pnoEJ7`IUxSVfz`y1*9>nc6= zTX|RW8KDU1HQLLW4*~xEhNmzXpPf-BTXrdRvn=MJ{MiX%_93H6;YZ8$U|GdDqo5*- z8|hz5VyzAz-uD4hLHNgz)b8vThTvGT0>L+p_|3sP2ja}BQ zh4Gc$B3N@iJ1?)-BY`rV=YG*mKkq_%dbp?8bvjF1R)XSk^Ll$EBok~eD#AmVjrH3`rGg`!g4C z)i$tw0`6jEMj};IH}R+~%c|OjtcY+*{q2?~m-^wy$n)pVOPCGKAWwbd-LfMD=Ry_u z#I^NO&`cA!(^;y4%h8O|6AepKE(_;3IfP*8G@JQzB#eS0Jn3<6s0N&1mcG7UiQ#5moLc!}y6={? zR_KBR6DA=kOF|o4Q!O((`xGGty;H=l9dJVK9hBgvH@F`5E+1}_!#uh-zWAqX;K`ia zI%cGT-370>z~gC~ac-<6jdNXj$6r4VRhGW0V-l}(z{1d)cgFBm+nzHyiDmIhf5kwhHLDB? zWgnEFQFwdX;2@m6U)SNkn?pi+StdCZ22LQ=Vv$9c`Q>%o(inM_aW8(7#?VA$e;o6? zyCMUTT7*lS@WZFqp-*Yl<_72FK$PFJg1wVzj1(z-QAyiGK3LE3#jrttR$O}> z={6yxH6UX71VaV1wqdYv;1)VTZ6(M{lg7g-w9^tJZ zIyySGr_rM`umyJMM&7EvpE^lv>C^JtiKG@ASDG zemL(-9^40OwB;jTG~8PKhw4kT z%5^^x#Ji6S9JF-$+;bo_283&@*LinCo+Gf#m}}0N6?e6rJ+KpQ<2Nd(h&;`&cE2Ad z4J?E@`!Fw(LW8bTY{s!k@gf%ISX2CW1h_#@e)5u@1d>or7M~9BlCkQD)TNI)I;T;~ z+0r7|&hu%pXB7EWnl|>n@}!a~!?@qPC2y!_K03;iI0Pd(U1-}_DQR?4t7pDeDq;f+ z&_(VY8dWIDt{P&1)qE=~#1T7?Ut5Iz0l3B*7lB>Lql#bAPk$X}8cOu@O8a>?%eoe; zh-pXs3tXT%Y%ZrFJAUKz7!JXTp%Q4N@}$Vs#ql2&7#<%933gCo85CYd^UL8_A}1h9 zlsW%^(ETN{V%tnfo@Yq!^paIS?|csX!9tMZyu87hE>LGG2&^jpJWkKGTXNe$hg7Is z`Rautb`JtWeR<&=H-LoRW^H;^@H&krcju}8*Sm!F6B4I_v!lN>&o-vZ#N`MP%~Qnd znevNG8H!-BBvis3{!V4((a)sczcvo5E95Jw%e`&h! z5Tm?8xr|Ay?!SBHQESyGKRWZGpZH(&a}E>ni{{n>B>D@5M)Py0-n#roDlMK}oH?;f z;NM%9%vq4w#wd^G?|h4`=EwC>XwyABo4n#5Y!1)e45 zAHY!WL_8T)_?H$xkFYt56JU8tD+j#=-ztq7ou)%AFb`WO(D{VDWpEs9PfezrMtIzr zF~U@23)gsEZS81hXIm$Qrn!Vjo$Dz!gJvfUrhNaL-IgiZ-91ZA;N5Q>f%Wr}045rA zMA{XN501Y{Qeta;eeigA<96c1F7a)%#Kaz+$A+wn%1F6x=ZAmWUmu-|KQYA~a#X^M(d5OFLuW6@5>?=erK0_Qi)=K9P;8v zjZK5*7~2ND^YIFM$P7Uk1NI6DnfAMkcjCWLR|g;{WWP?gJV9J!ZLhB^U$1FaPXjUm z0TDn;O-k7bi_Z!Eo3lP5A^);8;U8O41;m-MO|$zjR9_+|>n#)UpjQmABwoNaUW3+{ zF)gQgRX~sz8ObCJ*!toAO@lT<1X*ptq=S+O4B~}|5gzlw6Jmlt%%~F(WjqC%-s_R) zA0BSJb92n3Kt+qnUk(T2b0=O*fdMYsdwHuj-b>QVES6%o;#ojKUT4>wD7j%u(FLB1 z_VdVOnyUCFASM@Ff$$KRNfR!Z9O1MXS`k}oRB^>b%C;z=dSc6d`rr#}?MLOk`yw|1 z4rLr`+o|bDcR9wD7lZBmbE^wMq9Zesk0+SYr!D%o!dA4AQ(+>|6=qfbLg!7x`D|k{ zbWrl-)z>FV2291S2@$@tM3AmjAoD)=7fk2|Xs}j@Fw8^wla4lr)scc_QS zVzz|9L_+@iDJ5#l72_86J$4P>ltxBJpIt4eER{+5z41K~_a{ZvWaERQzW62V=CFuu zynpri8}S6EucqeRe_W%Tz}B{0(>upE!3D@X8APN0fYu=DmID7!K?roxhBwuPZjLN4 z1dxCKOvw54!Ms}&fV66n8Gabs%9kx}G%rOUvGEyVaG&M7{Myl}Euq0NIqkf9lt>rZ z3b(0_5eigNcHECSh>su5JMbraf?6{-+O)s9(vU8C8uNW@pXnx>rWi4p zUd{e;2a?m@vr|tG#PfK17P0f`bH9iG>)U!xz|tk$Q-_1_K`p5FLKi_GIXZq|j+*&* zS65eSH-!cl0@X_fnJ#G3ZTa;5^<=V@;6gMAQOQaD9I;K^V$qm?55U8N(M5<(6DfH+ z#HIda9s2LM1^2(gn)BP=4F;QK0w}g1GtAmx3bNx_$sUaKPm9?t?D?^EN0(D!x_9=p ztqRtJv%4mdXfg#TQ$l+`We_}T-m8WDUwRcfWa*pvu`stiVYLHU*^RCRQ#c^*eHelh zu=N_<+nQ;*gz!nrz=ib@(1>&POFf8rc$osNJ1SC^HE(+5^Jv4_B}Qe;@yeH; z*G8Xl=Io;ChqEFcl>i@qFM)pC$7_P=o}P|aySC(A83TTbhBlne1FP2@3TubD)IBQk zzW+N7@C>v+N6e_~F6UPq<*Pb+CqkSP2+n_7_>SlAZ7bF)L%R0!rU2QI;Psl0F83Fkf4D4k@GCfo$-!;bu?b<%KKFZDvoeTf7~a6)(@-5zq+w4^vv5_ z)hDyx=6F7GGYj{D?Gp@Ba?&gF)&RruM?uRBM{;t-ZjFW@5yW*M$WO@etf{Yx)))Q`cXoO! zNcPEzf~&8O@vz65uE9I1EsOt){@11Ze8F0`atO}5-nZgqsB*-caK}byi*4_6_N~$^AaFb3c_AZ4(k%q($Tx}usz5m9zSO*O~9!Rf6G-xv@VW-Oi)Rv_5-!; zX^+9N_NR3{yg2*S5QgMIQE{z7&E?%pw`guq-8SwZ1Rp_#-Cf6mh$))(axmGU6Zaa# zwSzdzPu_~Wn7`*S`(a*O-QoI6`x(TD`x_{pnoEJ7`IUxSVfz`y1*9>nc6= zTX|RW8KDU1HQLLW4*~xEhNmzXpPf-BTXrdRvn=MJ{MiX%_93H6;YZ8$U|GdDqo5*- z8|hz5VyzAz-uD4hLHNgz)b8vThTvGT0>L+p_|3sP2ja}BQ zh4Gc$B3N@iJ1?)-BY`rV=YG*mKkq_%dbp?8bvjF1R)XSk^Ll$EBok~eD#AmVjrH3`rGg`!g4C z)i$tw0`6jEMj};IH}R+~%c|OjtcY+*{q2?~m-^wy$n)pVOPCGKAWwbd-LfMD=Ry_u z#I^NO&`cA!(^;y4%h8O|6AepKE(_;3IfP*8G@JQzB#eS0Jn3<6s0N&1mcG7UiQ#5moLc!}y6={? zR_KBR6DA=kOF|o4Q!O((`xGGty;H=l9dJVK9hBgvH@F`5E+1}_!#uh-zWAqX;K`ia zI%cGT-370>z~gC~ac-<6jdNXj$6r4VRhGW0V-l}(z{1d)cgFBm+nzHyiDmIhf5kwhHLDB? zWgnEFQFwdX;2@m6U)SNkn?pi+StdCZ22LQ=Vv$9c`Q>%o(inM_aW8(7#?VA$e;o6? zyCMUTT7*lS@WZFqp-*Yl<_72FK$PFJg1wVzj1(z-QAyiGK3LE3#jrttR$O}> z={6yxH6UX71VaV1wqdYv;1)VTZ6(M{lg7g-w9^tJZ zIyySGr_rM`umyJMM&7EvpE^lv>C^JtiKG@ASDG zemL(-9^40OwB;jTG~8PKhw4kT z%5^^x#Ji6S9JF-$+;bo_283&@*LinCo+Gf#m}}0N6?e6rJ+KpQ<2Nd(h&;`&cE2Ad z4J?E@`!Fw(LW8bTY{s!k@gf%ISX2CW1h_#@e)5u@1d>or7M~9BlCkQD)TNI)I;T;~ z+0r7|&hu%pXB7EWnl|>n@}!a~!?@qPC2y!_K03;iI0Pd(U1-}_DQR?4t7pDeDq;f+ z&_(VY8dWIDt{P&1)qE=~#1T7?Ut5Iz0l3B*7lB>Lql#bAPk$X}8cOu@O8a>?%eoe; zh-pXs3tXT%Y%ZrFJAUKz7!JXTp%Q4N@}$Vs#ql2&7#<%933gCo85CYd^UL8_A}1h9 zlsW%^(ETN{V%tnfo@Yq!^paIS?|csX!9tMZyu87hE>LGG2&^jpJWkKGTXNe$hg7Is z`Rautb`JtWeR<&=H-LoRW^H;^@H&krcju}8*Sm!F6B4I_v!lN>&o-vZ#N`MP%~Qnd znevNG8H!-BBvis3{!V4((a)sczcvo5E95Jw%e`&h! z5Tm?8xr|Ay?!SBHQESyGKRWZGpZH(&a}E>ni{{n>B>D@5M)Py0-n#roDlMK}oH?;f z;NM%9%vq4w#wd^G?|h4`=EwC>XwyABo4n#5Y!1)e45 zAHY!WL_8T)_?H$xkFYt56JU8tD+j#=-ztq7ou)%AFb`WO(D{VDWpEs9PfezrMtIzr zF~U@23)gsEZS81hXIm$Qrn!Vjo$Dz!gJvfUrhNaL-IgiZ-91ZA;N5Q>f%Wr}045rA zMA{XN501Y{Qeta;eeigA<96c1F7a)%#Kaz+$A+wn%1F6x=ZAmWUmu-|KQYA~a#X^M(d5OFLuW6@5>?=erK0_Qi)=K9P;8v zjZK5*7~2ND^YIFM$P7Uk1NI6DnfAMkcjCWLR|g;{WWP?gJV9J!ZLhB^U$1FaPXjUm z0TDn;O-k7bi_Z!Eo3lP5A^);8;U8O41;m-MO|$zjR9_+|>n#)UpjQmABwoNaUW3+{ zF)gQgRX~sz8ObCJ*!toAO@lT<1X*ptq=S+O4B~}|5gzlw6Jmlt%%~F(WjqC%-s_R) zA0BSJb92n3Kt+qnUk(T2b0=O*fdMYsdwHuj-b>QVES6%o;#ojKUT4>wD7j%u(FLB1 z_VdVOnyUCFASM@Ff$$KRNfR!Z9O1MXS`k}oRB^>b%C;z=dSc6d`rr#}?MLOk`yw|1 z4rLr`+o|bDcR9wD7lZBmbE^wMq9Zesk0+SYr!D%o!dA4AQ(+>|6=qfbLg!7x`D|k{ zbWrl-)z>FV2291S2@$@tM3AmjAoD)=7fk2|Xs}j@Fw8^wla4lr)scc_QS zVzz|9L_+@iDJ5#l72_86J$4P>ltxBJpIt4eER{+5z41K~_a{ZvWaERQzW62V=CFuu zynpri8}S6EucqeRe_W%Tz}B{0(>upE!3D@X8APN0fYu=DmID7!K?roxhBwuPZjLN4 z1dxCKOvw54!Ms}&fV66n8Gabs%9kx}G%rOUvGEyVaG&M7{Myl}Euq0NIqkf9lt>rZ z3b(0_5eigNcHECSh>su5JMbraf?6{-+O)s9(vU8C8uNW@pXnx>rWi4p zUd{e;2a?m@vr|tG#PfK17P0f`bH9iG>)U!xz|tk$Q-_1_K`p5FLKi_GIXZq|j+*&* zS65eSH-!cl0@X_fnJ#G3ZTa;5^<=V@;6gMAQOQaD9I;K^V$qm?55U8N(M5<(6DfH+ z#HIda9s2LM1^2(gn)BP=4F;QK0w}g1GtAmx3bNx_$sUaKPm9?t?D?^EN0(D!x_9=p ztqRtJv%4mdXfg#TQ$l+`We_}T-m8WDUwRcfWa*pvu`stiVYLHU*^RCRQ#c^*eHelh zu=N_<+nQ;*gz!nrz=ib@(1>&POFf8rc$osNJ1SC^HE(+5^Jv4_B}Qe;@yeH; z*G8Xl=Io;ChqEFcl>i@qFM)pC$7_P=o}P|aySC(A83TTbhBlne1FP2@3TubD)IBQk zzW+N7@C>v+N6e_~F6UPq<*Pb+CqkSP2+n_7_>SlAZ7bF)L%R0!rU2QI;Psl0F83Fkf4D4k@GCfo$-!;bu?b<%KKFZDvoeTf7~a6)(@-5zq+w4^vv5_ z)hDyx=6F7GGYj{D?Gp@Ba?&gF)&RruM?uRBM{;t-ZjFW@5yW*M$WO@etf{Yx)))Q`cXoO! zNcPEzf~&8O@vz65uE9I1EsOt){@11Ze8F0`atO}5-nZgqsB*-caK}byi*4_6_N~$^AaFb3c_AZ4(k%q($Tx}usz5m9zSO*O~9!Rf6G-xv@VW-Oi)Rv_5-!; zX^+9N_NR3{yg2*S5QgMIQE{z7&E?%pw`guq-8SwZ1Rp_#-Cf6mh$))(axmGU6Zaa# zwSzdzPu_~Wn7