From 44b73b6b9263d4d77282d50ed2d702d9425eff3d Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 16 May 2022 10:48:09 +0800 Subject: [PATCH 1/2] fix bug of log thread problem when tracelog write --- .../mogo_core_function_devatools/trace/TraceManager.kt | 7 +++++-- gradle.properties | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt index c8f0920981..b9264ea64c 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt @@ -6,6 +6,8 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant import com.mogo.eagle.core.data.deva.chain.ChainLogParam import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel +import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA import com.mogo.eagle.core.utilcode.util.DeviceUtils import com.mogo.eagle.core.utilcode.util.Utils @@ -38,7 +40,7 @@ class TraceManager { fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT] = FwBuild(true, -1,pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_AUTO) fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED] = - FwBuild(false, 2,pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_DATA_TRACK) + FwBuild(false, 30,pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_DATA_TRACK) fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY] = FwBuild(false, 30,pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_TRAJECTORY) fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE] = @@ -47,7 +49,7 @@ class TraceManager { traceInfoCache[ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS] = ChainLogParam(true, "ADAS连接状态") traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT] = - ChainLogParam(true, "ADAS自动驾驶链路(包含: 定位,自动驾驶状态,全局路径,到站提醒,节点状态,异常上报)") + ChainLogParam(false, "ADAS自动驾驶链路(包含: 定位,自动驾驶状态,全局路径,到站提醒,节点状态,异常上报)") traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED] = ChainLogParam(false, "ADAS感知物体") traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY] = @@ -57,6 +59,7 @@ class TraceManager { FileWriteManager.getInstance() .init(context, MoGoAiCloudClientConfig.getInstance().sn, pkgName, fwBuildMap) + setTraceLogEnable(true) FileWriteManager.getInstance().registerListener { type -> val param = traceInfoCache[type] param?.let { diff --git a/gradle.properties b/gradle.properties index 0becb77ae1..476474b5a3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -60,7 +60,7 @@ HOOK_LOG_VERSION=1.6.1 SERVICE_CHAIN_VERSION=1.1.0 ################ 外部依赖引用 ################ # loglib -LOGLIB_VERSION=1.2.46 +LOGLIB_VERSION=1.2.60 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION MOGO_NETWORK_VERSION=1.3.55 From 4a19b9850fe65fbf895841fdd49caace272133e5 Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Mon, 16 May 2022 14:07:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E8=AF=95=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 控制中心添加普通模式，展示常用信息，查看更多的信息选择开发者模式 --- .../hmi/ui/setting/DebugSettingView.kt | 71 ++++++- .../main/res/layout/view_debug_setting.xml | 173 +++++++++++++++--- 2 files changed, 219 insertions(+), 25 deletions(-) diff --git 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 index c3912d7216..d7817aab5b 100644 --- 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 @@ -265,13 +265,31 @@ class DebugSettingView @JvmOverloads constructor( if (isChecked) { buttonView.setCompoundDrawables(null, null, iconDown, null) //展示控制中心 - controlCenterLayout.visibility = View.VISIBLE +// controlCenterLayout.visibility = View.VISIBLE + commonLayout.visibility = View.VISIBLE + swDevelopMode.visibility = View.VISIBLE + swDevelopMode.isChecked = false } else { buttonView.setCompoundDrawables(null, null, iconRight, null) //隐藏控制中心 controlCenterLayout.visibility = View.GONE + commonLayout.visibility = View.GONE + swDevelopMode.visibility = View.GONE } } + /** + * 开发者模式 + */ + swDevelopMode.setOnCheckedChangeListener { _, isChecked -> + if(isChecked){ + controlCenterLayout.visibility = View.VISIBLE + commonLayout.visibility = View.GONE + }else{ + controlCenterLayout.visibility = View.GONE + commonLayout.visibility = View.VISIBLE + } + + } /** * 鹰眼参数配置 @@ -311,14 +329,16 @@ class DebugSettingView @JvmOverloads constructor( buttonView.setCompoundDrawables(null, null, iconDown, null) //展示OBU控制中心 obuControllerLayout.visibility = View.VISIBLE - + tbVehicleStateController.isChecked = true } else { buttonView.setCompoundDrawables(null, null, iconRight, null) //隐藏OBU控制中心 obuControllerLayout.visibility = View.GONE + tbVehicleStateController.isChecked = false } } + /** * 车辆状态控制中心 */ @@ -476,6 +496,7 @@ class DebugSettingView @JvmOverloads constructor( //工控机配置信息 tvAutopilotInfo.text = CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfoJsonString() + tvIpcInfo.text = CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfoJsonString() // 绘制应用基本信息 drawAppInfo() @@ -682,6 +703,23 @@ class DebugSettingView @JvmOverloads constructor( CallerAutoPilotManager.recordPackage() } } + btnRecordBag.onClick { + val recordTimeStr = etInputRecordBagTime.text?.toString() + try { + if (recordTimeStr.isNullOrEmpty()) { + CallerAutoPilotManager.recordPackage() + } + val recordTime = recordTimeStr?.toInt() + if (recordTime != null && recordTime > 0) { + CallerAutoPilotManager.recordPackage(recordTime) + } else { + CallerAutoPilotManager.recordPackage() + } + } catch (e: Exception) { + CallerAutoPilotManager.recordPackage() + } + } + } @@ -1350,6 +1388,22 @@ class DebugSettingView @JvmOverloads constructor( }" ) + tvIpcConnectStatus.text = Html.fromHtml( + "工控机连接状态：${ + if (AppConfigInfo.isConnectAutopilot) { + "正常" + } else { + "异常 原因：${ + if (AppConfigInfo.connectStatusDescribe.isNullOrEmpty()) { + "主动断开连接" + } else { + AppConfigInfo.connectStatusDescribe + } + }" + } + }" + ) + tvObuConnectStatus.text = Html.fromHtml( "OBU连接状态：${ if (AppConfigInfo.isConnectObu) { @@ -1396,18 +1450,31 @@ class DebugSettingView @JvmOverloads constructor( tvAutopilotInfo.text = GsonUtils.toJson(mAutoPilotStatusInfo) + tvIpcInfo.text = GsonUtils.toJson(mAutoPilotStatusInfo) tvCarInfo.text = "GPS时间：${(mGnssInfo?.satelliteTime?.times(1000))?.toLong()}\n" + "自车经纬度：\n${mGnssInfo?.longitude}\n${mGnssInfo?.latitude}\n" + tvCarInfoCopy.text = + "GPS时间：${(mGnssInfo?.satelliteTime?.times(1000))?.toLong()}\n" + + "自车经纬度：\n${mGnssInfo?.longitude}\n${mGnssInfo?.latitude}\n" tvIdentifyInfo.text = "「有效类型」感知数据个数：${mIdentifyDataSize}\n" + "「未知类型」感知数据个数：${mUnknownIdentifyDataSize}\n" + tvIdentifyInfoCopy.text = + "「有效类型」感知数据个数：${mIdentifyDataSize}\n" + + "「未知类型」感知数据个数：${mUnknownIdentifyDataSize}\n" + tvTrajectoryInfoSize.text = "引导线点个数：${mTrajectoryInfoSize}" + tvTrajectoryInfoSizeCopy.text = + "引导线点个数：${mTrajectoryInfoSize}" + tvRouteInfoSize.text = "全局路径规划点个数：${mRouteInfoSize}" + tvRouteInfoSizeCopy.text = + "全局路径规划点个数：${mRouteInfoSize}" // 用完之后重制为0，防止节点回掉突然没数据，导致页面显示还是之前的数据情况 diff --git 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 index 7205050429..2e426d215d 100644 --- 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 @@ -166,6 +166,29 @@ android:layout_height="match_parent" android:orientation="vertical"> + + + + + + + + + + + + + + +