代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

 ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs

@@ -83,7 +83,7 @@
            {
                X = Application.GetRealWidth(29),
                Y = Application.GetRealHeight(374),
                Width = Application.GetRealWidth(340),
                Width = Application.GetRealWidth(400),
                Height = Application.GetRealHeight(80),
                BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor2
            };
@@ -103,16 +103,16 @@
            var temperatureText = new Button
            {
                X = Application.GetRealWidth(69),
                Width = Application.GetRealWidth(100),
                Width = Application.GetRealWidth(120),
                Height = Application.GetRealHeight(58),
                Gravity = Gravity.CenterVertical,
                Text = "26℃"
                Text = $"{room.Temperatrue}℃"
            };
            roomTemperatureBackground.AddChidren(temperatureText);

            var humidityIcon = new Button
            {
                X = Application.GetRealWidth(179),
                X = Application.GetRealWidth(200),
                Width = Application.GetMinRealAverage(58),
                Height = Application.GetMinRealAverage(58),
                Gravity = Gravity.CenterVertical,
@@ -122,11 +122,11 @@

            var humidityText = new Button
            {
                X = Application.GetRealWidth(236),
                Width = Application.GetRealWidth(86),
                X = Application.GetRealWidth(260),
                Width = Application.GetRealWidth(120),
                Height = Application.GetRealHeight(58),
                Gravity = Gravity.CenterVertical,
                Text = "13%"
                Text = $"{room.Humidity}%"
            };
            roomTemperatureBackground.AddChidren(humidityText);

@@ -152,6 +152,7 @@
                            {
                                //0℃
                                temperatureText.Text = "0.0℃";
                                room.Temperatrue = 0;
                            }
                            else if (data.AttriButeData > 32767)
                            {
@@ -160,6 +161,7 @@
                                //小数点需要一位
                                strValue = strValue.Substring(0, strValue.Length - 1);
                                temperatureText.Text = strValue.Insert(strValue.Length - 1, ".") + "℃";
                                room.Temperatrue = int.Parse(strValue) * 0.1;
                            }
                            else
                            {
@@ -167,6 +169,7 @@
                                string strValue = data.AttriButeData.ToString();
                                strValue = strValue.Substring(0, strValue.Length - 1);
                                temperatureText.Text = strValue.Insert(strValue.Length - 1, ".") + "℃";
                                room.Temperatrue = int.Parse(strValue) * 0.1;
                            }
                        }
                    }
@@ -199,6 +202,7 @@
                            {
                                //0
                                humidityText.Text = "0.0%";
                                room.Humidity = 0;
                            }
                            else
                            {
@@ -206,6 +210,7 @@
                                string strValue = data.AttriButeData.ToString();
                                strValue = strValue.Substring(0, strValue.Length - 1);
                                humidityText.Text = strValue.Insert(strValue.Length - 1, ".") + "%";
                                room.Humidity = int.Parse(strValue) * 0.1;
                            }
                        }
                    }
@@ -217,6 +222,7 @@
                    (dev as ZigBee.Device.TemperatureSensor).ReadTemperatureOrHumidity();
                }
            }


            var roomListBtn = new Button()
            {
@@ -240,7 +246,6 @@
                    action?.Invoke();
                };
            };

        }
    }
}