From f10a6b11094c6c42b11018126653965a02aac944 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Fri, 5 Nov 2021 15:25:54 +0800
Subject: [PATCH] opt

---
 .../core/function/hmi/ui/notice/NoticeCheckDialog.kt  |  9 +++++++--
 .../function/hmi/ui/notice/NoticeTrafficDialog.java   |  1 -
 .../widget/media/video/NoticeSimpleVideoPlayer.kt     | 11 +++++------
 3 files changed, 12 insertions(+), 9 deletions(-)

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 6137d4249b..d282396ae4 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
@@ -13,11 +13,9 @@ import com.mogo.eagle.core.widget.media.video.NoticeSimpleVideoPlayer
 import com.mogo.module.common.dialog.BaseFloatDialog
 import com.mogo.utils.BitmapHelper
 import com.mogo.utils.glide.GlideApp
-import com.mogo.utils.logger.Logger
 import com.shuyu.gsyvideoplayer.GSYVideoManager
 import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder
 import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack
-import com.shuyu.gsyvideoplayer.video.base.GSYVideoView
 
 
 /**
@@ -67,6 +65,12 @@ class NoticeCheckDialog(context: Context) : BaseFloatDialog(context) {
         }
     }
 
+
+    override fun dismiss() {
+        super.dismiss()
+        stopLive()
+    }
+
     /**
      * 展示详情页面
      */
@@ -200,4 +204,5 @@ class NoticeCheckDialog(context: Context) : BaseFloatDialog(context) {
     }
 
 
+
 }
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java
index 43eb4d3615..14ad6fd81d 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java
@@ -20,7 +20,6 @@ import com.mogo.eagle.core.function.api.notice.NoticeNetCallBack;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
 import com.mogo.eagle.core.function.call.notice.CallerNoticeManager;
 import com.mogo.eagle.core.function.hmi.R;
-import com.mogo.eagle.core.widget.media.video.NoticeSimpleSmallVideoPlayer;
 import com.mogo.eagle.core.widget.media.video.NoticeSimpleVideoPlayer;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.dialog.BaseFloatDialog;
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 725ef4b17e..311b231698 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
@@ -63,13 +63,12 @@ class NoticeSimpleVideoPlayer : StandardGSYVideoPlayer {
 
     override fun getLayoutId(): Int {
         Log.d("liyz", "NoticeSimpleVideoPlayer --- getLayoutId type = " + SharedPrefs.getInstance(context).getInt("videoType", 0))
-        if (SharedPrefs.getInstance(context).getInt("videoType", 0) == 1) { //大播放器
-            return R.layout.item_notice_video
-        }
+//        if (SharedPrefs.getInstance(context).getInt("videoType", 0) == 1) { //大播放器
+//            return R.layout.item_notice_video
+//        }
+//        return R.layout.item_notice_video_small
 
-        return R.layout.item_notice_video_small
-
-//        return R.layout.item_notice_video
+        return R.layout.item_notice_video
     }
 
     override fun getGSYVideoManager(): GSYVideoViewBridge {