From 411d6651a607b351f78a3f41edfdcb5e61695c02 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 17 Aug 2021 16:59:16 +0800 Subject: [PATCH] add obu status --- .../mogo/module/obu/mogo/MogoPrivateObuManager.kt | 11 +++++++++-- .../mogo/module/service/status/EnvStatusManager.java | 12 +++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt index 4acc1d2fef..84476351d3 100644 --- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt +++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt @@ -9,6 +9,7 @@ import com.mogo.service.IMogoServiceApis import com.mogo.service.MogoServicePaths import com.mogo.service.warning.IMoGoWaringProvider import com.mogo.utils.logger.Logger +import com.mogo.utils.storage.SharedPrefsMgr import com.zhidao.support.obu.MogoObuManager import com.zhidao.support.obu.OnMogoObuListener import com.zhidao.support.obu.constants.ObuConstants @@ -38,11 +39,13 @@ class MogoPrivateObuManager private constructor() { // Obu 弱势群体预警绘制 private var mObuVulnerableGroupsDrawer: ObuVulnerableGroupsDrawer? = null + private var mContext: Context? = null fun init(context: Context?) { Logger.d(MogoObuConst.TAG_MOGO_OBU, "obuManager初始化--") mMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS) .navigation(context) as IMogoServiceApis + mContext = context // 获取预警模块的接口 mIMoGoWaringProvider = mMogoServiceApis!!.waringProviderApi @@ -64,13 +67,15 @@ class MogoPrivateObuManager private constructor() { // OBU连接失败 override fun onConnectFail(isNeedReconnect: Boolean) { Logger.d(MogoObuConst.TAG_MOGO_OBU, "onConnectFail ------> ") - + mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean("OBU_HV", false) } + mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean("OBU_RV", false) } } // OBU断开连接 override fun onDisconnect() { Logger.d(MogoObuConst.TAG_MOGO_OBU, "onDisconnect ------> ") - + mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean("OBU_HV", false) } + mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean("OBU_RV", false) } } // 接收到的原始数据 @@ -105,12 +110,14 @@ class MogoPrivateObuManager private constructor() { // 主车信息 override fun onCvxHvInfoIndInfo(info: CvxHvInfoIndInfo) { + mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean("OBU_HV", true) } Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxHvInfoIndInfo ------> $info") } // 远车信息 override fun onCvxRvInfoIndInfo(info: CvxRvInfoIndInfo) { Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxRvInfoIndInfo ------> $info") + mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean("OBU_RV", true) } // 更新周边车辆 mObuRecognizedResultDrawer?.addCvxRvInfoIndInfo(info) } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java index cbf9254143..7de0be8def 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java @@ -6,6 +6,7 @@ import android.os.Handler; import android.os.Looper; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.Gravity; import android.view.ViewGroup; import android.widget.TextView; @@ -16,6 +17,7 @@ import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.wm.WindowManagerView; import com.mogo.module.service.R; import com.mogo.utils.NetworkUtils; +import com.mogo.utils.storage.SharedPrefsMgr; import static com.mogo.utils.CommonUtils.getVersionName; @@ -78,7 +80,9 @@ public class EnvStatusManager { "纬度", "网络状态", "App版本", - "Map版本" + "Map版本", + "HV状态", + "RV状态" }; StringBuilder stringBuilder = new StringBuilder(); for (int i = 0; i < sStatusName.length; i++) { @@ -96,6 +100,12 @@ public class EnvStatusManager { if (!TextUtils.isEmpty(mapVersion)) { stringBuilder.append(mapVersion).append("\n"); } + } else if (i == 10) { + boolean isHv = SharedPrefsMgr.getInstance( mContext ).getBoolean("OBU_HV", false ); + stringBuilder.append("true".equals(isHv) ? "已连接" : "未连接").append("\n"); + } else if (i == 11) { + boolean isRv = SharedPrefsMgr.getInstance( mContext ).getBoolean("OBU_RV", false ); + stringBuilder.append("true".equals(isRv) ? "已连接" : "未连接").append("\n"); } else { stringBuilder.append("true".equals(DebugConfig.getStatus(i, true)) ? "正常" : "异常").append("\n"); }