From 265d9284e173068eb5b695f392742596bd2b8c16 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 13 May 2022 11:39:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B9=98=E5=AE=A2=E6=95=B0=20=E5=92=8C?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=AD=97=E6=AE=B5=E7=9A=84=E5=BD=B1=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java  | 2 +-
 .../taxi/passenger/presenter/BaseTaxiPassengerPresenter.java  | 2 +-
 .../mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java | 4 ++--
 .../com/mogo/och/taxi/passenger/ui/TaxiPassengerCheckView.kt  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java
index dc5859b4ab..c26eec8f05 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java
@@ -48,7 +48,7 @@ public class TaxiPassengerOrderQueryRespBean extends BaseData {
         //乘客手机号
         public String passengerPhone;
         //订单多少乘客
-        public String passengerCount;
+        public String passengerNum;
 
 
         // !!!接口中暂无此字段，仅用于本地实现逻辑使用：起始站目的站距离km
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 ff968bba03..c4671cfb9e 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
@@ -151,7 +151,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
         }
         if (TaxiPassengerOrderStatusEnum.ArriveAtStart.getCode() == order.orderStatus) {
             runOnUIThread(() -> mView.showOrHidePressengerCheckPager(true, order.startSiteAddr,
-                    order.endSiteAddr, order.passengerCount, order.carNumber, order.passengerPhone));
+                    order.endSiteAddr, order.passengerNum, order.carNumber, order.passengerPhone));
             return;
         }
         if (TaxiPassengerOrderStatusEnum.ArriveAtStart.getCode() == order.orderStatus
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 dc92f549c7..21d0dfb343 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
@@ -265,12 +265,12 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
 
     public void showOrHidePressengerCheckPager(boolean isShow, String startSiteAddr,
                                                String endSiteAddr,
-                                               String passengerCount,
+                                               String passengerNum,
                                                String carNumber,
                                                String phone) {
         try {
             if (isShow) {
-                mArrivedCheckView.setData(startSiteAddr, endSiteAddr, passengerCount, carNumber,phone);
+                mArrivedCheckView.setData(startSiteAddr, endSiteAddr, passengerNum, carNumber,phone);
                 OverlayViewUtils.showOverlayView(getActivity(), mArrivedCheckView);
             } else {
                 OverlayViewUtils.dismissOverlayView(mArrivedCheckView);
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerCheckView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerCheckView.kt
index 9a038ea710..9f3d885b9c 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerCheckView.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerCheckView.kt
@@ -166,12 +166,12 @@ class TaxiPassengerCheckView :RelativeLayout, View.OnClickListener {
     fun setData(
         startSiteAddr: String?,
         endSiteAddr: String?,
-        passengerCount: String? = "1",
+        passengerNum: String?,
         carNumber: String?,
         phone: String?
     ) {
         this.phone = phone?:""
-        val sb = SpannableStringBuilder("乘客数：$passengerCount 位") // 包装字体内容
+        val sb = SpannableStringBuilder("乘客数：$passengerNum 位") // 包装字体内容
         sb.setSpan(
             TextAppearanceSpan("default",
                 Typeface.NORMAL,100,