From cf0bffdf072bae11bdb8c780d0a355818700f713 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 18 五月 2020 15:42:45 +0800
Subject: [PATCH] 请合并代码，优化面板问题
---
ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
index 4fe007b..9e2afc2 100644
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
@@ -304,6 +304,21 @@
}
/// <summary>
+ /// 鐢辫澶囪矾寰勬仮澶嶈澶囧璞�
+ /// </summary>
+ /// <returns>The device by file path.</returns>
+ /// <param name="deviceFilePath">Device file path.</param>
+ public static CommonDevice CommonDeviceByFilePath(string deviceFilePath)
+ {
+ var v = deviceFilePath.Split('_');
+ if (v.Length < 3)
+ {
+ return null;
+ }
+ return CommonDeviceByByteString(v[1], System.Text.Encoding.UTF8.GetString(Shared.Common.Global.ReadFileByHomeId(deviceFilePath)));
+ }
+
+ /// <summary>
/// 淇濆瓨璁惧
/// </summary>
public void Save()
@@ -457,6 +472,8 @@
/// 娓╁害娴嬮噺鍔熻兘鐨勮澶囧锛氭俯搴︿紶鎰熷櫒銆傘�傘��
/// <para>1029:Relative Humidity Measurement,璁惧鏀寔鈥滄箍搴︽祴閲忓姛鑳解��</para>
/// 婀垮害娴嬮噺鍔熻兘鐨勮澶囧锛氭箍搴︿紶鎰熷櫒銆傘�傘��
+ /// <para>1066:Pm2.5 Measurement,璁惧鏀寔鈥減m2.5娴嬮噺鍔熻兘鈥�</para>
+ /// Pm2.5娴嬮噺鍔熻兘鐨勮澶囧锛歅m2.5浼犳劅鍣ㄣ�傘�傘��
/// </summary>
public int InCluster;
}
--
Gitblit v1.8.0