From 6bca8fcd37a48808a0b9c9342fc1be0adddfece6 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 08 五月 2020 17:46:44 +0800
Subject: [PATCH] 请合并最新代码，优化绑定信息
---
ZigbeeApp/Shared/Common/Device.cs | 141 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 102 insertions(+), 39 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index 197639c..9c73532 100644
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -400,6 +400,27 @@
}
}
+ /// <summary>
+ /// 娣诲姞铏氭嫙璁惧鍒扮紦瀛�
+ /// </summary>
+ /// <param name="device">璁惧瀵硅薄</param>
+ public void AddVirtualDeviceToMemory(CommonDevice device)
+ {
+ string mainKeys = this.GetDeviceMainKeys(device);
+ this.dicAllDevice[mainKeys] = device;
+
+ //璁惧鍥炶矾鏀堕泦
+ if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == false)
+ {
+ this.dicDeviceEpoint[device.DeviceAddr] = new HashSet<int>();
+ }
+ if (this.dicDeviceEpoint[device.DeviceAddr].Contains(device.DeviceEpoint) == false)
+ {
+ this.dicDeviceEpoint[device.DeviceAddr].Add(device.DeviceEpoint);
+ }
+ device.ReSave();
+ }
+
#endregion
#region 鈻� 淇敼璁惧___________________________
@@ -416,6 +437,12 @@
this.SetEpointName(device, newName);
this.BackupDeviceAfterReName(device);
+
+ //濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ return true;
+ }
//涓嶅啀妫�娴嬪悕瀛楁槸鍚︿竴鏍�
//鎴愬憳鍙兘淇敼鑷繁鏈湴鐨勫悕瀛�
@@ -462,6 +489,11 @@
//鏇存敼鍚嶅瓧鍚庯紝鍒锋柊璁惧缂撳瓨
this.BackupDeviceAfterReName(device2);
+ }
+ //濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ return true;
}
CommonDevice device = listDevice[0];
@@ -679,7 +711,11 @@
/// <param name="device"></param>
public void SetFixedPositionCommand(CommonDevice device)
{
- device.IdentifyControl(device.DeviceAddr, device.DeviceEpoint, 5);
+ //濡傛灉褰撳墠浣忓畢涓嶆槸铏氭嫙浣忓畢
+ if (Common.Config.Instance.Home.IsVirtually == false)
+ {
+ device.IdentifyControl(device.DeviceAddr, device.DeviceEpoint, 5);
+ }
}
/// <summary>
@@ -1766,8 +1802,8 @@
info.ConcreteType = DeviceConcreteType.Sensor_Humidity;
}
info.ObjectTypeNameId = 60000;//浼犳劅鍣�
- }
- //14鏂伴璁惧
+ }
+ //14鏂伴璁惧
else if (dicType.ContainsKey(DeviceType.FreshAir) == true)
{
info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId2310;
@@ -1951,9 +1987,19 @@
/// <param name="listMac">璁惧Mac鍦板潃</param>
public void DeleteRealDeviceFromRoom(List<string> listMac)
{
+ bool save = false;
foreach (var deviceMacAddr in listMac)
{
- this.dicDeviceRoomId.Remove(deviceMacAddr);
+ if (this.dicDeviceRoomId.ContainsKey(deviceMacAddr) == true)
+ {
+ this.dicDeviceRoomId.Remove(deviceMacAddr);
+ save = true;
+ }
+ }
+ if (save == false)
+ {
+ //娌℃湁鏀瑰彉,涓嶉渶瑕佷繚瀛�
+ return;
}
//淇濆瓨璁板綍
string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
@@ -2030,8 +2076,9 @@
list.Add(DeviceBeloneType.A骞叉帴鐐�);
list.Add(DeviceBeloneType.A鏅鸿兘闂ㄩ攣);
list.Add(DeviceBeloneType.A鏅鸿兘绌哄紑);
- list.Add(DeviceBeloneType.A浼犳劅鍣�);
- //鍏朵粬鐨勭湅鐫�鍔炲憲,閮芥槸鎺掑湪鍚庨潰鐨�,閮藉綊涓鸿繖涓睘鎬�
+ list.Add(DeviceBeloneType.A浼犳劅鍣�);
+
+ //鍏朵粬鐨勭湅鐫�鍔炲憲,閮芥槸鎺掑湪鍚庨潰鐨�,閮藉綊涓鸿繖涓睘鎬�
list.Add(DeviceBeloneType.A鏈煡璁惧);
return list;
@@ -2040,6 +2087,17 @@
#endregion
#region 鈻� 涓�鑸柟娉昣__________________________
+
+ /// <summary>
+ /// 浠庣紦瀛樺彉閲忔娴嬭澶囨槸鍚﹀湪绾�
+ /// </summary>
+ /// <param name="i_device"></param>
+ /// <returns></returns>
+ public bool CheckDeviceIsOnline(CommonDevice i_device)
+ {
+ //0:绂荤嚎 1:鍦ㄧ嚎 2:姝ｅ湪鍒锋柊鐘舵��
+ return i_device.IsOnline == 1 || i_device.IsOnline == 2;
+ }
/// <summary>
/// 鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ樉绀哄湪涓婚〉
@@ -2509,10 +2567,7 @@
else if (deviceType == DeviceType.FreshAir) { device = new FreshAir(); }
else if (deviceType == DeviceType.DoorLock) { device = new DoorLock(); }
else if (deviceType == DeviceType.TemperatureSensor) { device = new TemperatureSensor(); }
- else if (deviceType == DeviceType.FreshAirHumiditySensor)
- {
- device = new HumiditySensor();
- }
+ else if (deviceType == DeviceType.FreshAirHumiditySensor) { device = new HumiditySensor(); }
else if (deviceType == DeviceType.OtaDevice || deviceType == DeviceType.OtaPanelDevice) { device = new OTADevice(); }
else { return null; }
@@ -2603,19 +2658,23 @@
//=========鈽呪槄瀹夐槻绫讳紶鎰熷櫒绫�(1300-2299)鈽呪槄=========
//杩欓噷鏄害涔愬厠鐨�
- this.dicDeviceModelIdEnum["MULTI-GASE--EA07"] = "1300-1300-60000";//鐕冩皵浼犳劅鍣�
- this.dicDeviceModelIdEnum["MULTI-MECI--EA01"] = "1301-1300-60000";//闂ㄧ獥纾佷紶鎰熷櫒
- this.dicDeviceModelIdEnum["MULTI-FIRE--EA05"] = "1302-1300-60000";//鐑熼浘浼犳劅鍣�
- this.dicDeviceModelIdEnum["MULTI-MOTI--EA04"] = "1303-1300-60000";//绾㈠浼犳劅鍣�
- this.dicDeviceModelIdEnum["MULTI-WATE--EA02"] = "1304-1300-60000";//姘存蹈浼犳劅鍣�
- this.dicDeviceModelIdEnum["MULTI-BURO--EA06"] = "1305-1300-60000";//绱ф�ユ寜閿�
+ this.dicDeviceModelIdEnum["MULTI-GASE--EA07"] = "1300-1200-60000";//鐕冩皵浼犳劅鍣�
+ this.dicDeviceModelIdEnum["MULTI-MECI--EA01"] = "1301-1200-60000";//闂ㄧ獥纾佷紶鎰熷櫒
+ this.dicDeviceModelIdEnum["MULTI-FIRE--EA05"] = "1302-1200-60000";//鐑熼浘浼犳劅鍣�
+ this.dicDeviceModelIdEnum["MULTI-MOTI--EA04"] = "1303-1200-60000";//绾㈠浼犳劅鍣�
+ this.dicDeviceModelIdEnum["MULTI-WATE--EA02"] = "1304-1200-60000";//姘存蹈浼犳劅鍣�
+ this.dicDeviceModelIdEnum["MULTI-BURO--EA06"] = "1305-1200-60000";//绱ф�ユ寜閿�
//杩欓噷鏄渤涓滅殑
- this.dicDeviceModelIdEnum["MSG01/M-ZB.10"] = "1300-1300-60000";//鐕冩皵浼犳劅鍣�
- this.dicDeviceModelIdEnum["MSDC01/M-ZB.10"] = "1301-1300-60000";//闂ㄧ獥纾佷紶鎰熷櫒
- this.dicDeviceModelIdEnum["MSS01/M-ZB.10"] = "1302-1300-60000";//鐑熼浘浼犳劅鍣�
- this.dicDeviceModelIdEnum["MSPIR01/M-ZB.10"] = "1303-1300-60000";//绾㈠浼犳劅鍣�
- this.dicDeviceModelIdEnum["MSW01/M-ZB.10"] = "1304-1300-60000";//姘存蹈浼犳劅鍣�
- this.dicDeviceModelIdEnum["MBU01/M-ZB.10"] = "1305-1300-60000";//绱ф�ユ寜閿�
+ this.dicDeviceModelIdEnum["MSG01/M-ZB.10"] = "1300-1200-60000";//鐕冩皵浼犳劅鍣�
+ this.dicDeviceModelIdEnum["MSDC01/M-ZB.10"] = "1301-1200-60000";//闂ㄧ獥纾佷紶鎰熷櫒
+ this.dicDeviceModelIdEnum["MSS01/M-ZB.10"] = "1302-1200-60000";//鐑熼浘浼犳劅鍣�
+ this.dicDeviceModelIdEnum["MSPIR01/M-ZB.10"] = "1303-1200-60000";//绾㈠浼犳劅鍣�
+ this.dicDeviceModelIdEnum["MSW01/M-ZB.10"] = "1304-1200-60000";//姘存蹈浼犳劅鍣�
+ this.dicDeviceModelIdEnum["MBU01/M-ZB.10"] = "1305-1200-60000";//绱ф�ユ寜閿�
+ this.dicDeviceModelIdEnum["MGCD01/ZB.10"] = "1306-1200-60000";//鍚搁《鐕冩皵浼犳劅鍣�
+
+ //PM2.5绌烘皵璐ㄩ噺浼犳劅鍣� 銆愯璁惧灞炰簬绗笁鏂硅澶囷紝娌℃湁闀滃儚ID銆�
+ this.dicDeviceModelIdEnum["SZ_PM100"] = "1307-1200-60000";//PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
//=========鈽呪槄缁х數鍣ㄧ被(2300-2499)鈽呪槄=========
this.dicDeviceModelIdEnum["MPR0310-ZB.10"] = "2300-2300-60001";//3璺户鐢靛櫒灏忔ā鍧�
@@ -2651,19 +2710,19 @@
this.dicDeviceModelIdChanged["MULTI-FIRE--EA05"] = "MSS01/M-ZB.10";//鐑熼浘浼犳劅鍣�
this.dicDeviceModelIdChanged["MULTI-MOTI--EA04"] = "MSPIR01/M-ZB.10";//绾㈠浼犳劅鍣�
this.dicDeviceModelIdChanged["MULTI-WATE--EA02"] = "MSW01/M-ZB.10";//姘存蹈浼犳劅鍣�
- this.dicDeviceModelIdChanged["MULTI-BURO--EA06"] = "MBU01/M-ZB.10";//绱ф�ユ寜閿�
-
-
- //鉁┾湬鉁┾湬鉁╅渶瑕佸叡鏈夌殑鍥剧墖瀵硅薄鉁┾湬鉁┾湬鉁�
- //涓よ�呴兘鏄疍eviceConcreteType
- //Keys:鎸囧畾鐨勮澶� value:娌跨敤鐨勫浘鐗囨槸鍝璁惧鐨�
+ this.dicDeviceModelIdChanged["MULTI-BURO--EA06"] = "MBU01/M-ZB.10";//绱ф�ユ寜閿�
+
+
+
+ //鉁┾湬鉁┾湬鉁╅渶瑕佸叡鏈夌殑鍥剧墖瀵硅薄鉁┾湬鉁┾湬鉁�
+ //涓よ�呴兘鏄疍eviceConcreteType
+ //Keys:鎸囧畾鐨勮澶� value:娌跨敤鐨勫浘鐗囨槸鍝璁惧鐨�
this.dicPictrueShard = new Dictionary<string, string>();
this.dicPictrueShard["ButtonPanel_SimpleFour"] = "ButtonPanel_Four";//绠�绾�4鎸夐敭闈㈡澘 娌跨敤 4鎸夐敭鐨勫浘鏍�
this.dicPictrueShard["ButtonPanel_SimpleThree"] = "ButtonPanel_Three";//绠�绾�3鎸夐敭闈㈡澘 娌跨敤 3鎸夐敭鐨勫浘鏍�
this.dicPictrueShard["ButtonPanel_SimpleTwo"] = "ButtonPanel_Two";//绠�绾�2鎸夐敭闈㈡澘 娌跨敤 2鎸夐敭鐨勫浘鏍�
- this.dicPictrueShard["IntelligentLocks_Sone"] = "IntelligentLocks_H06C";//S-one鐨勯棬閿佸浘鐗囨部鐢℉06C鐨勫浘鏍�
- this.dicPictrueShard["Relay_FangyueFreshAirModul"] = "Relay_ThreeLoad";//鏂规偊鏂伴灏忔ā鍧楀浘鐗囨部鐢�3璺户鐢靛櫒鐨勫浘鏍�
-
+ this.dicPictrueShard["IntelligentLocks_Sone"] = "IntelligentLocks_H06C";//S-one鐨勯棬閿佸浘鐗� 娌跨敤 H06C鐨勫浘鏍�
+ this.dicPictrueShard["Relay_FangyueFreshAirModul"] = "Relay_ThreeLoad";//鏂规偊鏂伴灏忔ā鍧楀浘鐗� 娌跨敤 3璺户鐢靛櫒鐨勫浘鏍�
}
#endregion
@@ -2804,6 +2863,15 @@
/// </summary>
Sensor_EmergencyButton = 1305,
/// <summary>
+ /// 鍚搁《鐕冩皵浼犳劅鍣�
+ /// </summary>
+ Sensor_CeilingGas = 1306,
+ /// <summary>
+ /// PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+ /// </summary>
+ Sensor_PMTwoPointFive = 1307,
+
+ /// <summary>
/// 杩愬姩浼犳劅鍣�
/// </summary>
Sensor_Motion = -1306,
@@ -2823,11 +2891,6 @@
/// 婀垮害浼犳劅鍣�
/// </summary>
Sensor_Humidity = -1310,
-
- /// <summary>
- /// PM2.5浼犳劅鍣�
- /// </summary>
- Sensor_PM = -1311,
//=========鈽呪槄缁х數鍣ㄧ被(2300-2499)鈽呪槄=========
/// <summary>
@@ -2953,7 +3016,7 @@
/// <summary>
/// 鎸夐敭闈㈡澘(200-1199)
/// </summary>
- A鎸夐敭闈㈡澘 = 200,
+ A鎸夐敭闈㈡澘 = 200,
/// <summary>
/// 浼犳劅鍣�(1200-2299)
/// </summary>
@@ -2961,7 +3024,7 @@
/// <summary>
/// 缁х數鍣�(2300-2499)
/// </summary>
- A缁х數鍣� = 2300,
+ A缁х數鍣� = 2300,
/// <summary>
/// 鏂伴
/// </summary>
@@ -3021,7 +3084,7 @@
/// <summary>
/// 骞叉帴鐐�
/// </summary>
- A骞叉帴鐐� = 16,
+ A骞叉帴鐐� = 16,
}
#endregion
--
Gitblit v1.8.0