From 800b814e967cbaed8d90854065a8fef6cde1aef3 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 4 Nov 2021 14:07:35 +0800 Subject: [PATCH] opt --- .../hmi/ui/notice/NoticeCheckDialog.kt | 4 ++- .../video_pause.png | Bin .../main/res/drawable-xhdpi/video_play.png} | Bin .../media/video/NoticeSimpleVideoPlayer.kt | 10 ++----- .../dark_clore_close.png | Bin .../res/drawable/notice_seekbar_style.xml | 23 +++++++++++++++ .../main/res/drawable/notice_video_pause.png | Bin 6164 -> 0 bytes .../src/main/res/drawable/placeholder.png | Bin 1869 -> 0 bytes .../src/main/res/drawable/seekbar_style.xml | 27 ------------------ .../src/main/res/layout/item_notice_video.xml | 14 ++------- .../src/main/res/values/dimens.xml | 1 - 11 files changed, 30 insertions(+), 49 deletions(-) rename core/function-impl/mogo-core-function-hmi/src/main/res/{drawable => drawable-xhdpi}/video_pause.png (100%) rename core/{mogo-core-res/src/main/res/drawable/notice_video_play.png => function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/video_play.png} (100%) rename core/mogo-core-res/src/main/res/{drawable => drawable-xhdpi}/dark_clore_close.png (100%) create mode 100644 core/mogo-core-res/src/main/res/drawable/notice_seekbar_style.xml delete mode 100644 core/mogo-core-res/src/main/res/drawable/notice_video_pause.png delete mode 100755 core/mogo-core-res/src/main/res/drawable/placeholder.png delete mode 100644 core/mogo-core-res/src/main/res/drawable/seekbar_style.xml diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt index 66b2443c5d..5bc06e14eb 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt @@ -174,6 +174,9 @@ class NoticeCheckDialog(context: Context) : BaseFloatDialog(context) { Log.d(TAG, "onStartPrepared") } + override fun onPlayError(url: String, vararg objects: Any) { + Log.d(TAG, "onPlayError") + } override fun onPrepared(url: String, vararg objects: Any) {} override fun onClickStartIcon(url: String, vararg objects: Any) {} override fun onClickStartError(url: String, vararg objects: Any) {} @@ -188,7 +191,6 @@ class NoticeCheckDialog(context: Context) : BaseFloatDialog(context) { override fun onTouchScreenSeekVolume(url: String, vararg objects: Any) {} override fun onTouchScreenSeekPosition(url: String, vararg objects: Any) {} override fun onTouchScreenSeekLight(url: String, vararg objects: Any) {} - override fun onPlayError(url: String, vararg objects: Any) {} override fun onClickStartThumb(url: String, vararg objects: Any) {} override fun onClickBlank(url: String, vararg objects: Any) {} override fun onClickBlankFullscreen(url: String, vararg objects: Any) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/video_pause.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/video_pause.png similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable/video_pause.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/video_pause.png diff --git a/core/mogo-core-res/src/main/res/drawable/notice_video_play.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/video_play.png similarity index 100% rename from core/mogo-core-res/src/main/res/drawable/notice_video_play.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/video_play.png diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleVideoPlayer.kt b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleVideoPlayer.kt index 3f1fdcdcdc..9e4980be33 100644 --- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleVideoPlayer.kt +++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleVideoPlayer.kt @@ -136,8 +136,6 @@ class NoticeSimpleVideoPlayer : StandardGSYVideoPlayer { override fun changeUiToClear() { super.changeUiToClear() Logger.d("liyz", "changeUiToClear ------> ") - mBottomContainer?.visibility = View.INVISIBLE - mProgressBar?.visibility = View.GONE } override fun changeUiToCompleteClear() { @@ -150,11 +148,6 @@ class NoticeSimpleVideoPlayer : StandardGSYVideoPlayer { override fun onAutoCompletion() { super.onAutoCompletion() Logger.d("liyz", "onAutoCompletion ------> ") - mProgressBar?.progress = 0 - mBottomContainer?.visibility = View.VISIBLE - mProgressBar?.visibility = View.VISIBLE - start?.visibility = View.VISIBLE - start.setImageResource(R.drawable.notice_video_play) } override fun showWifiDialog() { @@ -226,4 +219,5 @@ class NoticeSimpleVideoPlayer : StandardGSYVideoPlayer { } } } -} \ No newline at end of file +} + diff --git a/core/mogo-core-res/src/main/res/drawable/dark_clore_close.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/dark_clore_close.png similarity index 100% rename from core/mogo-core-res/src/main/res/drawable/dark_clore_close.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/dark_clore_close.png diff --git a/core/mogo-core-res/src/main/res/drawable/notice_seekbar_style.xml b/core/mogo-core-res/src/main/res/drawable/notice_seekbar_style.xml new file mode 100644 index 0000000000..342665c887 --- /dev/null +++ b/core/mogo-core-res/src/main/res/drawable/notice_seekbar_style.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/mogo-core-res/src/main/res/drawable/notice_video_pause.png b/core/mogo-core-res/src/main/res/drawable/notice_video_pause.png deleted file mode 100644 index 2bc83b4e41ec612d163b4391e0cb25750b77ba8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6164 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 F{sV=E);|CM diff --git a/core/mogo-core-res/src/main/res/drawable/placeholder.png b/core/mogo-core-res/src/main/res/drawable/placeholder.png deleted file mode 100755 index 402c1def0125339979c4f3a3b31832e2cb9d6a3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1869 zcma)7X;4#F6po^T3m_^kltrz83pC175fDoWA|s6;pr9mxwrrLPVhD?Xs3o9aKm;Wk z5Fw+oDTrVKk+v+sG8lFgc!7k55V8Wn5RyP|c{3en`ln~+efK-x`R=)Q=DeAk;fZ$B zUT3flfk0@xpFo`kEB2pHO9LQzgLeP|v2wGghmR{r|9_;UqyRG>j|UhP6$LOqKc7OO zeAyvBJ|3jkuV4RHbaiz_qtRhuVUdxMPEJn8k01B-^~GQ??d|PMCbPM@xvQ(IrKP2# zql3X<^!4?DhQ-Cj!^6Xcg@u)sl^`XP$xoj?EiEmrsi~n-seC?PB9V-Zjd8hL2!hyb zc6WDoe}BJNEEWodv$M0))6-K^Q0)YVLzz;eD z4v1VX2MGJ;=jQ=gSPr0r_4DV?fXvO!!5kPA3I#|3ffbMf4@iLsn->=sVFF6Pqf)8V zYBj9D+y9He2FyyO5|{yj4X^?uFu+yN9422P=nr)GAQ=Bm0fDPu;?mL*&^KkNE`#A! zUp94<0&XWo2z+W9#VTdD{D|KQ{0}LSjnltu#VL#_ijgnRm0ZbMEEkKOm7FzkKzk zuCAWiK!4Zt+wXt8f8Wv5+t)Ynad>0|3>9K6$0&%gF*cjS;f#-u|Hb7_Oz?PMu#+e1u|z}svzyOuXGEJ8m|8d6^;GZJ(pq_@ zyfXIXrAX*a{{ZF9n@6$Tw4heg{SgqNJ6%gJtJrHlY4@&)Q^J@~v+Q8;&Wp*9$JZAP z#yG_=4R%$B7K9s5L3{ZS8mg3X=zz$GdL9XOV^&<_uv7Ti}3h9>v~NKfu&SE(!TqPyZW>eeT{s=5=I3rTK)SEQ%{rvdS;VOl5t z+eV4pD2e^Mcg8jmw#T8tfHkeCXs}c8P^J)ueqc^{X}3V)e+`vA=sQHu4+nvrhyI)|OD{EeCFUy&JlZ@dJs)c2 zlvIIu#tW${KqnB13>;G?i;DA;8ygb^=!Ihe#=T^j1yK`cPG*$QazC(xq1TSagGbXf zam)}C*-V_L{O8L^q8pAk`$|j)74k%&vF;SwzKC(vT&+iN!YIX>%Z8%DtfQ z!lW~?AGwD8ok!MAp%>`X!V>#B>r1hzw9QLNS@I`2tts{Ty>!oOs$%gGv!4i!B&uF7 z-ESl!qR<7)OLP$EqU52iF0aWFA&R-8A>`d4ViMaZ&3O^8^O4LwkZ|o&pgtan^)nvK z%Nf+Dco*SkV)(pPS$xXE#VDG}4(Mzr1=Fkd`Mb**!xR2#X2iFoXk`8cl3vlmbp2Uu zt&)E9Zc}E2#iky{^5f<1 Libhp^A9UkyTJcZ` diff --git a/core/mogo-core-res/src/main/res/drawable/seekbar_style.xml b/core/mogo-core-res/src/main/res/drawable/seekbar_style.xml deleted file mode 100644 index 5fbe3746a6..0000000000 --- a/core/mogo-core-res/src/main/res/drawable/seekbar_style.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/mogo-core-res/src/main/res/layout/item_notice_video.xml b/core/mogo-core-res/src/main/res/layout/item_notice_video.xml index 41b1cf8ec9..f907999474 100644 --- a/core/mogo-core-res/src/main/res/layout/item_notice_video.xml +++ b/core/mogo-core-res/src/main/res/layout/item_notice_video.xml @@ -66,12 +66,11 @@ android:layout_width="990px" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:background="@null" android:max="100" android:maxHeight="8px" android:minHeight="8px" - android:thumb="@drawable/notice_player_ic_circle_nor" - android:visibility="visible" /> + android:progressDrawable="@drawable/notice_seekbar_style" + android:thumb="@drawable/notice_player_ic_circle_nor" /> - - - - - - - - - 38px 33px - 190px 76px 16px