请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

 ZigbeeApp/Shared/Phone/ZigBee/Device/TemperatureSensor.cs

@@ -10,6 +10,15 @@
        /// </summary>
        public int SensorDiv = 1;

        /// <summary>
        /// 温度
        /// </summary>
        public decimal Temperatrue;
        /// <summary>
        /// 湿度
        /// </summary>
        public decimal Humidity;

        public TemperatureSensor()
        {
            this.Type = DeviceType.TemperatureSensor ;
@@ -18,10 +27,16 @@
        /// <summary>
        /// 读取温/湿度
        /// </summary>
        public void ReadTemperature()
        public void ReadTemperatureOrHumidity()
        {
            ReadAttri(Device.Cluster_ID.TemperatureMeasurement, AttriButeId.MeasuredValue );
            ReadAttri(Device.Cluster_ID.RelativeHumidityMeasurement, AttriButeId.MeasuredValue);
            if (SensorDiv == 1)

            {

                ReadAttri(Device.Cluster_ID.TemperatureMeasurement, AttriButeId.MeasuredValue);

            }
            else if (SensorDiv == 2)

            {

                ReadAttri(Device.Cluster_ID.RelativeHumidityMeasurement, AttriButeId.MeasuredValue);

            }
        }
    }
}