[8.2.0]运营面板V2X

2025-08-06 15:35:58 +08:00
parent 16a625e5b8
commit 3abaa2663a
9 changed files with 170 additions and 27 deletions
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt
@@ -494,11 +494,13 @@ class MoGoHmiProvider : IMoGoHmiProvider {
            if (target != null && target.visibility != View.VISIBLE) {
                TransitionManager.beginDelayedTransition(target.parent as ViewGroup, Slide(Gravity.START).also { it.duration = 150; it.addTarget(target) })
                target.visibility = View.VISIBLE
+                CallerHmiViewControlListenerManager.invokeOperatePanelDisplayStatus(true)
            }
        } else {
            if (target != null && target.visibility == View.VISIBLE) {
                TransitionManager.beginDelayedTransition(target.parent as ViewGroup, Slide(Gravity.START).also { it.duration = 150; it.addTarget(target) })
                target.visibility = View.GONE
+                CallerHmiViewControlListenerManager.invokeOperatePanelDisplayStatus(false)
            }
        }
    }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt
@@ -5,10 +5,12 @@ import android.os.Bundle
 import android.os.SystemClock
 import android.util.AttributeSet
 import android.util.Log
+import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
+import android.widget.Toast
 import androidx.annotation.CallSuper
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
@@ -26,6 +28,7 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.config.HmiBuildConfig
 import com.mogo.eagle.core.data.multidisplay.TelematicConstant
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoGetParamResponseListener
 import com.mogo.eagle.core.function.api.devatools.IV2XListener
 import com.mogo.eagle.core.function.api.devatools.mofang.IMoGoMoFangProvider
@@ -322,7 +325,8 @@ class OperatePanelLayout : LinearLayout {
        }
    }

