From 5d5b72c4cbc31d3e2a0d410e8dbf3837f4f8ca48 Mon Sep 17 00:00:00 2001
From: pangfan <pangfan@zhidao.com>
Date: Mon, 25 Jul 2022 16:31:42 +0800
Subject: [PATCH] =?UTF-8?q?[Bus/Taxi=20driver=20v2.9.0]=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0DPQP?=
 =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/bus/fragment/BaseBusTabFragment.java    |  8 ++++++++
 .../src/main/res/layout/bus_test_bar_view.xml        | 12 ++++++++++++
 .../main/java/com/mogo/och/taxi/ui/TaxiFragment.java |  8 ++++++++
 OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml | 12 ++++++++++++
 4 files changed, 40 insertions(+)

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 d7bd5beb2d..f5a22cf79e 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
@@ -527,6 +527,8 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
     private TextView lineIdTV;
     private TextView trajMd5TV;
     private TextView stopMd5TV;
+    private TextView trajMd5DPQPTV;
+    private TextView stopMd5DPQPTV;
 
     public void showHideTestBar() {
         if (busTestBar == null) {
@@ -534,6 +536,8 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
             lineIdTV = findViewById(R.id.bus_test_bar_current_line_id);
             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);
+            stopMd5DPQPTV = findViewById(R.id.bus_test_bar_current_stop_md5_dpqp);
         }
 
         if (busTestBar.getVisibility() == View.VISIBLE) {
@@ -543,6 +547,8 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
             lineIdTV.setText("lineId:" + (routesResult == null ? "" : String.valueOf(routesResult.getLineId())));
             trajMd5TV.setText("TMd5:" + (routesResult == null ? "" : routesResult.csvFileMd5));
             stopMd5TV.setText("SMd5:" + (routesResult == null ? "" : routesResult.txtFileMd5));
+            trajMd5DPQPTV.setText("TMd5DPQP:" + (routesResult == null ? "" : routesResult.csvFileMd5DPQP));
+            stopMd5DPQPTV.setText("SMd5DPQP:" + (routesResult == null ? "" : routesResult.txtFileMd5DPQP));
             busTestBar.setVisibility(View.VISIBLE);
         }
     }
@@ -553,6 +559,8 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
             lineIdTV.setText("lineId:" + (routesResult == null ? "" : String.valueOf(routesResult.getLineId())));
             trajMd5TV.setText("TMd5:" + (routesResult == null ? "" : routesResult.csvFileMd5));
             stopMd5TV.setText("SMd5:" + (routesResult == null ? "" : routesResult.txtFileMd5));
+            trajMd5DPQPTV.setText("TMd5DPQP:" + (routesResult == null ? "" : routesResult.csvFileMd5DPQP));
+            stopMd5DPQPTV.setText("SMd5DPQP:" + (routesResult == null ? "" : routesResult.txtFileMd5DPQP));
         }
     }
     /**
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 1c5d8bdf33..f71b6208a6 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
@@ -22,4 +22,16 @@
         android:layout_height="wrap_content"
         android:textColor="@android:color/white"/>
 
+    <TextView
+        android:id="@+id/bus_test_bar_current_traj_md5_dpqp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@android:color/white"/>
+
+    <TextView
+        android:id="@+id/bus_test_bar_current_stop_md5_dpqp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@android:color/white"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
index e7c81a0a9d..d90e7aa8b2 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
@@ -383,6 +383,8 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
     private TextView testCurLineId;
     private TextView testCurTrajMd5;
     private TextView testCurStopMd5;
+    private TextView testCurTrajMd5DPQP;
+    private TextView testCurStopMd5DPQP;
 
     public void clickTestBar() {
         if (testBar == null) {
@@ -391,6 +393,8 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
             testCurLineId = findViewById(R.id.test_bar_current_line_id);
             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);
+            testCurStopMd5DPQP = findViewById(R.id.test_bar_current_stop_md5_dpqp);
         }
 
         if (testBar.getVisibility() == View.VISIBLE) {
@@ -401,6 +405,8 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
             testCurLineId.setText("lineId:" + (order == null ? "" : String.valueOf(order.lineId)));
             testCurTrajMd5.setText("TMd5:" + (order == null ? "" : order.csvFileMd5));
             testCurStopMd5.setText("SMd5:" + (order == null ? "" : order.txtFileMd5));
+            testCurTrajMd5DPQP.setText("TMd5DPQP:" + (order == null ? "" : order.csvFileMd5DPQP));
+            testCurStopMd5DPQP.setText("SMd5DPQP:" + (order == null ? "" : order.txtFileMd5DPQP));
             testBar.setVisibility(View.VISIBLE);
         }
     }
@@ -412,6 +418,8 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
             testCurLineId.setText("lineId:" + (order == null ? "" : String.valueOf(order.lineId)));
             testCurTrajMd5.setText("TMd5:" + (order == null ? "" : order.csvFileMd5));
             testCurStopMd5.setText("SMd5:" + (order == null ? "" : order.txtFileMd5));
+            testCurTrajMd5DPQP.setText("TMd5DPQP:" + (order == null ? "" : order.csvFileMd5DPQP));
+            testCurStopMd5DPQP.setText("SMd5DPQP:" + (order == null ? "" : order.txtFileMd5DPQP));
         }
     }
     /**
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml
index 7e797f8f4d..4608e957b9 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml
@@ -46,6 +46,18 @@
             android:layout_height="wrap_content"
             android:textColor="@android:color/white"/>
 
+        <TextView
+            android:id="@+id/test_bar_current_traj_md5_dpqp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@android:color/white"/>
+
+        <TextView
+            android:id="@+id/test_bar_current_stop_md5_dpqp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@android:color/white"/>
+
         <Button
             android:id="@+id/test_bar_to_start"
             android:layout_width="wrap_content"