From 3aa397ab145382935492b11c1f18c9634e69910b Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 10 十二月 2020 16:45:00 +0800
Subject: [PATCH] 请合并,门锁和晾衣架第一版代码

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs |  783 ++++++++++++++++++++++++++++++-------------------------
 1 files changed, 432 insertions(+), 351 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs
old mode 100755
new mode 100644
index ec80f72..7ff956a
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs
@@ -5,107 +5,107 @@
 using ZigBee.Device;
 
 namespace Shared.Phone.UserCenter
-{
-    /// <summary>
-    /// 璁惧灞炴�х殑閫昏緫绫�
-    /// </summary>
-    public class HdlDeviceAttributeLogic
-    {
-        #region 鈻� 鍙橀噺澹版槑___________________________
-
-        /// <summary>
-        /// 灞炴�х殑閫昏緫
-        /// </summary>
-        private static HdlDeviceAttributeLogic m_Current = null;
-        /// <summary>
-        /// 灞炴�х殑閫昏緫
-        /// </summary>
-        public static HdlDeviceAttributeLogic Current
-        {
-            get
-            {
-                if (m_Current == null)
-                {
-                    m_Current = new HdlDeviceAttributeLogic();
-                }
-                return m_Current;
-            }
-            set
-            {
-                m_Current = value;
-            }
-        }
-
-        #endregion
-
-        #region 鈻� 鍐欏叆璁惧灞炴�______________________
-
-        /// <summary>
-        /// 鑾峰彇鏇存敼璁惧绉佹湁灞炴�х殑鍛戒护
-        /// </summary>
-        /// <param name="clusterId"></param>
-        /// <param name="attributeId"></param>
-        /// <param name="attributeDataType"></param>
-        /// <param name="attributeData"></param>
-        /// <returns></returns>
-        public string GetWriteDeviceAttributeText(string DeviceAddr, int DeviceEpoint, int clusterId, int attributeId, int attributeDataType, object attributeData)
-        {
-            var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", DeviceAddr }, { "Epoint", DeviceEpoint }, { "Cluster_ID", clusterId }, { "Command", 120 } };
-            Newtonsoft.Json.Linq.JObject data = null;
-            if (attributeData is int)
-            {
-                data = new Newtonsoft.Json.Linq.JObject { { "Undivided", 0 }, { "AttributeId", attributeId }, { "AttributeDataType", attributeDataType }, { "AttributeData", Convert.ToInt32(attributeData) } };
-            }
-            else
-            {
-                data = new Newtonsoft.Json.Linq.JObject { { "Undivided", 0 }, { "AttributeId", attributeId }, { "AttributeDataType", attributeDataType }, { "AttributeData", attributeData.ToString() } };
-            }
-            jObject.Add("Data", data);
-
-            return jObject.ToString();
-        }
-
-        #endregion
-
-        #region 鈻� 绌鸿皟_______________________________
-
-        /// <summary>
-        /// SendACStatuComand
-        /// </summary>
-        /// <param name="device">璁惧</param>
-        public void SendACStatuComand(CommonDevice device)
-        {
-            if (device == null)
-            {
-                return;
-            }
-            new System.Threading.Thread(() =>
-            {
-                SendFanStatuComand(device);
-                System.Threading.Thread.Sleep(300);
-                SendThermostatStatuComand(device);
-            })
-            { IsBackground = true }.Start();
-        }
+{
+  /// <summary>
+  /// 璁惧灞炴�х殑閫昏緫绫�
+  /// </summary>
+  public class HdlDeviceAttributeLogic
+  {
+    #region 鈻� 鍙橀噺澹版槑___________________________
 
-        /// <summary>
-        /// SendThermostatStatuComand
-        /// </summary>
-        /// <param name="device">璁惧</param>
-        public void SendThermostatStatuComand(CommonDevice device)
-        {
-            if (device == null)
-            {
-                return;
-            }
-            var jObject = new Newtonsoft.Json.Linq.JObject
+    /// <summary>
+    /// 灞炴�х殑閫昏緫
+    /// </summary>
+    private static HdlDeviceAttributeLogic m_Current = null;
+    /// <summary>
+    /// 灞炴�х殑閫昏緫
+    /// </summary>
+    public static HdlDeviceAttributeLogic Current
+    {
+      get
+      {
+        if (m_Current == null)
+        {
+          m_Current = new HdlDeviceAttributeLogic();
+        }
+        return m_Current;
+      }
+      set
+      {
+        m_Current = value;
+      }
+    }
+
+    #endregion
+
+    #region 鈻� 鍐欏叆璁惧灞炴�______________________
+
+    /// <summary>
+    /// 鑾峰彇鏇存敼璁惧绉佹湁灞炴�х殑鍛戒护
+    /// </summary>
+    /// <param name="clusterId"></param>
+    /// <param name="attributeId"></param>
+    /// <param name="attributeDataType"></param>
+    /// <param name="attributeData"></param>
+    /// <returns></returns>
+    public string GetWriteDeviceAttributeText(string DeviceAddr, int DeviceEpoint, int clusterId, int attributeId, int attributeDataType, object attributeData)
+    {
+      var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", DeviceAddr }, { "Epoint", DeviceEpoint }, { "Cluster_ID", clusterId }, { "Command", 120 } };
+      Newtonsoft.Json.Linq.JObject data = null;
+      if (attributeData is int)
+      {
+        data = new Newtonsoft.Json.Linq.JObject { { "Undivided", 0 }, { "AttributeId", attributeId }, { "AttributeDataType", attributeDataType }, { "AttributeData", Convert.ToInt32(attributeData) } };
+      }
+      else
+      {
+        data = new Newtonsoft.Json.Linq.JObject { { "Undivided", 0 }, { "AttributeId", attributeId }, { "AttributeDataType", attributeDataType }, { "AttributeData", attributeData.ToString() } };
+      }
+      jObject.Add("Data", data);
+
+      return jObject.ToString();
+    }
+
+    #endregion
+
+    #region 鈻� 绌鸿皟_______________________________
+
+    /// <summary>
+    /// SendACStatuComand
+    /// </summary>
+    /// <param name="device">璁惧</param>
+    public void SendACStatuComand(CommonDevice device)
+    {
+      if (device == null)
+      {
+        return;
+      }
+      new System.Threading.Thread(() =>
+      {
+        SendFanStatuComand(device);
+        System.Threading.Thread.Sleep(300);
+        SendThermostatStatuComand(device);
+      })
+      { IsBackground = true }.Start();
+    }
+
+    /// <summary>
+    /// SendThermostatStatuComand
+    /// </summary>
+    /// <param name="device">璁惧</param>
+    public void SendThermostatStatuComand(CommonDevice device)
+    {
+      if (device == null)
+      {
+        return;
+      }
+      var jObject = new Newtonsoft.Json.Linq.JObject
             {
                 { "DeviceAddr",device.DeviceAddr },
                 { "Epoint", device.DeviceEpoint },
                 { "Cluster_ID", (int)Cluster_ID.Thermostat },
                 { "Command", 108 }
-            };
-            var attriBute = new Newtonsoft.Json.Linq.JArray
+            };
+      var attriBute = new Newtonsoft.Json.Linq.JArray
             {
                new Newtonsoft.Json.Linq.JObject
                {
@@ -135,30 +135,30 @@
                {
                  { "AttriButeId", (int)AttriButeId.CleanStatu}
                }
-            };
-            var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
-            jObject.Add("Data", data);
-            device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
-        }
+            };
+      var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
+      jObject.Add("Data", data);
+      device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
+    }
 
-        /// <summary>
-        /// SendFanStatuComand
-        /// </summary>
-        /// <param name="device">璁惧</param>
-        private void SendFanStatuComand(CommonDevice device)
-        {
-            if (device == null)
-            {
-                return;
-            }
-            var jObject = new Newtonsoft.Json.Linq.JObject
+    /// <summary>
+    /// SendFanStatuComand
+    /// </summary>
+    /// <param name="device">璁惧</param>
+    private void SendFanStatuComand(CommonDevice device)
+    {
+      if (device == null)
+      {
+        return;
+      }
+      var jObject = new Newtonsoft.Json.Linq.JObject
             {
                 { "DeviceAddr",device.DeviceAddr },
                 { "Epoint", device.DeviceEpoint },
                 { "Cluster_ID", (int)Cluster_ID.FanControl },
                 { "Command", 108 }
-            };
-            var attriBute = new Newtonsoft.Json.Linq.JArray
+            };
+      var attriBute = new Newtonsoft.Json.Linq.JArray
             {
                new Newtonsoft.Json.Linq.JObject
                {
@@ -168,332 +168,413 @@
                {
                  { "AttriButeId", (int)AttriButeId.FanSwing}
                }
-            };
-            var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
-            jObject.Add("Data", data);
-            device.Gateway?.Send("GetDeviceStatus", jObject.ToString());
-        }
+            };
+      var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
+      jObject.Add("Data", data);
+      device.Gateway?.Send("GetDeviceStatus", jObject.ToString());
+    }
 
-        #endregion
+    #endregion
 
-        #region 鈻� 鏂伴_______________________________
-        /// <summary>
-        /// SendFreshAirStatuComand
-        /// </summary>
-        /// <param name="device">璁惧</param>
-        public void SendFreshAirStatuComand(CommonDevice device)
-        {
-            if (device == null)
-            {
-                return;
-            }
-            new System.Threading.Thread(() =>
-            {
-                SendFreshAirFanStatuComand(device);
-                System.Threading.Thread.Sleep(300);
-            })
-            { IsBackground = true }.Start();
-        }
-
-        /// <summary>
-        /// SendFanStatuComand
-        /// </summary>
-        /// <param name="device">璁惧</param>
-        private void SendFreshAirFanStatuComand(CommonDevice device)
-        {
-            if (device == null)
-            {
-                return;
-            }
-            var jObject = new Newtonsoft.Json.Linq.JObject
+    #region 鈻� 鏂伴_______________________________
+    /// <summary>
+    /// SendFreshAirStatuComand
+    /// </summary>
+    /// <param name="device">璁惧</param>
+    public void SendFreshAirStatuComand(CommonDevice device)
+    {
+      if (device == null)
+      {
+        return;
+      }
+      new System.Threading.Thread(() =>
+      {
+        SendFreshAirFanStatuComand(device);
+        System.Threading.Thread.Sleep(300);
+      })
+      { IsBackground = true }.Start();
+    }
+
+    /// <summary>
+    /// SendFanStatuComand
+    /// </summary>
+    /// <param name="device">璁惧</param>
+    private void SendFreshAirFanStatuComand(CommonDevice device)
+    {
+      if (device == null)
+      {
+        return;
+      }
+      var jObject = new Newtonsoft.Json.Linq.JObject
             {
                 { "DeviceAddr",device.DeviceAddr },
                 { "Epoint", device.DeviceEpoint },
                 { "Cluster_ID", (int)Cluster_ID.FanControl },
                 { "Command", 108 }
-            };
-            var attriBute = new Newtonsoft.Json.Linq.JArray
+            };
+      var attriBute = new Newtonsoft.Json.Linq.JArray
             {
                new Newtonsoft.Json.Linq.JObject
                {
                  { "AttriButeId", (int)AttriButeId.FanMode}
                }
-            };
-            var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
-            jObject.Add("Data", data);
-            device.Gateway?.Send("GetDeviceStatus", jObject.ToString());
-        }
-
-        #endregion
+            };
+      var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
+      jObject.Add("Data", data);
+      device.Gateway?.Send("GetDeviceStatus", jObject.ToString());
+    }
 