-    class V2XPreferenceFragmentCompat : OperatePanelDetailBase(), IV2XListener {
+    class V2XPreferenceFragmentCompat : OperatePanelDetailBase(), IV2XListener,
+        IMoGoAutopilotStatusListener,IViewControlListener {

        companion object {
            private const val TAG = "V2XPreferenceFragmentCompat"
@@ -352,14 +356,26 @@ class OperatePanelLayout : LinearLayout {
                //车辆图像上传行云大模型状态查询
                CallerAutoPilotControlManager.sendImgUploadCloudStatusQuery()
            }
+            CallerAutoPilotStatusListenerManager.addListener(TAG, this)
+            CallerHmiViewControlListenerManager.addListener(TAG,this)
            return super.onCreateView(inflater, container, savedInstanceState)
        }

        override fun onDestroyView() {
            CallerV2XManager.removeListener(TAG)
+            CallerAutoPilotStatusListenerManager.removeListener(TAG)
            super.onDestroyView()
        }

+        override fun operatePanelDisplayStatus(isShow: Boolean) {
+            super.operatePanelDisplayStatus(isShow)
+            if(isShow){
+                CallerAutoPilotStatusListenerManager.addListener(TAG, this)
+            }else{
+                CallerAutoPilotStatusListenerManager.removeListener(TAG)
+            }
+        }
+
        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
            setPreferencesFromResource(R.xml.operate_panel_preference_details_v2x, rootKey)
        }
@@ -418,6 +434,59 @@ class OperatePanelLayout : LinearLayout {
            return super.getDefaultVal(pref)
        }

+        override fun onAutopilotIpcConnectStatusChanged(
+            status: AdasConstants.IpcConnectionStatus,
+            reason: String?
+        ){
+            ThreadUtils.runOnUiThread{
+                Log.i("xuxinchao","status="+status)
+                if(status == AdasConstants.IpcConnectionStatus.CONNECTED){
+                    //域控连接成功，恢复正常状态
+                    Log.i("xuxinchao","域控连接成功")
+                    setEnableStatus(true)
+                }else{
+                    Log.i("xuxinchao","请等待与域控恢复连接后操作")
+                    //断连中，持续提示：请等待与域控恢复连接后操作；并且将所有开关置为不可用状态
+                    val customToastView = AppStateManager.currentActivity()?.layoutInflater?.inflate(R.layout.view_ipc_connect_status_toast,null)
+                    val customToast = Toast(context?.applicationContext)
+                    customToast.duration = Toast.LENGTH_LONG
+                    customToast.view = customToastView
+                    customToast.setGravity(Gravity.START,AutoSizeUtils.dp2px(context, 280f),0)
+                    customToast.show()
+
+                    setEnableStatus(false)
+                }
+            }
+        }
+
+        private fun setEnableStatus(isEnable: Boolean){
+            //NDE（数据上车）上行
+            preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(NDE_UPWARD_SWITCH)?.isEnabled = isEnable
+            //车辆图像上传行云大模型
+            preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(IMAGE_UPLOAD_SWITCH)?.isEnabled = isEnable
+            //NDE（数据上车）下行
+            preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(NDE_DOWNWARD_SWITCH)?.isEnabled = isEnable
+            //事件数据进PNC应用
+            preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(NDE_EVENT_DATA_TO_PNC)?.isEnabled = isEnable
+            //感知数据进PNC应用
+            preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(NDE_PERCEPTION_DATA_TO_PNC)?.isEnabled = isEnable
+            //云控基础平台上行
+            preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(CLOUD_CONTROL_UPWARD)?.isEnabled = isEnable
+            //云控基础平台下行
+            preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(CLOUD_CONTROL_DOWNWARD)?.isEnabled = isEnable
+            //OBU上报（V2I、V2V上行）
+            preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(OBU_UPWARD_SWITCH)?.isEnabled = isEnable
+            //V2I下行
+            preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(V2I_DOWNWARD_SWITCH)?.isEnabled = isEnable
+            //弱势交通参与者
+            preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(V2I_WEAK_TRAFFIC_PARTICIPANT)?.isEnabled = isEnable
+            //感知数据进PNC应用
+            preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(V2I_PERCEPTION_DATA_TO_PNC)?.isEnabled = isEnable
+            //V2V下行
+            preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(V2V_DOWNWARD_SWITCH)?.isEnabled = isEnable
+        }
+
+
        override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
            Log.d(TAG, "-- onPreferenceChange:($preference, $newValue)")
            when (preference.key) {
@@ -480,15 +549,15 @@ class OperatePanelLayout : LinearLayout {
                        //关闭事件数据进PNC应用
                        CallerAutoPilotControlManager.sendNdeDownEventToPnc(0)
                        //查询事件数据进PNC应用
-//                        UiThreadHandler.postDelayed({
-//                            CallerAutoPilotControlManager.sendGetParamReq(AdasConstants.MapSystemParamType.V2N_TO_PNC)
-//                        }, 500)
+                        UiThreadHandler.postDelayed({
+                            CallerAutoPilotControlManager.sendGetParamReq(AdasConstants.MapSystemParamType.V2N_TO_PNC)
+                        }, 500)
                        //关闭感知数据进PNC应用
                        CallerAutoPilotControlManager.sendNdeDownPerceptionToPnc(0)
                        //查询感知数据进PNC应用
-//                        UiThreadHandler.postDelayed({
-//                            CallerAutoPilotControlManager.sendGetParamReq(AdasConstants.MapSystemParamType.PERCEPTION_TO_PNC)
-//                        }, 500)
+                        UiThreadHandler.postDelayed({
+                            CallerAutoPilotControlManager.sendGetParamReq(AdasConstants.MapSystemParamType.PERCEPTION_TO_PNC)
+                        }, 500)
                    }
                    return true
                }
@@ -502,9 +571,9 @@ class OperatePanelLayout : LinearLayout {
                        CallerAutoPilotControlManager.sendNdeDownEventToPnc(0)
                    }
                    //查询事件数据进PNC应用
-//                    UiThreadHandler.postDelayed({
-//                        CallerAutoPilotControlManager.sendGetParamReq(AdasConstants.MapSystemParamType.V2N_TO_PNC)
-//                    }, 500)
+                    UiThreadHandler.postDelayed({
+                        CallerAutoPilotControlManager.sendGetParamReq(AdasConstants.MapSystemParamType.V2N_TO_PNC)
+                    }, 500)
                    hmiAction("事件数据进PNC应用, ", isChecked)
                    clickEventAnalytics("事件数据进PNC应用", isChecked)
                    return true
@@ -519,9 +588,9 @@ class OperatePanelLayout : LinearLayout {
                        CallerAutoPilotControlManager.sendNdeDownPerceptionToPnc(0)
                    }
                    //查询感知数据进PNC应用
-//                    UiThreadHandler.postDelayed({
-//                        CallerAutoPilotControlManager.sendGetParamReq(AdasConstants.MapSystemParamType.PERCEPTION_TO_PNC)
-//                    }, 500)
+                    UiThreadHandler.postDelayed({
+                        CallerAutoPilotControlManager.sendGetParamReq(AdasConstants.MapSystemParamType.PERCEPTION_TO_PNC)
+                    }, 500)
                    hmiAction("感知数据进PNC应用, ", isChecked)
                    clickEventAnalytics("感知数据进PNC应用", isChecked)
                    return true
@@ -583,9 +652,9 @@ class OperatePanelLayout : LinearLayout {
                        FunctionBuildConfig.v2iPerceptionDataToPnc = false
                        CallerAutoPilotControlManager.sendV2iDownPerceptionToPnc(0)
                        //查询V2I下行感知进PNC开关状态
-//                        UiThreadHandler.postDelayed({
-//                            CallerAutoPilotControlManager.sendGetParamReq(AdasConstants.MapSystemParamType.V2I_TO_PNC)
-//                        }, 500)
+                        UiThreadHandler.postDelayed({
+                            CallerAutoPilotControlManager.sendGetParamReq(AdasConstants.MapSystemParamType.V2I_TO_PNC)
+                        }, 500)
                    }
                    hmiAction("V2I下行, ", isChecked)
                    clickEventAnalytics("V2I下行", isChecked)
@@ -610,9 +679,9 @@ class OperatePanelLayout : LinearLayout {
                        CallerAutoPilotControlManager.sendV2iDownPerceptionToPnc(0)
                    }
                    //查询V2I下行感知进PNC开关状态
-//                    UiThreadHandler.postDelayed({
-//                        CallerAutoPilotControlManager.sendGetParamReq(AdasConstants.MapSystemParamType.V2I_TO_PNC)
-//                    }, 500)
+                    UiThreadHandler.postDelayed({
+                        CallerAutoPilotControlManager.sendGetParamReq(AdasConstants.MapSystemParamType.V2I_TO_PNC)
+                    }, 500)
                    hmiAction("感知数据进PNC应用, ", isChecked)
                    clickEventAnalytics("感知数据进PNC应用", isChecked)
                    return true
@@ -706,14 +775,23 @@ class OperatePanelLayout : LinearLayout {
         * @param adasParam    解析后的配置参数
         */
        override fun onGetParamResp(getParamResp: MessagePad.SetParamReq, adasParam: AdasParam) {
-//            ThreadUtils.runOnUiThread {
-//                //融合v2n开关 NDE下行事件数据进pnc
-//                preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(NDE_EVENT_DATA_TO_PNC)?.also { changeValue(it,adasParam.v2nToPnc==1) }
-//                //融合v2i开关 V2I下行感知数据进pnc
-//                preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(V2I_PERCEPTION_DATA_TO_PNC)?.also { changeValue(it,adasParam.v2iToPnc==1) }
-//                //NDE下行感知数据进pnc
-//                preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(NDE_PERCEPTION_DATA_TO_PNC)?.also { changeValue(it,adasParam.perceptionToPnc==1) }
-//            }
+            ThreadUtils.runOnUiThread {
+                Log.i("onGetParamResp","adasParam.v2nToPnc="+adasParam.v2nToPnc)
+                Log.i("onGetParamResp","adasParam.v2iToPnc="+adasParam.v2iToPnc)
+                Log.i("onGetParamResp","adasParam.perceptionToPnc="+adasParam.perceptionToPnc)
+                //融合v2n开关 NDE下行事件数据进pnc
+                if(adasParam.v2nToPnc != -1){
+                    preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(NDE_EVENT_DATA_TO_PNC)?.also { changeValue(it,adasParam.v2nToPnc==1) }
+                }
+                //融合v2i开关 V2I下行感知数据进pnc
+                if(adasParam.v2iToPnc != -1){
+                    preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(V2I_PERCEPTION_DATA_TO_PNC)?.also { changeValue(it,adasParam.v2iToPnc==1) }
+                }
+                //NDE下行感知数据进pnc
+                if(adasParam.perceptionToPnc != -1){
+                    preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(NDE_PERCEPTION_DATA_TO_PNC)?.also { changeValue(it,adasParam.perceptionToPnc==1) }
+                }
+            }
        }

        /**
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_v2x_toast.png
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_v2x_toast.png
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_v2x_tip.png
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_v2x_tip.png
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_ipc_connect_status_toast.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_ipc_connect_status_toast.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="@dimen/dp_698"
+    android:layout_height="@dimen/dp_371"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    >
+
+    <View
+        android:layout_width="@dimen/dp_698"
+        android:layout_height="@dimen/dp_371"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:background="@drawable/bg_v2x_toast"
+        />
+
+    <ImageView
+        android:id="@+id/ivConnectTip"
+        android:layout_width="@dimen/dp_140"
+        android:layout_height="@dimen/dp_140"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:src="@drawable/icon_v2x_tip"
+        android:contentDescription="@string/operate_v2x_connect_tip"
+        android:layout_marginTop="@dimen/dp_78"
+        />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/ivConnectTip"
+        android:text="@string/operate_v2x_connect_tip"
+        android:textSize="@dimen/sp_38"
+        android:textColor="@color/white"
+        android:layout_marginTop="@dimen/dp_16"
+        />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- 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
@@ -222,6 +222,8 @@
    <string name="traffic_light_source">红绿灯信号来源</string>
    <string name="report_success">已发起上报</string>

+    <string name="operate_v2x_connect_tip">请等待与域控恢复连接后操作</string>
+
    <string name="wifi_connect_icon">Wifi连接状态图标</string>
    <string name="ipc_connect_icon">域控连接状态图标</string>
    <string name="ssm_connect_icon">SSM连接状态图标</string>
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/MogoRouteOverlayManager.java
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/MogoRouteOverlayManager.java
@@ -34,6 +34,11 @@ public class MogoRouteOverlayManager implements

    private final IViewControlListener listener = new IViewControlListener() {

+        @Override
+        public void operatePanelDisplayStatus(boolean isShow) {
+
+        }
+
        @Override
        public void showColdStartProcessView() {