From 5492f781ed95d35120fbb5db89aacf8c95dc53b0 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 18 Mar 2022 18:49:12 +0800
Subject: [PATCH] =?UTF-8?q?[Taxi=20Passenger=20v1.1.0]=201=E3=80=81?=
 =?UTF-8?q?=E9=83=A8=E5=88=86UI=E8=B0=83=E6=95=B4=202=E3=80=81=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/model/TaxiPassengerModel.java   |  28 +-
 .../TaxiPassengerNaviToDestinationModel.java  |   2 +-
 .../network/TaxiPassengerServiceManager.java  |   5 +-
 .../presenter/BaseTaxiPassengerPresenter.java |   5 +-
 .../ui/TaxiPassengerBaseFragment.java         |   7 +-
 .../ui/TaxiPassengerMapDirectionView.java     |   5 +-
 .../ui/TaxiPassengerRadiuImageView.java       | 110 ++++
 .../ui/TaxiPassengerServingOrderFragment.java |  26 +-
 .../bg_progress_bar.png                       | Bin 0 -> 495 bytes
 .../taxi_p_dot_line.png                       | Bin 1004 -> 256 bytes
 .../taxi_p_panel_bottom_bg.png                | Bin 0 -> 1169 bytes
 .../res/drawable-xhdpi/bg_progress_bar.png    | Bin 0 -> 495 bytes
 .../res/drawable-xhdpi/taxi_p_dot_line.png    | Bin 1004 -> 256 bytes
 .../drawable-xhdpi/taxi_p_panel_bottom_bg.png | Bin 0 -> 1169 bytes
 .../res/drawable/taxi_p_map_bottom_shape.xml  |   4 +-
 .../taxi_p_seekbar_calculator_layer.xml       |  18 +-
 .../taxi_p_activity_serving_order_view.xml    | 563 +++++++++---------
 .../main/res/layout/taxi_p_base_fragment.xml  |   9 +-
 .../layout/taxi_p_v2x_notification_view.xml   |   1 +
 .../src/main/res/values-sw320dp/dimens.xml    |   1 +
 .../res/values-xhdpi-2560x1440/dimens.xml     |   2 +
 .../src/main/res/values/attrs.xml             |  21 +-
 .../src/main/res/values/dimens.xml            |   2 +
 .../src/main/res/values/strings.xml           |   2 +-
 .../src/main/res/values/styles.xml            |   8 -
 .../com/mogo/och/taxi/ui/OCHTaxiFragment.java |   1 +
 gradle.properties                             |   2 +-
 27 files changed, 473 insertions(+), 349 deletions(-)
 create mode 100644 OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerRadiuImageView.java
 create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_progress_bar.png
 create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_panel_bottom_bg.png
 create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_progress_bar.png
 create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_panel_bottom_bg.png

diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
index 9e254b5f5a..38a4ac3e1a 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
@@ -149,6 +149,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
         if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) {
             apis.getLocationInfoApi().start();
         }
