From f17e6428d688b58d06e76e789bb120dcd9270392 Mon Sep 17 00:00:00 2001
From: pangfan <pangfan@zhidao.com>
Date: Wed, 23 Aug 2023 16:06:32 +0800
Subject: [PATCH] =?UTF-8?q?[6.0.0/5.0.0]MessagePad.Line=E6=96=B0=E5=A2=9El?=
 =?UTF-8?q?ineName=E5=AD=97=E6=AE=B5:=E5=A2=9E=E5=8A=A0debug=20view?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/bus/fragment/BaseBusTabFragment.java | 4 ++++
 OCH/mogo-och-bus/src/main/res/layout/bus_test_bar_view.xml | 7 +++++++
 .../java/com/mogo/och/bus/fragment/BaseBusTabFragment.java | 4 ++++
 .../driver/src/main/res/layout/bus_test_bar_view.xml       | 7 +++++++
 .../src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java   | 4 ++++
 OCH/taxi/driver/src/main/res/layout/taxi_panel.xml         | 7 +++++++
 .../src/main/java/com/mogo/och/taxi/ui/debug/DebugView.kt  | 5 ++++-
 .../src/main/res/layout/taxi_debug_order.xml               | 7 +++++++
 8 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
index f31ce37f04..a5565079e1 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
@@ -566,6 +566,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
      */
     private View busTestBar;
     private TextView lineIdTV;
+    private TextView lineNameTV;
     private TextView trajMd5TV;
     private TextView stopMd5TV;
     private TextView trajMd5DPQPTV;
