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 36610d631f..cdff9714ed 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 @@ -47,7 +47,7 @@ object MogoLogCatchManager : IMogoOnMessageListener, Handl MogoApisHandler.getInstance().apis .getSocketManagerApi(AbsMogoApplication.getApp().applicationContext) .registerOnMessageListener(LOG_PUSH_TYPE, this) - manualContent.duration = 60 + manualContent.duration = 10 manualContent.pkgName = context.packageName } @@ -98,13 +98,13 @@ object MogoLogCatchManager : IMogoOnMessageListener, Handl private fun startCatchLog(content: RemoteLogPushContent) { catchingList.add(content.pkgName) - var delay = (content.duration * 60 * 1000).toLong() + var delay = (content.duration).toLong() handler.removeMessages(MSG_TRY_CLOSE_LOG) if (delay <= 0) { // 如果push 下来的delay小于等于0，那就给个默认最大值一小时 - delay = 60 * 60 * 1000L + delay = 10 } - handler.sendEmptyMessageDelayed(MSG_TRY_CLOSE_LOG, delay) + handler.sendEmptyMessageDelayed(MSG_TRY_CLOSE_LOG, delay * 1000L * 60) openLoggerLevel() logInfoManager = LogInfoManagerFactory.createPushLogInfoManager( mContext, diff --git a/gradle.properties b/gradle.properties index 2160ee300d..434b03b691 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,7 +37,7 @@ kapt.include.compile.classpath=false android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true -android.jetifier.blacklist=module-service-2.1.16.6.aar +android.jetifier.blacklist=module-service-2.1.16.8.aar ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ @@ -60,7 +60,7 @@ HOOK_LOG_VERSION=1.4.109 SERVICE_CHAIN_VERSION=1.0.43 ################ 外部依赖引用 ################ # loglib -LOGLIB_VERSION=1.1.14 +LOGLIB_VERSION=1.1.18 ######## MogoAiCloudSDK Version ######## # 网络请求 MOGO_NETWORK_VERSION=1.3.17 @@ -89,105 +89,104 @@ applicationName=IntelligentPilot versionCode=80008 versionName=8.0.17 ################# 新架构模块Maven版本管理 ################# -MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_MAP_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_SMP_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_V2X_VERSION=0.0.58.6 -MOGO_CORE_DATA_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_API_VERSION=0.0.58.6 -MOGO_CORE_FUNCTION_CALL_VERSION=0.0.58.6 -MOGO_CORE_RES_VERSION=0.0.58.6 -MOGO_CORE_UTILS_VERSION=0.0.58.6 -MOGO_CORE_NETWORK_VERSION=0.0.58.6 +MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_MAP_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_SMP_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_V2X_VERSION=0.0.58.8 +MOGO_CORE_DATA_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_API_VERSION=0.0.58.8 +MOGO_CORE_FUNCTION_CALL_VERSION=0.0.58.8 +MOGO_CORE_RES_VERSION=0.0.58.8 +MOGO_CORE_UTILS_VERSION=0.0.58.8 +MOGO_CORE_NETWORK_VERSION=0.0.58.8 ################# 旧版本架构模块版本 ################# ## 工程内模块 -MOGO_COMMONS_VERSION=2.1.16.6 -MOGO_UTILS_VERSION=2.1.16.6 -MAP_AMAP_VERSION=2.1.16.6 -MAP_AUTONAVI_VERSION=2.1.16.6 -MOGO_MAP_VERSION=2.1.16.6 -MOGO_MAP_API_VERSION=2.1.16.6 -MOGO_ADAS_VERSION=2.1.16.6 -MOGO_SERVICE_VERSION=2.1.16.6 -MOGO_SERVICE_API_VERSION=2.1.16.6 -MOGO_CONNECTION_VERSION=2.1.16.6 -MOGO_MODULE_APPS_VERSION=2.1.16.6 -MOGO_MODULE_NAVI_VERSION=2.1.16.6 -MOGO_MODULE_SHARE_VERSION=2.1.16.6 -MOGO_MODULE_COMMON_VERSION=2.1.16.6 -MOGO_MODULE_MAIN_VERSION=2.1.16.6 -MOGO_MODULE_MAP_VERSION=2.1.16.6 -MOGO_MODULE_SERVICE_VERSION=2.1.16.6 -MOGO_MODULE_EXTENSIONS_VERSION=2.1.16.6 -MOGO_MODULE_SEARCH_VERSION=2.1.16.6 -MOGO_MODULE_BACK_VERSION=2.1.16.6 -MOGO_MODULE_V2X_VERSION=2.1.16.6 +MOGO_COMMONS_VERSION=2.1.16.8 +MOGO_UTILS_VERSION=2.1.16.8 +MAP_AMAP_VERSION=2.1.16.8 +MAP_AUTONAVI_VERSION=2.1.16.8 +MOGO_MAP_VERSION=2.1.16.8 +MOGO_MAP_API_VERSION=2.1.16.8 +MOGO_SERVICE_VERSION=2.1.16.8 +MOGO_SERVICE_API_VERSION=2.1.16.8 +MOGO_CONNECTION_VERSION=2.1.16.8 +MOGO_MODULE_APPS_VERSION=2.1.16.8 +MOGO_MODULE_NAVI_VERSION=2.1.16.8 +MOGO_MODULE_SHARE_VERSION=2.1.16.8 +MOGO_MODULE_COMMON_VERSION=2.1.16.8 +MOGO_MODULE_MAIN_VERSION=2.1.16.8 +MOGO_MODULE_MAP_VERSION=2.1.16.8 +MOGO_MODULE_SERVICE_VERSION=2.1.16.8 +MOGO_MODULE_EXTENSIONS_VERSION=2.1.16.8 +MOGO_MODULE_SEARCH_VERSION=2.1.16.8 +MOGO_MODULE_BACK_VERSION=2.1.16.8 +MOGO_MODULE_V2X_VERSION=2.1.16.8 # 探路 -MOGO_MODULE_TANLU_VERSION=2.1.16.6 +MOGO_MODULE_TANLU_VERSION=2.1.16.8 # 推送 -MOGO_MODULE_PUSH_VERSION=2.1.16.6 -MOGO_MODULE_PUSH_BASE_VERSION=2.1.16.6 -MOGO_MODULE_PUSH_NOOP_VERSION=2.1.16.6 +MOGO_MODULE_PUSH_VERSION=2.1.16.8 +MOGO_MODULE_PUSH_BASE_VERSION=2.1.16.8 +MOGO_MODULE_PUSH_NOOP_VERSION=2.1.16.8 # 探路上报和分享模块 -TANLULIB_VERSION=2.1.16.6 -MOGO_TANLU_API_VERSION=2.1.16.6 +TANLULIB_VERSION=2.1.16.8 +MOGO_TANLU_API_VERSION=2.1.16.8 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.1.16.6 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.16.6 +MOGO_MODULE_LEFT_PANEL_VERSION=2.1.16.8 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.16.8 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.1.16.6 +MOGO_MODULE_WIDGETS_VERSION=2.1.16.8 # obu -MOGO_MODULE_OBU_VERSION=2.1.16.6 -MOGO_MODULE_OBU_MOGO_VERSION=2.1.16.6 +MOGO_MODULE_OBU_VERSION=2.1.16.8 +MOGO_MODULE_OBU_MOGO_VERSION=2.1.16.8 # monitor -MOGO_MODULE_MONITOR_VERSION=2.1.16.6 +MOGO_MODULE_MONITOR_VERSION=2.1.16.8 # bugly -CRASHREPORT_VERSION=2.1.16.6 -CRASHREPORT_BUGLY_VERSION=2.1.16.6 -CRASHREPORT_NOOP_VERSION=2.1.16.6 -CRASHREPORT_UPGRADE_VERSION=2.1.16.6 +CRASHREPORT_VERSION=2.1.16.8 +CRASHREPORT_BUGLY_VERSION=2.1.16.8 +CRASHREPORT_NOOP_VERSION=2.1.16.8 +CRASHREPORT_UPGRADE_VERSION=2.1.16.8 ## tts -TTS_BASE_VERSION=2.1.16.6 -TTS_DI_VERSION=2.1.16.6 -TTS_ZHI_VERSION=2.1.16.6 -TTS_PAD_VERSION=2.1.16.6 -TTS_NOOP_VERSION=2.1.16.6 +TTS_BASE_VERSION=2.1.16.8 +TTS_DI_VERSION=2.1.16.8 +TTS_ZHI_VERSION=2.1.16.8 +TTS_PAD_VERSION=2.1.16.8 +TTS_NOOP_VERSION=2.1.16.8 # 自研地图 -MAP_CUSTOM_VERSION=2.1.16.6 -MOGO_MODULE_ADAS_VERSION=2.1.16.6 +MAP_CUSTOM_VERSION=2.1.16.8 +MOGO_MODULE_ADAS_VERSION=2.1.16.8 # 基础服务实现：passport、socket、location -MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.16.6 -MOGO_BASE_SERVICES_APK_VERSION=2.1.16.6 -MOGO_BASE_SERVICES_SDK_VERSION=2.1.16.6 -MOGO_MODULE_CHAT_VERSION=2.1.16.6 +MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.16.8 +MOGO_BASE_SERVICES_APK_VERSION=2.1.16.8 +MOGO_BASE_SERVICES_SDK_VERSION=2.1.16.8 +MOGO_MODULE_CHAT_VERSION=2.1.16.8 # 车聊聊 -MOGO_MODULE_CARCHATTING_VERSION=2.1.16.6 +MOGO_MODULE_CARCHATTING_VERSION=2.1.16.8 # 车聊聊接口 -MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.16.6 +MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.16.8 # 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.1.16.6 -MOGO_SKIN_LIGHT_VERSION=2.1.16.6 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.16.6 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.16.6 -SKIN_SUPPORT_VERSION=2.1.16.6 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.16.6 -SKIN_SUPPORT_CARDVIEW_VERSION=2.1.16.6 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.16.6 -SKIN_SUPPORT_DESIGN_VERSION=2.1.16.6 +MOGO_SKIN_SUPPORT_VERSION=2.1.16.8 +MOGO_SKIN_LIGHT_VERSION=2.1.16.8 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.16.8 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.16.8 +SKIN_SUPPORT_VERSION=2.1.16.8 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.16.8 +SKIN_SUPPORT_CARDVIEW_VERSION=2.1.16.8 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.16.8 +SKIN_SUPPORT_DESIGN_VERSION=2.1.16.8 # OCH -MOGO_OCH_VERSION=2.1.16.6-test +MOGO_OCH_VERSION=2.1.16.8-test MOGO_OCH_BUS_VERSION=2.0.66 MOGO_OCH_NOOP_VERSION=2.0.66 MOGO_OCH_TAXI_VERSION=2.0.66 # mogoAiCloud sdk services -MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.16.6 +MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.16.8 # v2x-sdk MOGO_V2X_SDK_VERSION=1.0.1 ################# 旧版本架构模块版本 #################