From dc0309e64f02227d8e1468b7326c07955f804612 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期三, 22 六月 2022 11:22:18 +0800
Subject: [PATCH] 修改引用路径
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 175 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
index f0739e7..7c1caca 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
@@ -41,6 +41,10 @@
/// 鍦版殩鐩爣
/// </summary>
Fh = 6,
+ /// <summary>
+ /// 鍦癈O2鏆栫洰鏍�
+ /// </summary>
+ CO2 = 7,
}
#endregion
@@ -171,6 +175,17 @@
{
curRoomDeviceListTemp.Add(device);
}
+
+ if (device.Type == ZigBee.Device.DeviceType.TemperatureSensor)
+ {
+ //鑾峰彇璁惧绫诲瀷
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
+ //绌烘皵璐ㄩ噺浼犳劅鍣�
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
+ {
+ curRoomDeviceListTemp.Add(device);
+ }
+ }
}
}
break;
@@ -187,6 +202,25 @@
continue;
}
curRoomDeviceListTemp.Add(device);
+ }
+ }
+ }
+ break;
+ case BindType.CO2:
+ foreach (var deviceKeys in curRoom.ListDevice)
+ {
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
+ if (device != null)
+ {
+ if (device.Type == ZigBee.Device.DeviceType.TemperatureSensor)
+ {
+ //鑾峰彇璁惧绫诲瀷
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
+ //绌烘皵璐ㄩ噺浼犳劅鍣�
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
+ {
+ curRoomDeviceListTemp.Add(device);
+ }
}
}
}
@@ -215,6 +249,10 @@
if (device.Type == DeviceType.TemperatureSensor)
{
var dev = device as TemperatureSensor;
+ if (BindInfo.checkRealTemperatureDevice(device) == false)
+ {
+ continue;
+ }
if (dev.SensorDiv == 1)
{
roomIncludeMatchTempDevice.Add(device);
@@ -256,7 +294,19 @@
if (device.Type == DeviceType.TemperatureSensor)
{
var dev = device as TemperatureSensor;
+ if (BindInfo.checkRealTemperatureDevice(device) == false)
+ {
+ continue;
+ }
if (dev.SensorDiv == 2)
+ {
+ roomIncludeMatchHumpDevice.Add(device);
+ }
+
+ //鑾峰彇璁惧绫诲瀷
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
+ //绌烘皵璐ㄩ噺浼犳劅鍣�
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
{
roomIncludeMatchHumpDevice.Add(device);
}
@@ -389,6 +439,16 @@
{
roomIncludeMatchDevice.Add(device);
}
+ else if (device.Type == ZigBee.Device.DeviceType.TemperatureSensor)
+ {
+ //鑾峰彇璁惧绫诲瀷
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
+ //绌烘皵璐ㄩ噺浼犳劅鍣�
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
+ {
+ roomIncludeMatchDevice.Add(device);
+ }
+ }
}
}
break;
@@ -409,6 +469,25 @@
}
}
break;
+ case BindType.CO2:
+ foreach (var de in room.ListDevice)
+ {
+ var device = LocalDevice.Current.GetDevice(de);
+ if (device != null)
+ {
+ if (device.Type == ZigBee.Device.DeviceType.TemperatureSensor)
+ {
+ //鑾峰彇璁惧绫诲瀷
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
+ //绌烘皵璐ㄩ噺浼犳劅鍣�
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
+ {
+ roomIncludeMatchDevice.Add(device);
+ }
+ }
+ }
+ }
+ break;
}
if (roomIncludeMatchDevice.Count == 0)
@@ -418,7 +497,7 @@
if (!string.IsNullOrEmpty(room.FloorId))
{
- //鏈夋ゼ灞�
+ //鏈夋ゼ灞俒鎺у埗闈㈡澘濡傛灉涓嶅湪鎴块棿锛岄粯璁や笉缁戝畾]
if (room.FloorId == curControlDev.currentSelectFloorId)
{
roomTempList.Add(room);
@@ -512,6 +591,14 @@
{
undistruibuteDevList.Add(device);
}
+
+ //鑾峰彇璁惧绫诲瀷
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
+ //绌烘皵璐ㄩ噺浼犳劅鍣�
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
+ {
+ undistruibuteDevList.Add(device);
+ }
}
else if (device.Type == DeviceType.PMSensor)
{
@@ -537,6 +624,16 @@
{
undistruibuteDevList.Add(device);
}
+ else if (device.Type == ZigBee.Device.DeviceType.TemperatureSensor)
+ {
+ //鑾峰彇璁惧绫诲瀷
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
+ //绌烘皵璐ㄩ噺浼犳劅鍣�
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
+ {
+ undistruibuteDevList.Add(device);
+ }
+ }
}
break;
case BindType.AC:
@@ -549,6 +646,21 @@
continue;
}
undistruibuteDevList.Add(device);
+ }
+ }
+ break;
+ case BindType.CO2:
+ foreach (var device in UndistributeCommonDeviceListTemp)
+ {
+ if (device.Type == ZigBee.Device.DeviceType.TemperatureSensor)
+ {
+ //鑾峰彇璁惧绫诲瀷
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
+ //绌烘皵璐ㄩ噺浼犳劅鍣�
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
+ {
+ undistruibuteDevList.Add(device);
+ }
}
}
break;
@@ -646,6 +758,17 @@
{
currentPanelBindSupportDeviceListTemp.Add(device);
}
+
+ if (device.Type == ZigBee.Device.DeviceType.TemperatureSensor)
+ {
+ //鑾峰彇璁惧绫诲瀷
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
+ //绌烘皵璐ㄩ噺浼犳劅鍣�
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
+ {
+ currentPanelBindSupportDeviceListTemp.Add(device);
+ }
+ }
}
}
}
@@ -669,6 +792,32 @@
continue;
}
currentPanelBindSupportDeviceListTemp.Add(device);
+ }
+ }
+ }
+ }
+ break;
+ case BindType.CO2:
+ foreach (var r in supportRoomList)
+ {
+ if (r.ListDevice.Count == 0)
+ {
+ continue;
+ }
+ foreach (var deviceKeys in r.ListDevice)
+ {
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
+ if (device != null)
+ {
+ if (device.Type == ZigBee.Device.DeviceType.TemperatureSensor)
+ {
+ //鑾峰彇璁惧绫诲瀷
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device });
+ //绌烘皵璐ㄩ噺浼犳劅鍣�
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
+ {
+ currentPanelBindSupportDeviceListTemp.Add(device);
+ }
}
}
}
@@ -704,7 +853,7 @@
}
/// <summary>
- /// 鏄惁鏄湡瀹炵殑绌鸿皟璁惧 銆愰儴鍒嗘槸鑳界粦瀹氱┖璋冪殑璁惧銆�
+ /// 鏄惁鏄湡瀹炵殑绌鸿皟璁惧 銆愯繃婊erver绔��
/// </summary>
/// <param name="device"></param>
/// <returns></returns>
@@ -721,7 +870,7 @@
}
/// <summary>
- /// 鏄惁鏄湡瀹炵殑鏂伴璁惧 銆愰儴鍒嗘槸鑳界粦瀹氭柊椋庣殑璁惧銆�
+ /// 鏄惁鏄湡瀹炵殑鏂伴璁惧 銆愯繃婊erver绔��
/// </summary>
/// <param name="device"></param>
/// <returns></returns>
@@ -738,7 +887,28 @@
}
/// <summary>
- /// 妫�娴嬭璁惧鑳藉惁鏄剧ず
+ /// 鏄惁鏄湡瀹炵殑娓╁害璁惧 銆愯繃婊erver绔��
+ /// </summary>
+ /// <param name="device"></param>
+ /// <returns></returns>
+ public static bool checkRealTemperatureDevice(CommonDevice device)
+ {
+ bool result = true;
+ //鑾峰彇璁惧灞炰簬銆愮畝绾﹀鍔熻兘闈㈡澘銆�
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice> { device });
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ {
+ if (device.Type == DeviceType.TemperatureSensor && device.DeviceEpoint == 1)
+ {
+ //绠�绾﹀鍔熻兘闈㈡澘绗�1鍥炶矾鏄竴涓粦瀹氭俯婀垮害浼犳劅鍣ㄧ绫诲瀷锛屼笉鏄湡鐨勬俯婀垮害鐨勪紶鎰熷櫒锛岄渶瑕佸睆钄芥帀
+ result = false;
+ }
+ }
+ return result;
+ }
+
+ /// <summary>
+ /// 妫�娴嬭璁惧鑳藉惁鏄剧ず銆愯繃婊erver绔��
/// </summary>
/// <param name="device"></param>
/// <returns></returns>
@@ -1048,6 +1218,6 @@
btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
}
}
- #endregion
+ #endregion
}
}
--
Gitblit v1.8.0