From a520449296dadfe69726f6151161e0d9c88aae31 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 11 Apr 2023 17:24:56 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8C=85=E8=BD=A6]=20=E5=8C=85=E8=BD=A6?=
 =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E7=AB=AF=E8=AE=A2=E5=8D=95=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=9A=E4=B9=98=E5=AE=A2=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E5=90=8E=E7=AB=8B=E9=A9=AC=E6=98=BE=E7=A4=BA=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/charter/fragment/DriverM1Fragment.kt   |  7 +++++--
 .../magic/mogo/och/charter/model/DriverM1Model.kt   |  7 +++----
 .../mogo/och/charter/presenter/DriverM1Presenter.kt |  1 +
 .../src/driverm1/res/layout/fragment_driver_m1.xml  | 13 ++++++++-----
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt
index 8bf0693933..22410bf5b7 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt
@@ -48,11 +48,14 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
     }
 
     private fun showOrHideOrderUI(show:Boolean){
-        if (show && group_stations_panel.visibility == GONE){
+        if (show && (group_stations_panel.visibility != VISIBLE
+                    || group_stations_panel2.visibility != VISIBLE)){
             group_stations_panel.visibility = VISIBLE
+            group_stations_panel2.visibility = VISIBLE
             no_line_data_view.visibility = GONE
         }else if (!show){
             group_stations_panel.visibility = GONE
+            group_stations_panel2.visibility = GONE
             hideSlidePanel()
         }
     }
@@ -71,7 +74,7 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
 
             if (orderStatus.lineName.isEmpty()){
                 driverm1_line_name.text = "暂无"
-                group_stations_panel1.visibility = VISIBLE
+                group_stations_panel2.visibility = GONE
                 no_line_data_view.visibility = VISIBLE
                 no_order_data_tv.text = resources.getString(R.string.bus_task_wait_tip)
             }else{
diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
index 04fd599f55..0d444eca2a 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
@@ -572,10 +572,10 @@ class DriverM1Model {
                             mCurrentOrder == null
                             sendCharterEndTripInfo()
                             startOrStopCheckCountDown(false)
-                        }else{ // 订单不为空，有服务中订单，去查询订单
-                            mOrderCallback?.updateReturnCarStatus(true)
-                            startQueryCurrentOrder()
                         }
+//                        else{ // 订单不为空，有服务中订单，等待去查询订单
+//                            mOrderCallback?.updateReturnCarStatus(true)
+//                        }
                     }else{ //车辆无订单，闲置状态
                         clearAutopilotControlParameters()
                         mCurrentOrder = null
@@ -603,7 +603,6 @@ class DriverM1Model {
                         isArrivedStation = false
                         mCurrentOrder = null
                         queryCurrentServiceStatus()
-                        stopQueryCurrentOrder()
                         return
                     }
                     if (data.data.equals(mCurrentOrder)){
diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
index f40d8a9e05..fb99b6010d 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
@@ -72,6 +72,7 @@ class DriverM1Presenter(view: DriverM1Fragment?) :
         if(isLogin()){
             // 查询服务状态
             DriverM1Model.get().queryCurrentServiceStatus()
+            DriverM1Model.get().startQueryCurrentOrder()
         }else{
             CharterTrajectoryManager.stopTrajReqLoop()
         }
diff --git a/OCH/mogo-och-charter/src/driverm1/res/layout/fragment_driver_m1.xml b/OCH/mogo-och-charter/src/driverm1/res/layout/fragment_driver_m1.xml
index 4833798ed1..3e41cb7213 100644
--- a/OCH/mogo-och-charter/src/driverm1/res/layout/fragment_driver_m1.xml
+++ b/OCH/mogo-och-charter/src/driverm1/res/layout/fragment_driver_m1.xml
@@ -82,10 +82,12 @@
         android:id="@+id/cur_station_title1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/dp_10"
         android:layout_marginTop="@dimen/dp_50"
         android:textSize="@dimen/dp_34"
         android:text="@string/bus_arrive_to_next_tag1"
         android:textColor="@color/station_title_color"
+        app:layout_constraintBottom_toTopOf="@+id/driverm1StationName2Tv"
         app:layout_constraintTop_toBottomOf="@+id/driverm1StationName1Tv"
         app:layout_constraintLeft_toLeftOf="parent"
         android:layout_marginLeft="@dimen/dp_96"/>
@@ -112,7 +114,7 @@
         android:layout_height="wrap_content"
         android:text="--"
         android:textSize="@dimen/module_mogo_och_bus_station_name_text_size"
-        android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginBottom="@dimen/dp_20"
         android:textStyle="bold"
         android:textColor="@color/bus_arrived_station_name_text_color"
         android:includeFontPadding = "false"
@@ -121,7 +123,7 @@
         android:marqueeRepeatLimit="marquee_forever"
         app:layout_constraintLeft_toLeftOf="@+id/cur_station_title1"
         app:layout_constraintRight_toRightOf="@+id/driverm1_order_count_down"
-        app:layout_constraintTop_toBottomOf="@+id/cur_station_title1" />
+        app:layout_constraintBottom_toTopOf="@+id/line3"/>
 
     <ImageView
         android:id="@+id/driverm1CircleIvBg"
@@ -170,6 +172,7 @@
         android:layout_marginBottom="@dimen/dp_40"
         android:background="#33FFFFFF"
         app:layout_constraintLeft_toLeftOf="@id/driverm1_line_name"
+        app:layout_constraintRight_toRightOf="@+id/driverm1_order_count_down"
         app:layout_constraintBottom_toTopOf="@+id/during_time"/>
 
     <TextView
@@ -203,12 +206,12 @@
          ,line3,during_time,passenger_phone"/>
 
     <androidx.constraintlayout.widget.Group
-        android:id="@+id/group_stations_panel1"
+        android:id="@+id/group_stations_panel2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        app:constraint_referenced_ids="driverm1_line_name,driverm1_order_count_down
-         ,line1,line2,line3,during_time,passenger_phone"/>
+        app:constraint_referenced_ids="cur_station_title,cur_station_title1,driverm1StationName1Tv,
+         driverm1StationName2Tv,driverm1nextCircleIv,driverm1CircleIvBg,driverm1ArrowBg"/>
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file