[Change]

增加未知类型绘制开关按钮增加未知类型计数 Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-03-01 18:46:47 +08:00
parent 193f7f4c4b
commit e447fb1a3e
6 changed files with 107 additions and 83 deletions
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -14,6 +14,7 @@ import com.mogo.eagle.core.data.autopilot.*
 import com.mogo.eagle.core.data.chain.ChainConstant
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.constants.MoGoConfig
+import com.mogo.eagle.core.data.enums.TrafficTypeEnum
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.data.obu.ObuStatusInfo
 import com.mogo.eagle.core.data.traffic.TrafficData
@@ -44,12 +45,7 @@ import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
 import com.mogo.eagle.core.utilcode.util.*
 import com.mogo.map.MogoMap
 import com.mogo.map.uicontroller.VisualAngleMode
-import com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_300
-import com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_CROSS
-import com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_TOP
-import com.mogo.map.uicontroller.VisualAngleMode.MODE_CLOSE_SIGHT
-import com.mogo.map.uicontroller.VisualAngleMode.MODE_LONG_SIGHT
-import com.mogo.map.uicontroller.VisualAngleMode.MODE_MEDIUM_SIGHT
+import com.mogo.map.uicontroller.VisualAngleMode.*
 import com.mogo.module.common.MogoApisHandler
 import kotlinx.android.synthetic.main.view_debug_setting.view.*
 import java.util.*
@@ -61,13 +57,13 @@ import java.util.*
 * 展示 本机、网络、工控机、OBU等状态信息，支持设置IP，等参数进行调试
 */
 class DebugSettingView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoObuStatusListener,
