From 9c29ff0f35c85fa78b50de4c0aee75168d4fba4c Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 25 Jul 2022 14:46:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxi/passenger/ui/video/FloatingDistanceInfoUtils.kt | 4 ++-- .../mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt | 7 ++++++- .../src/main/res/drawable/taxi_video_order_process.xml | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FloatingDistanceInfoUtils.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FloatingDistanceInfoUtils.kt index a483f93e4e..c5f8d6ad39 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FloatingDistanceInfoUtils.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/FloatingDistanceInfoUtils.kt @@ -78,8 +78,8 @@ object FloatingDistanceInfoUtils { actvArrivedTime = view.findViewById(R.id.actv_arrived_time) val intArrayOf = intArrayOf( - context.resources.getColor(R.color.taxi_p_video_gradient_start), - context.resources.getColor(R.color.taxi_p_video_gradient_end) + context.resources.getColor(R.color.taxi_p_video_gradient_end), + context.resources.getColor(R.color.taxi_p_video_gradient_start) ) actvSpeed?.setVertrial(true) 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 eefc1dbe12..4b46f036bf 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.graphics.drawable.GradientDrawable import android.os.Build import android.util.AttributeSet import android.util.TypedValue @@ -94,11 +95,15 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { val layoutParams = mTopContainer.layoutParams as ConstraintLayout.LayoutParams layoutParams.height = 320 mTopContainer.layoutParams = layoutParams + val background = layoutBottom.background as GradientDrawable + val x = arrayOf(12f, 12f,12f, 12f,12f, 12f,12f, 12f) + background.cornerRadii = x.toFloatArray() + layoutBottom.background = background 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) + layoutParams1.marginStart = 80 titleTextView.layoutParams = layoutParams1 aivStartPlay.scaleX = 1f aivStartPlay.scaleY = 1f diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_order_process.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_order_process.xml index 9141b27a36..b3c6d5d088 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_order_process.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_video_order_process.xml @@ -18,7 +18,7 @@ - +