diff --git a/config.gradle b/config.gradle index f31899eddc..3ace774d82 100644 --- a/config.gradle +++ b/config.gradle @@ -245,7 +245,7 @@ ext { mogo_core_network : "com.mogo.eagle.core:network:${MOGO_CORE_NETWORK_VERSION}", //========================= V2X SDK ========================= - mogo_v2x : "com.mogo.v2x:v2x:${MOGO_V2X_SDK_VERSION}", + mogo_v2x : "com.mogo.v2x:v2x:${MOGO_V2X_SDK_VERSION}", life_cycle_scope : "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0", view_model_scope : "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0", diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt index 4a8c4499e0..ca79afe0be 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt @@ -70,7 +70,7 @@ class DevaToolsProvider : IDevaToolsProvider { private fun initTrace(context: Context) { // 初始化Trace抓取服务 val pkgName = Utils.getApp().packageName - ChainTraceStarter.start(pkgName, DeviceUtils.getMacAddress()) + ChainTraceStarter.start(pkgName, DeviceUtils.getMacAddress(), BuildConfig.DEBUG) // Trace过程中进行日志抓取，对日志进行配置 fwBuildMap[CHAIN_LINK_LOG_CONNECT_STATUS] = diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/AbsLogView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/AbsLogView.kt index 8af3873f7b..b83074ecb1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/AbsLogView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/AbsLogView.kt @@ -68,7 +68,6 @@ abstract class AbsLogView : ILogView, TouchProxy.OnTouchEventListener { fun show(context: Context) { if (isShow) { - Log.d("EmArrow", "isShow : $isShow") return } performCreate(context) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/LogInfoView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/LogInfoView.kt index 6a8e8bf27c..30495732c2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/LogInfoView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/LogInfoView.kt @@ -244,7 +244,6 @@ class LogInfoView : AbsLogView() { mLogHint!!.visibility = View.VISIBLE mLogRvWrap!!.visibility = View.GONE val layoutParams = systemLayoutParams ?: return - Log.d("EmArrow", "minimize , layoutParams is not null") layoutParams.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE layoutParams.width = WindowManager.LayoutParams.MATCH_PARENT layoutParams.height = WindowManager.LayoutParams.WRAP_CONTENT diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 93edc490a0..05e39daa4c 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -177,8 +177,8 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { // 设置AI云平台分配给三方应用的签名密钥，需要从AI云平台申请 // 设置车机设备的唯一标识（这些表识必须是通过后台录入的设备） clientConfig.setThirdPartyDeviceId(Utils.getDevicesId()); - // 设置循环检测间隔时间 - clientConfig.setLoopCheckDelay(60 * 60 * 24 * 1000); + // 设置循环检测间隔时间（每隔2小时loop一次httpDnsConfig） + clientConfig.setLoopCheckDelay(60 * 60 * 2 * 1000); //连接ami connectAmiIp(); diff --git a/gradle.properties b/gradle.properties index cdea54efa9..4fc8fbe279 100644 --- a/gradle.properties +++ b/gradle.properties @@ -56,30 +56,30 @@ bytex.forbidUseLenientMutationDuringGetArtifact=true bytex.verifyProguardConfigurationChanged=false bytex.ASM_API=ASM7 -HOOK_LOG_VERSION=1.5.16 -SERVICE_CHAIN_VERSION=1.0.52 +HOOK_LOG_VERSION=1.5.17 +SERVICE_CHAIN_VERSION=1.0.53 ################ 外部依赖引用 ################ # loglib LOGLIB_VERSION=1.2.8 ######## MogoAiCloudSDK Version ######## # 网络请求 -MOGO_NETWORK_VERSION=1.3.19 +MOGO_NETWORK_VERSION=1.3.30 # 鉴权 -MOGO_PASSPORT_VERSION=1.3.19 +MOGO_PASSPORT_VERSION=1.3.30 # 常链接 -MOGO_SOCKET_VERSION=1.3.19 +MOGO_SOCKET_VERSION=1.3.30 # 数据采集 -MOGO_REALTIME_VERSION=1.3.19 +MOGO_REALTIME_VERSION=1.3.30 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.3.19 +MOGO_TANLU_VERSION=1.3.30 # 直播推流 -MOGO_LIVE_VERSION=1.3.19 +MOGO_LIVE_VERSION=1.3.30 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.3.19 +MOGO_TRAFFICLIVE_VERSION=1.3.30 # 定位服务 -MOGO_LOCATION_VERSION=1.3.19 +MOGO_LOCATION_VERSION=1.3.30 # 远程通讯模块 -MOGO_TELEMATIC_VERSION=1.3.19 +MOGO_TELEMATIC_VERSION=1.3.30 ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=2.0.5.1 @@ -196,5 +196,5 @@ MOGO_OCH_TAXI_VERSION=2.0.66 # mogoAiCloud sdk services MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.16.10 # v2x-sdk -MOGO_V2X_SDK_VERSION=1.0.1 +MOGO_V2X_SDK_VERSION=1.3.30 ################# 旧版本架构模块版本 ################# diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java index f02e748b39..57d5e2d4ab 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java @@ -211,7 +211,6 @@ public class AdasRecognizedResultDrawer extends BaseDrawer { return; } Iterator iterator = mLastPositions.values().iterator(); - Log.d("EmArrow", "removeUselessLastRecord size : " + mLastPositions.size()); while (iterator.hasNext()) { TrafficData result = iterator.next(); long internal = result.getSatelliteTime() - getCurSatelliteTime(); diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java index 9eef614826..d5e3a69162 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java @@ -253,7 +253,6 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic return; } Iterator iterator = mLastPositions.values().iterator(); - Log.d("EmArrow", "removeUselessLastRecord size : " + mLastPositions.size()); while (iterator.hasNext()) { SocketDownData.CloudRoadDataProto result = iterator.next(); long internal = Long.parseLong(adasControllerApi.getSatelliteTime()) - result.getSatelliteTime(); diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/kt/ScopeManager.kt b/modules/mogo-module-common/src/main/java/com/mogo/module/common/kt/ScopeManager.kt deleted file mode 100644 index 8909e4213b..0000000000 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/kt/ScopeManager.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.mogo.module.common.kt - -import androidx.annotation.RestrictTo -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.MainScope -import kotlinx.coroutines.launch - -/** - * @author congtaowang - * @since 2021/3/3 - * - * 描述 - */ -object ScopeManager { - - private var mScope = MainScope() - private var mAdasScope = MainScope() - private var mThreadScope: RestrictTo.Scope? = null - - fun mainScope(runnable: Runnable?) { - mScope.launch(Dispatchers.Default) { - runnable?.apply { - run() - } - } - } - - fun adasScope(runnable: Runnable?) { - mAdasScope.launch(Dispatchers.Default) { - runnable?.apply { - run() - } - } - } -} \ No newline at end of file