diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt index 3eb347961b..415faa3582 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt @@ -17,7 +17,6 @@ import kotlinx.android.synthetic.main.taxi_p_itinerary.view.actv_arrived_time import kotlinx.android.synthetic.main.taxi_p_itinerary.view.actv_distance import kotlinx.android.synthetic.main.taxi_p_itinerary.view.actv_distance_unit import kotlinx.android.synthetic.main.taxi_p_itinerary.view.actv_endstation -import kotlinx.android.synthetic.main.taxi_p_itinerary.view.actv_speed_value import kotlinx.android.synthetic.main.taxi_p_itinerary.view.actv_surplus_time import kotlinx.android.synthetic.main.taxi_p_itinerary.view.actv_surplus_time_unit import kotlinx.android.synthetic.main.taxi_p_itinerary.view.progress_distance @@ -60,7 +59,7 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback val setondColor = ContextCompat.getColor(context, R.color.taxi_p_44C8FF) val thirdColor = ContextCompat.getColor(context, R.color.taxi_p_8AE4ED) val fourceColor = ContextCompat.getColor(context, R.color.taxi_p_C8F3F4) - val bottomColor = ContextCompat.getColor(context, R.color.taxi_p_66476FBE) + val bottomColor = ContextCompat.getColor(context, android.R.color.transparent) gradientDrawable.colors = intArrayOf(firstColor, setondColor, thirdColor, fourceColor) gradientDrawable.orientation = GradientDrawable.Orientation.LEFT_RIGHT @@ -86,9 +85,6 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback viewModel?.setDistanceCallback(this) } - override fun setSpeed(speedValue:String){ - actv_speed_value.text = speedValue - } override fun setEndStation(endStation:String){ if(endStation.length>9){ actv_endstation.text = "${endStation.subSequence(0,9)}…" diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt index 11f3e8a07d..fa6f095fb1 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt @@ -2,9 +2,6 @@ package com.mogo.och.taxi.passenger.ui.orderinfo import androidx.lifecycle.ViewModel import com.mogo.commons.AbsMogoApplication -import com.mogo.eagle.core.data.map.MogoLocation -import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener -import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.NumberFormatUtil @@ -16,8 +13,7 @@ import com.mogo.och.taxi.passenger.model.TaxiPassengerModel import kotlin.math.abs import kotlin.math.ceil -class OrderInfoViewModel: ViewModel(), IMoGoChassisLocationGCJ02Listener, - IOCHTaxiPassengerOrderStatusCallback { +class OrderInfoViewModel: ViewModel(), IOCHTaxiPassengerOrderStatusCallback { private val TAG = OrderInfoViewModel::class.java.simpleName @@ -30,7 +26,6 @@ class OrderInfoViewModel: ViewModel(), IMoGoChassisLocationGCJ02Listener, disUnit = AbsMogoApplication.getApp().getString(R.string.taxi_p_distance_unit_km) surplusTimeUnit = AbsMogoApplication.getApp().getString(R.string.taxi_p_surplustime) // 设置起点和终点marker和实时车辆位置 - CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 4, this) TaxiPassengerModel.setOrderStatusCallback(TAG,this) } @@ -44,22 +39,12 @@ class OrderInfoViewModel: ViewModel(), IMoGoChassisLocationGCJ02Listener, TaxiPassengerModel.setOrderStatusCallback(TAG,null) } - override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) { - mogoLocation?.let { - UiThreadHandler.post { - val speedKM = (abs(it.gnssSpeed) * 3.6f).toInt() - viewCallback?.setSpeed(speedKM.toString()) - } - } - } - interface ItineraryViewCallback{ fun setDistanceInfo(surplusdistance:String,distanceUnit:String, surplusTime:String,surplusTimeUnit:String, arrivedTime:String,alreadyGone:Int,distance:Int ) fun setEndStation(endStation:String) - fun setSpeed(speedValue:String) } override fun onCurrentOrderStatusChanged(order: TaxiPassengerOrderQueryRespBean.Result?) { diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/speed/SpeedView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/speed/SpeedView.kt index d5e37d6ee4..d7203b5faa 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/speed/SpeedView.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/speed/SpeedView.kt @@ -8,7 +8,10 @@ import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager +import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.taxi.passenger.R +import kotlinx.android.synthetic.main.taxt_p_speed.view.actv_speed_value +import kotlin.math.abs class SpeedView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { @@ -44,7 +47,12 @@ class SpeedView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { } override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) { - + mogoLocation?.let { + UiThreadHandler.post { + val speedKM = (abs(it.gnssSpeed) * 3.6f).toInt() + actv_speed_value.text = speedKM.toString() + } + } } diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_itinerary_bg.png b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_itinerary_bg.png index b5ed8c603b..a626a703f3 100644 Binary files a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_itinerary_bg.png and b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_itinerary_bg.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_itinerary_bg.png b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_itinerary_bg.png new file mode 100644 index 0000000000..a626a703f3 Binary files /dev/null and b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxt_p_itinerary_bg.png differ diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_itinerary.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_itinerary.xml index 8d5f3e34e3..5fdb3b1e1a 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_itinerary.xml +++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_itinerary.xml @@ -2,81 +2,60 @@ + app:layout_constraintEnd_toEndOf="parent" /> - - + android:layout_height="wrap_content"/> - + android:layout_height="wrap_content"/> + - + android:text="--" /> + android:text="--" />