From 33006f843f94c5f9bf630915b8864b6abc225c45 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Mon, 19 Oct 2020 19:20:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E8=A7=86=E9=A2=91=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/adapter/holder/V2XRoadEventVH.java    | 32 +++++++++++++------
 .../scene/road/V2XRoadVideoWindow.java        |  8 -----
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java
index 05605ee461..604d7ccc75 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java
@@ -197,15 +197,26 @@ public class V2XRoadEventVH extends V2XBaseViewHolder<V2XEventShowEntity> {
                 mUserInfo = mNoveltyInfo.getUserInfo();
                 if (!ArrayUtils.isEmpty(mNoveltyInfo.getItems())) {
                     String imgUrl = mNoveltyInfo.getItems().get(0).getThumbnail();
+                    String url = mNoveltyInfo.getItems().get(0).getUrl();
                     if (TextUtils.isEmpty(imgUrl)) {
                         imgUrl = mNoveltyInfo.getItems().get(0).getUrl();
                     }
                     if (!TextUtils.isEmpty(imgUrl)) {
                         V2XServiceManager.getImageLoader()
                                 .displayImage(imgUrl, ivEventImg);
+                    }
+                    if (url.contains(".mp4")) {
                         ivEventImg.setOnClickListener(v -> {
                             showRoadVideoInfo(v2XEventShowEntity);
                         });
+                        ivEventPlay.setOnClickListener(v -> {
+                            showRoadVideoInfo(v2XEventShowEntity);
+                        });
+                        ivEventPlay.setVisibility(VISIBLE);
+                    } else {
+                        ivEventImg.setOnClickListener(null);
+                        ivEventPlay.setOnClickListener(null);
+                        ivEventPlay.setVisibility(GONE);
                     }
                 }
                 if (mNoveltyInfo.getUserInfo() != null &&
@@ -277,22 +288,23 @@ public class V2XRoadEventVH extends V2XBaseViewHolder<V2XEventShowEntity> {
     }
 
     /*
-    * 展示事件的图片/视频资源
-    * */
-    private void showRoadVideoInfo(V2XEventShowEntity v2XEventShowEntity){
-        if (v2XEventShowEntity != null){
+     * 展示事件的图片/视频资源
+     * */
+    private void showRoadVideoInfo(V2XEventShowEntity v2XEventShowEntity) {
+        if (v2XEventShowEntity != null) {
             /*
-            * MarkerExploreWay 具体事件
-            * V2XRoadEventEntity 包含MarkerExploreWay 事件的二次封装(tts播报内容  事件类型等)
-            * V2XMessageEntity   三次封装(是否进行事件与本机连线 是否显示通话功能等)
-            * V2XEventShowEntity 包含V2XRoadEventEntity
-            * */
-            Log.d(TAG,"马上展示图片/视频资源全屏");
+             * MarkerExploreWay 具体事件
+             * V2XRoadEventEntity 包含MarkerExploreWay 事件的二次封装(tts播报内容  事件类型等)
+             * V2XMessageEntity   三次封装(是否进行事件与本机连线 是否显示通话功能等)
+             * V2XEventShowEntity 包含V2XRoadEventEntity
+             * */
+            Log.d(TAG, "马上展示图片/视频资源全屏");
             V2XMessageEntity v2XMessageEntity = new V2XMessageEntity<>();
             v2XMessageEntity.setContent(v2XEventShowEntity);
             V2XRoadVideoCarScenario.getInstance().init(v2XMessageEntity);
         }
     }
+
     /**
      * 展示直播信息
      *
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java
index 7a2f4a6c41..7d314f7d9a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java
@@ -37,7 +37,6 @@ public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow, ID
     private V2XWindowStatusListener mV2XWindowStatusListener;
     private TextureVideoView mVideoView;
     private ImageView closeImage;
-    private MogoImageView bigImage;
 
     public V2XRoadVideoWindow() {
         this(V2XServiceManager.getContext(), null);
@@ -59,7 +58,6 @@ public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow, ID
     private void initView(Context context) {
         LayoutInflater.from(context).inflate(R.layout.window_road_video, this);
         mVideoView = findViewById(R.id.roadVideoView);
-        bigImage = findViewById(R.id.big_image);
         closeImage = findViewById(R.id.roadVideoClose);
         closeImage.setOnClickListener(v -> {
             close();
@@ -79,7 +77,6 @@ public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow, ID
             }
             if (path.contains(".mp4")) {
                 mVideoView.setVisibility(VISIBLE);
-                bigImage.setVisibility(View.GONE);
                 mVideoView.setVideoPath(path);
                 mVideoView.setOnPreparedListener(mediaPlayer -> {
                     Logger.w(MODULE_NAME, "全屏准备。。。。。");
@@ -91,11 +88,6 @@ public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow, ID
                     }
                 });
                 mVideoView.start();
-            } else {
-                bigImage.setVisibility(View.VISIBLE);
-                mVideoView.setVisibility(View.GONE);
-                V2XServiceManager.getImageLoader()
-                        .displayImage(path, bigImage);
             }
 
         }