From da3634e011bbda29cf4e1c168997b780fe795b20 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 13 五月 2020 09:05:23 +0800
Subject: [PATCH] 优化新风模块和新风面板的测试功能，请合并代码
---
ZigbeeApp/Shared/Common/Device.cs | 79 ++++++++++++++++++++++++++++++++++++---
1 files changed, 72 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index 30db26d..53787a6 100644
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -271,7 +271,7 @@
//娣诲姞缂撳瓨
this.AddDeviceToMemory(ref device);
- //绉婚櫎瀛樺湪鐨勮澶囧唴瀛�
+ //绉婚櫎瀛樺湪鐨勮澶囧唴瀛�
string maikey = this.GetDeviceMainKeys(device);
if (dicExist.ContainsKey(maikey) == true)
{
@@ -628,6 +628,9 @@
/// <param name="deleteRoom">鏄惁浠庢埧闂村垹闄�</param>
public void DeleteMemmoryDevice(CommonDevice device, bool deleteRoom = true)
{
+ //鍒犻櫎缂撳瓨璁惧鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
+ Phone.UserView.UserPage.Instance.RefreshForm = true;
+
if (deleteRoom == true)
{
//浠庢埧闂翠腑鍒犻櫎
@@ -1811,6 +1814,14 @@
info.ConcreteType = DeviceConcreteType.Relay_FangyueFreshAirModul;
info.ObjectTypeNameId = 60011;//鏂伴
}
+ //15 PM2.5浼犳劅鍣ㄨ澶�
+ else if (dicType.ContainsKey(DeviceType.PMSensor) == true)
+ {
+ info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1307;
+ info.BeloneType = DeviceBeloneType.A浼犳劅鍣�;
+ info.ConcreteType = DeviceConcreteType.Sensor_PMTwoPointFive;
+ info.ObjectTypeNameId = 60000;//浼犳劅鍣�
+ }
int value = (int)info.BeloneType;
if (dicDeviceAllNameID.ContainsKey("uDeviceBelongId" + value) == true)
@@ -2079,9 +2090,53 @@
list.Add(DeviceBeloneType.A浼犳劅鍣�);
//鍏朵粬鐨勭湅鐫�鍔炲憲,閮芥槸鎺掑湪鍚庨潰鐨�,閮藉綊涓鸿繖涓睘鎬�
- list.Add(DeviceBeloneType.A鏈煡璁惧);
-
+ list.Add(DeviceBeloneType.A鏈煡璁惧);
+
return list;
+ }
+
+ #endregion
+
+ #region 鈻� 鑾峰彇璁惧鍦ㄧ嚎鐘舵�佸垪琛╛______________
+
+ /// <summary>
+ /// 鑾峰彇璁惧鍦ㄧ嚎鐘舵�佸垪琛�(娉ㄦ剰,涓�涓澶囧彧杩斿洖涓�涓洖璺�)
+ /// </summary>
+ /// <param name="gwId">缃戝叧id</param>
+ /// <returns></returns>
+ public List<CommonDevice> GetDeviceOnlineList(string gwId)
+ {
+ var zbway = HdlGatewayLogic.Current.GetLocalGateway(gwId);
+ int statu = 0;
+ var listDevice = this.GetDeviceListFromGateway(zbway, ref statu, false, ShowErrorMode.NO);
+ if (statu == -1)
+ {
+ //褰撳嚭鐜板紓甯告椂,浣跨敤鍚庡鎿嶄綔,鐩存帴鑾峰彇鏈湴鐨勮澶囧垪琛�
+ listDevice = this.GetDeviceByGatewayID(gwId);
+ }
+
+ var dicDevice = new Dictionary<string, CommonDevice>();
+ foreach (var device in listDevice)
+ {
+ if (dicDevice.ContainsKey(device.DeviceAddr) == false)
+ {
+ dicDevice[device.DeviceAddr] = device;
+ continue;
+ }
+ //璁惧鏄惁澶勪簬鍦ㄧ嚎鐘舵��
+ bool online = this.CheckDeviceIsOnline(device);
+ if (online == true)
+ {
+ //濡傛灉璁惧鍥炶矾鍦ㄧ嚎,鍒欎紭鍏堜娇鐢ㄥ湪绾跨殑鍥炶矾,鍚庢潵鐨勭洿鎺ヨ鐩�
+ dicDevice[device.DeviceAddr] = device;
+ }
+ }
+ var listReturn = new List<CommonDevice>();
+ foreach (var device in dicDevice.Values)
+ {
+ listReturn.Add(device);
+ }
+ return listReturn;
}
#endregion
@@ -2095,7 +2150,7 @@
/// <returns></returns>
public bool CheckDeviceIsOnline(CommonDevice i_device)
{
- //0:绂荤嚎 1:鍦ㄧ嚎 2:姝ｅ湪鍒锋柊鐘舵��
+ //0:绂荤嚎 1:鍦ㄧ嚎 2:姝ｅ湪鍒锋柊鐘舵��
return i_device.IsOnline == 1 || i_device.IsOnline == 2;
}
@@ -2454,6 +2509,7 @@
mainDevice.DeviceEpointName = device.DeviceInfo.DeviceName;
}
mainDevice.CurrentGateWayId = device.CurrentGateWayId;
+ mainDevice.ZigbeeType = device.DeviceInfo.ZigbeeType;
mainDevice.IsOnline = device.DeviceInfo.IsOnline;
mainDevice.DriveCode = device.DeviceInfo.DriveCode;
mainDevice.IasDeviceType = device.DeviceInfo.DeviceType;
@@ -2567,6 +2623,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.PMSensor) { device = new PMSensor(); }
else if (deviceType == DeviceType.FreshAirHumiditySensor) { device = new HumiditySensor(); }
else if (deviceType == DeviceType.OtaDevice || deviceType == DeviceType.OtaPanelDevice) { device = new OTADevice(); }
else { return null; }
@@ -2672,6 +2729,9 @@
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璺户鐢靛櫒灏忔ā鍧�
@@ -2864,6 +2924,11 @@
/// </summary>
Sensor_CeilingGas = 1306,
/// <summary>
+ /// PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+ /// </summary>
+ Sensor_PMTwoPointFive = 1307,
+
+ /// <summary>
/// 杩愬姩浼犳劅鍣�
/// </summary>
Sensor_Motion = -1306,
@@ -2896,9 +2961,9 @@
/// <summary>
/// 鏂规偊鏂伴灏忔ā鍧� 闀滃儚id锛�2310
/// </summary>
- Relay_FangyueFreshAirModul = 2310,
-
- //=========鈽呪槄璋冨厜鍣ㄧ被(2500-2799)鈽呪槄=========
+ Relay_FangyueFreshAirModul = 2310,
+
+ //=========鈽呪槄璋冨厜鍣ㄧ被(2500-2799)鈽呪槄=========
/// <summary>
/// 璋冨厜鍣�
/// </summary>
--
Gitblit v1.8.0