From 09e849ad191151eb3c3e8a60bbb7605a1e08f5d8 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Mon, 3 Apr 2023 16:33:04 +0800
Subject: [PATCH] =?UTF-8?q?[dev=5Fopt=5F2.15.0]=E8=BF=90=E8=90=A5=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E5=A2=9E=E5=8A=A0V2N=E5=9C=BA=E6=99=AF=E8=BF=9BPNC?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../autopilot/MoGoAutopilotControlProvider.kt |  8 +++++
 .../function/hmi/ui/setting/SOPSettingView.kt | 29 ++++++++-----------
 .../src/main/res/layout/view_sop_setting.xml  | 14 +++++++++
 .../core/data/config/FunctionBuildConfig.kt   |  7 +++++
 .../IMoGoAutopilotControlProvider.kt          |  6 ++++
 .../CallerAutoPilotControlManager.kt          |  8 +++++
 6 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt
index 6d1e589274..b2b2029787 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt
@@ -649,6 +649,14 @@ class MoGoAutopilotControlProvider :
         return AdasManager.getInstance().sendBagManagerCmd(bagManager.build())
     }
 
+    /**
+     * 控制V2N数据给车端PnC
+     * @param switchCmd true为发给PnC，false为不发给PnC
+     */
+    override fun sendV2nToPncCmd(switchCmd: Boolean) {
+        AdasManager.getInstance().sendV2nToPncCmd(switchCmd)
+    }
+
     /**
      * 向左变道
      */
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
index a181ddf9ed..2572fe8dfe 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
@@ -87,6 +87,18 @@ internal class SOPSettingView @JvmOverloads constructor(
             HmiBuildConfig.isShowCloudWeaknessTrafficView = isChecked
         }
 
+        /**
+         * V2N场景进PNC
+         */
+        tbV2nPnc.isChecked = FunctionBuildConfig.isV2NPnc
+        tbV2nPnc.setOnCheckedChangeListener{ compoundButton, isChecked ->
+            if(!compoundButton.isPressed){
+                return@setOnCheckedChangeListener
+            }
+            CallerAutoPilotControlManager.sendV2nToPncCmd(isChecked)
+            FunctionBuildConfig.isV2NPnc = isChecked
+        }
+
         /**
          * obu V2V开关，默认打开
          */
@@ -239,29 +251,12 @@ internal class SOPSettingView @JvmOverloads constructor(
         CallerDevaToolsFuncConfigListenerManager.registerDevaToolsFuncConfigListener(
             FuncBizConfig.FOUNDATION, TAG, true, this
         )
-        // 开启定时查询速度
-        Timer().schedule(timerTaskRefresh, Date(), 500)
     }
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
         // 移除 业务配置监听
         CallerDevaToolsFuncConfigListenerManager.unRegisterDevaToolsFuncConfigListener(FuncBizConfig.FOUNDATION, TAG)
-        try {
-            timerTaskRefresh.cancel()
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    private val timerTaskRefresh = object : TimerTask(){
-        override fun run() {
-            UiThreadHandler.post{
-                tbDemoMode.isChecked = FunctionBuildConfig.isDemoMode
-                tbRainMode.isChecked = FunctionBuildConfig.isRainMode
-            }
-        }
-
     }
 
     override fun updateBizView(type: String, lock: Boolean) {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
index 79e9b2dd26..61553163b8 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
@@ -233,6 +233,20 @@
         app:layout_constraintLeft_toLeftOf="parent"
         />
 
+    <androidx.appcompat.widget.SwitchCompat
+        android:id="@+id/tbV2nPnc"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="V2N场景进PNC"
+        android:paddingTop="25dp"
+        android:paddingBottom="25dp"
+        android:scaleY="1.2"
+        android:scaleX="1.2"
+        app:layout_constraintLeft_toRightOf="@id/verticalGuideLine"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tbGreenWaveSop"
+        />
+
     <TextView
         android:id="@+id/tvSpeedThresholdTitle"
         android:layout_width="wrap_content"
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
index 2615772153..6faee4048f 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
@@ -219,4 +219,11 @@ object FunctionBuildConfig {
     @Volatile
     @JvmField
     var isSupportPatchUpgrade = true
+
+    /**
+     * 是否开启V2N场景进PNC的开关，开关默认关闭
+     */
+    @Volatile
+    @JvmField
+    var isV2NPnc = false
 }
\ No newline at end of file
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt
index 4c7ec99bab..eb5a03b877 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt
@@ -194,6 +194,12 @@ interface IMoGoAutopilotControlProvider : IMoGoFunctionServerProvider {
      */
     fun sendBagManagerCmd(bagManagerEntity: BagManagerEntity): Boolean
 
+    /**
+     * 控制V2N数据给车端PnC
+     * @param switchCmd true为发给PnC，false为不发给PnC
+     */
+    fun sendV2nToPncCmd(switchCmd: Boolean)
+
     /**
      * 发送工控机所有节点重启命令
      */
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt
index a9fd29e07f..f5c5c16400 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt
@@ -282,6 +282,14 @@ object CallerAutoPilotControlManager {
         }
     }
 
+    /**
+     * 控制V2N数据给车端PnC
+     * @param switchCmd true为发给PnC，false为不发给PnC
+     */
+    fun sendV2nToPncCmd(switchCmd: Boolean){
+        providerApi?.sendV2nToPncCmd(switchCmd)
+    }
+
     /**
      * 向左变道
      */