-        #region 鈻� PM2.5_______________________________
-        /// <summary>
-        /// SendPmSensorComand
-        /// </summary>
-        /// <param name="device">璁惧</param>
-        public void SendPmSensorComand(CommonDevice device)
-        {
-            if (device == null)
-            {
-                return;
-            }
-            new System.Threading.Thread(() =>
-            {
-                SendPmSensorStatuComand(device);
-                //璇诲彇Pm2.5浼犳劅鍣ㄧ殑娓╁害鏁版嵁
-                HdlDeviceAttributeLogic.Current.SendTemperatureStatuComand(device);
-                //璇诲彇Pm2.5浼犳劅鍣ㄧ殑婀垮害鏁版嵁
-                HdlDeviceAttributeLogic.Current.SendHumidityStatuComand(device);
-                System.Threading.Thread.Sleep(300);
-            })
-            { IsBackground = true }.Start();
-        }
-
-        /// <summary>
-        /// SendFanStatuComand
-        /// </summary>
-        /// <param name="device">璁惧</param>
-        private void SendPmSensorStatuComand(CommonDevice device)
-        {
-            if (device == null)
-            {
-                return;
-            }
-            var jObject = new Newtonsoft.Json.Linq.JObject
+    #endregion
+
+    #region 鈻� PM2.5_______________________________
+    /// <summary>
+    /// SendPmSensorComand
+    /// </summary>
+    /// <param name="device">璁惧</param>
+    public void SendPmSensorComand(CommonDevice device)
+    {
+      if (device == null)
+      {
+        return;
+      }
+      new System.Threading.Thread(() =>
+      {
+        SendPmSensorStatuComand(device);
+        //璇诲彇Pm2.5浼犳劅鍣ㄧ殑娓╁害鏁版嵁
+        HdlDeviceAttributeLogic.Current.SendTemperatureStatuComand(device);
+        //璇诲彇Pm2.5浼犳劅鍣ㄧ殑婀垮害鏁版嵁
+        HdlDeviceAttributeLogic.Current.SendHumidityStatuComand(device);
+        System.Threading.Thread.Sleep(300);
+      })
+      { IsBackground = true }.Start();
+    }
+
+    /// <summary>
+    /// SendFanStatuComand
+    /// </summary>
+    /// <param name="device">璁惧</param>
+    private void SendPmSensorStatuComand(CommonDevice device)
+    {
+      if (device == null)
+      {
+        return;
+      }
+      var jObject = new Newtonsoft.Json.Linq.JObject
             {
                 { "DeviceAddr",device.DeviceAddr },
                 { "Epoint", device.DeviceEpoint },
                 { "Cluster_ID", (int)Cluster_ID.PmTwoPointFiveMeasurement  },
                 { "Command", 108 }
-            };
-            var attriBute = new Newtonsoft.Json.Linq.JArray
+            };
+      var attriBute = new Newtonsoft.Json.Linq.JArray
             {
                new Newtonsoft.Json.Linq.JObject
                {
                  { "AttriButeId", (int)AttriButeId.MeasuredValue}
                }
-            };
-            var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
-            jObject.Add("Data", data);
-            device.Gateway?.Send("GetDeviceStatus", jObject.ToString());
-        }
-
-        #endregion
-
-        #region 鈻� 绐楀笜_______________________________
-        /// <summary>
-        /// 鍙戦�佽幏鍙栫獥甯樼姸鎬佸懡浠�
-        /// </summary>
-        /// <param name="device">绐楀笜</param>
-        public void SendCurtainStatuComand(CommonDevice device)
-        {
-            if (device == null)
-            {
-                return;
-            }
-            var jObject = new Newtonsoft.Json.Linq.JObject
+            };
+      var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
+      jObject.Add("Data", data);
+      device.Gateway?.Send("GetDeviceStatus", jObject.ToString());
+    }
+
+    #endregion
+
+    #region 鈻� 鏅捐。鏋禵______________________________
+    /// <summary>
+    /// SendAirerComand
+    ///鍥炶矾2:璇诲彇鐓ф槑寮�鍏崇姸鎬�
+    ///鍥炶矾3:璇诲彇椋庡共寮�鍏崇姸鎬佸拰鏃堕棿鍊� 
+    ///鍥炶矾4:璇诲彇鐑樺共寮�鍏崇姸鎬佸拰鏃堕棿鍊�
+    ///鍥炶矾5:璇诲彇娑堟瘨寮�鍏崇姸鎬佸拰鏃堕棿鍊�
+    /// </summary>
+    /// <param name="device">璁惧</param>
+    /// <param name="ctrlEpoint">鎺у埗绔偣</param>
+    public void SendAirerComand(CommonDevice device, int ctrlEpoint)
+    {
+      if (device == null)
+      {
+        return;
+      }
+      new System.Threading.Thread(() =>
+      {
+        SendAirerStatuComand(device, ctrlEpoint);
+        System.Threading.Thread.Sleep(300);
+      })
+      { IsBackground = true }.Start();
+    }
+
+    /// <summary>
+    /// SendAirerStatuComand
+    /// </summary>
+    /// <param name="device">璁惧</param>
+    private void SendAirerStatuComand(CommonDevice device, int ctrlEpoint = 1)
+    {
+      if (device == null)
+      {
+        return;
+      }
+      var jObject = new Newtonsoft.Json.Linq.JObject
+            {
+                { "DeviceAddr",device.DeviceAddr },
+                { "Epoint", ctrlEpoint },
+                { "Cluster_ID", (int)Cluster_ID.Switch},
+                { "Command", 108 }
+            };
+      Newtonsoft.Json.Linq.JArray attriBute = new Newtonsoft.Json.Linq.JArray();
+
+      if (device.DeviceEpoint == 2)
+      {
+        attriBute = new Newtonsoft.Json.Linq.JArray
+             {
+                new Newtonsoft.Json.Linq.JObject
+               {
+                    //鏅捐。鏋剁殑鐓ф槑寮�鍏崇姸鎬�
+                 { "AttriButeId", (int)AttriButeId.Switch}
+               }
+             };
+      }
+      else
+      {
+        attriBute = new Newtonsoft.Json.Linq.JArray {
+                new Newtonsoft.Json.Linq.JObject
+               {
+                    //鏅捐。鏋剁殑寮�鍏崇姸鎬侊紙鐑樺共锛岄骞诧紝娑堟瘨锛�
+                 { "AttriButeId", (int)AttriButeId.Switch}
+               },
+                   new Newtonsoft.Json.Linq.JObject
+               {
+                    //鏅捐。鏋剁殑鏅捐。鏋剁殑锛堢儤骞诧紝椋庡共锛屾秷姣掞級鍓╀綑鏃堕棿
+                 { "AttriButeId", (int)AttriButeId.AirerRemainTime}
+               },
+               new Newtonsoft.Json.Linq.JObject
+               {
+                   //鏅捐。鏋剁殑锛堢儤骞诧紝椋庡共锛屾秷姣掞級鏃堕棿
+                 { "AttriButeId", (int)AttriButeId.AirerTime}
+               }
+            };
+      }
+      var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
+      jObject.Add("Data", data);
+      device.Gateway?.Send("GetDeviceStatus", jObject.ToString());
+    }
+
+    #endregion
+
+    #region 鈻� 绐楀笜_______________________________
+    /// <summary>
+    /// 鍙戦�佽幏鍙栫獥甯樼姸鎬佸懡浠�
+    /// </summary>
+    /// <param name="device">绐楀笜</param>
+    public void SendCurtainStatuComand(CommonDevice device)
+    {
+      if (device == null)
+      {
+        return;
+      }
+      var jObject = new Newtonsoft.Json.Linq.JObject
             {
                 { "DeviceAddr",device.DeviceAddr },
                 { "Epoint", device.DeviceEpoint },
                 { "Cluster_ID", (int)Cluster_ID.WindowCovering },
                 { "Command", 108 }
-            };
-            var attriBute = new Newtonsoft.Json.Linq.JArray
+            };
+      var attriBute = new Newtonsoft.Json.Linq.JArray
             {
                new Newtonsoft.Json.Linq.JObject
                {
                  { "AttriButeId", (int)AttriButeId.CurrentPositionLiftPercentage}
                }
-            };
-            var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
-            jObject.Add("Data", data);
-            device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
-        }
+            };
+      var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
+      jObject.Add("Data", data);
+      device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
+    }
 
