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 e08f4a5d00..513a22cd8d 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 @@ -8,11 +8,10 @@ import android.view.Gravity import android.view.LayoutInflater import android.view.View import android.view.WindowManager -import androidx.appcompat.widget.AppCompatImageView +import androidx.appcompat.widget.AppCompatTextView import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.taxi.passenger.R -import com.mogo.och.taxi.passenger.ui.leftmenu.ItemViewTouchListener -import io.reactivex.disposables.Disposable import java.lang.Exception /** @@ -33,6 +32,13 @@ object FloatingDistanceInfoUtils { private var overlayView: View?=null + private var actvDistancew: AppCompatTextView?=null + private var actvDistancewUnit: AppCompatTextView?=null + private var actvSurplusTime: AppCompatTextView?=null + private var actvArrivedTime: AppCompatTextView?=null + private var actvSpeed: AppCompatTextView?=null + + /** * 添加覆盖View在Activity上面 */ @@ -55,6 +61,11 @@ object FloatingDistanceInfoUtils { or View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) layoutParams(ani) + actvSpeed = view.findViewById(R.id.actv_speed) + actvDistancew = view.findViewById(R.id.actv_distancew) + actvDistancewUnit = view.findViewById(R.id.actv_distancew_unit) + actvSurplusTime = view.findViewById(R.id.actv_surplus_time) + actvArrivedTime = view.findViewById(R.id.actv_arrived_time) // 如果正在展示中,并且lastOverlayView不为null,先做移除操作,保证覆盖在最上面的View只有一个,防止叠加导致无法移除 dismissOverlayView() @@ -94,6 +105,21 @@ object FloatingDistanceInfoUtils { } } + fun setSpeed(speed: Float) { + UiThreadHandler.getsUiHandler().post { + actvSpeed?.text = "$speed" + } + } + + fun setDistance(remainDis: String?, disUnit: String, time: Int, arriveTime: String) { + UiThreadHandler.getsUiHandler().post { + actvDistancew?.text = "$remainDis" + actvDistancewUnit?.text = disUnit + actvSurplusTime?.text = "$time" + actvArrivedTime?.text = arriveTime + } + } + /** * 移除覆盖View在Activity上面 */ diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt index 3224717fc9..2f764925ca 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt @@ -5,17 +5,12 @@ import android.content.Intent import android.graphics.Bitmap import android.graphics.Color import android.graphics.drawable.BitmapDrawable -import android.os.Build import android.os.Bundle import android.view.View -import android.view.WindowManager import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.AppCompatImageView import androidx.constraintlayout.widget.ConstraintLayout -import androidx.core.view.WindowCompat -import androidx.core.view.WindowInsetsCompat -import androidx.core.view.WindowInsetsControllerCompat import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy @@ -33,7 +28,6 @@ import com.mogo.och.taxi.passenger.ui.video.layoutmanage.CarouselLayoutManager import com.mogo.och.taxi.passenger.ui.video.layoutmanage.CarouselZoomPostLayoutListener import com.mogo.och.taxi.passenger.ui.video.layoutmanage.CenterScrollListener import com.mogo.och.taxi.passenger.utils.FixMemoryLeak -import com.mogo.och.taxi.passenger.utils.PermissionUtil import com.mogo.och.taxi.passenger.utils.blur.GlideBlurTransform import com.mogo.och.taxi.passenger.widget.ConsultVideoPlayer import com.mogo.och.taxi.passenger.widget.indicator.IndicatorView @@ -97,8 +91,10 @@ class VideoActivity : AppCompatActivity() { //到达时间 val arriveTime = DateTimeUtil.formatCalendarToString(beforeTime, DateTimeUtil.TAXI_HH_mm) System.err.println("------剩余公里$remainDis$disUnit----剩余分钟:$time------到达时间:$arriveTime") + FloatingDistanceInfoUtils.setDistance(remainDis,disUnit,time,arriveTime) }else{ System.err.println("速度----$speed") + FloatingDistanceInfoUtils.setSpeed(speed) } } }