From e6a9c35c0a25052bbe94751c9b263067869137b0 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 13 May 2021 15:46:14 +0800 Subject: [PATCH 1/4] opt ui --- .../res/drawable-ldpi/module_switch_map_angle.png | Bin 0 -> 862 bytes .../res/drawable-mdpi/module_switch_map_angle.png | Bin 0 -> 862 bytes .../module_switch_map_angle.png | Bin 0 -> 862 bytes .../drawable-xhdpi/module_switch_map_angle.png | Bin 0 -> 862 bytes .../main/res/drawable/module_switch_map_bg.xml | 9 +++++++++ .../res/layout/module_ext_layout_entrance.xml | 11 ++++++----- .../src/main/res/values/colors.xml | 1 + 7 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_switch_map_angle.png create mode 100644 modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_switch_map_angle.png create mode 100644 modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_switch_map_angle.png create mode 100644 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_switch_map_angle.png create mode 100644 modules/mogo-module-extensions/src/main/res/drawable/module_switch_map_bg.xml diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_switch_map_angle.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_switch_map_angle.png new file mode 100644 index 0000000000000000000000000000000000000000..3e1b96f3e3f0a01072632bcd1389a7811a195517 GIT binary patch literal 862 zcmeAS@N?(olHy`uVBq!ia0vp^20(1V!3HFE2UfoVQjEnx?oJHr&dIz4a$Hg)JkxxA z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPYp{SB&b9z4eC@7&mVtrkgr|#R zNCxZMS=Je%jv{T}kFDO=@xwz^^Uanojr}EILRVJ2T*D$L8lAt?Hz0cBHW8Pk`3oEu zH!bMky4E!HW8+eV6&yu>|IL=|EKdLSF3rH2+xWx%)N^O%{5)s*yJ7F_RMF_|w`2R) zEzsY&t}rLGWO63&r1|GF1Y_5{TKuWTOwxJ%guCa$OWT@@w+a6W4*knBHMZe1^O@S- zZMtp1R?AK%TEG_&!f)!o`h$qjP>Iw~KFQx-j?o zZmY`Kk1hCWLc~`$Ztl-@5Z__&^?_B#z037^{#`roR|_%!Irvi0o_hN2(G9p1lLsQ>rH{+BObtY>_%o#7XUZhJhJ;%T=$NxOUHgr+R#{I}!eo|(eYtUS|euV`LnU+?M5ae(`N3j@y| z{)4-s&WK)M_F3L59>;i8s^LLDZ&Q3G!~HE6vh-$~E?xgR`g6<7r4ODKs)}B?u2Z%< zU)t+SY_`_H={FABwk}U)uXXtK#pucA)2ny#|D5TTeb@Te+Ioh6t2vj;-VZGSrEO1F KKbLh*2~7Znyl$od literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_switch_map_angle.png b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_switch_map_angle.png new file mode 100644 index 0000000000000000000000000000000000000000..3e1b96f3e3f0a01072632bcd1389a7811a195517 GIT binary patch literal 862 zcmeAS@N?(olHy`uVBq!ia0vp^20(1V!3HFE2UfoVQjEnx?oJHr&dIz4a$Hg)JkxxA z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPYp{SB&b9z4eC@7&mVtrkgr|#R zNCxZMS=Je%jv{T}kFDO=@xwz^^Uanojr}EILRVJ2T*D$L8lAt?Hz0cBHW8Pk`3oEu zH!bMky4E!HW8+eV6&yu>|IL=|EKdLSF3rH2+xWx%)N^O%{5)s*yJ7F_RMF_|w`2R) zEzsY&t}rLGWO63&r1|GF1Y_5{TKuWTOwxJ%guCa$OWT@@w+a6W4*knBHMZe1^O@S- zZMtp1R?AK%TEG_&!f)!o`h$qjP>Iw~KFQx-j?o zZmY`Kk1hCWLc~`$Ztl-@5Z__&^?_B#z037^{#`roR|_%!Irvi0o_hN2(G9p1lLsQ>rH{+BObtY>_%o#7XUZhJhJ;%T=$NxOUHgr+R#{I}!eo|(eYtUS|euV`LnU+?M5ae(`N3j@y| z{)4-s&WK)M_F3L59>;i8s^LLDZ&Q3G!~HE6vh-$~E?xgR`g6<7r4ODKs)}B?u2Z%< zU)t+SY_`_H={FABwk}U)uXXtK#pucA)2ny#|D5TTeb@Te+Ioh6t2vj;-VZGSrEO1F KKbLh*2~7Znyl$od literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_switch_map_angle.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-1920x1000/module_switch_map_angle.png new file mode 100644 index 0000000000000000000000000000000000000000..3e1b96f3e3f0a01072632bcd1389a7811a195517 GIT binary patch literal 862 zcmeAS@N?(olHy`uVBq!ia0vp^20(1V!3HFE2UfoVQjEnx?oJHr&dIz4a$Hg)JkxxA z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPYp{SB&b9z4eC@7&mVtrkgr|#R zNCxZMS=Je%jv{T}kFDO=@xwz^^Uanojr}EILRVJ2T*D$L8lAt?Hz0cBHW8Pk`3oEu zH!bMky4E!HW8+eV6&yu>|IL=|EKdLSF3rH2+xWx%)N^O%{5)s*yJ7F_RMF_|w`2R) zEzsY&t}rLGWO63&r1|GF1Y_5{TKuWTOwxJ%guCa$OWT@@w+a6W4*knBHMZe1^O@S- zZMtp1R?AK%TEG_&!f)!o`h$qjP>Iw~KFQx-j?o zZmY`Kk1hCWLc~`$Ztl-@5Z__&^?_B#z037^{#`roR|_%!Irvi0o_hN2(G9p1lLsQ>rH{+BObtY>_%o#7XUZhJhJ;%T=$NxOUHgr+R#{I}!eo|(eYtUS|euV`LnU+?M5ae(`N3j@y| z{)4-s&WK)M_F3L59>;i8s^LLDZ&Q3G!~HE6vh-$~E?xgR`g6<7r4ODKs)}B?u2Z%< zU)t+SY_`_H={FABwk}U)uXXtK#pucA)2ny#|D5TTeb@Te+Ioh6t2vj;-VZGSrEO1F KKbLh*2~7Znyl$od literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_switch_map_angle.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_switch_map_angle.png new file mode 100644 index 0000000000000000000000000000000000000000..3e1b96f3e3f0a01072632bcd1389a7811a195517 GIT binary patch literal 862 zcmeAS@N?(olHy`uVBq!ia0vp^20(1V!3HFE2UfoVQjEnx?oJHr&dIz4a$Hg)JkxxA z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPYp{SB&b9z4eC@7&mVtrkgr|#R zNCxZMS=Je%jv{T}kFDO=@xwz^^Uanojr}EILRVJ2T*D$L8lAt?Hz0cBHW8Pk`3oEu zH!bMky4E!HW8+eV6&yu>|IL=|EKdLSF3rH2+xWx%)N^O%{5)s*yJ7F_RMF_|w`2R) zEzsY&t}rLGWO63&r1|GF1Y_5{TKuWTOwxJ%guCa$OWT@@w+a6W4*knBHMZe1^O@S- zZMtp1R?AK%TEG_&!f)!o`h$qjP>Iw~KFQx-j?o zZmY`Kk1hCWLc~`$Ztl-@5Z__&^?_B#z037^{#`roR|_%!Irvi0o_hN2(G9p1lLsQ>rH{+BObtY>_%o#7XUZhJhJ;%T=$NxOUHgr+R#{I}!eo|(eYtUS|euV`LnU+?M5ae(`N3j@y| z{)4-s&WK)M_F3L59>;i8s^LLDZ&Q3G!~HE6vh-$~E?xgR`g6<7r4ODKs)}B?u2Z%< zU)t+SY_`_H={FABwk}U)uXXtK#pucA)2ny#|D5TTeb@Te+Ioh6t2vj;-VZGSrEO1F KKbLh*2~7Znyl$od literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_switch_map_bg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_switch_map_bg.xml new file mode 100644 index 0000000000..0b1b92b69c --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/drawable/module_switch_map_bg.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index 32ac090144..7d4328956a 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -48,13 +48,14 @@ @@ -62,8 +63,8 @@ android:id="@+id/module_switch_model_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/module_ext_display_overview_icon_marginTop" - android:src="@drawable/model_ext_default_user_head" /> + android:layout_gravity="center" + android:src="@drawable/module_switch_map_angle" /> #DB3137 #3E77F6 + #3B4577 \ No newline at end of file From 5581594320e846259b9439841ddfc74f75bc83ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 13 May 2021 16:06:23 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=BD=91=E7=BA=A6?= =?UTF-8?q?=E8=BD=A6=EF=BC=8C=E5=87=BA=E7=A7=9F=E8=BD=A6=E3=80=81=E5=B0=8F?= =?UTF-8?q?=E5=B7=B4=E8=BD=A6=E8=B5=84=E6=BA=90=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/adapter/OchBusStationAdapter.java | 6 +++--- .../module_mogo_och_bus_icon_arrived_station.png | Bin 850 -> 0 bytes ...module_mogo_och_bus_icon_arriving_station.png | Bin 828 -> 0 bytes .../drawable-xhdpi/module_och_bus_dot_line.png | Bin 323 -> 0 bytes .../src/main/res/layout/fragment_och_bus.xml | 6 +++--- .../src/main/res/layout/item_och_bus_station.xml | 2 +- .../drawable-xhdpi/module_och_taxi_blue_dot.png | Bin 828 -> 0 bytes .../drawable-xhdpi/module_och_taxi_dot_line.png | Bin 323 -> 0 bytes .../drawable-xhdpi/module_och_taxi_green_dot.png | Bin 850 -> 0 bytes .../main/res/layout/module_och_taxi_panel.xml | 6 +++--- ...odule_mogo_och_base_icon_not_in_autopilot.png | Bin 0 -> 2342 bytes .../module_mogo_och_icon_arrived_station.png | Bin 0 -> 1420 bytes .../module_mogo_och_icon_arriving_station.png | Bin 0 -> 1349 bytes .../module_och_base_slide_block.png | Bin 0 -> 4933 bytes .../module_och_dot_line.png | Bin 0 -> 1004 bytes .../main/res/values-xhdpi-2560x1600/dimens.xml | 6 +++--- 16 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 OCH/mogo-och-bus/src/main/res/drawable-xhdpi/module_mogo_och_bus_icon_arrived_station.png delete mode 100644 OCH/mogo-och-bus/src/main/res/drawable-xhdpi/module_mogo_och_bus_icon_arriving_station.png delete mode 100644 OCH/mogo-och-bus/src/main/res/drawable-xhdpi/module_och_bus_dot_line.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_blue_dot.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_dot_line.png delete mode 100644 OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_green_dot.png create mode 100644 OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_base_icon_not_in_autopilot.png create mode 100644 OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arrived_station.png create mode 100644 OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arriving_station.png create mode 100644 OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_base_slide_block.png create mode 100644 OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_dot_line.png diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java index 9c1d54a25f..f46502e624 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/adapter/OchBusStationAdapter.java @@ -59,18 +59,18 @@ public class OchBusStationAdapter extends RecyclerView.AdapterT6Y43?sRmT(vnCofiAP>uRWDh|2#1@(MeIb`>i}1r{un-Wbcl zx?RsjfMxa81x{;jBuHh?u6vUGu40~X@iB+JAD+#rem?K{zVFKWzW;xA+F((nPt`o} z<(wCbewQU|YV6o4C@In)J<-v)KtX=3Bu_xV+OTG0{q=V>LXNGksC$xm&k2 z=zqcMpXD>{1x|*u9^0{yQAK~s>8D9=4_(<~FLs8ZE5*t%>?hOIm30Qemi1Zlc3xSs zHH)ufXY%idH^swW*Gc%ymUeh$z`ENp=fca!9^b6--R&6lf+ zg6URzJ8QK=yfy=MpW5WTu=(qv>HKPdI;EHIY*5jf!JTx5UoAKxd{M*)rOjD< z&UasNbnJ69IVD)I{)yp*`slFsKNoJ;SMJ+>GyBH0uW#P)T%IvU^LF1}$L04IsI6^X zD3Ek*+r9r0UgvZyop%fDe!51VuRQG9v`vRh4BIQ7H@clRpRZdsdv0p2UX|g?X_vc= zuI~*?|9Sh)W!J1rQFrajHox_XD>&Etw&w5FD9hS6E%7|7JB=Hy^i&(an{Bf)&thZe81bwN-z+ z{N2~Jzf1=);T3K0RXMoYA^r* diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/module_mogo_och_bus_icon_arriving_station.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/module_mogo_och_bus_icon_arriving_station.png deleted file mode 100644 index e1fd463963f85f911b0e9447d663c9770c4f6617..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 828 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~m(&Q)G+$o^ zEg+kNfw4W4fd!-lh^2s-fq{7eBLg##W(0{XV1mnvEMP{kK?*nB{qUE8foYkii(`m| zVC|H%*}{ne$G&Ud_Vr1w?g&^bw`4)w-mriVdXF|P(70uPsNUh@8&`qAH%Ge@ULRe( zU=h1*=tpIatr<#Do?!P&SZN{%Rr#D@) zIgq_3ySgis<9&~#tDwiR1&dlYsCQ>+wM__Le|;}=zg^7tW$F6SedU)#R2QFLJooKX z`*45zjP19TPclj+xP@4+o}taX^su?S-0FFIOYVPaHV)G&-8M~fQ7Z4R^=0vPvHwbc z-{L>X!@BW+&+4hWZ1;z)W-abFzn)_sapvXkT_pm0^WrS46nPGNaIrBJi*URw$*F&J zVXgV;I3b-~LC?PBuKploU3soz<;=-Z7EC+b+*v=WG%v8)pTaF@5g1jGB(*~Q+bZ{I z51zyWyhK_adH^oE8?oG_7TJ$st~Iiwdr$+~qstj-A=ES?0B;NM6U|R0+c(7Gbg4+V6*A z+AQ^VPPt=!aeu`1>L6>!Y5bxoEbDCZ*2Kj0-acEJ_o;qCTa<<6^_=Fy?zdhsUXzZz z-+FETnRD~41BpASDmjY+nLmVsX}6#+4lXm_1`|8{8_zsty^%GbyKXP|AF%cp^DqiZPw&o z#%gSt^+=m3zQK_7vVmw)f_sC4{lS*>!}l0vD@;rd{&-epp8QN4LQe?Gua+L z?-IC>+>r7wv}nDPn@^Fe;>R5;H7rFhm#VIw@vQehcTKVAY^hGmAE1=$>FVdQ&MBb@ E08IvEV*mgE diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/module_och_bus_dot_line.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/module_och_bus_dot_line.png deleted file mode 100644 index 186001352c82bb9ad01ac4c1556c3b1e0f551dda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^Oh9bI!3HFKj%EJ@QjEnx?oJHr&dIz4a$Hg)JkxxA z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvP%d~(Q&b9$5{LHz_7f7x3ba4#P z5KZ1%-o0L#n{r)6q;u;dN8?mF!s!=Ufy&zF_GaV6H`Z{09(KZ z{)h<*2Vd+jo~eJrZ$sGx&jRMihI2|Q @@ -125,7 +125,7 @@ android:layout_width="wrap_content" android:layout_height="0dp" android:scaleType="fitXY" - android:src="@drawable/module_och_bus_dot_line" + android:src="@drawable/module_och_dot_line" app:layout_constraintBottom_toTopOf="@+id/blueDot" app:layout_constraintLeft_toLeftOf="@+id/greenDot" app:layout_constraintRight_toRightOf="@+id/greenDot" @@ -135,7 +135,7 @@ android:id="@+id/blueDot" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/module_mogo_och_bus_icon_arriving_station" + android:src="@drawable/module_mogo_och_icon_arriving_station" app:layout_constraintBottom_toBottomOf="@+id/module_och_bus_order_end_station" app:layout_constraintLeft_toLeftOf="@+id/greenDot" app:layout_constraintTop_toTopOf="@+id/module_och_bus_order_end_station" /> diff --git a/OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml b/OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml index d777f2d0d6..25ac60ead5 100644 --- a/OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml +++ b/OCH/mogo-och-bus/src/main/res/layout/item_och_bus_station.xml @@ -26,7 +26,7 @@ android:layout_width="20px" android:layout_height="20px" android:scaleType="center" - android:src="@drawable/module_mogo_och_bus_icon_arrived_station" + android:src="@drawable/module_mogo_och_icon_arrived_station" app:layout_constraintBottom_toBottomOf="@id/module_mogo_och_bus_station_name" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintVertical_bias="0.4" diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_blue_dot.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_blue_dot.png deleted file mode 100644 index e1fd463963f85f911b0e9447d663c9770c4f6617..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 828 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~m(&Q)G+$o^ zEg+kNfw4W4fd!-lh^2s-fq{7eBLg##W(0{XV1mnvEMP{kK?*nB{qUE8foYkii(`m| zVC|H%*}{ne$G&Ud_Vr1w?g&^bw`4)w-mriVdXF|P(70uPsNUh@8&`qAH%Ge@ULRe( zU=h1*=tpIatr<#Do?!P&SZN{%Rr#D@) zIgq_3ySgis<9&~#tDwiR1&dlYsCQ>+wM__Le|;}=zg^7tW$F6SedU)#R2QFLJooKX z`*45zjP19TPclj+xP@4+o}taX^su?S-0FFIOYVPaHV)G&-8M~fQ7Z4R^=0vPvHwbc z-{L>X!@BW+&+4hWZ1;z)W-abFzn)_sapvXkT_pm0^WrS46nPGNaIrBJi*URw$*F&J zVXgV;I3b-~LC?PBuKploU3soz<;=-Z7EC+b+*v=WG%v8)pTaF@5g1jGB(*~Q+bZ{I z51zyWyhK_adH^oE8?oG_7TJ$st~Iiwdr$+~qstj-A=ES?0B;NM6U|R0+c(7Gbg4+V6*A z+AQ^VPPt=!aeu`1>L6>!Y5bxoEbDCZ*2Kj0-acEJ_o;qCTa<<6^_=Fy?zdhsUXzZz z-+FETnRD~41BpASDmjY+nLmVsX}6#+4lXm_1`|8{8_zsty^%GbyKXP|AF%cp^DqiZPw&o z#%gSt^+=m3zQK_7vVmw)f_sC4{lS*>!}l0vD@;rd{&-epp8QN4LQe?Gua+L z?-IC>+>r7wv}nDPn@^Fe;>R5;H7rFhm#VIw@vQehcTKVAY^hGmAE1=$>FVdQ&MBb@ E08IvEV*mgE diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_dot_line.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/module_och_taxi_dot_line.png deleted file mode 100644 index 186001352c82bb9ad01ac4c1556c3b1e0f551dda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^Oh9bI!3HFKj%EJ@QjEnx?oJHr&dIz4a$Hg)JkxxA z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvP%d~(Q&b9$5{LHz_7f7x3ba4#P z5KZ1%-o0L#n{r)6q;u;dN8?mF!s!=Ufy&zF_GaV6H`Z{09(KZ z{)h<*2Vd+jo~eJrZ$sGx&jRMihI2|QT6Y43?sRmT(vnCofiAP>uRWDh|2#1@(MeIb`>i}1r{un-Wbcl zx?RsjfMxa81x{;jBuHh?u6vUGu40~X@iB+JAD+#rem?K{zVFKWzW;xA+F((nPt`o} z<(wCbewQU|YV6o4C@In)J<-v)KtX=3Bu_xV+OTG0{q=V>LXNGksC$xm&k2 z=zqcMpXD>{1x|*u9^0{yQAK~s>8D9=4_(<~FLs8ZE5*t%>?hOIm30Qemi1Zlc3xSs zHH)ufXY%idH^swW*Gc%ymUeh$z`ENp=fca!9^b6--R&6lf+ zg6URzJ8QK=yfy=MpW5WTu=(qv>HKPdI;EHIY*5jf!JTx5UoAKxd{M*)rOjD< z&UasNbnJ69IVD)I{)yp*`slFsKNoJ;SMJ+>GyBH0uW#P)T%IvU^LF1}$L04IsI6^X zD3Ek*+r9r0UgvZyop%fDe!51VuRQG9v`vRh4BIQ7H@clRpRZdsdv0p2UX|g?X_vc= zuI~*?|9Sh)W!J1rQFrajHox_XD>&Etw&w5FD9hS6E%7|7JB=Hy^i&(an{Bf)&thZe81bwN-z+ z{N2~Jzf1=);T3K0RXMoYA^r* diff --git a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml index 33d370bf3f..888fec075e 100644 --- a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml +++ b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml @@ -49,7 +49,7 @@ android:id="@+id/greenDot" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/module_och_taxi_green_dot" + android:src="@drawable/module_mogo_och_icon_arriving_station" app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_start_station" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="@+id/module_och_taxi_order_start_station" /> @@ -83,7 +83,7 @@ android:layout_width="wrap_content" android:layout_height="0dp" android:scaleType="fitXY" - android:src="@drawable/module_och_taxi_dot_line" + android:src="@drawable/module_och_dot_line" app:layout_constraintBottom_toTopOf="@+id/blueDot" app:layout_constraintLeft_toLeftOf="@+id/greenDot" app:layout_constraintRight_toRightOf="@+id/greenDot" @@ -93,7 +93,7 @@ android:id="@+id/blueDot" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/module_och_taxi_blue_dot" + android:src="@drawable/module_mogo_och_icon_arrived_station" app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_end_station" app:layout_constraintLeft_toLeftOf="@+id/greenDot" app:layout_constraintTop_toTopOf="@+id/module_och_taxi_order_end_station" /> diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_base_icon_not_in_autopilot.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_base_icon_not_in_autopilot.png new file mode 100644 index 0000000000000000000000000000000000000000..927296d6900963a898b84f78d1f7699c9d5cec12 GIT binary patch literal 2342 zcmV+>3EB3EP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91NuUD&1ONa40RR91NdN!<04n#S8~^|akV!;ARCodHn`?*_Wf;djrj}Zf znYvqnXrg&1mC6uNQ%fNc@@qlg3=Uq_s!5^Jktj+JVmt-rfazcq$SNmruovtGUr@B0 zSsiwYJ;j*>HiL_xk|O_#GqF<=O%oKdGr`xOGemJ`rr})`8^}EY4tGXnVq%Jio_n<+ zkQo5Bfm@)KM0~_cFNMw%2+Rk~pqAxN$j#4ErBrV>g5FNh4dA5=!S$Ly0)7VIQ#ia03BU*K2%eMJ0+I)w07!SPsd-h<6)be8~)q$?)!AH-2S zSNQ|QvAL4M;Sg}vk%4Z5wZQ9k%1T)Ag1D}?q4F7$HEz)!M-AX4aFG)zJ(f%0lui^M zh=+?PuZEPN+RSj!6C84hhR!?Sj!Xe_G8T`34+pC#zn-Z>W4y^4qHPelBz2Gq8p2)A zM3+JCrc^X=zQCbCy8mBD6`)E+;s;!wQ_p%)!fAhCo4x;wj-O*M7WpZQClFtgDBu3h zQBmG%@)qt{=Qa6 zHK-uo;J78f{YL5-&#*XXp?`$YNsV{H|6!m!Ofn-e4XnN~S<<&Q(YOnBC=W}X`(o3< zXq?4R>qc6_=<=dGfNdRYT$pJ0@Pwmnyt9V27_Iemc?t4ZV@afaJ*cXtAEt59Z}iv1 zl*5vkbGPyV$}34O&{3SOXirR{9ftdgXYv1Rqx%2EcloyxT&s@vf;)khQgjT@OE)L~ zru_=gQD}yTRxvY+@`1;89IZ@nro}ncWp`Ml*$Ika^GD%{>k$G;*XV`AFdHQ__IsF&hMY=`$#X)7=mcg8Ot8TX&W}Uk4y`dtt)O{Ju1!z%`n$0?O z-`lJa_c<^$p%nV`cLg{Av}B=4?ENLs80%?J%fpCE@cSH`1ZPX2$*-1av^(-9P%Yx* zoaSyjK$0Advnp-Fum{ivg0{p>i&%75O~gZd#49QJC=GOuf+X3YA}vqqrTr@C6?wCq zpsN+m#Xzfiogs>=_|6|dpxX;5&m>u{B549^lBt&3bm+#JKCD^|Y+E;`xITSKQt`Y$ z7{g|&CD2?I$+n)fszVhV8}L0IoVJk2+AaU%9VvBC!*-R0Kx5GeCDTVwdT6H>d=CT% zEJV_F%dghUQ;UV$iO4aE`o9@TqR&7vygG#Run(bqRJNO^(}-FjJ{QL@i; zi;2GS0m>^$PSH`E(`v-sja>yza^KT=f@pjD`Gh{_X5whiY##94`Uzub3Nol^u9qE)m2&}8fbVaKU4YBU&_ym|_ zW2~WPBLOsy@*QwW-+LSsM-4w4fk{4&vn#e?HOpj4pWXx$5*>JS;7224A6e|-K2eo` z6M*TBCQjNJN){CMNXsDFzp~DUk|VVB;6qaw&9PiWdd^dgq}cfA0c`t)dy?#DON<^{t2PYnB*URv~nY*{&dk zf6Ko*fd$5zu6!yl4x)#m_icgALW}Q(z6pp2usx*1u*$DE{qT(w>EoaeFfDI}!F1H? z)oUDuzU{X5x(yUR;K9Kv$}69ZSsXQjGuDu83L2=r4Vx+QIt>Hf?Aoc)IV`J8n_lpEHpQI5g3a_{}^Brcnv0eDS01BN7sF(T zV_i|YM14fd5$i$h!X53CEzTy#agskEzoz95x;u#Y=X(W}6C{A1QLYd3Qii$>v{<$Z zOa;Y7GmcAvNtTKO3R<+2o$Teu^|nGa67kOG8B|`F^4|pN4qS!@5xbZZ?QrO?YFeI= znfj$?+V+v2O~g0bTdcegF24z?H(^b M07*qoM6N<$f)F%O!~g&Q literal 0 HcmV?d00001 diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arrived_station.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arrived_station.png new file mode 100644 index 0000000000000000000000000000000000000000..8a065b66dd39352486755c293369d25987521e94 GIT binary patch literal 1420 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 Hu0mjf@OOIK literal 0 HcmV?d00001 diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_base_slide_block.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_base_slide_block.png new file mode 100644 index 0000000000000000000000000000000000000000..ed7b293b90817473c775392fe3ad51d4d7f11d24 GIT binary patch literal 4933 zcmV-L6T0k)P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91c%TCS1ONa40RR91cmMzZ00`n$?f?K1uSrBfRCodHoePi@$9c!U+1)$1 z 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 DCiI-Y literal 0 HcmV?d00001 diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_dot_line.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_dot_line.png new file mode 100644 index 0000000000000000000000000000000000000000..a720a532eafc22cd6f4393f745e5f4b91c336aa1 GIT binary patch literal 1004 zcmVPx#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR911fT-|1ONa40RR91h5!Hn01iqW@BjbN!306SHf(|+Z1t8&w$Y+T_ zh|kB}y|=r=?Cdkx2)cuj?!CR)dAr{?-|Q@c*sr%cGoxBFch-+=bo6Ux9(cGXE6v~P zFo6&-P64QcQA|8&45tX02?4-452SHGNHUTKtHUHOWG19f+BmiR-eT5wTvl`AeJS8m zcdza*gKK7`{ZEm4#$N>YY?=9I71FeAF*KB*TQCrSg>ID(2?zwn zW5#~GB)+y7}mlLJZ? zVP$=B>KZbBEn06fVee~j#_LydXBKaq@$7SJXeHqQ(=v!P0;=y2%5zA{ZAYOIqGVDo z*eb%rd>9~G6)uJF6oHKm@bC7|$2QjeJ4;JRj^*W`gO#FxE^a~d^AFUaaHAs=F3ci< zDwj^p)}(@>kg>fi)mT+$a_X~sxFBmRh=3X55;=D-Z@0VK1I9MS4l})2ygz4aUdjdD z**AZ_$O7`|Vkn?9xBp$C8+M*N$ye9>At(xHHhVAa+S;JO4v$H1gU!wM+a0>tnm{kC z5$LJLV4yU2$=MQY@{19+(eL3X$qI#Uq%((P90$M{F?JqbTo5n(@qBs!#Ssc}5+-II zQfaUbfeuJxJBYrhksAulic9W9XqbpgCFM5aC?6qKT;=aZ>XtDkTJ9#XlR{tP)dR83X6`#)BWnnaBrq=p?wB$>`g@t$- zd;`Nvi#(BU!gN{h^OfHw*C{Vy-zW>GL#Y2AH&kHKufecU4CFC&2hlJ&ws85+uin%~ a0X_f)vOJ530px 492px - 30px - 30px + 20px + 20px 70px 130px 93px 150px - 48px + 70px 24px 460px From 744117770bf6f50e0bde864563abdf72d450a3bc Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 13 May 2021 16:34:50 +0800 Subject: [PATCH 3/4] opt --- .../module_switch_map_angle.png | Bin 0 -> 862 bytes .../res/layout/module_ext_layout_entrance.xml | 6 +- .../res/values-xhdpi-1920x1000/dimens.xml | 2 + .../res/values-xhdpi-2560x1600/dimens.xml | 167 ++++++++++++++++++ .../src/main/res/values/dimens.xml | 2 +- 5 files changed, 173 insertions(+), 4 deletions(-) create mode 100644 modules/mogo-module-extensions/src/main/res/drawable-xhdpi-2560x1600/module_switch_map_angle.png create mode 100644 modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-2560x1600/module_switch_map_angle.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-2560x1600/module_switch_map_angle.png new file mode 100644 index 0000000000000000000000000000000000000000..3e1b96f3e3f0a01072632bcd1389a7811a195517 GIT binary patch literal 862 zcmeAS@N?(olHy`uVBq!ia0vp^20(1V!3HFE2UfoVQjEnx?oJHr&dIz4a$Hg)JkxxA z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPYp{SB&b9z4eC@7&mVtrkgr|#R zNCxZMS=Je%jv{T}kFDO=@xwz^^Uanojr}EILRVJ2T*D$L8lAt?Hz0cBHW8Pk`3oEu zH!bMky4E!HW8+eV6&yu>|IL=|EKdLSF3rH2+xWx%)N^O%{5)s*yJ7F_RMF_|w`2R) zEzsY&t}rLGWO63&r1|GF1Y_5{TKuWTOwxJ%guCa$OWT@@w+a6W4*knBHMZe1^O@S- zZMtp1R?AK%TEG_&!f)!o`h$qjP>Iw~KFQx-j?o zZmY`Kk1hCWLc~`$Ztl-@5Z__&^?_B#z037^{#`roR|_%!Irvi0o_hN2(G9p1lLsQ>rH{+BObtY>_%o#7XUZhJhJ;%T=$NxOUHgr+R#{I}!eo|(eYtUS|euV`LnU+?M5ae(`N3j@y| z{)4-s&WK)M_F3L59>;i8s^LLDZ&Q3G!~HE6vh-$~E?xgR`g6<7r4ODKs)}B?u2Z%< zU)t+SY_`_H={FABwk}U)uXXtK#pucA)2ny#|D5TTeb@Te+Ioh6t2vj;-VZGSrEO1F KKbLh*2~7Znyl$od literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index 7d4328956a..f5b8e825f0 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -48,13 +48,13 @@ diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml index ca06e7f314..4bdcc21227 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -163,4 +163,6 @@ 36px 393px 700px + 108px + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml new file mode 100644 index 0000000000..22d28b5b60 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml @@ -0,0 +1,167 @@ + + + + 90px + 32px + 2px + 16px + 26px + 26px + 32px + + 90px + 32px + 2px + 100px + 90px + 2px + 54px + 100px + 90px + 8px + + 180px + 180px + 2px + 60px + 60px + 28px + + 32px + 2px + + 140px + 32px + 60px + 92px + 24px + 48px + 2px + 140px + 140px + 120px + 20px + 30px + 32px + 32px + + 120px + 120px + 32px + 60px + 32px + 60px + 32px + 30px + 20px + + + 120px + 60px + 60px + 32px + 48px + 80px + 28px + 26px + 44px + 44px + 18px + 34px + 26px + 28px + 30px + 30px + 30px + 20px + + 103px + 103px + + + 1058px + 210px + 144px + 159px + 159px + 70px + 70px + 56px + 83px + 24px + 40px + 60px + 50px + 12px + 10px + 40px + 30px + 34px + 24px + 28px + 23px + 17px + 17px + 36px + 36px + -2px + 95px + + 30px + 40px + 40px + 15px + 15px + 5px + 50px + 56px + 30px + 56px + 30px + 56px + 30px + 15px + 15px + + + 1000px + 390px + 200px + 200px + 240px + 30px + 120px + 120px + 10px + 22px + 28px + 28px + 30px + 90px + 90px + 6dp + 15px + 4px + 10px + 20px + + 40px + 45px + 100px + 134px + 30px + 20px + 20px + 8px + 21px + 31px + 1920px + + -1 + 0px + + 36px + 393px + 700px + 150px + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index d430472dff..54c5195205 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -244,5 +244,5 @@ 400px 300px - + 108px \ No newline at end of file From e3104e2c45b950b954514c4d510fffbd9e8d9639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 13 May 2021 16:35:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86V2X=E4=B8=ADPad?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/module_mogo_och_base_fragment.xml | 3 +- .../res/values-xhdpi-2560x1600/dimens.xml | 1 + OCH/mogo-och/src/main/res/values/dimens.xml | 1 + .../v2x_optimal_route_warning.png | Bin 0 -> 7004 bytes .../main/res/layout/vr_window_top_tips.xml | 4 +- .../src/main/res/values-ldpi/dimens.xml | 5 + .../src/main/res/values-mdpi/dimens.xml | 5 + .../res/values-xhdpi-1920x1000/dimens.xml | 5 + .../res/values-xhdpi-2560x1600/dimens.xml | 98 ++++++++++++++++++ .../src/main/res/values-xhdpi/dimens.xml | 5 + 10 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_optimal_route_warning.png create mode 100644 modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml diff --git a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml index 8e31eb693a..f7c61df715 100644 --- a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml +++ b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml @@ -49,9 +49,10 @@ android:textAlignment="center" android:textColor="@color/module_mogo_och_autopilot_text_color_selector" android:textSize="@dimen/module_mogo_och_autopilot_status_text_size" + android:layout_marginLeft="@dimen/module_mogo_och_autopilot_status_text_m_l" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintLeft_toLeftOf="@+id/module_mogo_och_autopilot_status" /> + app:layout_constraintLeft_toLeftOf="parent" /> 44px 13px 12px + 224px 460px 30px diff --git a/OCH/mogo-och/src/main/res/values/dimens.xml b/OCH/mogo-och/src/main/res/values/dimens.xml index b3352fd0e7..84f4ec5a14 100644 --- a/OCH/mogo-och/src/main/res/values/dimens.xml +++ b/OCH/mogo-och/src/main/res/values/dimens.xml @@ -33,6 +33,7 @@ 30px 13px 12px + 188px 460px 30px diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_optimal_route_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_optimal_route_warning.png new file mode 100644 index 0000000000000000000000000000000000000000..76ae6f035a38ff44d7cdebf8ea7565cc200f90f9 GIT binary patch literal 7004 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 44px 19px + + + 133px + 42px + 572px 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 a580148415..2344ee5dea 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 @@ -99,6 +99,11 @@ 14px 44px 19px + + + 133px + 42px + 572px 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 091c72520e..b43ce52f75 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 @@ -80,6 +80,11 @@ 26px 80px 34px + + + 100px + 32px + 940px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml new file mode 100644 index 0000000000..e5e04824ef --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml @@ -0,0 +1,98 @@ + + + + 800px + + 32px + 32px + + 390px + 410px + + + 160px + + + 60px + 40px + + 80px + + 15px + 550px + 200px + 200px + 100px + 90px + 162px + 64px + 80px + 26px + 270px + 86px + 58px + 48px + 48px + 349px + 465px + 306px + 77px + 50px + 28px + 16px + 5px + 80px + 22px + + 20px + 30px + + 42px + 30px + 36px + 30px + 50px + + 120px + + 158px + + + 20px + 36px + 28px + 55px + 36px + 310px + 110px + 120px + + + 270px + 480px + 330px + 450px + + + 200px + + 75px + 32px + 26px + 80px + 34px + + + 133px + 42px + + + + 940px + 701px + 150px + 46px + 26px + + + 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 1882f8ea15..6c0cad7db0 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 @@ -113,6 +113,11 @@ 26px 80px 34px + + + 133px + 42px + 940px