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 2bc83b4e41..0000000000
Binary files a/core/mogo-core-res/src/main/res/drawable/notice_video_pause.png and /dev/null differ
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 402c1def01..0000000000
Binary files a/core/mogo-core-res/src/main/res/drawable/placeholder.png and /dev/null differ
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