From c94b273eb1b0eb56549849106ce2c0d49bd3206d Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 19 May 2022 19:28:00 +0800 Subject: [PATCH] fixed conflict --- .../autopilot/MoGoAutopilotProvider.kt | 10 ++-- .../autopilot/telematic/TeleMsgHandler.kt | 1 + .../bindingcar/BindingcarProvider.java | 49 +++++++++++++------ 3 files changed, 41 insertions(+), 19 deletions(-) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt index 3e607c7846..2ef43afaa6 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt @@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.autopilot import android.Manifest.permission import android.content.Context +import android.util.Log import androidx.annotation.RequiresPermission import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.cloud.passport.MoGoAiCloudClientConfig @@ -27,8 +28,8 @@ import com.mogo.eagle.core.function.autopilot.adapter.MoGoHandAdasMsgManager import com.mogo.eagle.core.function.autopilot.server.AsyncDataToAutopilotServer import com.mogo.eagle.core.function.autopilot.telematic.IMsgHandler import com.mogo.eagle.core.function.autopilot.telematic.TeleMsgHandler -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager +import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger @@ -37,10 +38,10 @@ import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.telematic.MogoProtocolMsg -import com.mogo.telematic.MogoProtocolMsg.* +import com.mogo.telematic.MogoProtocolMsg.NORMAL_DATA +import com.mogo.telematic.MogoProtocolMsg.SYNC_MODE_STATUS import com.mogo.telematic.NSDNettyManager import com.mogo.telematic.client.listener.NettyClientListener -import com.mogo.telematic.client.status.ConnectState import com.mogo.telematic.server.netty.NettyServerListener import com.mogo.telematic.server.netty.NettyTcpServer import com.zhidao.support.adas.high.AdasManager @@ -116,7 +117,6 @@ class MoGoAutopilotProvider : } override fun onReceiveClientSign(channel: Channel?, sn: String?) { -// CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo("", sn) } }, MoGoAiCloudClientConfig.getInstance().sn) } else { @@ -446,6 +446,8 @@ class MoGoAutopilotProvider : override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) { // 乘客屏才监听 AppConfigInfo.plateNumber = carConfigResp.plateNumber + Log.d("liyz", "onAutopilotCarConfig 乘客屏Mac地址为 = ${carConfigResp.macAddress}") + CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.macAddress, MoGoAiCloudClientConfig.getInstance().sn) invokeNettyConnResult("乘客屏车牌号:${carConfigResp.plateNumber},Mac地址为：${carConfigResp.macAddress}") } diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/TeleMsgHandler.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/TeleMsgHandler.kt index d589c3af99..4478404aae 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/TeleMsgHandler.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/TeleMsgHandler.kt @@ -7,6 +7,7 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CONNECT_STATUS import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager.setDemoMode +import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ToastUtils diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java index 00ff397d42..d4bb9dc475 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java @@ -54,21 +54,13 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { */ @Override public void getBindingcarInfo(String macAddress, String widevineIDWithMd5) { - mAddress = macAddress; - mWidevineIDWithMd5 = widevineIDWithMd5; - long currentHour = System.currentTimeMillis() / (1000 * 60); - long oldHour = SharedPrefsMgr.getInstance(mContext).getLong("type", 0); - - Log.d("liyz", "getBindingcarInfo ------ mAddress = " + mAddress + "--mWidevineIDWithMd5 = " + mWidevineIDWithMd5 + "--getScreenType() = " + getScreenType()); - //如果5分钟内频繁调，需要拦截，业务导致的会多次请求工控机信息 TODO - //司机屏 - if (HmiBuildConfig.isShowSnBindingView && getScreenType() == 1) { - Log.d("liyz", "getBindingcarInfo -----间隔时间 = " + (currentHour - oldHour)); - if (currentHour - oldHour > 5) { - SharedPrefsMgr.getInstance(mContext).putLong("type", System.currentTimeMillis() / (1000 * 60)); - BindingcarNetWorkManager.getInstance().getBindingcarInfo(mContext, macAddress, mWidevineIDWithMd5, getScreenType()); - } - } +// mAddress = macAddress; +// mWidevineIDWithMd5 = widevineIDWithMd5; +// if (getScreenType() == 1) { //司机屏 +// driverScreen(macAddress, widevineIDWithMd5); +// } else if (getScreenType() == 2) { //乘客屏 +// passengerScreen(macAddress, widevineIDWithMd5); +// } } @Override @@ -76,6 +68,33 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { BindingcarNetWorkManager.getInstance().modifyBindingcar(mAddress, mWidevineIDWithMd5, callBack, getScreenType()); } + private void driverScreen(String macAddress, String widevineIDWithMd5) { + long currentHour = System.currentTimeMillis() / (1000 * 60); + long oldHour = SharedPrefsMgr.getInstance(mContext).getLong("typeDriver", 0); + Log.d("liyz", "driverScreen ------ macAddress = " + macAddress + "--widevineIDWithMd5 = " + widevineIDWithMd5 + "--getScreenType() = " + getScreenType()); + //如果5分钟内频繁调，需要拦截，业务导致的会多次请求工控机信息 TODO + if (HmiBuildConfig.isShowSnBindingView) { + Log.d("liyz", "driverScreen -----间隔时间 = " + (currentHour - oldHour)); + if (currentHour - oldHour > 5) { + SharedPrefsMgr.getInstance(mContext).putLong("typeDriver", System.currentTimeMillis() / (1000 * 60)); + BindingcarNetWorkManager.getInstance().getBindingcarInfo(mContext, macAddress, widevineIDWithMd5, getScreenType()); + } + } + } + + private void passengerScreen(String macAddress, String widevineIDWithMd5) { + long currentHour = System.currentTimeMillis() / (1000 * 60); + long oldHour = SharedPrefsMgr.getInstance(mContext).getLong("typePassenger", 0); + Log.d("liyz", "passengerScreen ------ mAddress = " + macAddress + "--mWidevineIDWithMd5 = " + widevineIDWithMd5 + "--getScreenType() = " + getScreenType()); + //如果5分钟内频繁调，需要拦截，业务导致的会多次请求工控机信息 + if (HmiBuildConfig.isShowSnBindingView) { + Log.d("liyz", "passengerScreen -----间隔时间 = " + (currentHour - oldHour)); + if (currentHour - oldHour > 5) { + SharedPrefsMgr.getInstance(mContext).putLong("typePassenger", System.currentTimeMillis() / (1000 * 60)); + BindingcarNetWorkManager.getInstance().getBindingcarInfo(mContext, macAddress, widevineIDWithMd5, getScreenType()); + } + } + } private int getScreenType() { int screenType = -1;