From 0636f5a9c8c6969af08e03f438a6e68690e4ebab Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Sat, 11 Mar 2023 17:48:11 +0800
Subject: [PATCH] =?UTF-8?q?[M2]=201=E3=80=81=E8=A7=86=E9=A2=91=E5=B0=81?=
 =?UTF-8?q?=E9=9D=A2=E6=9A=82=E5=8F=AA=E5=8A=A0=E8=BD=BD=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=9B=BE=20=202=E3=80=81=E6=9A=82=E6=97=B6=E5=85=B3=E6=8E=89?=
 =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/widget/video/AdvanceVideoView.kt       | 27 ++++++++++---------
 .../module/wigets/video/VideoPlayerView.kt    |  5 ++--
 app/build.gradle                              |  4 +--
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt
index d97e706582..d41aca1126 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt
@@ -86,24 +86,25 @@ class AdvanceVideoView @JvmOverloads constructor(
 
     private fun loadCacheImg() {
         //        BitmapHelper.getVideoThumbnail(path) /*获取第一帧图*
-        videoViewPlayer?.thumbImageView = cacheImage
-        cacheImage?.setImageResource(R.drawable.m2_p_video_holder)
-        setCacheImageViewVisible()
 //        OCHThreadPoolManager.getsInstance().execute {
 //            var bitmap = BitmapHelper.getVideoThumbnail(fileNetPath)
             Logger.d(ImageAndVideoRotation.TAG, "setVideoPath")
 //            ThreadUtils.runOnUiThread {
 //                Logger.d(ImageAndVideoRotation.TAG, "bitmap加载")
-                cacheImage?.let {
-                    Glide.with(context).load(cacheImageUrl)
-                        .apply(
-                            RequestOptions().placeholder(R.drawable.m2_p_video_holder)
-                                .error(R.drawable.m2_p_video_holder)
-                                .fallback(R.drawable.m2_p_video_holder)
-                                .centerCrop()
-                        )
-                        .into(it)
-                }
+        cacheImage?.setImageResource(R.drawable.m2_p_video_holder)
+//        cacheImage?.let { //暂时去掉加载首帧图，加载视频时，用本地默认图
+//                    Glide.with(context).asBitmap().load(cacheImageUrl)
+//                        .apply(
+//                            RequestOptions().useUnlimitedSourceGeneratorsPool(true)
+//                                .placeholder(R.drawable.m2_p_video_holder)
+//                                .error(R.drawable.m2_p_video_holder)
+//                                .fallback(R.drawable.m2_p_video_holder)
+//                                .centerCrop()
+//                        )
+//                        .into(it)
+//                }
+        videoViewPlayer?.thumbImageView = cacheImage
+        setCacheImageViewVisible()
 //            }
 //        }
     }
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerView.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerView.kt
index 272e483d38..e7a306d261 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerView.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerView.kt
@@ -96,9 +96,10 @@ class AdvanceVideoView @JvmOverloads constructor(
         setCacheImageViewVisible()
         Logger.d(ImageVideoRotationView.TAG, "setVideoPath")
         cacheImage?.let {
-            Glide.with(context).load(cacheImageUrl)
+            Glide.with(context).asBitmap().load(cacheImageUrl)
                 .apply(
-                    RequestOptions().placeholder(R.drawable.video_holder)
+                    RequestOptions().useUnlimitedSourceGeneratorsPool(true)
+                        .placeholder(R.drawable.video_holder)
                         .error(R.drawable.video_holder)
                         .fallback(R.drawable.video_holder)
                         .centerCrop()
diff --git a/app/build.gradle b/app/build.gradle
index 1f802cc097..8803c9b601 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ def isReleaseBuild = isReleaseBuild()
 if (!isAndroidTestBuild()) {
     apply plugin: 'bytex'
     ByteX {
-        enable true
-        enableInDebug true
+        enable false
+        enableInDebug false
         logLevel "DEBUG"
     }
 }