黄学彪
2020-08-04 fd3c74df4d30a88d490d0c5b469df821f1bb2d78
ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
@@ -136,10 +136,11 @@
                TextSize = 14,
                TextAlignment = TextAlignment.CenterLeft
            };
            if (LocalDevice.Current.GetDevice(room.TemperatrueDevice) != null)
            if (this.temperDevice != null)
            {
                //这个设备要存在本地才行
                temperatureText.Text = room.Temperatrue == 0 ? "0.0℃" : room.Temperatrue.ToString() + "℃";
                decimal temperatrue = (decimal)temperDevice.GetType().InvokeMember("currentTemperature", System.Reflection.BindingFlags.GetField, null, temperDevice, null);
                temperatureText.Text = temperatrue == 0 ? "0.0℃" : temperatrue.ToString() + "℃";
            }
            roomTemperatureBackground.AddChidren(temperatureText);
            temperatureText.Width = temperatureText.GetTextWidth() + Application.GetRealWidth(60);
@@ -162,10 +163,12 @@
                TextSize = 14,
                TextAlignment = TextAlignment.CenterLeft
            };
            if (LocalDevice.Current.GetDevice(room.HumidityDevice) != null)
            if (this.humidDevice != null)
            {
                //这个设备要存在本地才行
                humidityText.Text = room.Humidity == 0 ? "0.0%" : room.Humidity.ToString() + "%";
                decimal humidity = (decimal)humidDevice.GetType().InvokeMember("currentHumidity", System.Reflection.BindingFlags.GetField, null, humidDevice, null);
                humidityText.Text = humidity == 0 ? "0.0%" : humidity.ToString() + "%";
            }
            roomTemperatureBackground.AddChidren(humidityText);
            humidityText.Width = humidityText.GetTextWidth() + Application.GetRealWidth(60);
@@ -216,13 +219,14 @@
                    {
                        HdlThreadLogic.Current.RunMain(() =>
                        {
                            if (((TemperatureSensor)temperDevice).Temperatrue == 0)
                            decimal temperatrue = (decimal)temperDevice.GetType().InvokeMember("currentTemperature", System.Reflection.BindingFlags.GetField, null, temperDevice, null);
                            if (temperatrue == 0)
                            {
                                temperatureText.Text = "0.0℃";
                            }
                            else
                            {
                                temperatureText.Text = ((TemperatureSensor)temperDevice).Temperatrue + "℃";
                                temperatureText.Text = temperatrue + "℃";
                            }
                        }, ShowErrorMode.NO);
                    }
@@ -234,7 +238,7 @@
                    {
                        HdlThreadLogic.Current.RunMain(() =>
                        {
                            decimal humidity = (decimal)humidDevice.GetType().InvokeMember("Humidity", System.Reflection.BindingFlags.GetField, null, humidDevice, null);
                            decimal humidity = (decimal)humidDevice.GetType().InvokeMember("currentHumidity", System.Reflection.BindingFlags.GetField, null, humidDevice, null);
                            if (humidity == 0)
                            {
                                humidityText.Text = "--%";