From 8335714ca4fb01ddec05e49d9b171299a6ef95b9 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 23 Mar 2023 14:45:13 +0800 Subject: [PATCH] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E6=B7=BB=E5=8A=A0ob?= =?UTF-8?q?u=E9=97=AE=E9=A2=98=E6=8E=92=E6=9F=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../obu/MogoPrivateObuNewManager.kt | 52 +++++++++++++++++-- .../obu/adapter/MoGoObuListenerImpl.kt | 4 ++ .../com/zhidao/support/obu/OnObuListener.java | 1 - 3 files changed, 53 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt index 10ce62b628..57d837a4e2 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt @@ -30,6 +30,10 @@ import com.mogo.support.obu.constants.MogoObuConstants import com.mogo.support.obu.constants.MogoObuLogLevel import com.mogo.support.obu.constants.MogoObuTopicId import com.mogo.support.obu.model.* +import com.mogo.support.obu.model.result.BaseResult +import com.mogo.support.obu.model.result.MogoObuCallConfigResult +import com.mogo.support.obu.model.result.MogoObuCallRegisterResult +import com.mogo.support.obu.model.result.MogoObuCallResult import com.mogo.support.obu.option.MogoObuCom import com.mogo.support.obu.option.MogoObuLog import com.mogo.support.obu.option.MogoObuOptions @@ -40,6 +44,7 @@ import com.zhidao.support.obu.OnObuListener import mogo.telematics.pad.MessagePad import kotlin.math.roundToInt + /** * * @author lixiaopeng @@ -106,8 +111,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { } fun setHvInfoSendCycle(time: Int) { - Log.d("liyz", "---setHvInfoSendCycle = time = $time") -// ObuManager.getInstance().setHvInfoPushCycle(time); + ObuManager.getInstance().setHvInfoPushCycle(time); } /** @@ -206,10 +210,52 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { * @param data 系统状态 */ override fun onObuSystemStatus(data: MogoObuSystemStatusData?) { - Log.d("liyz", "data.toString() = ${data.toString()}" ) CallerObuInfoListenerManager.invokeGetObuInfo(data.toString()) } + override fun onObuCallResult(result: BaseResult?) { + val builder = StringBuilder("调用结果:\n") + when (result!!.function) { + MogoObuConstants.CALL_FUNCTION.CONFIG -> { + val configResult = result as MogoObuCallConfigResult + builder.append(configResult.type.desc).append("配置调用= ") + .append(configResult.result.desc) + } + MogoObuConstants.CALL_FUNCTION.INIT -> { + val initResult = result as MogoObuCallResult + builder.append("初始化调用= ").append(initResult.result.desc) + } + MogoObuConstants.CALL_FUNCTION.DEINIT -> { + val deinitResult = result as MogoObuCallResult + builder.append("用户注销调用= ").append(deinitResult.result.desc) + } + + MogoObuConstants.CALL_FUNCTION.TOPIC_REGIST, MogoObuConstants.CALL_FUNCTION.TOPIC_CANCEL -> { + val str = if (result.function === MogoObuConstants.CALL_FUNCTION.TOPIC_REGIST) "注册" else "取消注册" + val callRegisterResult = result as MogoObuCallRegisterResult + if (callRegisterResult.results != null && !callRegisterResult.results.isEmpty()) { + val size = callRegisterResult.results.size + var i = 0 + while (i < size) { + val register = callRegisterResult.results[i] + builder.append(str).append("Topic ID= ").append(register.topicId.desc) + .append(" 调用= ").append(register.result.desc) + if (i < size - 1) { + builder.append("\n") + } + i++ + } + } + } + MogoObuConstants.CALL_FUNCTION.SET_DATA -> { + val setDataResult = result as MogoObuCallResult + builder.append("OBU应用配置= ").append(setDataResult.result.desc) + } + } + val str = builder.toString() + CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", "onObuCallResult str = $str") + } + /** * HV车辆基础信息 gnssInfo */ diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/adapter/MoGoObuListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/adapter/MoGoObuListenerImpl.kt index 1f3e178188..c908aa757c 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/adapter/MoGoObuListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/adapter/MoGoObuListenerImpl.kt @@ -4,6 +4,7 @@ import com.mogo.eagle.core.function.call.obu.* import com.mogo.support.obu.ObuScene import com.mogo.support.obu.constants.Define.ConnectStatus import com.mogo.support.obu.model.* +import com.mogo.support.obu.model.result.BaseResult import com.zhidao.support.obu.OnObuListener import mogo.telematics.pad.MessagePad @@ -99,4 +100,7 @@ object MoGoObuListenerImpl : OnObuListener { } + override fun onObuCallResult(result: BaseResult?) { + + } } \ No newline at end of file diff --git a/libraries/mogo-obu/src/main/java/com/zhidao/support/obu/OnObuListener.java b/libraries/mogo-obu/src/main/java/com/zhidao/support/obu/OnObuListener.java index ef9cf8c9a2..7257b7dc66 100644 --- a/libraries/mogo-obu/src/main/java/com/zhidao/support/obu/OnObuListener.java +++ b/libraries/mogo-obu/src/main/java/com/zhidao/support/obu/OnObuListener.java @@ -17,7 +17,6 @@ public interface OnObuListener { */ void onConnectStatus(@Define.ConnectStatus int connectStatus); - /** * OBU 函数调用 返回状态 *