From 430388b61ed582209dfddcc8dc529797b8ba28a6 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Tue, 13 Oct 2020 14:17:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87+=E8=A7=86=E9=A2=91(=E6=97=A0?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E5=92=8C=E6=9A=82=E5=81=9C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/StrategyServiceModel.kt             |  3 +-
 .../scene/road/V2XRoadVideoWindow.java        | 15 ++++++--
 .../res/drawable/v2x_bg_big_image_dark.xml    |  9 +++++
 .../src/main/res/layout/window_road_video.xml | 34 +++++++++++++------
 4 files changed, 47 insertions(+), 14 deletions(-)
 create mode 100644 modules/mogo-module-v2x/src/main/res/drawable/v2x_bg_big_image_dark.xml

diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/StrategyServiceModel.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/StrategyServiceModel.kt
index f4755ff79c..8891def0ee 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/StrategyServiceModel.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/model/StrategyServiceModel.kt
@@ -40,7 +40,8 @@ class StrategyServiceModel : BaseRepository() {
 //            }
 //        }
 //
-//    suspend fun getSplashConfig(): BaseResponse<SplashConfig> {
+//    suspend fun getSplashConfig(): BaseR
+//    esponse<SplashConfig> {
 //        return apiCall {
 //            var splashConfigRequest =
 //                SplashConfigRequest("1", "1")
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 6514dc0a30..7a2f4a6c41 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
@@ -21,6 +21,7 @@ import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.listener.V2XWindowStatusListener;
 import com.mogo.module.v2x.scenario.view.IV2XWindow;
 import com.mogo.module.v2x.view.TextureVideoView;
+import com.mogo.service.imageloader.MogoImageView;
 import com.mogo.utils.logger.Logger;
 
 import java.util.ArrayList;
@@ -36,6 +37,7 @@ 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);
@@ -57,6 +59,7 @@ 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();
@@ -74,8 +77,10 @@ public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow, ID
             if (path == null) {
                 return;
             }
-            mVideoView.setVideoPath(path);
-            if (path != null) {
+            if (path.contains(".mp4")) {
+                mVideoView.setVisibility(VISIBLE);
+                bigImage.setVisibility(View.GONE);
+                mVideoView.setVideoPath(path);
                 mVideoView.setOnPreparedListener(mediaPlayer -> {
                     Logger.w(MODULE_NAME, "全屏准备。。。。。");
                 });
@@ -86,7 +91,13 @@ public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow, ID
                     }
                 });
                 mVideoView.start();
+            } else {
+                bigImage.setVisibility(View.VISIBLE);
+                mVideoView.setVisibility(View.GONE);
+                V2XServiceManager.getImageLoader()
+                        .displayImage(path, bigImage);
             }
+
         }
     }
 
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_bg_big_image_dark.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_bg_big_image_dark.xml
new file mode 100644
index 0000000000..318b24d43d
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_bg_big_image_dark.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <gradient android:angle="180" android:endColor="#FFFFFF" android:startColor="#FFFFFF" />
+            <corners android:radius="@dimen/dp_28" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_video.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_video.xml
index a145599956..8f97e4af0e 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_road_video.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_video.xml
@@ -14,16 +14,17 @@
         android:layout_margin="@dimen/dp_30"
         app:roundLayoutRadius="@dimen/dp_28">
 
-        <com.mogo.module.v2x.view.TextureVideoView
-            android:id="@+id/roadVideoView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/live_video_progress_bar_loading_color"
-            android:clickable="false"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"></com.mogo.module.v2x.view.TextureVideoView>
+    <com.mogo.module.v2x.view.TextureVideoView
+        android:id="@+id/roadVideoView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/live_video_progress_bar_loading_color"
+        android:clickable="false"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
             android:id="@+id/roadVideoClose"
@@ -33,7 +34,18 @@
             android:layout_alignRight="@+id/roadVideoView"
             android:src="@drawable/v2x_panel_close" />
 
+    </com.mogo.module.v2x.view.TextureVideoView>
 
-    </com.mogo.module.v2x.view.RoundLayout>
+    <com.mogo.service.imageloader.MogoImageView
+        android:id="@+id/big_image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="@dimen/dp_30"
+        android:background="@drawable/v2x_bg_big_image_dark"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 </RelativeLayout>
\ No newline at end of file