From fca4c257a8f11f73824ecc86e0310849852eb593 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 18 May 2023 12:05:02 +0800
Subject: [PATCH] =?UTF-8?q?[3.2.0]=201=E3=80=81taxi/bus=E6=97=A0=E8=BD=A8?=
 =?UTF-8?q?=E8=BF=B9bug=E5=A4=84=E7=90=86=202=E3=80=81bus/B1=20UI=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=203=E3=80=81M1=E5=8C=85=E8=BD=A6=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/layout/bus_p_no_data_common_view.xml  | 42 +++++++++++--------
 .../res/layout/bus_p_route_fragment.xml       |  8 ++--
 .../com/mogo/och/bus/model/OrderModel.java    |  8 ++--
 .../charter/bean/QueryCurrentOrderResponse.kt |  2 +
 .../res/layout/bus_p_no_data_common_view.xml  | 10 ++++-
 .../res/layout/bus_p_route_fragment.xml       |  8 ++--
 .../com/mogo/och/taxi/model/TaxiModel.java    |  8 ++--
 7 files changed, 52 insertions(+), 34 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml
index 6bbfcd3104..9b12f4f268 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml
@@ -5,25 +5,31 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/bus_p_no_order_data_view">
-
-    <ImageView
-        android:id="@+id/no_order_data_iv"
-        android:layout_width="@dimen/dp_200"
-        android:layout_height="@dimen/dp_210"
-        android:src="@drawable/bus_p_no_order_data"
-        android:layout_marginTop="@dimen/dp_100"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"/>
-    <TextView
-        android:id="@+id/no_order_data_tv"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/bus_p_speed_txt_color"
-        android:textSize="@dimen/bus_p_no_data_size"
-        android:layout_marginTop="50dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/no_order_data_iv"
-        android:text="@string/bus_p_no_out"/>
+        app:layout_constraintRight_toRightOf="parent">
+        <ImageView
+            android:id="@+id/no_order_data_iv"
+            android:layout_width="@dimen/dp_200"
+            android:layout_height="@dimen/dp_210"
+            android:src="@drawable/bus_p_no_order_data"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"/>
+        <TextView
+            android:id="@+id/no_order_data_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/bus_p_speed_txt_color"
+            android:textSize="@dimen/bus_p_no_data_size"
+            android:layout_marginTop="50dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/no_order_data_iv"
+            android:text="@string/bus_p_no_out"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
index 197c0bc4fb..a99b9ec46e 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
@@ -247,11 +247,11 @@
             <include
                 layout="@layout/bus_p_no_data_common_view"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 android:visibility="gone"
-                app:layout_constraintBottom_toTopOf="@+id/busPLineMapView"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/split_line_iv" />
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="@+id/bus_p_driver_num_plate_tv"
+                app:layout_constraintTop_toBottomOf="@+id/bus_p_cur_station_name" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/bus_p_line_stations_rl"
diff --git a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java
index 1017f2b3dc..aa43036428 100644
--- a/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java
+++ b/OCH/mogo-och-bus/src/jinlvvan/java/com/mogo/och/bus/model/OrderModel.java
@@ -622,11 +622,13 @@ public class OrderModel {
     private void startAutopilot(boolean isRestart, int leaveIndex) {
 
         //根据开关和后台是否发布轨迹启动自驾
-        if (FunctionBuildConfig.isPassStartAutopilotCommand && (TextUtils.isEmpty(busRoutesResult.csvFileUrl)
-                || TextUtils.isEmpty(busRoutesResult.csvFileUrlDPQP))){
+        if (FunctionBuildConfig.isPassStartAutopilotCommand && TextUtils.isEmpty(busRoutesResult.csvFileUrl)
+                && TextUtils.isEmpty(busRoutesResult.csvFileUrlDPQP)){
             ToastUtils.showLong("无发布轨迹, 请发布后重试");
             CallerLogger.INSTANCE.e(M_BUS + TAG, "isPassStartAutopilotCommand = " +
-                    FunctionBuildConfig.isPassStartAutopilotCommand);
+                    FunctionBuildConfig.isPassStartAutopilotCommand
+              + "busRoutesResult.csvFileUrl = "+ busRoutesResult.csvFileUrl
+              + "busRoutesResult.csvFileUrlDPQP = "+busRoutesResult.csvFileUrlDPQP);
             return;
         }
 
diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryCurrentOrderResponse.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryCurrentOrderResponse.kt
index 3e77f463b2..5d22b931c1 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryCurrentOrderResponse.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/QueryCurrentOrderResponse.kt
@@ -42,6 +42,8 @@ data class QueryCurrentOrderResponse(var data: Result):BaseData(){ //线路id ,
                     && Objects.equals(passengerPhone , result.passengerPhone)
                     && arriveStatus == result.arriveStatus
                     && writeVersion == result.writeVersion
+                    && startTime == result.startTime
+                    && endTime == result.endTime
         }
 
         companion object{
diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml
index 1c9f6a83fa..8d3bd854ec 100644
--- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml
@@ -5,12 +5,17 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/bus_p_no_order_data_view">
-
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent">
     <ImageView
         android:id="@+id/no_order_data_iv"
         android:layout_width="@dimen/dp_200"
         android:layout_height="@dimen/dp_210"
-        android:layout_marginTop="@dimen/dp_100"
         android:src="@drawable/bus_p_no_order_data"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -26,4 +31,5 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/no_order_data_iv"
         android:text="@string/bus_p_no_out"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
index ce9bcdbc7e..5ada0511f4 100644
--- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
@@ -238,11 +238,11 @@
             <include
                 layout="@layout/bus_p_no_data_common_view"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 android:visibility="gone"
-                app:layout_constraintBottom_toTopOf="@+id/bus_p_line_map_view"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/split_line_iv" />
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="@+id/bus_p_driver_num_plate_tv"
+                app:layout_constraintTop_toBottomOf="@+id/bus_p_cur_station_name" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/bus_p_line_stations_rl"
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
index 0d5c1aa63c..d07526da74 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
@@ -907,11 +907,13 @@ public class TaxiModel {
         }
 
         //根据开关和后台是否发布轨迹启动自驾
-        if (FunctionBuildConfig.isPassStartAutopilotCommand && (TextUtils.isEmpty(mCurrentOCHOrder.csvFileUrl)
-                || TextUtils.isEmpty(mCurrentOCHOrder.csvFileUrlDPQP))){
+        if (FunctionBuildConfig.isPassStartAutopilotCommand && TextUtils.isEmpty(mCurrentOCHOrder.csvFileUrl)
+                && TextUtils.isEmpty(mCurrentOCHOrder.csvFileUrlDPQP)){
             ToastUtils.showLong("无发布轨迹, 请发布后重试");
             CallerLogger.INSTANCE.e(M_TAXI + TAG, "isPassStartAutopilotCommand = " +
-                    FunctionBuildConfig.isPassStartAutopilotCommand);
+                    FunctionBuildConfig.isPassStartAutopilotCommand
+                    + "busRoutesResult.csvFileUrl = "+ mCurrentOCHOrder.csvFileUrl
+                    + "busRoutesResult.csvFileUrlDPQP = "+mCurrentOCHOrder.csvFileUrlDPQP);
             return;
         }