合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

 ZigbeeApp/Shared/Phone/Device/DeviceLogic/ReadDeviceAttributeLogic.cs

@@ -35,6 +35,10 @@
        /// <param name="device">设备</param>
        public void SendACStatuComand(CommonDevice device)
        {
            if (device == null)
            {
                return;
            }
            new System.Threading.Thread(() =>
            {
                SendFanStatuComand(device);
@@ -50,6 +54,10 @@
        /// <param name="device">设备</param>

        private void SendThermostatStatuComand(CommonDevice device)

        {

            if (device == null)
            {
                return;
            }
            var jObject = new Newtonsoft.Json.Linq.JObject

            {

                { "DeviceAddr",device.DeviceAddr },

@@ -99,6 +107,10 @@
        /// <param name="device">设备</param>

        private void SendFanStatuComand(CommonDevice device)

        {

            if (device == null)
            {
                return;
            }
            var jObject = new Newtonsoft.Json.Linq.JObject

            {

                { "DeviceAddr",device.DeviceAddr },

@@ -131,6 +143,10 @@
        /// <param name="device">窗帘</param>

        public void SendCurtainStatuComand(CommonDevice device)

        {

            if (device == null)
            {
                return;
            }
            var jObject = new Newtonsoft.Json.Linq.JObject

            {

                { "DeviceAddr",device.DeviceAddr },

@@ -169,6 +185,10 @@
        /// <param name="device"></param>
        public void SendDimmableLightStatuComand(CommonDevice device)
        {
            if (device == null)
            {
                return;
            }
            new System.Threading.Thread(() =>
            {
                SendSwitchStatuComand(device);
@@ -184,6 +204,10 @@
        /// <param name="device">窗帘</param>

        private void SendSwitchStatuComand(CommonDevice device)

        {

            if (device == null)
            {
                return;
            }
            var jObject = new Newtonsoft.Json.Linq.JObject

            {

                { "DeviceAddr",device.DeviceAddr },

@@ -209,6 +233,10 @@
        /// <param name="device">窗帘</param>

        private void SendLevelStatuComand(CommonDevice device)

        {

            if (device == null)
            {
                return;
            }
            var jObject = new Newtonsoft.Json.Linq.JObject

            {

                { "DeviceAddr",device.DeviceAddr },

@@ -229,5 +257,68 @@
        }

        #endregion

        #region ◆ 温湿度____________________________

        /// <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
            {
               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());
        }

        /// <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
            {
               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

    }
}