-        #endregion
+    #endregion
 
-        #region 鈻� 鐏厜_______________________________
+    #region 鈻� 鐏厜_______________________________
 
-        /// <summary>
-        /// Light
-        /// </summary>
-        /// <param name="device"></param>
-        public void SendLightStatuComand(CommonDevice device)
-        {
-            SendSwitchStatuComand(device);
-        }
+    /// <summary>
+    /// Light
+    /// </summary>
+    /// <param name="device"></param>
+    public void SendLightStatuComand(CommonDevice device)
+    {
+      SendSwitchStatuComand(device);
+    }
 
-        /// <summary>
-        /// Light
-        /// </summary>
-        /// <param name="device"></param>
-        public void SendDimmableLightStatuComand(CommonDevice device)
-        {
-            if (device == null)
-            {
-                return;
-            }
-            new System.Threading.Thread(() =>
-            {
-                SendSwitchStatuComand(device);
-                System.Threading.Thread.Sleep(300);
-                SendLevelStatuComand(device);
-            })
-            { IsBackground = true }.Start();
-        }
+    /// <summary>
+    /// Light
+    /// </summary>
+    /// <param name="device"></param>
+    public void SendDimmableLightStatuComand(CommonDevice device)
+    {
+      if (device == null)
+      {
+        return;
+      }
+      new System.Threading.Thread(() =>
+      {
+        SendSwitchStatuComand(device);
+        System.Threading.Thread.Sleep(300);
+        SendLevelStatuComand(device);
+      })
+      { IsBackground = true }.Start();
+    }
 
