From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001 From: xm <1271024303@qq.com> Date: 星期五, 11 九月 2020 09:16:59 +0800 Subject: [PATCH] 优化多功能面板:绑定温湿度传感器目标,和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节 --- ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ZigbeeApp20200825/Shared/Phone/ZigBee/Device/Panel.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs old mode 100644 new mode 100755 similarity index 99% rename from ZigbeeApp20200825/Shared/Phone/ZigBee/Device/Panel.cs rename to ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs index 0e7fc73..26aad3f --- a/ZigbeeApp20200825/Shared/Phone/ZigBee/Device/Panel.cs +++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs @@ -17,6 +17,7 @@ /// <summary> /// 澶氬姛鑳介潰鏉夸腑琚粦瀹氱殑鐩爣 /// </summary> + [Newtonsoft.Json.JsonIgnore] public System.Collections.Generic.Dictionary<string, List<BindListAllInfo>> bindTargetsFromMutilfunctionPanelList = new System.Collections.Generic.Dictionary<string, List<BindListAllInfo>>(); /// <summary> /// 鎸夐敭妯″紡锛堢鏈夊姛鑳斤級 @@ -1181,7 +1182,7 @@ try { - var passData = CorrectTemperatureData(correctValue, direction, type); + var passData = CorrectTemperatureData(correctValue,direction, type); var jObject = new JObject { { "DeviceAddr", DeviceAddr }, { "Epoint", 200 }, { "Cluster_ID", 64513 }, { "Command", 0 } }; var data = new JObject { { "PassData", passData } }; jObject.Add("Data", data); @@ -1215,7 +1216,7 @@ /// </summary> /// <param name="correctValue">鏍℃娓╁害鍊�</param> /// <returns></returns> - string CorrectTemperatureData(double correctValue, int direction = 0, int type = 0) + string CorrectTemperatureData(double correctValue,int direction=0, int type = 0) { string data = ""; string dataLength = "09"; -- Gitblit v1.8.0