From dbd503128c5c7ef9d38f12793907053cd042de57 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 6 Apr 2023 14:32:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[dev=5Fopt=5F2.15.0]=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=AD=94=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DevaToolsProvider.kt | 1 + .../mofang/MoFangManager.kt | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) 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 0947465d35..00f4c6cd38 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 @@ -2,6 +2,7 @@ package com.zhjt.mogo_core_function_devatools import android.app.Activity import android.content.Context +import android.util.Log import android.view.View import android.view.ViewGroup import com.alibaba.android.arouter.facade.annotation.Route diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangManager.kt index b93271fa1d..cf28e98458 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangManager.kt @@ -20,7 +20,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager.invokeMoFangStatus import com.mogo.eagle.core.function.call.mofang.CallerMofangListenerManager -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_F @@ -113,9 +112,12 @@ class MoFangManager private constructor() : IMoGoMoFangListener { val isConnectedMethod = BluetoothDevice::class.java.getDeclaredMethod("isConnected") isConnectedMethod.isAccessible = true val isConnected = isConnectedMethod.invoke(device) as Boolean - CallerLogger.d("$M_F${TAG}"," showBondedDevice name = ${device.name} ---address = ${device.address}----isMfConnect = $isMfConnect ---isConnected = $isConnected") + d("$M_F${TAG}"," showBondedDevice name = ${device.name} ---address = ${device.address}----isMfConnect = $isMfConnect ---isConnected = $isConnected") if (device.name == "MINI_KEYBOARD") { //并且连接 mContext?.let { SharedPrefsMgr.getInstance(it).putString(MfConstants.BLUETOOTH_NAME, device.name) } + UiThreadHandler.postDelayed({ + invokeMoFangStatus(isConnected) + }, 1000) } mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean(MfConstants.BLUETOOTH_STATUS, isConnected) } @@ -134,7 +136,7 @@ class MoFangManager private constructor() : IMoGoMoFangListener { override fun onReceive(context: Context, intent: Intent) { when (intent.action) { BluetoothAdapter.ACTION_STATE_CHANGED -> { //中间状态 - CallerLogger.d("$M_F${TAG}","bluetoothMonitorReceiver ACTION_STATE_CHANGED action = ${intent.action}") + d("$M_F${TAG}","bluetoothMonitorReceiver ACTION_STATE_CHANGED action = ${intent.action}") } BluetoothDevice.ACTION_ACL_CONNECTED -> { //蓝牙设备已连接 @@ -144,11 +146,11 @@ class MoFangManager private constructor() : IMoGoMoFangListener { isMfConnect = true mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean(MfConstants.BLUETOOTH_STATUS, true) } } - CallerLogger.d("$M_F${TAG}","bluetoothMonitorReceiver ACTION_ACL_CONNECTED ----- isMfConnect = $isMfConnect") + d("$M_F${TAG}","bluetoothMonitorReceiver ACTION_ACL_CONNECTED ----- isMfConnect = $isMfConnect") } BluetoothDevice.ACTION_ACL_DISCONNECTED -> { //蓝牙设备已断开 主动更新 - CallerLogger.d("$M_F${TAG}","bluetoothMonitorReceiver ACTION_ACL_DISCONNECTED ----- isMfConnect = $isMfConnect ") + d("$M_F${TAG}","bluetoothMonitorReceiver ACTION_ACL_DISCONNECTED ----- isMfConnect = $isMfConnect ") if (isMfConnect) { invokeMoFangStatus(false) isMfConnect = false From 54298a74ef7956e44bb17af82200e856b9ff1ddd Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Thu, 6 Apr 2023 14:55:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[2.15.0][opt]=E7=BC=93=E5=AD=98=E4=B8=8A?= =?UTF-8?q?=E4=B8=80=E6=AC=A1V2X=E4=BA=8B=E4=BB=B6=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../call/autopilot/CallerV2XListenerManager.kt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerV2XListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerV2XListenerManager.kt index db94d4d4e4..9164301af8 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerV2XListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerV2XListenerManager.kt @@ -9,10 +9,27 @@ import mogo.v2x.MogoV2X */ object CallerV2XListenerManager : CallerBase() { + private var eventCountTmp: Int = -1 + private var constructTmp: MogoV2X.RSI_PB? = null + private var triangleTmp: MogoV2X.RSI_PB? = null + private var congestionTmp: MogoV2X.RSI_PB? = null + private var parkingViolationTmp: MogoV2X.RSM_PB? = null + + override fun doSomeAfterAddListener(tag: String, listener: IMoGoV2XListener) { + if (eventCountTmp >= 0) { + listener.onV2nGlobalPathEvents(eventCountTmp, constructTmp, triangleTmp, congestionTmp, parkingViolationTmp) + } + } + /** * 分发主车路径全局事件 */ fun dispatchV2nGlobalPathEvents(eventCount: Int, construct: MogoV2X.RSI_PB?, triangle: MogoV2X.RSI_PB?, congestion: MogoV2X.RSI_PB?, parkingViolation: MogoV2X.RSM_PB?) { + eventCountTmp = eventCount + constructTmp = construct + triangleTmp = triangle + congestionTmp = congestion + parkingViolationTmp = parkingViolation M_LISTENERS.forEach { val listener = it.value listener.onV2nGlobalPathEvents(eventCount, construct, triangle, congestion, parkingViolation)