-        /// <summary>
-        /// 鍙戦�佽幏鍙栫伅鍏夌姸鎬佸懡浠�
-        /// </summary>
-        /// <param name="device">绐楀笜</param>
-        private void SendSwitchStatuComand(CommonDevice device)
-        {
-            if (device == null)
-            {
-                return;
-            }
-            var jObject = new Newtonsoft.Json.Linq.JObject
+    /// <summary>
+    /// 鍙戦�佽幏鍙栫伅鍏夌姸鎬佸懡浠�
+    /// </summary>
+    /// <param name="device">绐楀笜</param>
+    private void SendSwitchStatuComand(CommonDevice device)
+    {
+      if (device == null)
+      {
+        return;
+      }
+      var jObject = new Newtonsoft.Json.Linq.JObject
             {
                 { "DeviceAddr",device.DeviceAddr },
                 { "Epoint", device.DeviceEpoint },
                 { "Cluster_ID", (int)Cluster_ID.Switch },
                 { "Command", 108 }
-            };
-            var attriBute = new Newtonsoft.Json.Linq.JArray
+            };
+      var attriBute = new Newtonsoft.Json.Linq.JArray
             {
                new Newtonsoft.Json.Linq.JObject
                {
                  { "AttriButeId", (int)AttriButeId.Switch}
                }
-            };
-            var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
-            jObject.Add("Data", data);
-            device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
-        }
+            };
+      var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
+      jObject.Add("Data", data);
+      device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
+    }
 
