From dfa6733793434bdcfd394f978ae72f1628b2260f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 22 四月 2020 16:50:03 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Common/Device.cs | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
old mode 100755
new mode 100644
index 0f8e7c2..15dcb3c
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -115,7 +115,7 @@
{
CommonDevice device = null;
//鍙嶅簭鍒楀寲涓烘寚瀹氱殑绫伙紝涓嶇劧鏁版嵁浼氫涪澶辫�屽鑷存棤娉曞己杞�
- try
+ try
{
device = CommonDevice.CommonDeviceByFilePath(file);
}
@@ -1766,6 +1766,14 @@
info.ConcreteType = DeviceConcreteType.Sensor_Humidity;
}
info.ObjectTypeNameId = 60000;//浼犳劅鍣�
+ }
+ //14鏂伴璁惧
+ else if (dicType.ContainsKey(DeviceType.FreshAir) == true)
+ {
+ info.ConcreteTextId = R.MyInternationalizationString.DeviceModelId2310;
+ info.BeloneType = DeviceBeloneType.A鏂伴;
+ info.ConcreteType = DeviceConcreteType.Relay_FangyueFreshAirModul;
+ info.ObjectTypeNameId = 60011;//鏂伴
}
int value = (int)info.BeloneType;
@@ -2024,8 +2032,8 @@
list.Add(DeviceBeloneType.A浼犳劅鍣�);
//鍏朵粬鐨勭湅鐫�鍔炲憲,閮芥槸鎺掑湪鍚庨潰鐨�,閮藉綊涓鸿繖涓睘鎬�
- list.Add(DeviceBeloneType.A鏈煡璁惧);
-
+ list.Add(DeviceBeloneType.A鏈煡璁惧);
+
return list;
}
@@ -2826,9 +2834,9 @@
/// <summary>
/// 鏂规偊鏂伴灏忔ā鍧� 闀滃儚id锛�2310
/// </summary>
- Relay_FangyueFreshAirModul = 2310,
-
- //=========鈽呪槄璋冨厜鍣ㄧ被(2500-2799)鈽呪槄=========
+ Relay_FangyueFreshAirModul = 2310,
+
+ //=========鈽呪槄璋冨厜鍣ㄧ被(2500-2799)鈽呪槄=========
/// <summary>
/// 璋冨厜鍣�
/// </summary>
@@ -3002,7 +3010,11 @@
/// <summary>
/// 骞叉帴鐐�
/// </summary>
- A骞叉帴鐐� = 16
+ A骞叉帴鐐� = 16,
+ /// <summary>
+ /// 鏂伴
+ /// </summary>
+ A鏂伴 = 17
}
#endregion
--
Gitblit v1.8.0