From 19ca7298ec6d091a2a73b04c1137a2ec08b0f7b5 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@ybm100.com>
Date: Fri, 22 Jul 2022 21:15:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/leftmenu/OverlayLeftViewUtils.kt       |   2 +-
 .../och/taxi/passenger/utils/ZoomDrawable.kt  |  21 +++++++++
 .../passenger/widget/ConsultVideoPlayer.kt    |  44 +++++++++++-------
 .../bg_taxi_p_video_index.png                 | Bin 0 -> 5600 bytes
 .../drawable-xhdpi/bg_taxi_p_video_index.png  | Bin 0 -> 5600 bytes
 .../res/drawable/bg_taxi_p_video_index.xml    |   6 ---
 .../res/drawable/taxi_video_seekbar_style.xml |   2 +-
 .../layout/taxi_p_arrived_mogo_consult.xml    |   4 +-
 .../src/main/res/layout/taxi_p_video_show.xml |   5 +-
 9 files changed, 55 insertions(+), 29 deletions(-)
 create mode 100644 OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/ZoomDrawable.kt
 create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_taxi_p_video_index.png
 create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_video_index.png
 delete mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_index.xml

diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt
index 5060724913..bb083da531 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt
@@ -157,7 +157,7 @@ object OverlayLeftViewUtils {
                     if(isCurrentProcess) {
                         close(view, windowManager)
                         val sumDis = SharedPrefsMgr.getInstance(context).getInt(TaxiPassengerConst.SP_KEY_ORDER_SUM_DIS, 0)
-                        VideoActivity.startActivity(context, VideoActivity.VIDEOTYPE_CONSULT,sumDis)
+                        VideoActivity.startActivity(context, VideoActivity.VIDEOTYPE_MOIES,sumDis)
                     }
                 }
             }
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/ZoomDrawable.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/ZoomDrawable.kt
new file mode 100644
index 0000000000..12776a6d7f
--- /dev/null
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/ZoomDrawable.kt
@@ -0,0 +1,21 @@
+package com.mogo.och.taxi.passenger.utils
+
+import android.content.Context
+import android.graphics.*
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import androidx.annotation.DrawableRes
+
+object ZoomDrawable {
+    fun zoomDrawableImage(context: Context,@DrawableRes id:Int,scaleX:Float,scaleY:Float):Drawable{
+
+        val bitmap: Bitmap = BitmapFactory.decodeResource(context.resources, id)
+        val bitmapWidth = bitmap.width
+        val bitmapHeight = bitmap.height
+        val matrix = Matrix()
+        matrix.postScale(scaleX, scaleY)
+        // 产生缩放后的Bitmap对象
+        val resizeBitmap = Bitmap.createBitmap(bitmap, 0, 0, bitmapWidth, bitmapHeight, matrix, true)
+        return BitmapDrawable(context.resources,resizeBitmap)
+    }
+}
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt
index bcd7611004..eefc1dbe12 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt
@@ -3,6 +3,7 @@ package com.mogo.och.taxi.passenger.widget
 import android.app.Activity
 import android.content.Context
 import android.graphics.Color
+import android.os.Build
 import android.util.AttributeSet
 import android.util.TypedValue
 import android.view.Gravity
@@ -14,13 +15,14 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.view.marginTop
+import androidx.core.app.ActivityCompat
 import com.mogo.eagle.core.utilcode.util.TimeTransformUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider
 import com.mogo.och.taxi.passenger.R
 import com.mogo.och.taxi.passenger.ui.leftmenu.OverlayLeftViewUtils
 import com.mogo.och.taxi.passenger.ui.video.FullVideoUtils
+import com.mogo.och.taxi.passenger.utils.ZoomDrawable
 import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack
 import com.shuyu.gsyvideoplayer.utils.GSYVideoType
 import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer
@@ -74,6 +76,8 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
         GSYVideoType.setShowType(GSYVideoType.SCREEN_TYPE_FULL)
         aivStartPlay.scaleX = 0.8f
         aivStartPlay.scaleY = 0.8f
