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 f8eb5d491c..66b2443c5d 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
@@ -54,11 +54,16 @@ class NoticeCheckDialog(context: Context) : BaseFloatDialog(context) {
}
playImageView!!.setOnClickListener {
- if (pushVideo!!.currentState == GSYVideoView.CURRENT_STATE_PAUSE) { /*播放中*/
- resume()
- } else {
- pause()
- }
+// if (pushVideo!!.currentState == GSYVideoView.CURRENT_STATE_PAUSE) { /*播放中*/
+// resume()
+// } else {
+// pause()
+// }
+
+ playVideo(mVideoUrl)
+
+ playImageView!!.visibility = View.GONE
+ thumbnailImageView!!.visibility = View.GONE
}
}
@@ -142,10 +147,10 @@ class NoticeCheckDialog(context: Context) : BaseFloatDialog(context) {
* 播放结束后
*/
private fun complete(firstbitmap: Bitmap, path: String) {
+ playImageView!!.visibility = View.VISIBLE
+ playImageView!!.setImageResource(R.drawable.notice_video_play)
thumbnailImageView!!.visibility = View.VISIBLE
thumbnailImageView!!.setImageBitmap(firstbitmap)
- playImageView!!.setImageResource(R.drawable.notice_video_play)
- playImageView!!.visibility = View.VISIBLE
}
private fun startVideoCallBack(path: String) {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_check_with_accessory.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_check_with_accessory.xml
index 53afa2df29..560a232411 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_check_with_accessory.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_check_with_accessory.xml
@@ -97,20 +97,20 @@
+ android:layout_width="100px"
+ android:layout_height="100px"
android:src="@drawable/video_play"
- android:visibility="gone" />
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
")
- mBottomContainer?.visibility = View.INVISIBLE
- mProgressBar?.visibility = View.GONE
}
override fun hideAllWidget() {
super.hideAllWidget()
Log.d("liyz", "hideAllWidget ------> ")
- mBottomContainer?.visibility = View.INVISIBLE
- mProgressBar?.visibility = View.GONE
+ mBottomContainer?.visibility = View.VISIBLE
+ mProgressBar?.visibility = View.VISIBLE
+ start?.visibility = View.VISIBLE
+ start.setImageResource(R.drawable.notice_video_pause)
}
override fun changeUiToPrepareingClear() {
super.changeUiToPrepareingClear()
+ Log.d("liyz", "changeUiToPrepareingClear ------> ")
mBottomContainer?.visibility = View.INVISIBLE
mProgressBar?.visibility = View.GONE
}
override fun changeUiToPlayingBufferingClear() {
super.changeUiToPlayingBufferingClear()
+ Log.d("liyz", "changeUiToPlayingBufferingClear ------> ")
mBottomContainer?.visibility = View.INVISIBLE
mProgressBar?.visibility = View.GONE
@@ -132,19 +135,26 @@ class NoticeSimpleVideoPlayer : StandardGSYVideoPlayer {
override fun changeUiToClear() {
super.changeUiToClear()
+ Logger.d("liyz", "changeUiToClear ------> ")
mBottomContainer?.visibility = View.INVISIBLE
mProgressBar?.visibility = View.GONE
}
override fun changeUiToCompleteClear() {
super.changeUiToCompleteClear()
+ Logger.d("liyz", "changeUiToCompleteClear ------> ")
mBottomContainer?.visibility = View.INVISIBLE
mProgressBar?.visibility = View.GONE
}
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() {
@@ -163,6 +173,12 @@ class NoticeSimpleVideoPlayer : StandardGSYVideoPlayer {
}
override fun onCompletion() {
+ Logger.d("liyz", "onCompletion ------> ")
+ mBottomContainer?.visibility = View.VISIBLE
+ mProgressBar?.visibility = View.VISIBLE
+ start?.visibility = View.VISIBLE
+ start.setImageResource(R.drawable.notice_video_play)
+
isPostBufferUpdate = false
}