+        startOrStopOrderLoop();
     }
 
     /**
@@ -270,7 +271,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
                                 }
                             }
                         } else {
-                            // 1.2. 当无进行中订单时：如果本地也无则跳过；如果本地仍存在currentOrder，查询此单（完成or取消）并通知ui更新
+                            // 1.2. 当无进行中订单时：如果本地也无则跳过；如果本地仍存在currentOrder，查询此单（完成or取消）并通知ui更
                             if (mCurrentOCHOrder != null) {
                                 queryCurOrderStatus();
                             }
@@ -299,13 +300,18 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
                             if (data.data.orderStatus == TaxiPassengerOrderStatusEnum.Cancel.getCode()
                                     || data.data.orderStatus == TaxiPassengerOrderStatusEnum.JourneyCompleted.getCode()
                                     || data.data.orderStatus == TaxiPassengerOrderStatusEnum.None.getCode()) {
+                                if (mOrderStatusCallbackMap.size() > 0) {
+                                    for (IOCHTaxiPassengerOrderStatusCallback callback :mOrderStatusCallbackMap.values()){
+                                        callback.onCurrentOrderStatusChanged(data.data);
+                                    }
+                                }
                                 clearCurrentOCHOrder();
                             } else {
                                 updateNativeCurrentOrder(data.data);
-                            }
-                            if (mOrderStatusCallbackMap.size() > 0) {
-                                for (IOCHTaxiPassengerOrderStatusCallback callback :mOrderStatusCallbackMap.values()){
-                                    callback.onCurrentOrderStatusChanged(mCurrentOCHOrder);
+                                if (mOrderStatusCallbackMap.size() > 0) {
+                                    for (IOCHTaxiPassengerOrderStatusCallback callback :mOrderStatusCallbackMap.values()){
+                                        callback.onCurrentOrderStatusChanged(mCurrentOCHOrder);
+                                    }
                                 }
                             }
                         }
@@ -367,9 +373,6 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
                     endLon, endLat,
                     carLocation.getLongitude(), carLocation.getLatitude());
             mCurrentOCHOrder.decreaseTravelDistance(distance);
-//            if (mOrderStatusCallback != null && distance >= 0) {
-//                mOrderStatusCallback.onCurrentOrderDistToEndChanged((long) distance, 0);
-//            }
         }
     }
 
@@ -448,9 +451,6 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
             apis.getLocationInfoApi().provideLocation(mogoLocation);
             //位置变化时，通过围栏判断是否到达x点
             if (location != null && checkCurrentOCHOrder()) {
-//                if (getCurOrderStatus() == OrderStatusEnum.OnTheWayToStartStation) {
-//                    judgeStartStation(location);
-//                } else
                 if (getCurOrderStatus() == TaxiPassengerOrderStatusEnum.OnTheWayToEndStation) {
                     calculateTravelDistance(location);
                 }
@@ -580,12 +580,6 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
             TaxiPassengerNaviToDestinationModel.getInstance(mContext).initAMapNavi(startNaviLatLng, endNaviLatLng);
             TaxiPassengerNaviToDestinationModel.getInstance(mContext).setOCHTaciNaviChangedCallback(this);
         }
-//        else {
-//            NaviLatLng startNaviLatLng = new NaviLatLng(40.200478,116.741377);
-//            NaviLatLng endNaviLatLng = new NaviLatLng(40.200863,116.732574);
-//            TaxiPassengerNaviToDestinationModel.getInstance(mContext).initAMapNavi(startNaviLatLng, endNaviLatLng);
-//            TaxiPassengerNaviToDestinationModel.getInstance(mContext).setOCHTaciNaviChangedCallback(this);
-//        }
     }
 
     @Override
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerNaviToDestinationModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerNaviToDestinationModel.java
index d48aef1510..7620977e1e 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerNaviToDestinationModel.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerNaviToDestinationModel.java
@@ -152,7 +152,7 @@ public class TaxiPassengerNaviToDestinationModel implements AMapNaviListener {
     public void onCalculateRouteFailure(AMapCalcRouteResult result) {
         //路线计算失败
         //多路径算路成功回调
-        if (errorCount.get() < 5){
+        if (errorCount.get() < 20){
             errorCount.getAndIncrement();
             if (mNaviChangedCallback != null){
                 mNaviChangedCallback.reInitNaviAmap(isPlay,true);
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java
index 47b2401b74..b4076925d8 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java
@@ -9,7 +9,6 @@ import com.mogo.eagle.core.network.RequestOptions;
 import com.mogo.eagle.core.network.SubscribeImpl;
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.module.common.MogoApisHandler;
-import com.mogo.och.taxi.passenger.bean.TaxiPassengerCarHeartbeatReqBean;
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryReqBean;
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean;
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean;
@@ -47,8 +46,8 @@ public class TaxiPassengerServiceManager {
      * @return
      */
     private String getDriverAppSn(){
-//        return CallerTelematicManager.INSTANCE.getServerToken();
-        return "X2020211111NG0XNFK";
+        return CallerTelematicManager.INSTANCE.getServerToken();
+//        return "X202021061514D29A1C2A926002";
     }
 
     /**
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
index bc4f790b38..8a0052cd67 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
@@ -2,7 +2,6 @@ package com.mogo.och.taxi.passenger.presenter;
 
 import android.location.Location;
 import android.os.Looper;
-import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LifecycleOwner;
@@ -120,7 +119,6 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
 
     @Override
     public void onCurrentOrderStatusChanged(TaxiPassengerOrderQueryRespBean.Result order) {
-        Log.d(TAG,"order = "+order.toString());
         if (mCurrentPassengerOrder == null){
             mCurrentPassengerOrder = order; //当前无订单
             updateOrderView(order);
@@ -136,6 +134,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
     }
 
     private void updateOrderView(TaxiPassengerOrderQueryRespBean.Result order) {
+        Logger.d(TAG,"updateOrderView = "+order.orderStatus);
         if (TaxiPassengerOrderStatusEnum.Cancel.getCode() == order.orderStatus){
             mView.showOrHideServingOrderFragment(false);
             recoverNaviInfo();
@@ -151,12 +150,14 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
             runOnUIThread(() ->{
                 AIAssist.getInstance(getContext()).speakTTSVoice(getContext().getString(R.string.taxi_p_arrive_end_tts));
             });
+            TaxiPassengerNaviToDestinationModel.getInstance(getContext()).destroyAmaNavi();
             mView.showOrHideServingOrderFragment(false);
             mView.showOrHideArrivedEndLayout(true,order.endSiteAddr);
             return;
         }
         if (TaxiPassengerOrderStatusEnum.JourneyCompleted.getCode() == order.orderStatus){
             mView.showOrHideArrivedEndLayout(false,"");
+            mCurrentPassengerOrder = null;
             return;
         }
     }
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
index b1b801d27c..c3cfb460f2 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
@@ -72,6 +72,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
 
         mTrafficLightView = findViewById(R.id.traffic_light_view);
         CallerHmiManager.INSTANCE.setProxyTrafficLightView(mTrafficLightView);
+
         mV2XNotificationView = new TaxiPassengerV2XNotificationView(getContext());
         CallerHmiManager.INSTANCE.setProxyNotificationView(mV2XNotificationView);
 
@@ -114,7 +115,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
     @Override
     public void onResume() {
         super.onResume();
-        mPresenter.startOrStopOrderLoop();
+//        mPresenter.startOrStopOrderLoop();
 //        showOrHideServingOrderFragment(true);
     }
 
@@ -209,9 +210,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
         FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
 
         if (isShow){
-            if(ochServingOrderFragment == null){
-                ochServingOrderFragment = new TaxiPassengerServingOrderFragment().newInstance();
-            }
+            ochServingOrderFragment = new TaxiPassengerServingOrderFragment().newInstance();
             if (ochServingOrderFragment.isAdded()){
                 transaction.show(ochServingOrderFragment);
                 return;
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java
index a221413ee0..2668b0332d 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -172,7 +171,7 @@ public class TaxiPassengerMapDirectionView
 
     @Override
     public void onLocationChanged(@Nullable MogoLocation location) {
-        Logger.d(TAG, "onCarLocationChanged2 :" + location.getLatitude()+":"+location.getLongitude());
+//        Logger.d(TAG, "onCarLocationChanged2 :" + location.getLatitude()+":"+location.getLongitude());
         if (location == null){
             return;
         }
@@ -180,7 +179,7 @@ public class TaxiPassengerMapDirectionView
 
         //更新车辆位置
         if (mCarMarker != null) {
-            Log.d(TAG, "location.getBearing() = " + location.getBearing());
+//            Log.d(TAG, "location.getBearing() = " + location.getBearing());
             mCarMarker.setRotateAngle(360 - location.getBearing());
             mCarMarker.setPosition(currentLatLng);
             mCarMarker.setToTop();
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerRadiuImageView.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerRadiuImageView.java
new file mode 100644
index 0000000000..f110b9f5c3
--- /dev/null
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerRadiuImageView.java
@@ -0,0 +1,110 @@
+package com.mogo.och.taxi.passenger.ui;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Path;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.view.View;
+
+import androidx.appcompat.widget.AppCompatImageView;
+
+import com.mogo.och.taxi.passenger.R;
+
+/**
+ * @author: wangmingjun
+ * @date: 2021/9/29
+ */
+public class TaxiPassengerRadiuImageView extends AppCompatImageView {
+    private float width, height;
+    private int defaultRadius = 0;
+    private int radius;
+    private int leftTopRadius;
+    private int rightTopRadius;
+    private int rightBottomRadius;
+    private int leftBottomRadius;
+
+
+    public TaxiPassengerRadiuImageView(Context context) {
+        this(context, null);
+        init(context, null);
+    }
+
+    public TaxiPassengerRadiuImageView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+        init(context, attrs);
+    }
+
+    public TaxiPassengerRadiuImageView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+
+    private void init(Context context, AttributeSet attrs) {
+        if (Build.VERSION.SDK_INT < 18) {
+            setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+        }
+        // 读取配置
+        TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.RoundCornerImageView);
+        radius = array.getDimensionPixelOffset(R.styleable.RoundCornerImageView_taxi_passenger_radius, defaultRadius);
+        leftTopRadius = array.getDimensionPixelOffset(R.styleable.RoundCornerImageView_taxi_passenger_left_top_radius, defaultRadius);
+        rightTopRadius = array.getDimensionPixelOffset(R.styleable.RoundCornerImageView_taxi_passenger_right_top_radius, defaultRadius);
+        rightBottomRadius = array.getDimensionPixelOffset(R.styleable.RoundCornerImageView_taxi_passenger_right_bottom_radius, defaultRadius);
+        leftBottomRadius = array.getDimensionPixelOffset(R.styleable.RoundCornerImageView_taxi_passenger_left_bottom_radius, defaultRadius);
+
+
+        if (defaultRadius == leftTopRadius) {
+            leftTopRadius = radius;
+        }
+        if (defaultRadius == rightTopRadius) {
+            rightTopRadius = radius;
+        }
+        if (defaultRadius == rightBottomRadius) {
+            rightBottomRadius = radius;
+        }
+        if (defaultRadius == leftBottomRadius) {
+            leftBottomRadius = radius;
+        }
+        array.recycle();
+    }
+
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+        width = getWidth();
+        height = getHeight();
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        //这里做下判断，只有图片的宽高大于设置的圆角距离的时候才进行裁剪
+        int maxLeft = Math.max(leftTopRadius, leftBottomRadius);
+        int maxRight = Math.max(rightTopRadius, rightBottomRadius);
+        int minWidth = maxLeft + maxRight;
+        int maxTop = Math.max(leftTopRadius, rightTopRadius);
+        int maxBottom = Math.max(leftBottomRadius, rightBottomRadius);
+        int minHeight = maxTop + maxBottom;
+        if (width >= minWidth && height > minHeight) {
+            Path path = new Path();
+            //右上，右下，左下，左上
+            path.moveTo(leftTopRadius, 0);
+            path.lineTo(width - rightTopRadius, 0);
+            path.quadTo(width, 0, width, rightTopRadius);
+
+            path.lineTo(width, height - rightBottomRadius);
+            path.quadTo(width, height, width - rightBottomRadius, height);
+
+            path.lineTo(leftBottomRadius, height);
+            path.quadTo(0, height, 0, height - leftBottomRadius);
+
+            path.lineTo(0, leftTopRadius);
+            path.quadTo(0, 0, leftTopRadius, 0);
+
+            canvas.clipPath(path);
+        }
+        super.onDraw(canvas);
+    }
+
+}
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java
index f8ea1a36af..60ac1f23f5 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java
@@ -10,11 +10,11 @@ import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.RotateAnimation;
 import android.widget.ImageView;
