yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev_MogoAP_eagle-220_211207_8.0.17

Browse Source 
# Conflicts:
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
#	core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/V2XProvider.kt
#	gradle.properties
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
This commit is contained in:
donghongyu
2022-01-10 19:07:35 +08:00
parent 5105e66388 8faf47a41b
commit d5aa714f21
15 changed files with 289 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
View File

@@ -58,9 +58,6 @@ class DebugSettingView @JvmOverloads constructor(
private val TAG = "DebugSettingView"
// 初始化App 配置信息
private val mAppConfigInfo = AppConfigInfo()
private var logInfoView: LogInfoView? = null
private var logViewAttach = false
@@ -367,20 +364,21 @@ class DebugSettingView @JvmOverloads constructor(
* 绘制应用基本
*/
private fun drawAppInfo() {
mAppConfigInfo.appName = AppUtils.getAppName()
mAppConfigInfo.appVersionCode = AppUtils.getAppVersionCode()
mAppConfigInfo.appVersionName = AppUtils.getAppVersionName()
mAppConfigInfo.appPackageName = AppUtils.getAppPackageName()
mAppConfigInfo.uniqueDeviceId = DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp())
mAppConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn
mAppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token
mAppConfigInfo.mapSdkVersion = MogoMap.getInstance().mogoMap.mapVersion
mAppConfigInfo.isConnectNet = NetworkUtils.isConnected(context)
mAppConfigInfo.isConnectSocket = DebugConfig.isDownloadSnapshot()
AppConfigInfo.appName = AppUtils.getAppName()
AppConfigInfo.appName = AppUtils.getAppName()
AppConfigInfo.appVersionCode = AppUtils.getAppVersionCode()
AppConfigInfo.appVersionName = AppUtils.getAppVersionName()
AppConfigInfo.appPackageName = AppUtils.getAppPackageName()
AppConfigInfo.uniqueDeviceId = DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp())
AppConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn
AppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token
AppConfigInfo.netMode = DebugConfig.getNetMode()
AppConfigInfo.mapSdkVersion = MogoMap.getInstance().mogoMap.mapVersion
AppConfigInfo.isConnectNet = NetworkUtils.isConnected(context)
AppConfigInfo.isConnectSocket = DebugConfig.isDownloadSnapshot()
// 将数据绘制
tvAppInfo.text = mAppConfigInfo.toString()
tvAppInfo.text = AppConfigInfo.toString()
}
/**
@@ -390,8 +388,8 @@ class DebugSettingView @JvmOverloads constructor(
UiThreadHandler.post {
tvObuInfo.text = GsonUtils.toJson(obuStatusInfo)
mAppConfigInfo.obuSdkVersion = obuStatusInfo.obuSdkVersion
mAppConfigInfo.isConnectObu = obuStatusInfo.obuStatus
AppConfigInfo.obuSdkVersion = obuStatusInfo.obuSdkVersion
AppConfigInfo.isConnectObu = obuStatusInfo.obuStatus
drawAppInfo()
}
}
@@ -404,8 +402,8 @@ class DebugSettingView @JvmOverloads constructor(
tvAutopilotInfo.post {
tvAutopilotInfo.text = GsonUtils.toJson(autoPilotStatusInfo)
mAppConfigInfo.adasSdkVersion = autoPilotStatusInfo.version
mAppConfigInfo.isConnectAutopilot = autoPilotStatusInfo.connectStatus
AppConfigInfo.adasSdkVersion = autoPilotStatusInfo.version
AppConfigInfo.isConnectAutopilot = autoPilotStatusInfo.connectStatus
drawAppInfo()
}
}

21
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
View File

@@ -31,6 +31,27 @@
android:textSize="@dimen/dp_34"
android:textStyle="bold" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="PAD系统时间："
android:textColor="#000"
android:textSize="@dimen/dp_36" />
<TextClock
android:id="@+id/tvNowTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:format12Hour="yyyy年MM月dd日 EEEE aa HH:mm:ss"
android:format24Hour="yyyy年MM月dd日 EEEE aa HH:mm:ss"
android:textColor="#000"
android:textSize="@dimen/dp_36" />
</LinearLayout>
<TextView
android:id="@+id/tvAppInfo"
android:layout_width="match_parent"