From de0d9361f981a31960b1840f66b743aade6de52e Mon Sep 17 00:00:00 2001 From: aibingbing Date: Thu, 20 Jun 2024 20:04:13 +0800 Subject: [PATCH] =?UTF-8?q?[650]feat:=20=E5=A2=9E=E5=8A=A0=E5=8F=B8?= =?UTF-8?q?=E6=9C=BA=E5=B1=8F=20=E9=80=9A=E7=94=A8=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F=E5=8F=8A=20UI=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/unmanned_taxi_base_fragment.xml | 10 + .../res/layout/taxt_u_p_base_fragment.xml | 4 +- .../hmi/ui/v2n/PassengerV2NEventView.kt | 147 --------- ...layView.kt => RoadV2NEventLivePlayView.kt} | 20 +- .../hmi/ui/v2n/RoadV2NEventWindowView.kt | 291 ++++++++++++++++++ .../hmi_v2n_event_icon_close_driver.png | Bin 0 -> 2100 bytes .../main/res/drawable/bg_v2n_event_driver.xml | 6 +- .../bg_v2n_event_live_play_driver.xml | 1 + .../bg_v2n_event_live_play_passenger.xml | 1 + ...xml => hmi_view_road_v2n_event_window.xml} | 15 +- .../layout/hmi_view_v2n_event_live_play.xml | 4 +- 11 files changed, 335 insertions(+), 164 deletions(-) delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/PassengerV2NEventView.kt rename core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/{V2NEventLivePlayView.kt => RoadV2NEventLivePlayView.kt} (88%) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_v2n_event_icon_close_driver.png rename core/function-impl/mogo-core-function-hmi/src/main/res/layout/{hmi_view_passenger_v2n_event.xml => hmi_view_road_v2n_event_window.xml} (90%) diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml index c0c197cf4f..56ac8392a8 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml @@ -349,6 +349,16 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> + + diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml index c6280e5f48..2aa4a09f23 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml @@ -198,8 +198,8 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> - Px+?ny*JRCodHoqcFmRT#&g=}()v>3qQ@vvg@N+O)EqXks#vD8rxs#5ZMo)N+Iqgz^XvD!{_ef!+}-=! zd);~9*|{(0+~=I{XXl>#{wpG)AK8bJ^>Sl7*#EhjUgY#lj-TM^R`yt|h@%cQAUZ-f zaHfM-{Q#$zbqa-%#{%(J5xuFNeFys?_I~!r%mOi!wu!TU!Tt?oW+!lzQPR?8x zcmcp{XAgCEW`Q`RHk&`k+23a0ZC1=Zw*}&^jma7S*}&dnQm9bgVTBgjWyT6Dx@e}3JmA@HI8L=Hkbk4{4 zl)YRlcTOe?Bu9*pCo6e-TiB+a~6o7LgB7o!JDh|+N1^IrA{>K*7Ig>a@({8;-*Y= z%S(9EuefdA0&!C&+U2ayI(7D%od@l2za;Lh!USs+S@_|ggvJzIshK$H^krb|_L3q&aq zZ@QSn4;%t#r0X$$LOCs1^bnPlmQllr!*p@w+zqM{;t zY~>47J0Jh3SFE?UmpEv%mJnJ0t%BiAHF8+S}C#tHMLnS3+T-!0Jyn-fIOr>Lo_fubApKHFL zD|BJB{dJKxZ+eq1U1|#&DoD9zQ6ODims#k&u|Y9`@zDpb(}fFoxLwpbM1i1baY0D| z49L?d4kQjJDS zqBp2C>XVmc%-Awo^U_;X&eylR3_`nI+E?Y$00VVR%%HA>%T0AJvlR1v3olCx474H9 zKu|$lD9BsL(gXwbPdpG*GANX^!AK2|AW+f>1ML*MV~AjbwZGfjsJZc^)@E9o&roYC zzM_;aOT{h=lB)BJd*&|EQh4H|$&uc9)T%^)OsN2(VECP9INKlf?OjJxz|8%O(J`U2@G7DI@feM)~8wY zq}I!oI3T7l)T27OCyz-VQxXLvC=B(#cRfG>kk#z5k0pbJalJqRkd^G$yuhv+D3OK* zL)A6SJq19PvzMyINT*@LQ1wqM6aaaceY|RjWEvF=)rK@e0gyU&?^|-Jg(0RLOJ^LzF6K41`rJB4>|>j zY96m1Kd@|-=jOwPp@Nw}>F8*u#?ybOqGBn|Kk%DNVuts?y(}siDrS3ID}D0eYZ}+S z=Bgs1DS+Syu<)BpB8Hdp-7IPtDy|L`uX?KOM3Jg9bg{SN@r4Aul)B7y`pv`}Yq_Mf?XZQ8qW7rmE_@X~c*t9}B?Su6V&xT_}vW3fax8F{Sd> z>g4HkDT(w}&7)j`h;_xSzakkwtX&kbgN6KJPX!vWRxWo(ed7 z2r_SH7yrnIXDx@&N@ov2(=m==^AG(mIVcZ_&EB) zn9{(GtHXJ}HpcVT0w^#TASxVA9(S=%VYk=5lqvz!Fn}O5F0%j%o`Rgkj$N6x01AW! zM1{sx;;-4;+3|ZA-XF5!4A$}$FgY>IFX=yrF$Iqm;dlBf{IlB}P#{VmN@2v9&Aya< zF}v8qcpNKrCIKW@6g(k`3zc)OI(BQ;aukpTk`sDhvW)-Y&g3+99HGI-v!fSb{6Q-I e(|#N?Hv12u{Bd|5y^C!C0000 \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_v2n_event_live_play_driver.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_v2n_event_live_play_driver.xml index 083b51a3a8..0ded5f33d0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_v2n_event_live_play_driver.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_v2n_event_live_play_driver.xml @@ -2,4 +2,5 @@ + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_v2n_event_live_play_passenger.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_v2n_event_live_play_passenger.xml index 91cd731bb5..e9dc9a447d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_v2n_event_live_play_passenger.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_v2n_event_live_play_passenger.xml @@ -2,4 +2,5 @@ + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_passenger_v2n_event.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_road_v2n_event_window.xml similarity index 90% rename from core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_passenger_v2n_event.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_road_v2n_event_window.xml index 50fd5a3a54..367fd1ab83 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_passenger_v2n_event.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_road_v2n_event_window.xml @@ -28,19 +28,19 @@ app:layout_constraintTop_toTopOf="parent"> - + android:background="@drawable/bg_v2n_event_live_play_passenger">