From 230e3bfd7b4fd3c4ba0cf450773eec1daa36f24e Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Fri, 12 Jul 2024 11:13:22 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0]=E8=A1=8C=E7=A8=8B=E6=80=BB=E7=BB=93?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BD=A6=E8=BE=86=E6=9C=8D=E5=8A=A1=E6=AC=A1?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../notice/exploration/AutomaticExplorationView.kt |  2 --
 .../hmi/ui/widget/ItinerarySummaryDialog.kt        | 11 +++++------
 .../core/data/autopilot/AutopilotSummaryInfo.kt    | 14 --------------
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt
index 5c7be959ca..88e9d3eead 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt
@@ -155,8 +155,6 @@ open class AutomaticExplorationView @JvmOverloads constructor(
         })
         automaticExplorationAdapter?.setData(dataList)
         //每出现一次自动探查，增加相应的服务次数
-        //车辆服务次数
-        AutopilotSummaryInfo.vehicleServiceNum += 31
         //道路信息提醒次数
         AutopilotSummaryInfo.infoTipNum += 9
         //车辆行为提醒次数
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt
index 3814aa9bf2..fc13f21749 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ItinerarySummaryDialog.kt
@@ -60,8 +60,6 @@ open class ItinerarySummaryDialog(context: Context, isDriver: Boolean, theme: In
         ivSummaryClose = findViewById(R.id.ivSummaryClose)
         ivSummaryClose?.setOnClickListener {
             //对本次服务记录清零
-            AutopilotSummaryInfo.totalLength = 0
-            AutopilotSummaryInfo.vehicleServiceNum = 0
             AutopilotSummaryInfo.lightServicesNum = 0
             AutopilotSummaryInfo.infoTipNum = 0
             AutopilotSummaryInfo.vehicleTipNum = 0
@@ -99,13 +97,14 @@ open class ItinerarySummaryDialog(context: Context, isDriver: Boolean, theme: In
         tvEfficiencyNum?.text = num.toString()
         //小智总结
         tvSummaryZhiContent = findViewById(R.id.tvSummaryZhiContent)
-        AutopilotSummaryInfo.vehicleServiceNum = AutopilotSummaryInfo.lightServicesNum
-        +AutopilotSummaryInfo.infoTipNum + AutopilotSummaryInfo.vehicleTipNum + AutopilotSummaryInfo.vulnerableTipNum
+
+        val vehicleServiceNum = AutopilotSummaryInfo.infoTipNum+ AutopilotSummaryInfo.vehicleTipNum + AutopilotSummaryInfo.vulnerableTipNum + AutopilotSummaryInfo.lightServicesNum + CallerAutoPilotStatusListenerManager.getRoadCount()
+
         val smartRoadLen = random.nextInt(mileage.toInt())
         if(isDriver){
-            tvSummaryZhiContent?.text = "全程 ${(mileage/1000).toInt()}km，智慧道路护航 ${(smartRoadLen/1000)}km，全息感知覆盖率 ${(smartRoadLen*100/mileage).toInt()}%，车辆服务次数${AutopilotSummaryInfo.vehicleServiceNum}次"
+            tvSummaryZhiContent?.text = "全程 ${(mileage/1000).toInt()}km，智慧道路护航 ${(smartRoadLen/1000)}km，全息感知覆盖率 ${(smartRoadLen*100/mileage).toInt()}%，车辆服务次数${vehicleServiceNum}次"
         }else{
-            tvSummaryZhiContent?.text = "旅途全长 ${(mileage/1000).toInt()} km，全感知覆盖率 ${(smartRoadLen*100/mileage).toInt()}%，车辆服务次数${AutopilotSummaryInfo.vehicleServiceNum}次"
+            tvSummaryZhiContent?.text = "旅途全长 ${(mileage/1000).toInt()} km，全感知覆盖率 ${(smartRoadLen*100/mileage).toInt()}%，车辆服务次数${vehicleServiceNum}次"
         }
     }
 
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotSummaryInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotSummaryInfo.kt
index 5199c77603..df7931863d 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotSummaryInfo.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotSummaryInfo.kt
@@ -5,20 +5,6 @@ package com.mogo.eagle.core.data.autopilot
  */
 object AutopilotSummaryInfo {
 
-    /**
-     * 旅途全长
-     */
-    @JvmField
-    @Volatile
-    var totalLength = 0
-
-    /**
-     * 车辆服务次数
-     */
-    @JvmField
-    @Volatile
-    var vehicleServiceNum = 0
-
     /**
      * 路口灯态服务次数
      */