-import android.widget.SeekBar;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
+import androidx.appcompat.widget.AppCompatSeekBar;
 
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.eagle.core.data.map.MogoLatLng;
@@ -66,10 +66,10 @@ public class TaxiPassengerServingOrderFragment extends
     private float lastBearing = 0;
     private RotateAnimation rotateAnimation;
 
-    private SeekBar mProgressSeekBar;
+    private AppCompatSeekBar mProgressSeekBar;
     private TextView mProgessDes;
 
-    private TaxiPassengerCardView mSpeedLayoutBg;
+    private TaxiPassengerRadiuImageView mSpeedLayoutBg;
 
     private int mLimitingVelocity = 0;// 返回的道路限速值
 
@@ -107,6 +107,7 @@ public class TaxiPassengerServingOrderFragment extends
 
         mMapArrowIcon = findViewById(R.id.taxi_p_arrow_nor);
         mProgressSeekBar = findViewById(R.id.taxi_p_seekbar);
+        mProgressSeekBar.setFocusableInTouchMode(false);
         mProgessDes = findViewById(R.id.taxi_p_progress_des);
 
         mSpeedLayoutBg = findViewById(R.id.taxi_p_speed_bg);
@@ -341,9 +342,12 @@ public class TaxiPassengerServingOrderFragment extends
     @RequiresApi(api = Build.VERSION_CODES.N)
     private void updateDriveProcessLoading(int progressLoading,String currentRoadName) {
         mProgessDes.setText(currentRoadName);
+        int progressInt = SharedPrefsMgr.getInstance(getContext()).getInt(TaxiPassengerConst.SP_KEY_ORDER_SUM_DIS,0) - progressLoading;
+        Logger.d(TAG,"progressInt = "+progressInt);
         mProgressSeekBar.setProgress(
-                SharedPrefsMgr.getInstance(getContext()).getInt(TaxiPassengerConst.SP_KEY_ORDER_SUM_DIS,0) - progressLoading
+                progressInt
                 , true);
+        mProgressSeekBar.jumpDrawablesToCurrentState();
     }
 
 