-        /// <summary>
-        /// 鍙戦�佽幏鍙栫伅鍏夌姸鎬佸懡浠�
-        /// </summary>
-        /// <param name="device">绐楀笜</param>
-        public void SendLevelStatuComand(CommonDevice device)
-        {
-            if (device == null)
-            {
-                return;
-            }
-            var jObject = new Newtonsoft.Json.Linq.JObject
+    /// <summary>
+    /// 鍙戦�佽幏鍙栫伅鍏夌姸鎬佸懡浠�
+    /// </summary>
+    /// <param name="device">绐楀笜</param>
+    public void SendLevelStatuComand(CommonDevice device)
+    {
+      if (device == null)
+      {
+        return;
+      }
+      var jObject = new Newtonsoft.Json.Linq.JObject
             {
                 { "DeviceAddr",device.DeviceAddr },
                 { "Epoint", device.DeviceEpoint },
                 { "Cluster_ID", (int)Cluster_ID.LevelControl },
                 { "Command", 108 }
-            };
-            var attriBute = new Newtonsoft.Json.Linq.JArray
+            };
+      var attriBute = new Newtonsoft.Json.Linq.JArray
             {
                new Newtonsoft.Json.Linq.JObject
                {
                  { "AttriButeId", (int)AttriButeId.LevelControl}
                }
-            };
-            var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
-            jObject.Add("Data", data);
-            device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
-        }
-
-        #endregion
-
-        #region 鈻� 鑹叉俯鐏痏____________________________
-
-        /// <summary>
-        /// 鍙戦�佽幏鍙栬壊娓╃伅鐘舵�佸懡浠�
-        /// </summary>
-        /// <param name="device"></param>
-        public void SendColorTemperatureLightStatuComand(CommonDevice device)
+            };
+      var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
+      jObject.Add("Data", data);
+      device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
+    }
+
+    #endregion
+
+    #region 鈻� 鑹叉俯鐏痏____________________________
+
+    /// <summary>
+    /// 鍙戦�佽幏鍙栬壊娓╃伅鐘舵�佸懡浠�
+    /// </summary>
+    /// <param name="device"></param>
+    public void SendColorTemperatureLightStatuComand(CommonDevice device)
+    {
+      if (device == null)
+      {
+        return;
+      }
+      var colorDevice = (ColorTemperatureLight)device;
+      new System.Threading.Thread(() =>
+      {
+        colorDevice.ReadOnOffStatus();
+        System.Threading.Thread.Sleep(300);
+        colorDevice.ReadLevel();
+        System.Threading.Thread.Sleep(300);
+        colorDevice.ReadColorTemperature();
+        if (LocalDevice.Current.IsMiniLight(device) == true)
         {
-            if (device == null)
-            {
-                return;
-            }
-            var colorDevice = (ColorTemperatureLight)device;
-            new System.Threading.Thread(() =>
-            {
-                colorDevice.ReadOnOffStatus();
-                System.Threading.Thread.Sleep(300);
-                colorDevice.ReadLevel();
-                System.Threading.Thread.Sleep(300);
-                colorDevice.ReadColorTemperature();
-                if (LocalDevice.Current.IsMiniLight(device) == true)
-                {
-                    //mini澶滅伅闇�瑕佽鍙栬渹楦e櫒鐘舵��
-                    System.Threading.Thread.Sleep(300);
-                    colorDevice.ReadBuzzerStatu();
-                }
-            })
-            { IsBackground = true }.Start();
+          //mini澶滅伅闇�瑕佽鍙栬渹楦e櫒鐘舵��
+          System.Threading.Thread.Sleep(300);
+          colorDevice.ReadBuzzerStatu();
         }
+      })
+      { IsBackground = true }.Start();
+    }
 
