From 390deeba222cebda0d94f1a82a320dc9d91608bd Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 23 Oct 2020 20:50:58 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E6=B7=BB=E5=8A=A0=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E4=B8=AD=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/v2x/view/SimpleCoverVideoPlayer.kt | 16 +++++++++++----- .../drawable-ldpi/v2x_event_video_refresh.png | Bin 0 -> 3569 bytes .../drawable-mdpi/v2x_event_video_refresh.png | Bin 0 -> 3569 bytes .../drawable-xhdpi/v2x_event_video_refresh.png | Bin 0 -> 3569 bytes .../src/main/res/layout/window_road_video.xml | 5 +++-- 5 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_video_refresh.png create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_event_video_refresh.png create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_video_refresh.png diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt index d8f2f27e4e..d854120aaf 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt @@ -64,7 +64,7 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer { //加载图片 val requestOptions = RequestOptions() // .placeholder(R.drawable.tanlu_normal_image) - .error(R.drawable.video_loading_img) + .error(R.drawable.v2x_event_video_refresh) Glide.with(mContext).asBitmap() .load(url) .apply(requestOptions) @@ -75,16 +75,22 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer { /* * 默认双击暂停 * */ - override fun onClickUiToggle(){ + override fun onClickUiToggle() { super.touchDoubleUp() } override fun updateStartImage() { when (mCurrentState) { - GSYVideoView.CURRENT_STATE_PLAYING -> start.setImageResource(R.drawable.v2x_video_pause) -// GSYVideoView.CURRENT_STATE_ERROR -> start.setImageResource(R.drawable.live_error) - else -> start.setImageResource(R.drawable.v2x_icon_event_play) +// GSYVideoView.CURRENT_STATE_PLAYING -> start.setImageResource(R.drawable.v2x_video_pause) + GSYVideoView.CURRENT_STATE_ERROR -> start.setImageResource(R.drawable.v2x_event_video_refresh) + else -> start.setImageResource(R.drawable.v2x_icon_event_play) + } + + when (mCurrentState) { + GSYVideoView.CURRENT_STATE_PAUSE -> start.setImageResource(R.drawable.v2x_video_pause) + GSYVideoView.CURRENT_STATE_PAUSE -> start.visibility = View.VISIBLE + else -> start.visibility = View.INVISIBLE } } diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_video_refresh.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_video_refresh.png new file mode 100644 index 0000000000000000000000000000000000000000..7f021fc1a97e2b0ee18ecd3d7c86e2b662a70f5f GIT binary patch literal 3569 zcmV002t}1^@s6I8J)%00001b5ch_0Itp) z=>Px?t4TybRCod9TnTg&#~I#TS%+;T*_Lcewy8N1%u66niW?{f8puf?kOMaj zNt3iMNg+2aIhr0hT3$mRgr;fIq=6UbzzKx&K^jOL3WgATVz4dQGT0K9WMNCPwA+6~ zSJ{ zl~YvW^)j!(ua+Z5=m^p%!Jk{8RBP?M4r|PS#SE5z5NDWYVWtBIa!fwp-!ijRDykMe`F!?1pGChpG2jU=|gy(Fl!Hr?Buc zh1Gf?E=v|6*)XF|QKzI|?6q6#gv!~xumB+UfMk5XhIL*7OAzn(s=HQZJolTY^W!Zi zm_Jz9&kcEn(}MH4-yy+54yWIbVh9zNAf9Oi)Ccvf&8ajdq|AFyJmp8Pan``dQa|TPrQ0>fz3(C~9Me zv9S{I4a|7s#%b>YGzMjkNdmO%Hf&>^c9S(=D^ITWokLQ+Y;nxaS zv>4WDsj2eC*DuU0EuA%P@4kZV+itho{9q{*+ESP<=SN8_x>{{* zU7xx0{KZIsp)u>snHDEa(~Lr)kc0x)V9+NmS+Yp`)t6si=<2q_ZQ%{BloJIC{a`88 zX*a{jStuHX7zm>Q>{!i-p2asV`*!n|H#=V6@()u>ORIx~z5CqU>?Daq!m~=1N-4eN zmK(;`oH%JS8cm`%Bf>U;q-0Kqb%!4;l}hsffE9898J3ZV!bpIbOznN|SANuuSPu*g zFtv5{{oAW{SgJnx?3^LnAf1?>hjzCEpuu=1nK!RYvt!5ZF1y|C6QNRA5)hP@H$nda zg$`-pIC~IQnn2;UZIzZakFTqPpkmbH&Dpap?o}1{H9Yd@6Q^7*H?P~JrliQ&)*kRmCf_S+*@tJSK&SoOshUv@29u`29tO|<;kdK9<~qi!2M7NAf= zXoe;Zefbq{aXn+k^i;NyxZY@yrohE)B>7Z-bp#z=3p~lm$x@|q99EwT26+Fe;DC^^ zn&>ch4(hf!27?@Dd(e#04}aLK3;8&dgbXZ2dM?<#HoFb`5+oRej&}1Puyi_|thT-Z zwGYda08VKiaKhHVKdgM`@~o`Pz|P3lZI#AH*F1F=i?(5y$mH@tUC!h6V2!L&=s
    8bWx3_ojLcK*r1xozh^k9wVTwBW9wt`bQ zF030IBw+%uNaJA9;&XQG-p5;$L6noaVaXz1L&S3zrc6vsq-M@6;mJ4*(Np2tVsl9o zg)R+=B^RRm{PV*OyWPPv|2tPM*9+Cfm3QCjicGm&76{cKzPonq;W?>8mPInBDRjHa ze`#pQ+%7Rd-t-rT_}(-ePE)VAeW@0c2p$^9&X-{(@E5c zOVcgft{O5k4ud~!*k}rlfIhb7;fd+mbj*s;Cznx1MtUNIeT!k=FyOFq%f+N0xc}a)n{Qgo>*8o< z=;c>8V4bwU$M)mn2MgWTgQx~CrY%N!F3pR-d#M$52X5Zn5Y9C|CZz{Rhtfb<-A}MRUu=q``>Jx3@HX zgJ=UYh$=-hfP3Sjq49LTTqg5fb>&Rnw2n3wR<2m4(`Aj996frX*X53Ge7Sx3t=c!X zY@BjU>8wGMMN`vh$MTgwt%aC8@5d1X5SNA|sE^nD>KFcQ7#Kgw%E}TNn>*iw=+GcV zxWr=8FTeEL{1wZW<_OWU2R`=f-fyWs@*juM*zQ5w@hG6D(`U*i7ZxR!FPN(-n{%yJ z$60f7d7VAm+Pi$^s&Cud%{-TdTSrV9mN>LjBDtfjt=?~~0k9A=eNN%6umSL(7{-xk zR^MBZ`OH&m3!oeEx{eSX0#GiOhupU3(m+JC`<~Sg);paSv5r$n21Sy4J4{V4vho7m z5M^jmr=F!5=VC|>T4%8YV&AYO@2olTP0y7xXDHQb{!|~#6P=hrarEGP?l;4|%^m2D${wb^WH+RA>jZ$Yq7p+39tX;|mYV=Ml@yh)O3DVUhGTIhd6gq)dD zR0$gZVXO|`Xa^jo6t_%5J|_ee(w#TJa~p$hsVg6OEcEf5`ucgXly(h zsvRN0LIk}ws})_ohJz!sLoxWid>J>5&s2CM9X3oL&&4c*X;NA;f;V& zCXr7<)FmpvEu`xp1O~dYf-YZ!OR-F-d@SXmt_K#iK3bqq+oHBCR2hB=ro+^@2{vpt zf-vk0S0rON9yFMj&Yu2EEI=W>VzMl5LoVI*A=bqsq{EeiGmZQxilP48-rl%N4Bw~* zcp=6PoArE#cETQ?&yxq`2BA8mDGzz(G6}UdoF5fQU(uGuW$eFG3|D1G+X+IXBMcpA zhy1OAiMq;Ao;kNI;nG;ZLITj8Vsup&-2jD&KpIZyaFxNhdLU7**c2Q+5Gx-WSgZo* zsw}zz3ZUHppkWUpvT{Pb(ZmB|(|%ck)BPoaf#4#U$ zo5beF>kZxQJi(BAr4ni<8#Bi(D{f$M70t~p%p34Aa~YB>AsMCsz>CRc;qv08VW${v zfTDdpv|WW<8(ul)k6{6et20~#9oOUZO@kxGm;M7TNx*d&#sIsEa&A3t8oHJb6g7jR rV}c>u#E?ugnM55&Tk70;@lO92soyXLngFpK00000NkvXXu0mjfYt6-K literal 0 HcmV?d00001 diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_event_video_refresh.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_event_video_refresh.png new file mode 100644 index 0000000000000000000000000000000000000000..7f021fc1a97e2b0ee18ecd3d7c86e2b662a70f5f GIT binary patch literal 3569 zcmV002t}1^@s6I8J)%00001b5ch_0Itp) z=>Px?t4TybRCod9TnTg&#~I#TS%+;T*_Lcewy8N1%u66niW?{f8puf?kOMaj zNt3iMNg+2aIhr0hT3$mRgr;fIq=6UbzzKx&K^jOL3WgATVz4dQGT0K9WMNCPwA+6~ zSJ{ zl~YvW^)j!(ua+Z5=m^p%!Jk{8RBP?M4r|PS#SE5z5NDWYVWtBIa!fwp-!ijRDykMe`F!?1pGChpG2jU=|gy(Fl!Hr?Buc zh1Gf?E=v|6*)XF|QKzI|?6q6#gv!~xumB+UfMk5XhIL*7OAzn(s=HQZJolTY^W!Zi zm_Jz9&kcEn(}MH4-yy+54yWIbVh9zNAf9Oi)Ccvf&8ajdq|AFyJmp8Pan``dQa|TPrQ0>fz3(C~9Me zv9S{I4a|7s#%b>YGzMjkNdmO%Hf&>^c9S(=D^ITWokLQ+Y;nxaS zv>4WDsj2eC*DuU0EuA%P@4kZV+itho{9q{*+ESP<=SN8_x>{{* zU7xx0{KZIsp)u>snHDEa(~Lr)kc0x)V9+NmS+Yp`)t6si=<2q_ZQ%{BloJIC{a`88 zX*a{jStuHX7zm>Q>{!i-p2asV`*!n|H#=V6@()u>ORIx~z5CqU>?Daq!m~=1N-4eN zmK(;`oH%JS8cm`%Bf>U;q-0Kqb%!4;l}hsffE9898J3ZV!bpIbOznN|SANuuSPu*g zFtv5{{oAW{SgJnx?3^LnAf1?>hjzCEpuu=1nK!RYvt!5ZF1y|C6QNRA5)hP@H$nda zg$`-pIC~IQnn2;UZIzZakFTqPpkmbH&Dpap?o}1{H9Yd@6Q^7*H?P~JrliQ&)*kRmCf_S+*@tJSK&SoOshUv@29u`29tO|<;kdK9<~qi!2M7NAf= zXoe;Zefbq{aXn+k^i;NyxZY@yrohE)B>7Z-bp#z=3p~lm$x@|q99EwT26+Fe;DC^^ zn&>ch4(hf!27?@Dd(e#04}aLK3;8&dgbXZ2dM?<#HoFb`5+oRej&}1Puyi_|thT-Z zwGYda08VKiaKhHVKdgM`@~o`Pz|P3lZI#AH*F1F=i?(5y$mH@tUC!h6V2!L&=s
      8bWx3_ojLcK*r1xozh^k9wVTwBW9wt`bQ zF030IBw+%uNaJA9;&XQG-p5;$L6noaVaXz1L&S3zrc6vsq-M@6;mJ4*(Np2tVsl9o zg)R+=B^RRm{PV*OyWPPv|2tPM*9+Cfm3QCjicGm&76{cKzPonq;W?>8mPInBDRjHa ze`#pQ+%7Rd-t-rT_}(-ePE)VAeW@0c2p$^9&X-{(@E5c zOVcgft{O5k4ud~!*k}rlfIhb7;fd+mbj*s;Cznx1MtUNIeT!k=FyOFq%f+N0xc}a)n{Qgo>*8o< z=;c>8V4bwU$M)mn2MgWTgQx~CrY%N!F3pR-d#M$52X5Zn5Y9C|CZz{Rhtfb<-A}MRUu=q``>Jx3@HX zgJ=UYh$=-hfP3Sjq49LTTqg5fb>&Rnw2n3wR<2m4(`Aj996frX*X53Ge7Sx3t=c!X zY@BjU>8wGMMN`vh$MTgwt%aC8@5d1X5SNA|sE^nD>KFcQ7#Kgw%E}TNn>*iw=+GcV zxWr=8FTeEL{1wZW<_OWU2R`=f-fyWs@*juM*zQ5w@hG6D(`U*i7ZxR!FPN(-n{%yJ z$60f7d7VAm+Pi$^s&Cud%{-TdTSrV9mN>LjBDtfjt=?~~0k9A=eNN%6umSL(7{-xk zR^MBZ`OH&m3!oeEx{eSX0#GiOhupU3(m+JC`<~Sg);paSv5r$n21Sy4J4{V4vho7m z5M^jmr=F!5=VC|>T4%8YV&AYO@2olTP0y7xXDHQb{!|~#6P=hrarEGP?l;4|%^m2D${wb^WH+RA>jZ$Yq7p+39tX;|mYV=Ml@yh)O3DVUhGTIhd6gq)dD zR0$gZVXO|`Xa^jo6t_%5J|_ee(w#TJa~p$hsVg6OEcEf5`ucgXly(h zsvRN0LIk}ws})_ohJz!sLoxWid>J>5&s2CM9X3oL&&4c*X;NA;f;V& zCXr7<)FmpvEu`xp1O~dYf-YZ!OR-F-d@SXmt_K#iK3bqq+oHBCR2hB=ro+^@2{vpt zf-vk0S0rON9yFMj&Yu2EEI=W>VzMl5LoVI*A=bqsq{EeiGmZQxilP48-rl%N4Bw~* zcp=6PoArE#cETQ?&yxq`2BA8mDGzz(G6}UdoF5fQU(uGuW$eFG3|D1G+X+IXBMcpA zhy1OAiMq;Ao;kNI;nG;ZLITj8Vsup&-2jD&KpIZyaFxNhdLU7**c2Q+5Gx-WSgZo* zsw}zz3ZUHppkWUpvT{Pb(ZmB|(|%ck)BPoaf#4#U$ zo5beF>kZxQJi(BAr4ni<8#Bi(D{f$M70t~p%p34Aa~YB>AsMCsz>CRc;qv08VW${v zfTDdpv|WW<8(ul)k6{6et20~#9oOUZO@kxGm;M7TNx*d&#sIsEa&A3t8oHJb6g7jR rV}c>u#E?ugnM55&Tk70;@lO92soyXLngFpK00000NkvXXu0mjfYt6-K literal 0 HcmV?d00001 diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_video_refresh.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_video_refresh.png new file mode 100644 index 0000000000000000000000000000000000000000..7f021fc1a97e2b0ee18ecd3d7c86e2b662a70f5f GIT binary patch literal 3569 zcmV002t}1^@s6I8J)%00001b5ch_0Itp) z=>Px?t4TybRCod9TnTg&#~I#TS%+;T*_Lcewy8N1%u66niW?{f8puf?kOMaj zNt3iMNg+2aIhr0hT3$mRgr;fIq=6UbzzKx&K^jOL3WgATVz4dQGT0K9WMNCPwA+6~ zSJ{ zl~YvW^)j!(ua+Z5=m^p%!Jk{8RBP?M4r|PS#SE5z5NDWYVWtBIa!fwp-!ijRDykMe`F!?1pGChpG2jU=|gy(Fl!Hr?Buc zh1Gf?E=v|6*)XF|QKzI|?6q6#gv!~xumB+UfMk5XhIL*7OAzn(s=HQZJolTY^W!Zi zm_Jz9&kcEn(}MH4-yy+54yWIbVh9zNAf9Oi)Ccvf&8ajdq|AFyJmp8Pan``dQa|TPrQ0>fz3(C~9Me zv9S{I4a|7s#%b>YGzMjkNdmO%Hf&>^c9S(=D^ITWokLQ+Y;nxaS zv>4WDsj2eC*DuU0EuA%P@4kZV+itho{9q{*+ESP<=SN8_x>{{* zU7xx0{KZIsp)u>snHDEa(~Lr)kc0x)V9+NmS+Yp`)t6si=<2q_ZQ%{BloJIC{a`88 zX*a{jStuHX7zm>Q>{!i-p2asV`*!n|H#=V6@()u>ORIx~z5CqU>?Daq!m~=1N-4eN zmK(;`oH%JS8cm`%Bf>U;q-0Kqb%!4;l}hsffE9898J3ZV!bpIbOznN|SANuuSPu*g zFtv5{{oAW{SgJnx?3^LnAf1?>hjzCEpuu=1nK!RYvt!5ZF1y|C6QNRA5)hP@H$nda zg$`-pIC~IQnn2;UZIzZakFTqPpkmbH&Dpap?o}1{H9Yd@6Q^7*H?P~JrliQ&)*kRmCf_S+*@tJSK&SoOshUv@29u`29tO|<;kdK9<~qi!2M7NAf= zXoe;Zefbq{aXn+k^i;NyxZY@yrohE)B>7Z-bp#z=3p~lm$x@|q99EwT26+Fe;DC^^ zn&>ch4(hf!27?@Dd(e#04}aLK3;8&dgbXZ2dM?<#HoFb`5+oRej&}1Puyi_|thT-Z zwGYda08VKiaKhHVKdgM`@~o`Pz|P3lZI#AH*F1F=i?(5y$mH@tUC!h6V2!L&=s
        8bWx3_ojLcK*r1xozh^k9wVTwBW9wt`bQ zF030IBw+%uNaJA9;&XQG-p5;$L6noaVaXz1L&S3zrc6vsq-M@6;mJ4*(Np2tVsl9o zg)R+=B^RRm{PV*OyWPPv|2tPM*9+Cfm3QCjicGm&76{cKzPonq;W?>8mPInBDRjHa ze`#pQ+%7Rd-t-rT_}(-ePE)VAeW@0c2p$^9&X-{(@E5c zOVcgft{O5k4ud~!*k}rlfIhb7;fd+mbj*s;Cznx1MtUNIeT!k=FyOFq%f+N0xc}a)n{Qgo>*8o< z=;c>8V4bwU$M)mn2MgWTgQx~CrY%N!F3pR-d#M$52X5Zn5Y9C|CZz{Rhtfb<-A}MRUu=q``>Jx3@HX zgJ=UYh$=-hfP3Sjq49LTTqg5fb>&Rnw2n3wR<2m4(`Aj996frX*X53Ge7Sx3t=c!X zY@BjU>8wGMMN`vh$MTgwt%aC8@5d1X5SNA|sE^nD>KFcQ7#Kgw%E}TNn>*iw=+GcV zxWr=8FTeEL{1wZW<_OWU2R`=f-fyWs@*juM*zQ5w@hG6D(`U*i7ZxR!FPN(-n{%yJ z$60f7d7VAm+Pi$^s&Cud%{-TdTSrV9mN>LjBDtfjt=?~~0k9A=eNN%6umSL(7{-xk zR^MBZ`OH&m3!oeEx{eSX0#GiOhupU3(m+JC`<~Sg);paSv5r$n21Sy4J4{V4vho7m z5M^jmr=F!5=VC|>T4%8YV&AYO@2olTP0y7xXDHQb{!|~#6P=hrarEGP?l;4|%^m2D${wb^WH+RA>jZ$Yq7p+39tX;|mYV=Ml@yh)O3DVUhGTIhd6gq)dD zR0$gZVXO|`Xa^jo6t_%5J|_ee(w#TJa~p$hsVg6OEcEf5`ucgXly(h zsvRN0LIk}ws})_ohJz!sLoxWid>J>5&s2CM9X3oL&&4c*X;NA;f;V& zCXr7<)FmpvEu`xp1O~dYf-YZ!OR-F-d@SXmt_K#iK3bqq+oHBCR2hB=ro+^@2{vpt zf-vk0S0rON9yFMj&Yu2EEI=W>VzMl5LoVI*A=bqsq{EeiGmZQxilP48-rl%N4Bw~* zcp=6PoArE#cETQ?&yxq`2BA8mDGzz(G6}UdoF5fQU(uGuW$eFG3|D1G+X+IXBMcpA zhy1OAiMq;Ao;kNI;nG;ZLITj8Vsup&-2jD&KpIZyaFxNhdLU7**c2Q+5Gx-WSgZo* zsw}zz3ZUHppkWUpvT{Pb(ZmB|(|%ck)BPoaf#4#U$ zo5beF>kZxQJi(BAr4ni<8#Bi(D{f$M70t~p%p34Aa~YB>AsMCsz>CRc;qv08VW${v zfTDdpv|WW<8(ul)k6{6et20~#9oOUZO@kxGm;M7TNx*d&#sIsEa&A3t8oHJb6g7jR rV}c>u#E?ugnM55&Tk70;@lO92soyXLngFpK00000NkvXXu0mjfYt6-K literal 0 HcmV?d00001 diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_video.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_video.xml index 0eebfbca02..f3a814efb8 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_road_video.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_video.xml @@ -28,7 +28,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:scaleType="centerCrop" /> + android:scaleType="centerCrop" + android:src="@drawable/v2x_event_video_refresh"/> @@ -75,7 +76,7 @@ android:layout_height="@dimen/dp_56" android:layout_centerHorizontal="true" android:layout_centerVertical="true" - android:indeterminateDrawable="@drawable/video_loading_bg" + android:indeterminateDrawable="@drawable/video_loading_img" android:visibility="gone" />