diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/IMogoOCH.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/IMogoOCH.java
deleted file mode 100644
index c33547d928..0000000000
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/IMogoOCH.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mogo.och.taxi.passenger;
-
-import androidx.annotation.IdRes;
-import androidx.fragment.app.FragmentActivity;
-
-import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider;
-
-/**
- *
- * @author congtaowang
- * @since 2021/1/15
- *
- * 网约车抽象接口
- */
-public interface IMogoOCH extends IMoGoFunctionProvider {
-
- /**
- * 初始化网约车容器
- *
- * @param activity
- * @param containerId 容器ID
- */
- void createCoverage(FragmentActivity activity, @IdRes int containerId);
-}
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java
index 7d3b5ed99f..966f1aada9 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java
@@ -9,6 +9,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import com.alibaba.android.arouter.facade.annotation.Route;
+import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider;
import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst;
@@ -24,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
* 网约车-出租车-乘客端
*/
@Route(path = TaxiPassengerConst.PATH)
-public class MogoOCHTaxiPassenger implements IMogoOCH {
+public class MogoOCHTaxiPassenger implements IMoGoFunctionProvider {
private static final String TAG = "MogoOCHTaxiPassenger";
private TaxiPassengerBaseFragment ochTaxiPassengerFragment;
@@ -70,11 +71,6 @@ public class MogoOCHTaxiPassenger implements IMogoOCH {
}
}
- @Override
- public void createCoverage(FragmentActivity activity, int containerId) {
-
- }
-
@NotNull
@Override
public String getFunctionName() {
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt
index 261be963bc..de2a33f9fb 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/ItineraryView.kt
@@ -5,6 +5,9 @@ import android.graphics.drawable.GradientDrawable
import android.graphics.drawable.LayerDrawable
import android.graphics.drawable.ScaleDrawable
import android.os.Build
+import android.os.Handler
+import android.os.Looper
+import android.os.Message
import android.util.AttributeSet
import android.view.Gravity
import android.view.LayoutInflater
@@ -12,12 +15,12 @@ import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.content.ContextCompat
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.findViewTreeViewModelStoreOwner
+import com.mogo.och.common.module.utils.RxUtils
import com.mogo.och.taxi.passenger.R
import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_arrived_time
import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_distance
import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_distance_unit
import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_endstation
-import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_speed_value
import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_surplus_time
import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_surplus_time_unit
import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.progress_distance
@@ -60,7 +63,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 +89,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/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt
index 25dfc96139..9bc4fad09c 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/orderinfo/OrderInfoViewModel.kt
@@ -17,8 +17,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
@@ -31,7 +30,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)
}
@@ -45,22 +43,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: TaxiPassengerOrdersInServiceQueryRespBean.OrderBean?) {
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/speed/SpeedView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/speed/SpeedView.kt
new file mode 100644
index 0000000000..2c05bcc1cb
--- /dev/null
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/speed/SpeedView.kt
@@ -0,0 +1,51 @@
+package com.mogo.och.taxi.passenger.ui.speed
+
+import android.content.Context
+import android.os.Build
+import android.util.AttributeSet
+import android.view.LayoutInflater
+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.och.taxi.passenger.R
+
+class SpeedView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener {
+
+ private val TAG = "ItineraryView"
+
+ constructor(context: Context) : super(context)
+
+ constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet)
+
+ constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr)
+
+ constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes)
+
+ private fun initView() {
+ LayoutInflater.from(context).inflate(R.layout.taxt_u_p_speed, this, true)
+ }
+
+ override fun onVisibilityAggregated(isVisible: Boolean) {
+ super.onVisibilityAggregated(isVisible)
+ if(isVisible){
+ CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 4, this)
+ }else{
+ CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
+ }
+ }
+
+ init {
+ try {
+ initView()
+ } catch (e: Exception) {
+ e.printStackTrace()
+ }
+ }
+
+ override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) {
+
+ }
+
+
+}
\ No newline at end of file
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_speed_bg.webp b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_speed_bg.webp
new file mode 100644
index 0000000000..50f20ef2e8
Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_speed_bg.webp differ
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_itinerary_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_itinerary_bg.png
index b5ed8c603b..a626a703f3 100755
Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_itinerary_bg.png and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_itinerary_bg.png differ
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
index c6edcd19a9..9541e4e4db 100644
--- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
@@ -48,6 +48,15 @@
app:layout_constraintStart_toStartOf="parent"
app:pnc_size="@dimen/dp_44" />
+
+
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_itinerary.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_itinerary.xml
index 92ee74f811..817fd4263c 100644
--- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_itinerary.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_itinerary.xml
@@ -2,81 +2,60 @@
+ app:layout_constraintEnd_toEndOf="parent" />
-
-
+ android:layout_height="wrap_content"/>
-
+ android:layout_height="wrap_content"/>
+
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file