diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java index 9db7b427d9..5ab824a239 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java @@ -50,18 +50,18 @@ public class MoGoHandAdasMsgManager implements @Override public void onAutopilotLightSwitchData(Chassis.LightSwitch lightSwitch) { //can数据转发 转向灯状态 0是正常 1是左转 2是右转 - if (lightSwitch != null) { - int turnLightNum = lightSwitch.getNumber(); - AmiClientManager.getInstance().setTurnLightState(turnLightNum); - //设置转向灯 - CallerHmiManager.INSTANCE.showTurnLight(turnLightNum); - } +// if (lightSwitch != null) { +// int turnLightNum = lightSwitch.getNumber(); +// AmiClientManager.getInstance().setTurnLightState(turnLightNum); +// //设置转向灯 +// CallerHmiManager.INSTANCE.showTurnLight(turnLightNum); +// } } @Override public void onAutopilotBrakeLightData(boolean brakeLight) { //设置刹车信息 TODO 需要添加转向和删除的优先级 - CallerHmiManager.INSTANCE.showBrakeLight(brakeLight ? 1 : 0); +// CallerHmiManager.INSTANCE.showBrakeLight(brakeLight ? 1 : 0); } @Override @@ -91,9 +91,9 @@ public class MoGoHandAdasMsgManager implements @Override public void onAutopilotCarConfig(@NotNull MessagePad.CarConfigResp carConfigResp) { - if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.getMacAddress())) { - CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress()); - } +// if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.getMacAddress())) { +// CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress()); +// } } 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 77341ceedd..46270dfc08 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 @@ -21,14 +21,11 @@ import record_cache.RecordPanelOuterClass class DevaToolsProvider : IDevaToolsProvider { companion object { - const val MODULE_NAME = "DevaTools" + const val MODULE_NAME = "DevaToolsProvider" } private var mContext: Context? = null - override val functionName: String - get() = "DevaToolsProvider" - override fun init(context: Context) { mContext = context traceManager.init(context) @@ -92,7 +89,4 @@ class DevaToolsProvider : IDevaToolsProvider { // upgradeManager.downLoadPackage(mContext!!, downLoadKey) } - override fun onDestroy() { - MogoLogCatchManager.onDestroy() - } } \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt index 80a0dd7b88..6e0cf18547 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt @@ -2,16 +2,16 @@ package com.mogo.eagle.core.function.api.devatools import android.content.Context import android.view.View +import com.alibaba.android.arouter.facade.template.IProvider import com.mogo.eagle.core.data.deva.chain.ChainLogParam import com.mogo.eagle.core.data.deva.scene.SceneModule import com.mogo.eagle.core.data.deva.scene.SceneTAG -import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider import record_cache.RecordPanelOuterClass /** * 开发套件工具接口 */ -interface IDevaToolsProvider : IMoGoFunctionServerProvider { +interface IDevaToolsProvider : IProvider { /** * 开始抓取日志,默认10min diff --git a/gradle.properties b/gradle.properties index f0708fc8c6..9539555c09 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.19 +LOGLIB_VERSION=1.2.20 ######## MogoAiCloudSDK Version ######## # 网络请求 MOGO_NETWORK_VERSION=1.3.32