From 99b872e26a4409c5139a08a420fcc4053985b57b Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Fri, 19 Apr 2024 19:55:20 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.0]=E5=B0=86=E5=8E=9F=E4=B8=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=BD=95=E5=8C=85=E5=85=A5=E5=8F=A3=E7=A7=BB=E5=88=B0=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E7=AE=B1=EF=BC=8C=E5=8E=9F=E5=BD=95=E5=8C=85=E5=85=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=94=B9=E4=B8=BA=E5=B7=A5=E5=8D=95=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/bus/fragment/BaseBusTabFragment.java  |  2 +-
 .../och/charter/base/CharterBaseFragment.kt   |  4 +--
 .../fragment/BaseShuttleTabFragment.java      |  2 +-
 .../fragment/BaseSweeperCloudTabFragment.java |  2 +-
 .../BaseSweeperOperateTabFragment.java        |  2 +-
 .../mogo/och/taxi/ui/BaseTaxiTabFragment.java |  2 +-
 .../och/taxi/ui/base/BaseTaxiTabFragment.kt   |  4 +--
 .../hmi/ui/tools/AutoPilotAndCheckView.kt     |  2 ++
 .../main/res/layout/view_auto_pilot_check.xml | 28 ++++++++++++++++++-
 .../src/main/res/values/strings.xml           |  1 +
 10 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
index 0018c661ea..cf5c2c911c 100644
--- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
+++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
@@ -214,7 +214,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
         mBadcaseBtn = findViewById(R.id.module_mogo_och_badcase_rl);
 
         if (mBadcaseBtn != null) {
-            CallerDevaToolsManager.INSTANCE.initBadCase(mBadcaseBtn);
+            CallerDevaToolsManager.INSTANCE.reportWorkOrder(mBadcaseBtn);
         }
 
         //消息盒子
diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt
index 9beefcc925..c4a20f9d92 100644
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt
@@ -22,7 +22,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager.attachAutopilotBeforeLaunchView
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager.initAiCollect
-import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager.initBadCase
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager.reportWorkOrder
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showToolsView
 import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxBubbleView
 import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxButtonView
@@ -161,7 +161,7 @@ abstract class CharterBaseFragment<V : IView?, P : Presenter<V>?>() :
         // mBadcaseBtn的visible显示逻辑在showBadcaseEntrance内处理
         mBadcaseBtn = findViewById(R.id.module_mogo_och_badcase_rl)
         if (mBadcaseBtn != null) {
-            initBadCase(mBadcaseBtn!!)
+            reportWorkOrder(mBadcaseBtn!!)
             CallerAutopilotRecordListenerManager.addListener(TAG, this)
         }
         mAICollectBtn = findViewById(R.id.module_mogo_och_ai_collet_rl)
diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java
index 78da1aee41..81cfd770bf 100644
--- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java
+++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java
@@ -205,7 +205,7 @@ public abstract class BaseShuttleTabFragment<V extends IView, P extends Presente
         mBadcaseBtn = findViewById(R.id.module_mogo_och_badcase_rl);
 
         if (mBadcaseBtn != null) {
-            CallerDevaToolsManager.INSTANCE.initBadCase(mBadcaseBtn);
+            CallerDevaToolsManager.INSTANCE.reportWorkOrder(mBadcaseBtn);
         }
 
         mAICollectBtn = findViewById(R.id.module_mogo_och_ai_collet_rl);
diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperCloudTabFragment.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperCloudTabFragment.java
index 6ec468c553..1a1f332b02 100644
--- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperCloudTabFragment.java
+++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperCloudTabFragment.java
@@ -351,7 +351,7 @@ public abstract class BaseSweeperCloudTabFragment<V extends IView, P extends Pre
             CallerHmiManager.INSTANCE.showToolsView();
         });
         if (mCardBtn != null) {
-            CallerDevaToolsManager.INSTANCE.initBadCase(mCardBtn);
+            CallerDevaToolsManager.INSTANCE.reportWorkOrder(mCardBtn);
         }
         if (mAICollectBtn != null) {
             CallerDevaToolsManager.INSTANCE.initAiCollect(mAICollectBtn);
diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperOperateTabFragment.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperOperateTabFragment.java
index 924e86a90c..86ad4c77f6 100644
--- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperOperateTabFragment.java
+++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/fragment/BaseSweeperOperateTabFragment.java
@@ -348,7 +348,7 @@ public abstract class BaseSweeperOperateTabFragment<V extends IView, P extends P
         });
         mSettingBtn.setOnClickListener(v -> CallerHmiManager.INSTANCE.showToolsView());
         if (mCardBtn != null) {
-            CallerDevaToolsManager.INSTANCE.initBadCase(mCardBtn);
+            CallerDevaToolsManager.INSTANCE.reportWorkOrder(mCardBtn);
         }
         if (mAICollectBtn != null) {
             CallerDevaToolsManager.INSTANCE.initAiCollect(mAICollectBtn);
diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
index bf8c2ca079..43aa9fa48f 100644
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
@@ -173,7 +173,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
         // mBadcaseBtn的visible显示逻辑在showBadcaseEntrance内处理
         mBadcaseBtn = findViewById(R.id.module_och_taxi_badcase_ll);
         if (mBadcaseBtn != null) {
-            CallerDevaToolsManager.INSTANCE.initBadCase(mBadcaseBtn);
+            CallerDevaToolsManager.INSTANCE.reportWorkOrder(mBadcaseBtn);
             CallerAutopilotRecordListenerManager.INSTANCE.addListener(TAG, this);
         }
 
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt
index f19ddb6c93..177800399c 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt
@@ -21,7 +21,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getState
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
-import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager.initBadCase
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager.reportWorkOrder
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showToolsView
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getMapUIController
 import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxButtonView
@@ -163,7 +163,7 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
 
         // mBadCaseBtn的visible显示逻辑在showBadcaseEntrance内处理
         if (module_och_taxi_badcase_ll != null) {
-            initBadCase(module_och_taxi_badcase_ll)
+            reportWorkOrder(module_och_taxi_badcase_ll)
             CallerAutopilotRecordListenerManager.addListener(TAG, this)
         }
         debugPanelView = LayoutInflater.from(context)
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
index 797cadd2d6..916d6a2d5f 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
@@ -137,6 +137,8 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor(
         sopLayout.setOnClickListener {
             clickListener?.showSOPSettingView()
         }
+        //录包
+        CallerDevaToolsManager.initBadCase(badCaseReportLayout)
         //BadCase上报
         CallerDevaToolsManager.initAiCollect(badCaseLayout)
         ivDebugPanel.setOnClickListener {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
index dce7960ed1..30f8565c4c 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
@@ -146,6 +146,32 @@
 
             </RelativeLayout>
 
+            <RelativeLayout
+                android:id="@+id/badCaseReportLayout"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_216"
+                android:layout_marginTop="@dimen/dp_90"
+                app:layout_constraintLeft_toLeftOf="@id/sopLayout"
+                app:layout_constraintTop_toBottomOf="@id/sopLayout">
+
+                <ImageView
+                    android:layout_width="150dp"
+                    android:layout_height="150dp"
+                    android:layout_centerHorizontal="true"
+                    android:background="@drawable/debug_icon_bag_manager"
+                    />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="42dp"
+                    android:layout_alignParentBottom="true"
+                    android:layout_centerHorizontal="true"
+                    android:text="@string/debug_bad_case"
+                    android:textColor="@color/color_FFA7B6F0"
+                    android:textSize="32dp" />
+
+            </RelativeLayout>
+
             <com.mogo.eagle.core.function.hmi.ui.widget.CheckSystemView
                 android:id="@+id/checkSystemView"
                 android:layout_width="wrap_content"
@@ -174,7 +200,7 @@
                 android:layout_height="wrap_content"
                 android:visibility="gone"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/sopLayout">
+                app:layout_constraintTop_toBottomOf="@id/badCaseReportLayout">
 
                 <View
                     android:layout_width="14dp"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
index 4af209bad3..d6f91163e4 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
@@ -23,6 +23,7 @@
     <string name="debug_panel">调试面板</string>
     <string name="debug_panel_fb">录包设置</string>
     <string name="debug_sop">运营面板</string>
+    <string name="debug_bad_case">录包</string>
     <string name="debug_bad_case_manager">录包管理</string>
     <string name="debug_bad_case_report">上报</string>
     <string name="check_vehicle_speed_setting">车速设置</string>