From c4d239ed54366503831d9c987ac367a037ab9e9b Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 15 Apr 2021 11:50:07 +0800 Subject: [PATCH] changed the UI and qa request should add a close icon in frontCarLive --- .../scene/livecar/V2XPushLiveCarWindow.java | 5 +---- .../scene/livecar/V2XVoiceCallLiveCarWindow.java | 4 ++++ .../res/drawable-xhdpi/module_v2x_vr_close.png | Bin 0 -> 2242 bytes .../res/layout/item_v2x_push_live_video_vr.xml | 2 +- .../res/layout/window_see_carlive_video_vr.xml | 8 ++++++++ 5 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi/module_v2x_vr_close.png diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java index 2b07ee047e..299098af0c 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java @@ -68,10 +68,7 @@ public class V2XPushLiveCarWindow extends V2XBasWindow implements IV2XWindow { - //移除窗体 - V2XServiceManager - .getMogoTopViewManager() - .removeViewNoLinkage(this); + close(); }); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java index ec954655bd..a0ba1b3f5c 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java @@ -55,6 +55,7 @@ public class V2XVoiceCallLiveCarWindow extends V2XBasWindow : R.layout.window_see_carlive_video, this); CarZegoLiveVideoView mV2XCarLiveVideoView = findViewById(R.id.videoPlayer); tvCountDown = findViewById(R.id.tvCountDown); + ImageView ivLiveVideoClose = findViewById(R.id.liveVideoClose); ivVideoPlayingSign = findViewById(R.id.ivVideoPlayingSign); mV2XCarLiveVideoView.addOnVideoStatusChangeListener(videoPlaying -> { isVideoPlay = videoPlaying; @@ -64,6 +65,9 @@ public class V2XVoiceCallLiveCarWindow extends V2XBasWindow stopCountDown(); } }); + ivLiveVideoClose.setOnClickListener(v -> { + close(); + }); } @Override diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/module_v2x_vr_close.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/module_v2x_vr_close.png new file mode 100644 index 0000000000000000000000000000000000000000..c7f8ef28303ed1c9f17b709f7962cc7179a9472d GIT binary patch literal 2242 zcmV;z2tD_SP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91P@n?<1ONa40RR91Pyhe`05RZ9PXGW2EJ;K`RCodHom*@aRT#$$4PdDS zghDltw1J9HuoP>#2%1_#P!c23g!o_rEw#iKp9mx-zWAUo`eF?9OzzU-D;m&gDDj{CduuGiPR(33>k7 zbQM2enk&s4J-(o0L74P0Z!k>v^|@QRGkUzK<3q_8n~>pBr>MLtsd7|hI-0O9Ik_^b z%R2reWyCT8kTRA^b=~HlD1R<7OA8!BzoUiw}ooJGU>cDlx$;C0a&a;zLXXuTUdb8(kMBDG46v$Gq3ELE~$wpBBdGA>oDZMi1KwL|~` zw>@s|?2llHb4$7%uc;H`MJRlZ#2rSi8w_A!Yfb>Uw;gM@XSR*>7zhJc*jhY*?5eD= z&5@gduz*R7*#VrQRLwCd#{*yjn+UT5xKSzMj`@h(xpe{)Hi{!G8X#-FO%W-^Pr?bX z%MPQEMK5FCQOsMRSVJF*ii##~*sx(netv#lUtiz9hTO(=vv~31=T@&?U3B;E-65ID zhe`!1^q%y)Rd{$0WOH@16=CXFSy?%?v$M0drKM#}M@PrHJ$v@NY|6KtAN*4e z+okgm2BXkMba)SZRT1xdaBQ3P(4j+1s;a7H5jjCtQ&Ur1T3R~s#EBDqwi!GG9zJ|{ zQBzaXLdwBSVPWBw@cDIv@g%o@`er@ERK%uiM2L3VR?wzghqrbTY$`V_P?-A^HrDHZp`y z0g%nZMk(!P3St1@!HN!d5`Y!b+fqi%E5v}nvshgQV2#8xfQ(tH5CaAeUN->9nueX% zj9Rh~0|*aZJpg3$;6=_dZEhh36dt$+x#jszD&@>Ca{_er>ec%d6&1WU9b*|-s>GBT z6>y6lSTFgyb??*@XV0F^4oHjz03LN30^o^Y`??afjI87$RVU7jmN9l!Gr6B==ig=6AU%-xUwm0eQ%NUyOc;6?^;l0;EyfxpU{dUAuPi+$F|LYz!po ziT(Zk13a6KDcoBC^Tzkmf7WIK*THk%eA?&UvSrI$yBHJjEWfN5@n@ZfALErDo+gFQ zu!32{HrAOG93{-6*V#r23QuSfp5-?lM3w)ymB!#P#LAjP@coxmC-L@?F>7yce^g&z zU&5PG!^6W*_wL<$qq(`6*CLD?!?~oSh0|v&_YmH(4d9TEW~?-gm8RLn^Z8NKdn z$#Eg>1|SajQ5wGTIbF&HW8{4<4JK-=8-Vy2l9+|oN>in5Hn#RYlODKfq+5Xa8jvnY ztE6m&2t0b8>#v3-15kcPe$j`$Fy5)ow&BdMrRTYZr?h#=0wfPT@vO8&%9e?R34@;J zYS=1W$Wj4FX0C~?63>*!`Vxnw3bSp(2}5aOELDIwVs_@5cuRUsnkQREJZrOsF|?rpg}>-Ab$Qvj`ctkj2Q37|nVfbExTHwIFvuxWtQ zfwx^ZN}Hsh>}<1>%uqck#cW9_EM-dvK&vu59#}7JmP)L^3?F+`-ZAO46tR<{907*qoM6N<$g2{IJHUIzs literal 0 HcmV?d00001 diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video_vr.xml index b02a2d05fc..9cf4c607f9 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video_vr.xml @@ -19,5 +19,5 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20" - android:src="@drawable/module_common_close_selector" /> + android:src="@drawable/module_v2x_vr_close" /> \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video_vr.xml index c2f05ae98e..f8112f9948 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video_vr.xml @@ -12,4 +12,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> + + \ No newline at end of file