+
+        mProgressBar.thumb = ZoomDrawable.zoomDrawableImage(context,R.drawable.bg_taxi_p_video_index,0.66f,0.66f)
     }
 
     private fun addDrageAnchor(){
@@ -82,8 +86,30 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
         layoutBottom.post {
             val layoutParams = layoutBottom.layoutParams as ConstraintLayout.LayoutParams
             layoutParams.setMargins(333,0,333,90)
+            layoutParams.height = 148
             layoutBottom.layoutParams = layoutParams
         }
+
+        mTopContainer.post {
+            val layoutParams = mTopContainer.layoutParams as ConstraintLayout.LayoutParams
+            layoutParams.height = 320
+            mTopContainer.layoutParams = layoutParams
+
+            fullscreenButton.setPadding(92,0,92,0)
+            titleTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, 50f)
+            val layoutParams1 = titleTextView.layoutParams as ConstraintLayout.LayoutParams
+            layoutParams1.setMargins(80,0,0,0)
+            titleTextView.layoutParams = layoutParams1
+            aivStartPlay.scaleX = 1f
+            aivStartPlay.scaleY = 1f
+            val drawable = ActivityCompat.getDrawable(context, R.drawable.bg_taxi_p_video_index)
+            mProgressBar.thumb = drawable
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                mProgressBar.maxHeight = 6
+                mProgressBar.minHeight = 6
+            }
+        }
+
     }
 
     override fun getLayoutId(): Int {
@@ -240,21 +266,6 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
         }
     }
 
-    fun fullMarainTop(){
-        if(mIfCurrentIsFullscreen&&smalllPlayer!=null) {
-            if(mTopContainer.marginTop==0) {
-                val layoutParams = mTopContainer.layoutParams as ConstraintLayout.LayoutParams
-                layoutParams.height = 336
-                mTopContainer.layoutParams = layoutParams
-                fullscreenButton.setPadding(80,0,80,0)
-                titleTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, 50f)
-                titleTextView.setPadding(30,0,0,0)
-                aivStartPlay.scaleX = 1f
-                aivStartPlay.scaleY = 1f
-            }
-        }
-    }
-
     override fun setViewShowState(view: View?, visibility: Int) {
         if (view === mThumbImageViewLayout && visibility != View.VISIBLE) {
             return
@@ -264,7 +275,6 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
 
     override fun onSurfaceAvailable(surface: Surface) {
         super.onSurfaceAvailable(surface)
-        fullMarainTop()
         if (GSYVideoType.getRenderType() != GSYVideoType.TEXTURE) {
             if (mThumbImageViewLayout != null && mThumbImageViewLayout.visibility == View.VISIBLE) {
                 mThumbImageViewLayout.visibility = View.INVISIBLE
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_taxi_p_video_index.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_taxi_p_video_index.png
new file mode 100644
index 0000000000000000000000000000000000000000..61f22d3bf00f362deadb53bc21dc2a706a17fe6c
GIT binary patch
literal 5600
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

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_video_index.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_video_index.png
new file mode 100644
index 0000000000000000000000000000000000000000..61f22d3bf00f362deadb53bc21dc2a706a17fe6c
GIT binary patch
literal 5600
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

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_index.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_index.xml
deleted file mode 100644
index 98435cd0f6..0000000000
--- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_index.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/taxi_order_status_textColor"/>
-    <size android:width="24px" android:height="24px"/>
-</shape>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml
index 8aba3ae55c..597931f974 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_seekbar_style.xml
@@ -19,7 +19,7 @@
         <scale android:scaleWidth="100%">
             <shape>
                 <corners android:radius="5px"/>
-                <gradient android:startColor="#2972FF" android:endColor="#27C8FF"/>
+                <gradient android:startColor="#303CFF" android:centerColor="#216CFF" android:endColor="#25C1F9"/>
             </shape>
         </scale>
     </item>
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml
index 4e678150ba..2e59db6a7f 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_mogo_consult.xml
@@ -13,8 +13,8 @@
         android:src="@drawable/taxi_p_mogo_consult_title_icon"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginTop="@dimen/dp_130"
-        android:layout_marginStart="@dimen/dp_100"
+        android:layout_marginTop="157px"
+        android:layout_marginStart="120px"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml
index f78b22a632..1ab60fe003 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_video_show.xml
@@ -55,8 +55,8 @@
             android:id="@+id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintTop_toTopOf="@+id/fullscreen"
-            app:layout_constraintBottom_toBottomOf="@+id/fullscreen"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             android:layout_marginStart="40px"
             android:textColor="@android:color/white"
@@ -113,6 +113,7 @@
             android:max="100"
             android:maxHeight="4px"
             android:minHeight="4px"
+            android:splitTrack="false"
             android:progressDrawable="@drawable/taxi_video_seekbar_style"
             android:thumb="@drawable/bg_taxi_p_video_index" />