-        #endregion
+    #endregion
 
-        #region 鈻� 娓╂箍搴____________________________
+    #region 鈻� 娓╂箍搴____________________________
 
-        /// <summary>
-        /// 璇诲彇娓╁害
-        /// </summary>
-        /// <param name="device"></param>
-        public void SendTemperatureStatuComand(CommonDevice device)
-        {
-            if (device == null)
-            {
-                return;
-            }
-            var jObject = new Newtonsoft.Json.Linq.JObject
+    /// <summary>
+    /// 璇诲彇娓╁害
+    /// </summary>
+    /// <param name="device"></param>
+    public void SendTemperatureStatuComand(CommonDevice device)
+    {
+      if (device == null)
+      {
+        return;
+      }
+      var jObject = new Newtonsoft.Json.Linq.JObject
             {
                 { "DeviceAddr",device.DeviceAddr },
                 { "Epoint", device.DeviceEpoint },
                 { "Cluster_ID", (int)Cluster_ID.TemperatureMeasurement },
                 { "Command", 108 }
             };
-            var attriBute = new Newtonsoft.Json.Linq.JArray
+      var attriBute = new Newtonsoft.Json.Linq.JArray
             {
                new Newtonsoft.Json.Linq.JObject
                {
                  { "AttriButeId", (int)AttriButeId.MeasuredValue}
                }
             };
-            var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
-            jObject.Add("Data", data);
-            device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
-        }
+      var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
+      jObject.Add("Data", data);
+      device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
+    }
 
