wxr
2021-12-08 b4f5f74d74a0a0996358d8348956601b30f17266
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -19,8 +19,17 @@
                if (bodyView != null)
                {
                    bodyView.btnTempValues.Text = MainPage.cityInfo.temperature == null ? "--" : MainPage.cityInfo.temperature + "°";
                    bodyView.btnTempValues.Width = bodyView.btnTempValues.GetTextWidth();
                    bodyView.btnHumidityValues.Text = MainPage.cityInfo.humidity == null ? "--" : MainPage.cityInfo.humidity + "%";
                    bodyView.btnHumidityValues.Width = bodyView.btnHumidityValues.GetTextWidth();
                    bodyView.btnPm25Values.Text = MainPage.cityInfo.pm25 == null ? "--" : MainPage.cityInfo.pm25;
                    bodyView.btnPm25Values.Width = bodyView.btnPm25Values.GetTextWidth();
                    bodyView.btnIndoorTempValues.X = bodyView.btnTempValues.Right;
                    bodyView.btnHumidityIcon.X = bodyView.btnIndoorTempValues.Right + Application.GetRealWidth(8);
                    bodyView.btnHumidityValues.X = bodyView.btnHumidityIcon.Right + Application.GetRealWidth(4);
                    bodyView.btnIndoorHumiValues.X = bodyView.btnHumidityValues.Right;
                    bodyView.btnPm25Icon.X = bodyView.btnIndoorHumiValues.Right + Application.GetRealWidth(4);
                    bodyView.btnPm25Values.X = bodyView.btnPm25Icon.Right + Application.GetRealWidth(4);
                }
            });
        }
@@ -86,7 +95,7 @@
                                name = enviTemp.name,
                                sid = enviTemp.sid,
                                deviceId = enviTemp.deviceId,
                                attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = tempAttr.state, curValue = tempAttr.curValue } },
                                attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "humidity", state = tempAttr.state, curValue = tempAttr.curValue } },
                            };
                            humiSensorList.Add(newTemp);
                        }
@@ -96,7 +105,7 @@
                    foreach (var temp in humiSensorList)
                    {
                        double humiValue = 0;
                        double.TryParse(temp.GetAttrState(FunctionAttributeKey.Value), out humiValue);
                        double.TryParse(temp.GetAttrState("humidity"), out humiValue);
                        if(humiValue > 0)
                        {
                            humiTotalValues += humiValue;
@@ -108,6 +117,12 @@
                        bodyView.btnIndoorHumiValues.Text = "/" + (humiTotalValues /humiTotalCount).ToString("0")+ "%";
                    }
                    bodyView.btnIndoorHumiValues.Width = bodyView.btnIndoorHumiValues.GetTextWidth();
                    bodyView.btnHumidityIcon.X = bodyView.btnIndoorTempValues.Right + Application.GetRealWidth(8);
                    bodyView.btnHumidityValues.X = bodyView.btnHumidityIcon.Right + Application.GetRealWidth(4);
                    bodyView.btnIndoorHumiValues.X = bodyView.btnHumidityValues.Right;
                    bodyView.btnPm25Icon.X = bodyView.btnIndoorHumiValues.Right + Application.GetRealWidth(4);
                    bodyView.btnPm25Values.X = bodyView.btnPm25Icon.Right + Application.GetRealWidth(4);
                }
            });
        }
@@ -133,7 +148,7 @@
                                name = enviTemp.name,
                                sid = enviTemp.sid,
                                deviceId = enviTemp.deviceId,
                                attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = tempAttr.state, curValue = tempAttr.curValue } },
                                attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "temperature", state = tempAttr.state, curValue = tempAttr.curValue } },
                            };
                            tempSensorList.Add(newTemp);
                        }
@@ -143,7 +158,7 @@
                    foreach (var temp in tempSensorList)
                    {
                        double tempValue = 0;
                        double.TryParse(temp.GetAttrState(FunctionAttributeKey.Value), out tempValue);
                        double.TryParse(temp.GetAttrState("temperature"), out tempValue);
                        if (tempValue > 0)
                        {
                            tempTotalValues += tempValue;
@@ -155,6 +170,12 @@
                        bodyView.btnIndoorTempValues.Text = "/" + (tempTotalValues /tempTotalCount).ToString("0.0")+ "°";
                    }
                    bodyView.btnIndoorTempValues.Width = bodyView.btnIndoorTempValues.GetTextWidth();
                    bodyView.btnHumidityIcon.X = bodyView.btnIndoorTempValues.Right + Application.GetRealWidth(8);
                    bodyView.btnHumidityValues.X = bodyView.btnHumidityIcon.Right + Application.GetRealWidth(4);
                    bodyView.btnIndoorHumiValues.X = bodyView.btnHumidityValues.Right;
                    bodyView.btnPm25Icon.X = bodyView.btnIndoorHumiValues.Right + Application.GetRealWidth(4);
                    bodyView.btnPm25Values.X = bodyView.btnPm25Icon.Right + Application.GetRealWidth(4);
                }
            });
        }