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 116451e807..73be8f41e4 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
@@ -11,6 +11,7 @@ import android.view.WindowManager
import androidx.appcompat.widget.AppCompatTextView
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+import com.mogo.och.common.module.wigets.OCHGradientTextView
import com.mogo.och.taxi.passenger.R
/**
@@ -31,11 +32,16 @@ object FloatingDistanceInfoUtils {
private var overlayView: View?=null
- private var actvDistancew: AppCompatTextView?=null
+ // 距离
+ private var actvDistancew: OCHGradientTextView?=null
+ // 距离单位
private var actvDistancewUnit: AppCompatTextView?=null
- private var actvSurplusTime: AppCompatTextView?=null
- private var actvArrivedTime: AppCompatTextView?=null
- private var actvSpeed: AppCompatTextView?=null
+ // 剩余时间
+ private var actvSurplusTime: OCHGradientTextView?=null
+ // 到达时间
+ private var actvArrivedTime: OCHGradientTextView?=null
+
+ private var actvSpeed: OCHGradientTextView?=null
/**
@@ -66,6 +72,25 @@ object FloatingDistanceInfoUtils {
actvSurplusTime = view.findViewById(R.id.actv_surplus_time)
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)
+ )
+
+ actvSpeed?.setVertrial(true)
+ actvSpeed?.setmColorList(intArrayOf)
+
+ actvDistancew?.setVertrial(true)
+ actvDistancew?.setmColorList(intArrayOf)
+
+ actvSurplusTime?.setVertrial(true)
+ actvSurplusTime?.setmColorList(intArrayOf)
+
+ actvArrivedTime?.setVertrial(true)
+ actvArrivedTime?.setmColorList(intArrayOf)
+
+
+
// 如果正在展示中,并且lastOverlayView不为null,先做移除操作,保证覆盖在最上面的View只有一个,防止叠加导致无法移除
dismissOverlayView()
@@ -90,13 +115,14 @@ object FloatingDistanceInfoUtils {
it.alpha = 1.0f
it.gravity = Gravity.END or Gravity.TOP
it.x = 0
- it.y = 0
+ it.y = 199
it.format = PixelFormat.RGBA_8888
// 设置窗口类型为应用子窗口,和PopupWindow同类型
it.type = WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL
// 没有边界限制,允许窗口扩展到屏幕外
it.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS or
+ WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or
WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
if (ani != -1) {
it.windowAnimations = ani
@@ -115,7 +141,7 @@ object FloatingDistanceInfoUtils {
fun setDistance(remainDis: String?, disUnit: String, time: Int, arriveTime: String) {
UiThreadHandler.getsUiHandler().post {
actvDistancew?.text = "$remainDis"
- actvDistancewUnit?.text = disUnit
+ actvDistancewUnit?.text = "距离($disUnit)"
actvSurplusTime?.text = "$time"
actvArrivedTime?.text = arriveTime
}
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_taxi_p_arrived_info.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_taxi_p_arrived_info.png
new file mode 100644
index 0000000000..ebe94ecd52
Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_taxi_p_arrived_info.png differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_arrived_info.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_arrived_info.png
new file mode 100644
index 0000000000..ebe94ecd52
Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_taxi_p_arrived_info.png differ
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml
index 4bed9867fd..e97ad25151 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_p_video_bg.xml
@@ -1,5 +1,6 @@
-
+
+
\ No newline at end of file
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 f417a51bd4..1093f4319a 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
@@ -67,9 +67,14 @@
+ app:yOffset="0px">
-
-
-
-
-
-
-
+ android:layout_weight="1"
+ android:gravity="center"
+ android:layout_height="0dp">
+
-
+
+
+
+
+
+ app:layout_constraintStart_toStartOf="parent"/>
+
-
-
-
+
+ app:layout_constraintStart_toStartOf="parent"/>
-
-
+
+
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml
index 0627d9585c..f69881eed0 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml
@@ -53,5 +53,7 @@
#4DFFFFFF
#FFFFFF
-
+ #8FB3EF
+ #E1F3FE
+ #FFFFFF
\ No newline at end of file