@@ -576,6 +577,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
         if (busTestBar == null) {
             busTestBar = findViewById(R.id.module_mogo_och_bus_test_bar);
             lineIdTV = findViewById(R.id.bus_test_bar_current_line_id);
+            lineNameTV = findViewById(R.id.bus_test_bar_current_line_name);
             trajMd5TV = findViewById(R.id.bus_test_bar_current_traj_md5);
             stopMd5TV = findViewById(R.id.bus_test_bar_current_stop_md5);
             trajMd5DPQPTV = findViewById(R.id.bus_test_bar_current_traj_md5_dpqp);
@@ -587,6 +589,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
         } else {
             BusRoutesResult routesResult = OrderModel.getInstance().getBusRoutesResult();
             lineIdTV.setText("lineId:" + (routesResult == null ? "" : String.valueOf(routesResult.getLineId())));
+            lineNameTV.setText("lineName:" + (routesResult == null ? "" : routesResult.getName()));
             trajMd5TV.setText("TMd5:" + (routesResult == null ? "" : routesResult.csvFileMd5));
             stopMd5TV.setText("SMd5:" + (routesResult == null ? "" : routesResult.txtFileMd5));
             trajMd5DPQPTV.setText("TMd5DPQP:" + (routesResult == null ? "" : routesResult.csvFileMd5DPQP));
@@ -600,6 +603,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
         if (busTestBar != null && busTestBar.getVisibility() == View.VISIBLE) {
             BusRoutesResult routesResult = OrderModel.getInstance().getBusRoutesResult();
             lineIdTV.setText("lineId:" + (routesResult == null ? "" : String.valueOf(routesResult.getLineId())));
+            lineNameTV.setText("lineName:" + (routesResult == null ? "" : routesResult.getName()));
             trajMd5TV.setText("TMd5:" + (routesResult == null ? "" : routesResult.csvFileMd5));
             stopMd5TV.setText("SMd5:" + (routesResult == null ? "" : routesResult.txtFileMd5));
             trajMd5DPQPTV.setText("TMd5DPQP:" + (routesResult == null ? "" : routesResult.csvFileMd5DPQP));
diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_test_bar_view.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_test_bar_view.xml
index d3e7bffd9e..a64bdaa4d9 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/bus_test_bar_view.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/bus_test_bar_view.xml
@@ -11,6 +11,13 @@
         android:textSize="@dimen/dp_24"
         android:textColor="@android:color/white"/>
 
+    <TextView
+        android:id="@+id/bus_test_bar_current_line_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/dp_24"
+        android:textColor="@android:color/white"/>
+
     <TextView
         android:id="@+id/bus_test_bar_current_traj_md5"
         android:layout_width="wrap_content"
diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
index f134e38bd0..2e242a1d10 100644
--- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
+++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
@@ -587,6 +587,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
      */
     private View busTestBar;
     private TextView lineIdTV;
+    private TextView lineNameTV;
     private TextView trajMd5TV;
     private TextView stopMd5TV;
     private TextView trajMd5DPQPTV;
@@ -596,6 +597,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
         if (busTestBar == null) {
             busTestBar = findViewById(R.id.module_mogo_och_bus_test_bar);
             lineIdTV = findViewById(R.id.bus_test_bar_current_line_id);
+            lineNameTV = findViewById(R.id.bus_test_bar_current_line_name);
             trajMd5TV = findViewById(R.id.bus_test_bar_current_traj_md5);
             stopMd5TV = findViewById(R.id.bus_test_bar_current_stop_md5);
             trajMd5DPQPTV = findViewById(R.id.bus_test_bar_current_traj_md5_dpqp);
@@ -607,6 +609,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
         } else {
             BusRoutesResult routesResult = OrderModel.getInstance().getBusRoutesResult();
             lineIdTV.setText("lineId:" + (routesResult == null ? "" : String.valueOf(routesResult.getLineId())));
+            lineNameTV.setText("lineName:" + (routesResult == null ? "" : routesResult.getName()));
             trajMd5TV.setText("TMd5:" + (routesResult == null ? "" : routesResult.csvFileMd5));
             stopMd5TV.setText("SMd5:" + (routesResult == null ? "" : routesResult.txtFileMd5));
             trajMd5DPQPTV.setText("TMd5DPQP:" + (routesResult == null ? "" : routesResult.csvFileMd5DPQP));
@@ -619,6 +622,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
         if (busTestBar != null && busTestBar.getVisibility() == View.VISIBLE) {
             BusRoutesResult routesResult = OrderModel.getInstance().getBusRoutesResult();
             lineIdTV.setText("lineId:" + (routesResult == null ? "" : String.valueOf(routesResult.getLineId())));
+            lineNameTV.setText("lineName:" + (routesResult == null ? "" : routesResult.getName()));
             trajMd5TV.setText("TMd5:" + (routesResult == null ? "" : routesResult.csvFileMd5));
             stopMd5TV.setText("SMd5:" + (routesResult == null ? "" : routesResult.txtFileMd5));
             trajMd5DPQPTV.setText("TMd5DPQP:" + (routesResult == null ? "" : routesResult.csvFileMd5DPQP));
diff --git a/OCH/shuttle/driver/src/main/res/layout/bus_test_bar_view.xml b/OCH/shuttle/driver/src/main/res/layout/bus_test_bar_view.xml
index d3e7bffd9e..a64bdaa4d9 100644
--- a/OCH/shuttle/driver/src/main/res/layout/bus_test_bar_view.xml
+++ b/OCH/shuttle/driver/src/main/res/layout/bus_test_bar_view.xml
@@ -11,6 +11,13 @@
         android:textSize="@dimen/dp_24"
         android:textColor="@android:color/white"/>
 
+    <TextView
+        android:id="@+id/bus_test_bar_current_line_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/dp_24"
+        android:textColor="@android:color/white"/>
+
     <TextView
         android:id="@+id/bus_test_bar_current_traj_md5"
         android:layout_width="wrap_content"
diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
index 1f5d948c99..f5eb07f81e 100644
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
@@ -390,6 +390,7 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
     private View testBar;
     private TextView testCurOrderId;
     private TextView testCurLineId;
+    private TextView testCurLineName;
     private TextView testCurTrajMd5;
     private TextView testCurStopMd5;
     private TextView testCurTrajMd5DPQP;
@@ -400,6 +401,7 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
             testBar = findViewById(R.id.module_och_taxi_order_status_change_test_bar);
             testCurOrderId = findViewById(R.id.test_bar_current_order_id);
             testCurLineId = findViewById(R.id.test_bar_current_line_id);
+            testCurLineName = findViewById(R.id.test_bar_current_line_name);
             testCurTrajMd5 = findViewById(R.id.test_bar_current_traj_md5);
             testCurStopMd5 = findViewById(R.id.test_bar_current_stop_md5);
             testCurTrajMd5DPQP = findViewById(R.id.test_bar_current_traj_md5_dpqp);
@@ -412,6 +414,7 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
             OrderQueryRespBean.Result order = TaxiModel.getInstance().getCurrentOCHOrder();
             testCurOrderId.setText("orderNo:" + (order == null ? "" : String.valueOf(order.orderNo)));
             testCurLineId.setText("lineId:" + (order == null ? "" : String.valueOf(order.lineId)));
+            testCurLineName.setText("lineName:" + (order == null ? "" : order.lineName));
             testCurTrajMd5.setText("TMd5:" + (order == null ? "" : order.csvFileMd5));
             testCurStopMd5.setText("SMd5:" + (order == null ? "" : order.txtFileMd5));
             testCurTrajMd5DPQP.setText("TMd5DPQP:" + (order == null ? "" : order.csvFileMd5DPQP));
@@ -425,6 +428,7 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
             OrderQueryRespBean.Result order = TaxiModel.getInstance().getCurrentOCHOrder();
             testCurOrderId.setText("orderNo:" + (order == null ? "" : String.valueOf(order.orderNo)));
             testCurLineId.setText("lineId:" + (order == null ? "" : String.valueOf(order.lineId)));
+            testCurLineName.setText("lineName:" + (order == null ? "" : order.lineName));
             testCurTrajMd5.setText("TMd5:" + (order == null ? "" : order.csvFileMd5));
             testCurStopMd5.setText("SMd5:" + (order == null ? "" : order.txtFileMd5));
             testCurTrajMd5DPQP.setText("TMd5DPQP:" + (order == null ? "" : order.csvFileMd5DPQP));
diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_panel.xml b/OCH/taxi/driver/src/main/res/layout/taxi_panel.xml
index 56a2f1ecc5..a1eb06aa88 100644
--- a/OCH/taxi/driver/src/main/res/layout/taxi_panel.xml
+++ b/OCH/taxi/driver/src/main/res/layout/taxi_panel.xml
@@ -38,6 +38,13 @@
             android:textColor="@android:color/white"
             android:textSize="@dimen/dp_24" />
 
+        <TextView
+            android:id="@+id/test_bar_current_line_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/dp_24" />
+
         <TextView
             android:id="@+id/test_bar_current_traj_md5"
             android:layout_width="wrap_content"
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/DebugView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/DebugView.kt
index e336ea75a2..a4d5c2afab 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/DebugView.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/DebugView.kt
@@ -15,6 +15,7 @@ import kotlinx.android.synthetic.main.taxi_debug_order.view.taskStartSite
 import kotlinx.android.synthetic.main.taxi_debug_order.view.taskStatus2
 import kotlinx.android.synthetic.main.taxi_debug_order.view.taskType2
 import kotlinx.android.synthetic.main.taxi_debug_order.view.test_bar_current_line_id
+import kotlinx.android.synthetic.main.taxi_debug_order.view.test_bar_current_line_name
 import kotlinx.android.synthetic.main.taxi_debug_order.view.test_bar_current_order_id
 import kotlinx.android.synthetic.main.taxi_debug_order.view.test_bar_current_stop_md5
 import kotlinx.android.synthetic.main.taxi_debug_order.view.test_bar_current_stop_md5_dpqp
@@ -39,6 +40,8 @@ class DebugView @JvmOverloads constructor(
 
     fun toggleOrderDebugView() {
         val data = TaxiModel.getCurTaskAndOrder()
+        val curContrail = TaxiModel.getCurTaskContrail()
+
         visibility =
             if (visibility == View.VISIBLE)
                 View.GONE
@@ -46,6 +49,7 @@ class DebugView @JvmOverloads constructor(
                 View.VISIBLE
         test_bar_current_order_id.text = "orderNo: ${data?.order?.orderNo}"
         test_bar_current_line_id!!.text = "当前任务lineId: ${data?.lineId}"
+        test_bar_current_line_name!!.text = "当前任务lineName: ${curContrail?.lineName}"
         taskType2.text = "当前任务类型: ${data?.taskType}"
         taskStatus2.text = "任务状态: ${data?.currentStatus}"
         taskStartSite.text =
@@ -58,7 +62,6 @@ class DebugView @JvmOverloads constructor(
         orderToStartLines.text =
             "接驾任务的lineId集合: " + GsonUtil.jsonFromObject(data?.order?.planningLines)
 
-        val curContrail = TaxiModel.getCurTaskContrail()
         test_bar_current_traj_md5.text = "TrajMd5: ${curContrail?.csvFileMd5}"
         test_bar_current_stop_md5.text = "StopMd5: ${curContrail?.txtFileMd5}"
         test_bar_current_traj_md5_dpqp.text = "TrajMd5DPQP: ${curContrail?.csvFileMd5DPQP}"
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_debug_order.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_debug_order.xml
index 3bdc24bc81..b321e73e1b 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_debug_order.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_debug_order.xml
@@ -19,6 +19,13 @@
         android:textColor="@android:color/white"
         android:textSize="@dimen/dp_24" />
 
+    <TextView
+        android:id="@+id/test_bar_current_line_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/dp_24" />
+
     <TextView
         android:id="@+id/taskType2"
         android:layout_width="wrap_content"