-    IMoGoAutopilotStatusListener, IMoGoAutopilotCarStateListener,
-    IMoGoMapLocationListener, IMoGoAutopilotIdentifyListener,
-    IMoGoAutopilotPlanningListener {
+        IMoGoAutopilotStatusListener, IMoGoAutopilotCarStateListener,
+        IMoGoMapLocationListener, IMoGoAutopilotIdentifyListener,
+        IMoGoAutopilotPlanningListener {

    private val TAG = "DebugSettingView"

@@ -77,9 +73,12 @@ class DebugSettingView @JvmOverloads constructor(
    private var mAutoPilotStatusInfo: AutopilotStatusInfo? = null
    private var mAutoPilotCarStateInfo: AutopilotCarStateInfo? = null

-    // 感知识别数据个数
+    // 感知识别「已知类型」数据个数
    private var mIdentifyDataSize = 0

+    // 感知识别「未知类型」数据个数
+    private var mUnknownIdentifyDataSize = 0
+
    // 引导线点个数
    private var mTrajectoryInfoSize = 0

@@ -247,14 +246,14 @@ class DebugSettingView @JvmOverloads constructor(

        tvObuInfo.text = CallerObuListenerManager.getObuStatusInfoJsonString()
        tvAutopilotInfo.text =
-            CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfoJsonString()
+                CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfoJsonString()

        // 绘制应用基本信息
        drawAppInfo()

        // 初始化OBU IP信息
        val ipAddress =
-            SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, "192.168.1.199")
+                SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, "192.168.1.199")

        etObuIP.setText(ipAddress)
        etObuIP.text?.let { etObuIP.setSelection(it.length) }
@@ -270,8 +269,8 @@ class DebugSettingView @JvmOverloads constructor(

        // 初始化工控机 IP信息
        val autoPilotIpAddress =
-            SharedPrefsMgr.getInstance(context)
-                .getString(MoGoConfig.AUTOPILOT_IP, FunctionBuildConfig.adasConnectIP)
+                SharedPrefsMgr.getInstance(context)
+                        .getString(MoGoConfig.AUTOPILOT_IP, FunctionBuildConfig.adasConnectIP)

        etAutopilotIP.setText(autoPilotIpAddress)
        etAutopilotIP.text?.let { etAutopilotIP.setSelection(it.length) }
@@ -292,18 +291,18 @@ class DebugSettingView @JvmOverloads constructor(

        // 初始化 GSP数据源 数据
        rgGpsProvider.check(
-            when (FunctionBuildConfig.gpsProvider) {
-                0 -> {
-                    R.id.rbGpsProviderAndroid
+                when (FunctionBuildConfig.gpsProvider) {
+                    0 -> {
+                        R.id.rbGpsProviderAndroid
+                    }
+                    1 -> {
+                        R.id.rbGpsProviderRTK
+                    }
+                    2 -> {
+                        R.id.rbGpsProviderOBU
+                    }
+                    else -> R.id.rbGpsProviderAndroid
                }
-                1 -> {
-                    R.id.rbGpsProviderRTK
-                }
-                2 -> {
-                    R.id.rbGpsProviderOBU
-                }
-                else -> R.id.rbGpsProviderAndroid
-            }
        )
        rgGpsProvider.setOnCheckedChangeListener { group, checkedId ->
            when (checkedId) {
@@ -325,6 +324,12 @@ class DebugSettingView @JvmOverloads constructor(
            FunctionBuildConfig.isDrawIdentifyData = isChecked
        }

+        // 初始化 ADAS感知数据是否绘制 选择情况
+        tbIsDrawUnknownIdentifyData.isChecked = FunctionBuildConfig.isDrawUnknownIdentifyData
+        tbIsDrawUnknownIdentifyData.setOnCheckedChangeListener { buttonView, isChecked ->
+            FunctionBuildConfig.isDrawUnknownIdentifyData = isChecked
+        }
+
        // 初始化 OBU感知数据是否绘制 选择情况
        tbIsDrawOBUIdentifyData.isChecked = FunctionBuildConfig.isDrawObuIdentifyData
        tbIsDrawOBUIdentifyData.setOnCheckedChangeListener { buttonView, isChecked ->
@@ -385,7 +390,7 @@ class DebugSettingView @JvmOverloads constructor(
        }

        tbLogCatch.isChecked =
-            SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.CATCH_LOG, false)
+                SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.CATCH_LOG, false)
        tbLogCatch.setOnCheckedChangeListener { _, isChecked ->
            if (isChecked) {
                val logCatchTime = etLogCatch.text.toString().toInt()
@@ -400,20 +405,20 @@ class DebugSettingView @JvmOverloads constructor(
            }
        }
        CallerDevaToolsListenerManager.registerDevaToolsLogCatchListener(TAG,
-            object : IMoGoDevaToolsListener {
-                override fun onLogCatchClose() {
-                    super.onLogCatchClose()
-                    tbLogCatch.isChecked = false
-                }
+                object : IMoGoDevaToolsListener {
+                    override fun onLogCatchClose() {
+                        super.onLogCatchClose()
+                        tbLogCatch.isChecked = false
+                    }

-                override fun onLogCatch(lineLog: String) {
-                    logInfoView?.let {
-                        if (logViewAttach) {
-                            it.onLogCatch(lineLog)
+                    override fun onLogCatch(lineLog: String) {
+                        logInfoView?.let {
+                            if (logViewAttach) {
+                                it.onLogCatch(lineLog)
+                            }
                        }
                    }
-                }
-            })
+                })
        tbLogDebugView.setOnCheckedChangeListener { _, isChecked ->
            if (isChecked) {
                logInfoView = LogInfoView()
@@ -476,18 +481,20 @@ class DebugSettingView @JvmOverloads constructor(
        tvAutopilotInfo.text = GsonUtils.toJson(mAutoPilotStatusInfo)

        tvCarInfo.text =
-            "GPS时间：${mAutoPilotCarStateInfo?.values?.satelliteTime}\n" +
-                    "自车经纬度：\n${mAutoPilotCarStateInfo?.values?.lon}\n${mAutoPilotCarStateInfo?.values?.lat}\n"
+                "GPS时间：${mAutoPilotCarStateInfo?.values?.satelliteTime}\n" +
+                        "自车经纬度：\n${mAutoPilotCarStateInfo?.values?.lon}\n${mAutoPilotCarStateInfo?.values?.lat}\n"

        tvIdentifyInfo.text =
-            "感知数据个数：${mIdentifyDataSize}"
+                "「有效类型」感知数据个数：${mIdentifyDataSize}\n" +
+                        "「未知类型」感知数据个数：${mUnknownIdentifyDataSize}\n"
        tvTrajectoryInfoSize.text =
-            "引导线点个数：${mTrajectoryInfoSize}"
+                "引导线点个数：${mTrajectoryInfoSize}"
        tvRouteInfoSize.text =
-            "全局路径规划点个数：${mRouteInfoSize}"
+                "全局路径规划点个数：${mRouteInfoSize}"

        // 用完之后重制为0，防止节点回掉突然没数据，导致页面显示还是之前的数据情况
        mIdentifyDataSize = 0
+        mUnknownIdentifyDataSize = 0
        mTrajectoryInfoSize = 0
        mRouteInfoSize = 0
    }
@@ -534,7 +541,17 @@ class DebugSettingView @JvmOverloads constructor(
    }

    override fun onAutopilotIdentifyDataUpdate(trafficData: ArrayList<TrafficData>?) {
-        mIdentifyDataSize = trafficData?.size ?: 0
+        // 重制数据
+        mIdentifyDataSize = 0
+        mUnknownIdentifyDataSize = 0
+        // 遍历计数
+        trafficData?.forEach {
+            if (it.type == TrafficTypeEnum.TYPE_TRAFFIC_ID_WEI_ZHI) {
+                mUnknownIdentifyDataSize++
+            } else {
+                mIdentifyDataSize++
+            }
+        }
    }

    override fun onAutopilotWarnMessage(autopilotWarnMessage: AutopilotWarnMessage?) {
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -274,6 +274,16 @@
                        android:textOn="关闭鹰眼感知"
                        android:textSize="@dimen/dp_24" />

+                    <ToggleButton
+                        android:id="@+id/tbIsDrawUnknownIdentifyData"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="2dp"
+                        android:gravity="center"
+                        android:textOff="显示「未知类型」感知"
+                        android:textOn="关闭「未知类型」感知"
+                        android:textSize="@dimen/dp_24" />
+
                    <ToggleButton
                        android:id="@+id/tbIsDrawOBUIdentifyData"
                        android:layout_width="wrap_content"