From ee993243cd36a37a020cef330e78c7a81afd9a11 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 27 Nov 2024 10:30:20 +0800 Subject: [PATCH] =?UTF-8?q?[680][device]=E5=8D=87=E7=BA=A7=E7=A1=AC?= =?UTF-8?q?=E4=BB=B6=E6=9C=8D=E5=8A=A1SDK=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=B8=A0=E9=81=93=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 2 +- .../mogo/eagle/core/function/datacenter/iot/IotManager.kt | 7 ++++++- .../main/java/com/mogo/support/device/DevicesManager.kt | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/config.gradle b/config.gradle index f34cdaf6b6..c5566f1532 100644 --- a/config.gradle +++ b/config.gradle @@ -217,7 +217,7 @@ ext { androidautoSize : 'com.github.JessYanCoding:AndroidAutoSize:v1.2.1', //========================= 串口设备 ====================== - serialport : 'com.mogo.support.device.manager:serial_port:2.2.4', + serialport : 'com.mogo.support.device.manager:serial_port:2.2.5', thread_opt : "com.mogo.thread.opt:lib:10.10.3", diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/iot/IotManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/iot/IotManager.kt index 42c554ff1f..a0bf9e9949 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/iot/IotManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/iot/IotManager.kt @@ -1,6 +1,7 @@ package com.mogo.eagle.core.function.datacenter.iot import com.mogo.commons.AbsMogoApplication +import com.mogo.commons.env.ProjectUtils import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.commons.utils.MogoAnalyticUtils import com.mogo.eagle.core.data.deva.chain.ChainConstant @@ -32,7 +33,11 @@ object IotManager : IMoGoCloudListener, IWriteChainLogListener { private fun hardwareDeviceBind(sn: String) { if (sn.isNotEmpty()) { - DevicesManager.init(AbsMogoApplication.getApp(), sn) + DevicesManager.init( + AbsMogoApplication.getApp(), + sn, + ProjectUtils.getProjectType().value + ) } } diff --git a/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/DevicesManager.kt b/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/DevicesManager.kt index 7a3d5ef890..8cae092f86 100644 --- a/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/DevicesManager.kt +++ b/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/DevicesManager.kt @@ -44,8 +44,8 @@ object DevicesManager { ConcurrentHashMap() private var writeChainLogListener: IWriteChainLogListener? = null - fun init(context: Context, sn: String) { - serialPortManager.bindService(context, sn, bindStateChangeListener) + fun init(context: Context, sn: String, projectType: String) { + serialPortManager.bindService(context, sn, projectType, bindStateChangeListener) } fun destroy() {