@@ -467,13 +471,13 @@ public class TaxiPassengerServingOrderFragment extends
      */
     private void updateSpeedView(float newSpeed) {
         int speed = (int) (Math.abs(newSpeed) * 3.6F); // 倒车时工控机反馈定位信息中speed为负值
-        Logger.d(TAG,"mLimitingVelocity = "+mLimitingVelocity);
-        if (speed < mLimitingVelocity) {
-            mTPSpeedTv.setText(getSpeedTextStyle(String.valueOf(speed), true));
-            mSpeedLayoutBg.setBackgroundResource(R.drawable.taxi_p_speed_light_green_bg);
-        } else {
+//        Logger.d(TAG,"mLimitingVelocity = "+mLimitingVelocity);
+        if (mLimitingVelocity > 0 && speed >= mLimitingVelocity) {
             mTPSpeedTv.setText(getSpeedTextStyle(String.valueOf(speed), false));
-            mSpeedLayoutBg.setBackgroundResource(R.drawable.taxi_p_speed_light_red_bg);
+            mSpeedLayoutBg.setImageResource(R.drawable.taxi_p_speed_light_red_bg);
+        } else {
+            mTPSpeedTv.setText(getSpeedTextStyle(String.valueOf(speed), true));
+            mSpeedLayoutBg.setImageResource(R.drawable.taxi_p_speed_light_green_bg);
         }
     }
 
@@ -518,7 +522,7 @@ public class TaxiPassengerServingOrderFragment extends
      */
     private void startIvCompass(float bearing) {
         bearing = 360 - bearing;
-        Log.d(TAG, "startIvCompass: " + bearing);
+//        Log.d(TAG, "startIvCompass: " + bearing);
         rotateAnimation = new RotateAnimation(lastBearing, bearing, Animation.RELATIVE_TO_SELF
                 , 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
         rotateAnimation.setFillAfter(true);
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_progress_bar.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/bg_progress_bar.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd14bf27603bf858a7169163f1f59890c790572f
GIT binary patch
literal 495
zcmeAS@N?(olHy`uVBq!ia0vp^KY*B>gAGWkiZ&bvQjEnx?oJHr&dIz4a$Hg)JkxxA
z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvP`(pt!oXrkWc=F9l381n_PZ!6K
z2+p@N&U+np5NJ;?H`DyMK&eZF#ntAebj7EMN7P@OE&pI?^NY(iN<T=XWtFPe>-kw*
zc9(f)Uve&EI^ETHQg!y9vh;m_o%lK%ZYK6jOwT>=bL;CnughAr*>98|52<=E&mnaG
z{=I5HzTM$vTJC?6_uzKnDG9Sz{JXPX`Ny_9q8&H(&hTr`?0=Ab$<-#!#P&4*W%j1}
z%guW6zsz3L{57-M`{Tyd`$eYxl}FfaILzf$Iel^J7U_)GSu^6_S=oD~r89T49f{aK
zPp0eQ7uN8*7mp>K3D0TZy>ioG)0K)Xe>R!^{B~_()cVh9Gv@McXl!Ck-1Jyk;)b=*
zx%g{p_1Coi#%ND@peUWd{QoM$v0BBJjTKymag2hgmf49j?*G{=IIDsy?4E&+d}yqu
zzuhXwpU1RSB`QCKz6!F_{H=37$LaIV>&z@-9$Vaff0lA{_}+K8@SfvkjkJB_TyKYI
S&z5ci1-7TFpUXO@geCxhXv5P0

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_dot_line.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_dot_line.png
index a720a532eafc22cd6f4393f745e5f4b91c336aa1..46900bd157eb33ba8314705de866fed36d737454 100644
GIT binary patch
delta 194
zcmaFE-oT{T8Q|y6%O%Cdz`(%k>ERLtq#1!&m4gjPHfuDmoT%tg&$xh@fdwW5q#4d8
zi&z1vEKe855DwYga~lO46a-u@raHdf%8=f2LukzbB_7`OEX=P3j##Jrgfw;E`@=eS
zibuPR!2<?ct{Y0~d+upOFIj)w;l0rfhyF+Xvr{`&&V;^YeO>vzbhXc`S9@2lOt|=A
l^KS3|Z*KjcA|YXSnKijUYucXHhe;soJzf1=);T3K0RZfrMQs28

delta 948
zcmV;l155mX0_+DNiBL{Q4GJ0x0000DNk~Le000040001n2nGNE0Q!k5t&t%}e*~Zd
z00aO4009610EPen000h39q<4E16D~yK~zW$y;Z+&R7Vh=nces9hkqPrBwI;=K!AuM
zr2<({AVd|R1c`=!fPxN*g5F0>M@vCX4+&O4#)1wy0|g-Ah{$J&K#0%B-MzQF!|d!c
z*a*6Vk?y^{*?GI)H{a|mg4nOOe>*dyS~GXnk8E`GYi1sJxF;*k-|8@d5HL;wsDn{V
zJZKE32$=~1z&Q`3aX?5ik_W59Brjwpq)*y7wfx><)^}W1bK`v};8S<6?k|IDW~Kd4
zk$T2o1ov#2`DYc<v~A>~4#tqUI!IhN2w5>Sl%QKM5P*ell@AFB1jb{=e}23qzP4H-
z_t&+flIDgWf0c9zxHmwU4#p1D0fH2^BPA5=gr@aeDQ5_RQ1KR%14<TQWqon#8Zv$@
zT5mF8?`v?z>sNAT7H^#K>~m{qCE)<mGKe(-s_ziWb4bc<N1+j-WKu5JD#FBk7$92}
zE`{(EfsGCD@Al8fHrD++e@jbAj^*W`gO#FxE^a~d^AFUaaHAs=F3ci<Dwj^p)}(@>
zkg>fi)mT+$a_X~sxFBmRh=3X55;=D-Z@0VK1I9MS4l})2ygz4aUdjdD**AZ_$O7`|
zVkn?9x<kFjKbivFbEug2$~aPz6O-jk{aW{9go)7GZ}N|h_*qJwf96B7k_XmppWS-U
zf>sO4uIb09u^V=tJjqwr{2?d`Xf}H<?b_O)!48i}Z-dRv_S+r0*qT5utP$v`#$cc{
zcgfijZ1Rf{w$bn5D9H+iZ=^GaWE=;;7%_GpUtAC`{PBEx0L2jsauOzH9#Uzr4uK9x
zV>^hxsF52A&5BFze?(}Qh)X5qHsUBBAy!=F??&pDF(z8>CfQ;wD{08<at?9i2GTFT
zhvCKBt3Q<99*>)qfo@tZb16#@EkuTam7A$vk7KoFOLTF?P`O0U<nB49j8gB=kZyNp
z75=|_R>)y<gJAeLR_IT8ybQj9VW%URKaq0VIf>4`J-o3We|mf}Zg&0=U)SSdDAm-D
zJz%mCy4=S4lb1-A$7r>mUu(ox{~&mJRvg|HpU&K6VKil?*7|<5<V(PXg?Jf!1H(&;
zJdtn0bXo87mER`UDKBB)C<~`UsQ(@}RAADt!LU&b<S}&z(J(o-aQV-#-qc0`J^%%>
WJfbfgv~mCd3IG5}MNUMnLSTY_r?A=p

diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_panel_bottom_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_panel_bottom_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..d12681349e9486a05d103c9cc697a72edd86f17b
GIT binary patch
literal 1169
zcmeAS@N?(olHy`uVBq!ia0y~yVB!F>t2vl~q#AdJIFMQ$;1lAiW)-dGoDL!($TC{h
zDq7tt21u$}MFB~K6qv1S83h+nwuw;#bCH!PTgJc@z{SC)MXOmtO;ZKi0+9u>f$E_O
zFsy?c1!Sze-0%_TY|D}$zhDK%!mPcni$o-if+Nh2UwFa)cKI4Mza3t>Gi|uq=GIlE
z#yY4rb(JM<IduAJpXTFF-!|NS@MqH08$aLGTw-TnV2<&0aSW-r_2yD`_$>#K)`!Nb
zS|?ofJOjF;^m7&Cb~Uj6`Cor+Z<|NfrJ%3UGruQ_JvTV>Z`)bMq@O*pYaZM6)!2R#
zV=nX&+>jd2xRB$+8h#E}hq#u>bN_Yjzob$3di9bW-zNjrlraUc?AfHIAi_8=)XwVY
zntRjVpO7!B`_9O);E9|-7sL5^j6dTA&&@wy`prfmzJJeLW+%Z1k=z1Z4SP7|`mNr4
zcWXsd$vwZ5-!EBz`g$Uo9i&AMWZ@e=5VMbAA;*pAmX8-Bp38oJ@_OQSLxpMQQ|7$r
zu?IPD8iS`3(1FVv0$857W^DJreLJ>$x$E<{Q)=}0Dg!Os3N}a#WKbOw(B7No4jN20
z*$hsC0a}Nq`!AWQ2vk(d*rL>+v>?GAXw`=|Y#_z!!1@?LOf{g{72jk*%y|qOYu3#R
zv+|dB-zQfY4GgK6_1CO_E&TjFa?jcN$?M(kU2C|(3JQr>Mv!HOK;~2>p8j^LD6R79
zdlP^P+CZk6F&$}BPB7W>_-BoY{L3@iUB7GpPh9W(?}py91Ah*M1t;v<)UIhTH$s{9
zQk$yg1hs2jcB;KWb3IO6SG>Qej>V<6I9#x){OK9fG>$lD*Bx^dE2e8X$&?E2FbNa9
z<15~{yU@=yqg3^E+B~tj^=BUSE`M46seNAlPo*7|Z41uc-NvzeZ=C+?RIA&XQor9X
zxp7jy?4OCg)0}St8%(~rPPi?{RQCGFoFgxlo2DMC6nyed@ZhfE^{x}XvNcBSw(q`h
zMr`)kq|G0;yvTUBSNrV~e&hM3@!cCrw>V7byEAR)ov%q7V|27jRtDc)4NM40|87m~
z7U-YGaZW=|)bZCvZYJTcu{${~orx2evgYL~*9pJh@Gzcy7rT`suDGl%;moXcAuUez
zRc0UhP1u^hzx#Ddv0me6=KavFfDUzLmPDc5wyqOWEFIqJ3Wq1HJJYs5pm_i7#mORE
zi3%JGth;VJo!l>B(z~}w(e2D%|7CMqr4RZYwp%tcY1L2T?T=6OY(8-#qrf%c#v$v8
zn(+|^9Ba~U%sFwv%p^fD=$D`SMA5rnJrtKj8n65i!1M9M&D8(X_Ri{Ym3kN#J2iW?
n*xRNbD&Ie^iaovR*j`!Q`M%o^XzbAhW>yAIS3j3^P6<r_vVr?Y

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_progress_bar.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/bg_progress_bar.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd14bf27603bf858a7169163f1f59890c790572f
GIT binary patch
literal 495
zcmeAS@N?(olHy`uVBq!ia0vp^KY*B>gAGWkiZ&bvQjEnx?oJHr&dIz4a$Hg)JkxxA
z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvP`(pt!oXrkWc=F9l381n_PZ!6K
z2+p@N&U+np5NJ;?H`DyMK&eZF#ntAebj7EMN7P@OE&pI?^NY(iN<T=XWtFPe>-kw*
zc9(f)Uve&EI^ETHQg!y9vh;m_o%lK%ZYK6jOwT>=bL;CnughAr*>98|52<=E&mnaG
z{=I5HzTM$vTJC?6_uzKnDG9Sz{JXPX`Ny_9q8&H(&hTr`?0=Ab$<-#!#P&4*W%j1}
z%guW6zsz3L{57-M`{Tyd`$eYxl}FfaILzf$Iel^J7U_)GSu^6_S=oD~r89T49f{aK
zPp0eQ7uN8*7mp>K3D0TZy>ioG)0K)Xe>R!^{B~_()cVh9Gv@McXl!Ck-1Jyk;)b=*
zx%g{p_1Coi#%ND@peUWd{QoM$v0BBJjTKymag2hgmf49j?*G{=IIDsy?4E&+d}yqu
zzuhXwpU1RSB`QCKz6!F_{H=37$LaIV>&z@-9$Vaff0lA{_}+K8@SfvkjkJB_TyKYI
S&z5ci1-7TFpUXO@geCxhXv5P0

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_dot_line.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_dot_line.png
index a720a532eafc22cd6f4393f745e5f4b91c336aa1..46900bd157eb33ba8314705de866fed36d737454 100644
GIT binary patch
delta 194
zcmaFE-oT{T8Q|y6%O%Cdz`(%k>ERLtq#1!&m4gjPHfuDmoT%tg&$xh@fdwW5q#4d8
zi&z1vEKe855DwYga~lO46a-u@raHdf%8=f2LukzbB_7`OEX=P3j##Jrgfw;E`@=eS
zibuPR!2<?ct{Y0~d+upOFIj)w;l0rfhyF+Xvr{`&&V;^YeO>vzbhXc`S9@2lOt|=A
l^KS3|Z*KjcA|YXSnKijUYucXHhe;soJzf1=);T3K0RZfrMQs28

delta 948
zcmV;l155mX0_+DNiBL{Q4GJ0x0000DNk~Le000040001n2nGNE0Q!k5t&t%}e*~Zd
z00aO4009610EPen000h39q<4E16D~yK~zW$y;Z+&R7Vh=nces9hkqPrBwI;=K!AuM
zr2<({AVd|R1c`=!fPxN*g5F0>M@vCX4+&O4#)1wy0|g-Ah{$J&K#0%B-MzQF!|d!c
z*a*6Vk?y^{*?GI)H{a|mg4nOOe>*dyS~GXnk8E`GYi1sJxF;*k-|8@d5HL;wsDn{V
zJZKE32$=~1z&Q`3aX?5ik_W59Brjwpq)*y7wfx><)^}W1bK`v};8S<6?k|IDW~Kd4
zk$T2o1ov#2`DYc<v~A>~4#tqUI!IhN2w5>Sl%QKM5P*ell@AFB1jb{=e}23qzP4H-
z_t&+flIDgWf0c9zxHmwU4#p1D0fH2^BPA5=gr@aeDQ5_RQ1KR%14<TQWqon#8Zv$@
zT5mF8?`v?z>sNAT7H^#K>~m{qCE)<mGKe(-s_ziWb4bc<N1+j-WKu5JD#FBk7$92}
zE`{(EfsGCD@Al8fHrD++e@jbAj^*W`gO#FxE^a~d^AFUaaHAs=F3ci<Dwj^p)}(@>
zkg>fi)mT+$a_X~sxFBmRh=3X55;=D-Z@0VK1I9MS4l})2ygz4aUdjdD**AZ_$O7`|
zVkn?9x<kFjKbivFbEug2$~aPz6O-jk{aW{9go)7GZ}N|h_*qJwf96B7k_XmppWS-U
zf>sO4uIb09u^V=tJjqwr{2?d`Xf}H<?b_O)!48i}Z-dRv_S+r0*qT5utP$v`#$cc{
zcgfijZ1Rf{w$bn5D9H+iZ=^GaWE=;;7%_GpUtAC`{PBEx0L2jsauOzH9#Uzr4uK9x
zV>^hxsF52A&5BFze?(}Qh)X5qHsUBBAy!=F??&pDF(z8>CfQ;wD{08<at?9i2GTFT
zhvCKBt3Q<99*>)qfo@tZb16#@EkuTam7A$vk7KoFOLTF?P`O0U<nB49j8gB=kZyNp
z75=|_R>)y<gJAeLR_IT8ybQj9VW%URKaq0VIf>4`J-o3We|mf}Zg&0=U)SSdDAm-D
zJz%mCy4=S4lb1-A$7r>mUu(ox{~&mJRvg|HpU&K6VKil?*7|<5<V(PXg?Jf!1H(&;
zJdtn0bXo87mER`UDKBB)C<~`UsQ(@}RAADt!LU&b<S}&z(J(o-aQV-#-qc0`J^%%>
WJfbfgv~mCd3IG5}MNUMnLSTY_r?A=p

diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_panel_bottom_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_panel_bottom_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..d12681349e9486a05d103c9cc697a72edd86f17b
GIT binary patch
literal 1169
zcmeAS@N?(olHy`uVBq!ia0y~yVB!F>t2vl~q#AdJIFMQ$;1lAiW)-dGoDL!($TC{h
zDq7tt21u$}MFB~K6qv1S83h+nwuw;#bCH!PTgJc@z{SC)MXOmtO;ZKi0+9u>f$E_O
zFsy?c1!Sze-0%_TY|D}$zhDK%!mPcni$o-if+Nh2UwFa)cKI4Mza3t>Gi|uq=GIlE
z#yY4rb(JM<IduAJpXTFF-!|NS@MqH08$aLGTw-TnV2<&0aSW-r_2yD`_$>#K)`!Nb
zS|?ofJOjF;^m7&Cb~Uj6`Cor+Z<|NfrJ%3UGruQ_JvTV>Z`)bMq@O*pYaZM6)!2R#
zV=nX&+>jd2xRB$+8h#E}hq#u>bN_Yjzob$3di9bW-zNjrlraUc?AfHIAi_8=)XwVY
zntRjVpO7!B`_9O);E9|-7sL5^j6dTA&&@wy`prfmzJJeLW+%Z1k=z1Z4SP7|`mNr4
zcWXsd$vwZ5-!EBz`g$Uo9i&AMWZ@e=5VMbAA;*pAmX8-Bp38oJ@_OQSLxpMQQ|7$r
zu?IPD8iS`3(1FVv0$857W^DJreLJ>$x$E<{Q)=}0Dg!Os3N}a#WKbOw(B7No4jN20
z*$hsC0a}Nq`!AWQ2vk(d*rL>+v>?GAXw`=|Y#_z!!1@?LOf{g{72jk*%y|qOYu3#R
zv+|dB-zQfY4GgK6_1CO_E&TjFa?jcN$?M(kU2C|(3JQr>Mv!HOK;~2>p8j^LD6R79
zdlP^P+CZk6F&$}BPB7W>_-BoY{L3@iUB7GpPh9W(?}py91Ah*M1t;v<)UIhTH$s{9
zQk$yg1hs2jcB;KWb3IO6SG>Qej>V<6I9#x){OK9fG>$lD*Bx^dE2e8X$&?E2FbNa9
z<15~{yU@=yqg3^E+B~tj^=BUSE`M46seNAlPo*7|Z41uc-NvzeZ=C+?RIA&XQor9X
zxp7jy?4OCg)0}St8%(~rPPi?{RQCGFoFgxlo2DMC6nyed@ZhfE^{x}XvNcBSw(q`h
zMr`)kq|G0;yvTUBSNrV~e&hM3@!cCrw>V7byEAR)ov%q7V|27jRtDc)4NM40|87m~
z7U-YGaZW=|)bZCvZYJTcu{${~orx2evgYL~*9pJh@Gzcy7rT`suDGl%;moXcAuUez
zRc0UhP1u^hzx#Ddv0me6=KavFfDUzLmPDc5wyqOWEFIqJ3Wq1HJJYs5pm_i7#mORE
zi3%JGth;VJo!l>B(z~}w(e2D%|7CMqr4RZYwp%tcY1L2T?T=6OY(8-#qrf%c#v$v8
zn(+|^9Ba~U%sFwv%p^fD=$D`SMA5rnJrtKj8n65i!1M9M&D8(X_Ri{Ym3kN#J2iW?
n*xRNbD&Ie^iaovR*j`!Q`M%o^XzbAhW>yAIS3j3^P6<r_vVr?Y

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_map_bottom_shape.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_map_bottom_shape.xml
index 9fb453ea1b..381f4772b8 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_map_bottom_shape.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_map_bottom_shape.xml
@@ -3,6 +3,8 @@
     <corners android:bottomRightRadius="40px"
         android:bottomLeftRadius="40px"/>
     <gradient
-        android:startColor="#26263A5B"
+        android:angle="315"
+        android:type="linear"
+        android:startColor="#001B2B47"
         android:endColor="#80263A5B"/>
 </shape>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_seekbar_calculator_layer.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_seekbar_calculator_layer.xml
index efc0d4f4df..47335e5667 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_seekbar_calculator_layer.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_seekbar_calculator_layer.xml
@@ -1,17 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 背景图 -->
-    <item android:id="@android:id/background">
+    <item android:id="@android:id/background"
+        android:height="@dimen/dp_7"
+        android:gravity="center_vertical">
         <shape>
-            <corners android:radius="20dp"/>
-            <solid android:color="#00e2e2e2" />
+            <solid android:color="#1A3FA5FF"/>
         </shape>
     </item>
-    <item android:id="@android:id/progress">
+    <item android:id="@android:id/progress"
+        android:height="@dimen/dp_7"
+        android:gravity="center_vertical">
         <clip>
             <shape>
-                <corners android:radius="20dp"/>
-                <solid android:color="#84D4FF" /> <!-- #3FA5FF #84D4FF 渐变-->
+                <gradient
+                    android:angle="0"
+                    android:type="linear"
+                    android:startColor="#1A3FA5FF"
+                    android:endColor="#84D4FF"/>
             </shape>
         </clip>
     </item>
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml
index ba7d3ebfb0..3035bc1ea2 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml
@@ -1,303 +1,322 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/taxi_p_order_panel_width"
-    android:layout_height="match_parent">
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="@dimen/taxi_p_order_panel_width"
-        android:layout_height="@dimen/taxi_p_order_panel_height"
-        android:layout_marginTop="@dimen/dp_55"
-        android:background="@drawable/taxi_passenger_order_bg"
+    <androidx.cardview.widget.CardView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:cardBackgroundColor="@android:color/transparent"
+        app:cardCornerRadius="@dimen/dp_40"
+        app:cardElevation="@dimen/dp_15"
+        app:cardPreventCornerOverlap="false"
+        app:cardUseCompatPadding="true"
+        app:contentPaddingLeft="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_40"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <com.mogo.och.taxi.passenger.ui.TaxiPassengerCardView
-            android:id="@+id/taxi_p_speed_bg"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:taxi_right_top_radius="@dimen/dp_40"
-            app:taxi_left_top_radius="@dimen/dp_40"
-            android:background="@drawable/taxi_p_speed_light_green_bg"/>
-
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/taxi_p_order_stations"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_96"
-            android:background="#2661A2DC"
-            android:paddingTop="@dimen/dp_24"
-            android:paddingBottom="@dimen/dp_24"
+            android:layout_width="@dimen/taxi_p_order_panel_width"
+            android:layout_height="@dimen/taxi_p_order_panel_height"
+            android:background="@drawable/taxi_passenger_order_bg"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <TextView
-                android:id="@+id/taxi_p_order_status_start_station_tv"
+            <com.mogo.och.taxi.passenger.ui.TaxiPassengerRadiuImageView
+                android:id="@+id/taxi_p_speed_bg"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="68px"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:text="--"
-                android:textColor="#FFFFFF"
-                android:textSize="30px"
+                android:src="@drawable/taxi_p_speed_light_green_bg"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:taxi_passenger_left_top_radius="@dimen/dp_40"
+                app:taxi_passenger_right_top_radius="@dimen/dp_40" />
 
-            <ImageView
-                android:id="@+id/taxi_p_blue_dot"
-                android:layout_width="wrap_content"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/taxi_p_order_stations"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="20px"
-                android:background="@drawable/taxi_p_blue_circle_bg"
-                app:layout_constraintBottom_toBottomOf="@+id/taxi_p_order_status_start_station_tv"
-                app:layout_constraintRight_toLeftOf="@+id/taxi_p_order_status_start_station_tv"
-                app:layout_constraintTop_toTopOf="@+id/taxi_p_order_status_start_station_tv" />
+                android:layout_marginTop="@dimen/dp_96"
+                android:background="#2661A2DC"
+                android:paddingTop="@dimen/dp_24"
+                android:paddingBottom="@dimen/dp_24"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <TextView
+                    android:id="@+id/taxi_p_order_status_start_station_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="68px"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:text="--"
+                    android:textColor="#FFFFFF"
+                    android:textSize="30px"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <ImageView
+                    android:id="@+id/taxi_p_blue_dot"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="20px"
+                    android:background="@drawable/taxi_p_blue_circle_bg"
+                    app:layout_constraintBottom_toBottomOf="@+id/taxi_p_order_status_start_station_tv"
+                    app:layout_constraintRight_toLeftOf="@+id/taxi_p_order_status_start_station_tv"
+                    app:layout_constraintTop_toTopOf="@+id/taxi_p_order_status_start_station_tv" />
+
+                <TextView
+                    android:id="@+id/taxi_p_order_status_end_station_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10px"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:text="--"
+                    android:textColor="#FFFFFF"
+                    android:textSize="30px"
+                    app:layout_constraintLeft_toLeftOf="@+id/taxi_p_order_status_start_station_tv"
+                    app:layout_constraintTop_toBottomOf="@+id/taxi_p_order_status_start_station_tv" />
+
+                <ImageView
+                    android:id="@+id/taxi_p_yellow_dot"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="20px"
+                    android:background="@drawable/taxi_p_yellow_circle_bg"
+                    app:layout_constraintBottom_toBottomOf="@+id/taxi_p_order_status_end_station_tv"
+                    app:layout_constraintRight_toLeftOf="@+id/taxi_p_order_status_end_station_tv"
+                    app:layout_constraintTop_toTopOf="@+id/taxi_p_order_status_end_station_tv" />
+
+                <ImageView
+                    android:id="@+id/grab_order_end_dotLine"
+                    android:layout_width="wrap_content"
+                    android:layout_height="0px"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/taxi_p_dot_line"
+                    app:layout_constraintBottom_toTopOf="@+id/taxi_p_yellow_dot"
+                    app:layout_constraintLeft_toLeftOf="@+id/taxi_p_blue_dot"
+                    app:layout_constraintRight_toRightOf="@+id/taxi_p_blue_dot"
+                    app:layout_constraintTop_toBottomOf="@+id/taxi_p_blue_dot" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <LinearLayout
+                android:id="@+id/taxi_p_order_remain"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24px"
+                android:orientation="horizontal"
+                android:paddingLeft="@dimen/dp_48"
+                android:paddingRight="@dimen/dp_44"
+                android:weightSum="3"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/taxi_p_order_stations">
+
+                <RelativeLayout
+                    android:id="@+id/taxi_p_order_rl1"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    app:layout_constraintRight_toLeftOf="@+id/taxi_p_order_rl2"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <LinearLayout
+                        android:id="@+id/taxi_p_order_remain_distance_ll"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/taxi_p_order_remain_distance"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:includeFontPadding="false"
+                            android:text="0"
+                            android:textColor="#84D4FF"
+                            android:textSize="42px"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/taxi_p_order_remain_distance_unit"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_above="@+id/taxi_p_order_remain_distance_title"
+                            android:layout_marginLeft="@dimen/dp_6"
+                            android:layout_toRightOf="@+id/taxi_p_order_remain_distance"
+                            android:includeFontPadding="false"
+                            android:text="KM"
+                            android:textColor="#FFFFFF"
+                            android:textSize="20px" />
+                    </LinearLayout>
+
+                    <TextView
+                        android:id="@+id/taxi_p_order_remain_distance_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/taxi_p_order_remain_distance_ll"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:includeFontPadding="false"
+                        android:text="距离"
+                        android:textColor="#8FB3EF"
+                        android:textSize="20px" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/taxi_p_order_rl2"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    app:layout_constraintRight_toLeftOf="@+id/taxi_p_order_rl3"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <LinearLayout
+                        android:id="@+id/taxi_p_order_remain_distance_ll2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/taxi_p_order_remain_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:includeFontPadding="false"
+                            android:text="0"
+                            android:textColor="#84D4FF"
+                            android:textSize="42px"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/taxi_p_order_remain_time_unit"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_above="@+id/taxi_p_order_remain_time_title"
+                            android:layout_marginLeft="@dimen/dp_6"
+                            android:layout_toRightOf="@+id/taxi_p_order_remain_time"
+                            android:includeFontPadding="false"
+                            android:text="分钟"
+                            android:textColor="#FFFFFF"
+                            android:textSize="20px" />
+                    </LinearLayout>
+
+                    <TextView
+                        android:id="@+id/taxi_p_order_remain_time_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/taxi_p_order_remain_distance_ll2"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:includeFontPadding="false"
+                        android:text="剩余"
+                        android:textColor="#8FB3EF"
+                        android:textSize="20px" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/taxi_p_order_rl3"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <TextView
+                        android:id="@+id/taxi_p_order_remain_arrive_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
+                        android:includeFontPadding="false"
+                        android:text="0"
+                        android:textColor="#84D4FF"
+                        android:textSize="42px"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/taxi_p_order_remain_arrive_time_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/taxi_p_order_remain_arrive_time"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:includeFontPadding="false"
+                        android:text="到达"
+                        android:textColor="#8FB3EF"
+                        android:textSize="20px" />
+
+                </RelativeLayout>
+
+            </LinearLayout>
+
+            <com.mogo.och.taxi.passenger.ui.TaxiPassengerMapDirectionView
+                android:id="@+id/taxi_p_order_map_view"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/taxi_p_order_map_height"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_124"
+                android:background="@drawable/taxi_p_panel_bottom_bg"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
+            <androidx.appcompat.widget.AppCompatSeekBar
+                android:id="@+id/taxi_p_seekbar"
+                android:layout_width="@dimen/dp_250"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="20px"
+                android:fadingEdge="horizontal"
+                android:focusable="true"
+                android:maxHeight="@dimen/dp_14"
+                android:minHeight="@dimen/dp_14"
+                android:paddingStart="0dp"
+                android:paddingEnd="0dp"
+                android:progressDrawable="@drawable/taxi_p_seekbar_calculator_layer"
+                android:splitTrack="false"
+                android:thumb="@drawable/taxi_p_seekbar_point_icon"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="@id/taxi_p_progress_des" />
 
             <TextView
-                android:id="@+id/taxi_p_order_status_end_station_tv"
+                android:id="@+id/taxi_p_progress_des"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10px"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:text="--"
-                android:textColor="#FFFFFF"
-                android:textSize="30px"
-                app:layout_constraintLeft_toLeftOf="@+id/taxi_p_order_status_start_station_tv"
-                app:layout_constraintTop_toBottomOf="@+id/taxi_p_order_status_start_station_tv" />
+                android:layout_marginLeft="@dimen/dp_30"
+                android:paddingRight="@dimen/dp_10"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/taxi_p_progress_des_size"
+                android:textStyle="italic"
+                android:typeface="monospace"
+                app:layout_constraintBottom_toTopOf="@+id/taxi_p_seekbar"
+                app:layout_constraintLeft_toLeftOf="parent" />
 
             <ImageView
-                android:id="@+id/taxi_p_yellow_dot"
+                android:id="@+id/taxi_p_arrow_nor"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="20px"
-                android:background="@drawable/taxi_p_yellow_circle_bg"
-                app:layout_constraintBottom_toBottomOf="@+id/taxi_p_order_status_end_station_tv"
-                app:layout_constraintRight_toLeftOf="@+id/taxi_p_order_status_end_station_tv"
-                app:layout_constraintTop_toTopOf="@+id/taxi_p_order_status_end_station_tv" />
-
-            <ImageView
-                android:id="@+id/grab_order_end_dotLine"
-                android:layout_width="wrap_content"
-                android:layout_height="0px"
-                android:scaleType="fitXY"
-                android:src="@drawable/taxi_p_dot_line"
-                app:layout_constraintBottom_toTopOf="@+id/taxi_p_yellow_dot"
-                app:layout_constraintLeft_toLeftOf="@+id/taxi_p_blue_dot"
-                app:layout_constraintRight_toRightOf="@+id/taxi_p_blue_dot"
-                app:layout_constraintTop_toBottomOf="@+id/taxi_p_blue_dot" />
-
+                android:layout_marginRight="@dimen/dp_44"
+                android:layout_marginBottom="@dimen/dp_10"
+                android:src="@drawable/taxi_p_arrow_nor"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintRight_toRightOf="parent" />
         </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <LinearLayout
-            android:id="@+id/taxi_p_order_remain"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24px"
-            android:orientation="horizontal"
-            android:paddingLeft="@dimen/dp_48"
-            android:paddingRight="@dimen/dp_44"
-            android:weightSum="3"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/taxi_p_order_stations">
-
-            <RelativeLayout
-                android:id="@+id/taxi_p_order_rl1"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                app:layout_constraintRight_toLeftOf="@+id/taxi_p_order_rl2"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <LinearLayout
-                    android:id="@+id/taxi_p_order_remain_distance_ll"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/taxi_p_order_remain_distance"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="0"
-                        android:textColor="#84D4FF"
-                        android:includeFontPadding="false"
-                        android:textSize="42px"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/taxi_p_order_remain_distance_unit"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_above="@+id/taxi_p_order_remain_distance_title"
-                        android:layout_marginLeft="@dimen/dp_6"
-                        android:layout_toRightOf="@+id/taxi_p_order_remain_distance"
-                        android:text="KM"
-                        android:textColor="#FFFFFF"
-                        android:includeFontPadding="false"
-                        android:textSize="20px" />
-                </LinearLayout>
-
-                <TextView
-                    android:id="@+id/taxi_p_order_remain_distance_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/taxi_p_order_remain_distance_ll"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="@dimen/dp_10"
-                    android:text="距离"
-                    android:includeFontPadding="false"
-                    android:textColor="#8FB3EF"
-                    android:textSize="20px" />
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/taxi_p_order_rl2"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                app:layout_constraintRight_toLeftOf="@+id/taxi_p_order_rl3"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <LinearLayout
-                    android:id="@+id/taxi_p_order_remain_distance_ll2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/taxi_p_order_remain_time"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="0"
-                        android:textColor="#84D4FF"
-                        android:includeFontPadding="false"
-                        android:textSize="42px"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/taxi_p_order_remain_time_unit"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_above="@+id/taxi_p_order_remain_time_title"
-                        android:layout_marginLeft="@dimen/dp_6"
-                        android:layout_toRightOf="@+id/taxi_p_order_remain_time"
-                        android:text="分钟"
-                        android:textColor="#FFFFFF"
-                        android:includeFontPadding="false"
-                        android:textSize="20px" />
-                </LinearLayout>
-
-                <TextView
-                    android:id="@+id/taxi_p_order_remain_time_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/taxi_p_order_remain_distance_ll2"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="@dimen/dp_10"
-                    android:text="剩余"
-                    android:includeFontPadding="false"
-                    android:textColor="#8FB3EF"
-                    android:textSize="20px" />
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/taxi_p_order_rl3"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <TextView
-                    android:id="@+id/taxi_p_order_remain_arrive_time"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:text="0"
-                    android:includeFontPadding="false"
-                    android:textColor="#84D4FF"
-                    android:textSize="42px"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/taxi_p_order_remain_arrive_time_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/taxi_p_order_remain_arrive_time"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="@dimen/dp_10"
-                    android:text="到达"
-                    android:includeFontPadding="false"
-                    android:textColor="#8FB3EF"
-                    android:textSize="20px" />
-
-            </RelativeLayout>
-
-        </LinearLayout>
-
-        <com.mogo.och.taxi.passenger.ui.TaxiPassengerMapDirectionView
-            android:id="@+id/taxi_p_order_map_view"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/taxi_p_order_map_height"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent" />
-        
-        <SeekBar
-            android:id="@+id/taxi_p_seekbar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:thumbOffset="0dp"
-            android:focusable="true"
-            style="@style/CustomSeekbarStyle"
-            android:layout_marginBottom="36px"
-            android:layout_marginLeft="34px"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"/>
-
-        <TextView
-            android:id="@+id/taxi_p_progress_des"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintLeft_toLeftOf="@+id/taxi_p_seekbar"
-            app:layout_constraintBottom_toTopOf="@+id/taxi_p_seekbar"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/taxi_p_progress_des_size"
-            android:textStyle="italic"
-            android:typeface="monospace"
-            android:layout_marginBottom="@dimen/dp_15"/>
-
-        <ImageView
-            android:id="@+id/taxi_p_arrow_nor"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="@dimen/dp_44"
-            android:layout_marginBottom="@dimen/dp_10"
-            android:src="@drawable/taxi_p_arrow_nor"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintRight_toRightOf="parent" />
-        
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_124"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:background="@drawable/taxi_p_map_bottom_shape"/>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
+    </androidx.cardview.widget.CardView>
     <LinearLayout
         android:id="@+id/taxi_p_speed_ll"
-        android:layout_width="match_parent"
+        android:layout_width="@dimen/taxi_p_order_panel_width"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
+        android:layout_marginLeft="@dimen/dp_20"
+        android:elevation="10dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -305,7 +324,7 @@
             android:id="@+id/taxi_p_speed_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_28"
+            android:layout_marginLeft="@dimen/dp_30"
             android:shadowColor="@color/taxi_p_speed_color"
             android:shadowDx="0"
             android:shadowDy="1"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
index a751710d99..308f73c19f 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
@@ -99,8 +99,8 @@
         android:id="@+id/module_mogo_och_navi_panel_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="40px"
-        android:layout_marginTop="180px"
+        android:layout_marginTop="@dimen/dp_150"
+        android:layout_marginRight="@dimen/dp_30"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
 
@@ -118,8 +118,8 @@
         android:id="@+id/taxi_p_arrive_end_bg"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/taxi_p_arrive_end_panel_bg"
-        android:visibility="gone">
+        android:visibility="gone"
+        android:background="@drawable/taxi_p_arrive_end_panel_bg">
         <TextView
             android:id="@+id/arrived_title"
             android:layout_width="wrap_content"
@@ -153,6 +153,7 @@
             android:layout_marginTop="@dimen/dp_30"
             android:textColor="@color/taxi_p_arrive_end_tip_color"
             android:textSize="@dimen/taxi_p_arrived_end_tip_size"
+            android:includeFontPadding="false"
             android:text="@string/taxi_p_arrived_end_tips"/>
         <View
             android:layout_width="@dimen/dp_18"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_v2x_notification_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_v2x_notification_view.xml
index 573f199065..10f7eac6df 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_v2x_notification_view.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_v2x_notification_view.xml
@@ -21,6 +21,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/taxi_p_v2x_notification_text_margin_left"
+        android:paddingRight="@dimen/taxi_p_v2x_notification_text_margin_right"
         android:text="预警信息"
         android:textColor="#FFFFFF"
         android:textSize="@dimen/taxi_p_v2x_notification_text_size"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml
index 34834e946f..702aa40369 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml
@@ -47,6 +47,7 @@
     <dimen name="taxi_p_v2x_notification_icon_size">120px</dimen>
     <dimen name="taxi_p_v2x_notification_text_size">39px</dimen>
     <dimen name="taxi_p_v2x_notification_text_margin_left">20px</dimen>
+    <dimen name="taxi_p_v2x_notification_text_margin_right">30px</dimen>
 
     <dimen name="taxi_p_arrived_end_tv_size">82px</dimen>
     <dimen name="taxi_p_arrived_end_tip_size">42px</dimen>
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml
index 0305e67e98..88aec68c97 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -116,4 +116,6 @@
     <dimen name="taxi_p_v2x_notification_icon_size">120px</dimen>
     <dimen name="taxi_p_v2x_notification_text_size">39px</dimen>
     <dimen name="taxi_p_v2x_notification_text_margin_left">20px</dimen>
+    <dimen name="taxi_p_v2x_notification_text_margin_right">30px</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/attrs.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/attrs.xml
index acba6526a6..5df16f30c3 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values/attrs.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/attrs.xml
@@ -6,22 +6,13 @@
         <attr name="taxi_right_bottom_radius" format="dimension" />
         <attr name="taxi_left_bottom_radius" format="dimension" />
     </declare-styleable>
-    <!--阴影布局 -->
-    <declare-styleable name="ShadowLayout">
-        <!-- 阴影颜色-->
-        <attr name="shadowColor" format="color"/>
-        <!-- 圆角大小，默认无圆角0-->
-        <attr name="shadowRadius" format="dimension"/>
-        <!-- 模糊半径 -->
-        <attr name="blurRadius" format="dimension" />
-        <!-- 是否有点击效果-->
-        <attr name="hasEffect" format="boolean"/>
-        <attr name="bgColor" format="color"/>
-        <!-- 水平位移-->
-        <attr name="xOffset" format="dimension"/>
-        <!--竖直位移 -->
-        <attr name="yOffset" format="dimension"/>
 
+    <declare-styleable name="RoundCornerImageView">
+        <attr name="taxi_passenger_radius" format="dimension" />
+        <attr name="taxi_passenger_left_top_radius" format="dimension" />
+        <attr name="taxi_passenger_right_top_radius" format="dimension" />
+        <attr name="taxi_passenger_right_bottom_radius" format="dimension" />
+        <attr name="taxi_passenger_left_bottom_radius" format="dimension" />
     </declare-styleable>
 
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml
index 88098feac9..82e5f40f03 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml
@@ -108,6 +108,8 @@
     <dimen name="taxi_p_v2x_notification_icon_size">120px</dimen>
     <dimen name="taxi_p_v2x_notification_text_size">39px</dimen>
     <dimen name="taxi_p_v2x_notification_text_margin_left">20px</dimen>
+    <dimen name="taxi_p_v2x_notification_text_margin_right">30px</dimen>
+
 
     <dimen name="taxi_p_arrived_end_tv_size">82px</dimen>
     <dimen name="taxi_p_arrived_end_tip_size">42px</dimen>
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/strings.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/strings.xml
index 98094604c0..9be34f07d0 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values/strings.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/strings.xml
@@ -21,7 +21,7 @@
     <string name="taxi_p_arrive_to_start">准备出发</string>
     <string name="taxi_p_start_to_end">正在前往目的地</string>
     <string name="taxi_p_arrive_end_tts_200">即将到达目的地，请您收好好随声物品，准备下车</string>
-    <string name="taxi_p_arrive_end_tts">已达到目的地，请从右侧下车，感谢乘坐蘑菇车联无人驾驶车</string>
+    <string name="taxi_p_arrive_end_tts">已达到目的地，请从右侧下车，感谢乘坐\'蘑菇车联\'无人驾驶车</string>
     <string name="taxi_p_arrived_title">已到达</string>
     <string name="taxi_p_arrived_end_tips">感谢您使用蘑菇车联自动驾驶出行服务，期待下次与您相遇</string>
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml
index aa3f10f3cf..59da5d765c 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml
@@ -11,12 +11,4 @@
         <item name="android:textSize">32px</item>
     </style>
 
-    <!--自定义seekbarstyle-->
-    <style name="CustomSeekbarStyle" >
-        <item name="android:height">20px</item>
-        <item name="android:width">248px</item>
-        <item name="android:indeterminateOnly">false</item>
-        <item name="android:progressDrawable">@drawable/taxi_p_seekbar_calculator_layer</item>
-        <item name="android:thumb">@drawable/taxi_p_seekbar_point_icon</item>
-    </style>
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
index aede461144..4810b2b875 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
@@ -231,6 +231,7 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment<OCHTaxiFragment, OCH
         mPresenter.cancelOrderById(orderNo,reasonType,reason);
     }
     public void onCurrentOrderCancelDone(){
+        startOrStopLoadingAnim(false);
         if (null == serverOrdersFragment) return;
         serverOrdersFragment.onCurrentOrderCancelDone();
     }
diff --git a/gradle.properties b/gradle.properties
index 0425450858..37a0f1a95b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -90,7 +90,7 @@ WEBSOCKET_VERSION=1.1.7
 applicationId=com.mogo.launcer
 applicationName=IntelligentPilot
 # RoboBus司机端：2.5.1；RoboTaxi司机端：2.5.1；RoboTaxi乘客端：1.0.0
-versionCode=80008
+versionCode=8000800
 versionName=2.5.5
 
 ################# 新架构模块Maven版本管理 #################