diff --git a/config.gradle b/config.gradle index 3ace774d82..0dce01414a 100644 --- a/config.gradle +++ b/config.gradle @@ -95,7 +95,7 @@ ext { videoarmv7 : "com.shuyu:gsyVideoPlayer-armv7a:7.1.2", videoarm64 : "com.shuyu:gsyVideoPlayer-arm64:7.1.2", videojava : "com.shuyu:gsyVideoPlayer-java:7.1.2", - eventbus : "org.greenrobot:eventbus:3.1.1", + eventbus : "org.greenrobot:eventbus:3.3.1", videoprocessor : "com.zhidao.video:video-processor:1.0.2.1", livesdk : "com.tencent.liteavsdk:LiteAVSDK_Smart:7.4.9211", diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt index 3e5dc6400c..f46f5684a6 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt @@ -95,7 +95,7 @@ class MoGoAutopilotProvider : val options = AdasOptions.Builder() .setIpcConnectionMode(AdasOptions.IPC_CONNECTION_MODE.ASSIGN) .setIpcAssignIP(FunctionBuildConfig.adasConnectIP) - .setClient(true) + .setClient(false) .build() AdasManager.getInstance().create(context, options) // NSDNettyManager.getInstance().searchAndConnectServer(context, MoGoAiCloudClientConfig.getInstance().sn, object : NettyClientListener { diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java index 17997e98e6..9a50b94cbd 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java @@ -66,7 +66,7 @@ import java.util.List; * @author congtaowang * @since 2020/10/22 *

- * 适配ADAS 回调监听分发 + * 适配ADAS 回调监听分发，这里不做业务，只做数据包装及分发处理 */ public class MoGoAdasListenerImpl implements OnAdasListener { private final String TAG = "OnAdasListenerAdapter"; diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt index bb533a117f..8fe746db86 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt @@ -11,7 +11,6 @@ import com.mogo.commons.debug.DebugConfig import com.mogo.eagle.core.data.constants.MoGoConfig import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager -import com.mogo.eagle.core.network.NetConfig 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.storage.SharedPrefsMgr @@ -82,7 +81,7 @@ object MogoLogCatchManager : IMogoOnMessageListener, Handl return false } - fun startCatchLog(duration:Int = 10) { + fun startCatchLog(duration: Int = 10) { if (catchingList.contains(MANUAL_CATCH_PKG_NAME)) { TipToast.shortTip("已经在抓取日志了,请稍后再试") } else { @@ -156,13 +155,11 @@ object MogoLogCatchManager : IMogoOnMessageListener, Handl * 根据状态收紧Logger的限制 */ private fun closeLoggerLevel() { - if (catchingList.isNotEmpty()) { - LogUtils.getConfig().isLogSwitch = false - Logger.init(if (DebugConfig.isDebug()) LogLevel.DEBUG else LogLevel.OFF) - MoGoAiCloudClient.getInstance().aiCloudClientConfig.isShowDebugLog = false - CallerAutoPilotManager.setEnableLog(false) - CallerAutoPilotManager.setIsWriteLog(false) - } + LogUtils.getConfig().isLogSwitch = false + Logger.init(if (DebugConfig.isDebug()) LogLevel.DEBUG else LogLevel.OFF) + MoGoAiCloudClient.getInstance().aiCloudClientConfig.isShowDebugLog = false + CallerAutoPilotManager.setEnableLog(false) + CallerAutoPilotManager.setIsWriteLog(false) } override fun onError(errorCount: Int) { 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 e5292b1f22..358b8c8a73 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 @@ -393,7 +393,11 @@ class DebugSettingView @JvmOverloads constructor( SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.CATCH_LOG, false) tbLogCatch.setOnCheckedChangeListener { _, isChecked -> if (isChecked) { - val logCatchTime = etLogCatch.text.toString().toInt() + var logTimeStr = etLogCatch.text?.toString() + if(logTimeStr.isNullOrEmpty()){ + logTimeStr = "10" + } + val logCatchTime = logTimeStr.toInt() if (logCatchTime > 60) { tbLogCatch.isChecked = false TipToast.shortTip("最长抓取时间为60分钟") diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt index 52faf45bb8..aaf4dbac60 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt @@ -161,15 +161,18 @@ class SystemVersionView @JvmOverloads constructor( it.setProgress(AdUpgradeStateHelper.downloadProgress(currentProgress,totalProgress)) } }else if(AdUpgradeStateHelper.isDownloadFinish(downloadStatus,upgradeStatus)){ - //下载完成，处于可升级状态，展示“可升级”角标，将AD背景变为蓝色，并隐藏下载进度条 - ivAdStatus?.setImageResource(R.drawable.icon_upgradeable) - ivAdVersion?.setBackgroundResource(R.drawable.version_upgradeable_background) - adCircularProgressView?.visibility = View.GONE - if(AdUpgradeStateHelper.isQuietUpgradeMode(upgradeMode)){ - //如果升级模式为“静默升级”，则下载完成后，调用升级命令进行升级 - CallerAutoPilotManager.setIPCUpgradeAffirm() - AdUpgradeStateHelper.setUpgradeStatus(true) + //下载完成，处于可升级状态，展示“可升级”角标，将AD背景变为蓝色，并隐藏下载进度条(当状态为“升级中”时，不进行设置（存在升级命令已下发，但工控机未立即升级现象）) + if(!AdUpgradeStateHelper.getUpgradeStatus()){ + ivAdStatus?.setImageResource(R.drawable.icon_upgradeable) + ivAdVersion?.setBackgroundResource(R.drawable.version_upgradeable_background) + adCircularProgressView?.visibility = View.GONE + if(AdUpgradeStateHelper.isQuietUpgradeMode(upgradeMode)){ + //如果升级模式为“静默升级”，则下载完成后，调用升级命令进行升级 + CallerAutoPilotManager.setIPCUpgradeAffirm() + AdUpgradeStateHelper.setUpgradeStatus(true) + } } + }else if(AdUpgradeStateHelper.isDownloadFailed(downloadStatus)){ //下载失败，将状态设为“最新版”角标，并隐藏进度条 ivAdStatus?.setImageResource(R.drawable.icon_latest_version) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml index 8ed352878a..a3c3f0e935 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml @@ -108,13 +108,15 @@ diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt index ac55c90a4e..f0b13e9086 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt @@ -18,8 +18,8 @@ enum class TrafficTypeEnum( TYPE_TRAFFIC_ID_WEI_ZHI( 100, "未知数据", - R.raw.v2x_shigong_warning, - R.raw.v2x_shigong_warning + R.raw.special_vehicle, + R.raw.special_vehicle ), TYPE_TRAFFIC_ID_PEOPLE( 1, diff --git a/core/mogo-core-res/src/main/res/raw/traffic_unkonwn.nt3d b/core/mogo-core-res/src/main/res/raw/traffic_unkonwn.nt3d new file mode 100644 index 0000000000..7c10670e2f Binary files /dev/null and b/core/mogo-core-res/src/main/res/raw/traffic_unkonwn.nt3d differ diff --git a/gradle.properties b/gradle.properties index f880a04a82..973ee7a415 100644 --- a/gradle.properties +++ b/gradle.properties @@ -60,7 +60,7 @@ HOOK_LOG_VERSION=1.5.17 SERVICE_CHAIN_VERSION=1.0.53 ################ 外部依赖引用 ################ # loglib -LOGLIB_VERSION=1.2.8 +LOGLIB_VERSION=1.2.9 ######## MogoAiCloudSDK Version ######## # 网络请求 MOGO_NETWORK_VERSION=1.3.31