-        /// <summary>
-        /// 璇诲彇婀垮害
-        /// </summary>
-        /// <param name="device"></param>
-        public void SendHumidityStatuComand(CommonDevice device)
-        {
-            if (device == null)
-            {
-                return;
-            }
-            var jObject = new Newtonsoft.Json.Linq.JObject
+    /// <summary>
+    /// 璇诲彇婀垮害
+    /// </summary>
+    /// <param name="device"></param>
+    public void SendHumidityStatuComand(CommonDevice device)
+    {
+      if (device == null)
+      {
+        return;
+      }
+      var jObject = new Newtonsoft.Json.Linq.JObject
             {
                 { "DeviceAddr",device.DeviceAddr },
                 { "Epoint", device.DeviceEpoint },
                 { "Cluster_ID", (int)Cluster_ID.RelativeHumidityMeasurement },
                 { "Command", 108 }
             };
-            var attriBute = new Newtonsoft.Json.Linq.JArray
+      var attriBute = new Newtonsoft.Json.Linq.JArray
             {
                new Newtonsoft.Json.Linq.JObject
                {
                  { "AttriButeId", (int)AttriButeId.MeasuredValue}
                }
             };
-            var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
-            jObject.Add("Data", data);
-            device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
-        }
+      var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
+      jObject.Add("Data", data);
+      device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
+    }
 
-        #endregion
-    }
+    #endregion
+  }
 }

--
Gitblit v1.8.0