2020-07-23

wxr

2020-07-23 5de5a26d3825b3182a7d3a18ed1cbdbb78a3f9aa

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -105,10 +105,10 @@
                {
                    X = Application.GetRealWidth(16),
                    Y = Application.GetRealHeight(32),
                    Width = Application.GetRealWidth(200),
                    Width = Application.GetRealWidth(400),
                    Height = Application.GetRealHeight(33),
                    TextColor = CSS.CSS_Color.MainBackgroundColor,
                    TextSize = CSS.CSS_FontSize.EmphasisFontSize_FirstLevel,
                    TextColor = CSS_Color.MainBackgroundColor,
                    TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
                    TextAlignment = TextAlignment.CenterLeft,
                    Text = DB_ResidenceData.residenceData.residecenInfo.Name,
                    IsBold = true
@@ -122,9 +122,7 @@
                        async () => { await DAL.Net.MqttCommon.StartMqtt();
                    });
                };

#endif


                environmentalView = new FrameLayout()
                {
@@ -148,9 +146,9 @@
                    X = btnTempIcon.Right + Application.GetRealWidth(4),
                    Width = Application.GetRealWidth(30),
                    Gravity = Gravity.CenterVertical,
                    TextColor = CSS.CSS_Color.MainBackgroundColor,
                    TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
                    Text = MainPage.cityInfo.temperature,
                    TextColor = CSS_Color.MainBackgroundColor,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    Text = MainPage.cityInfo.temperature + "°",
                    TextAlignment = TextAlignment.CenterLeft,
                };
                environmentalView.AddChidren(btnTempValues);
@@ -170,9 +168,9 @@
                    X = btnHumidityIcon.Right + Application.GetRealWidth(4),
                    Width = Application.GetRealWidth(30),
                    Gravity = Gravity.CenterVertical,
                    TextColor = CSS.CSS_Color.MainBackgroundColor,
                    TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
                    Text = MainPage.cityInfo.humidity,
                    TextColor = CSS_Color.MainBackgroundColor,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    Text = MainPage.cityInfo.humidity + "%",
                    TextAlignment = TextAlignment.CenterLeft,
                };
                environmentalView.AddChidren(btnHumidityValues);
@@ -192,8 +190,8 @@
                    X = btnPm25Icon.Right + Application.GetRealWidth(4),
                    Width = Application.GetRealWidth(30),
                    Gravity = Gravity.CenterVertical,
                    TextColor = CSS.CSS_Color.MainBackgroundColor,
                    TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
                    TextColor = CSS_Color.MainBackgroundColor,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    Text = MainPage.cityInfo.pm25,
                    TextAlignment = TextAlignment.CenterLeft,
                };
@@ -213,7 +211,7 @@

                var btngb = new Button()
                {
                    BackgroundColor = CSS.CSS_Color.MainColor,//0x3F4484F4,//
                    BackgroundColor = CSS_Color.MainColor,//0x3F4484F4,//
                    Alpha = 0.4f,
                };
                msgView.AddChidren(btngb);
@@ -236,8 +234,8 @@
                    X = Application.GetRealWidth(10) + btnMsgIcon.Right,
                    Width = Application.GetRealWidth(240),
                    Text = "无",
                    TextColor = CSS.CSS_Color.MainBackgroundColor,
                    TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
                    TextColor = CSS_Color.MainBackgroundColor,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    TextAlignment = TextAlignment.CenterLeft,
                };
                msgView.AddChidren(btnMsg);
@@ -248,7 +246,7 @@
                    X = Application.GetRealWidth(299),
                    Width = Application.GetRealWidth(44),
                    Text = "00:00",
                    TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    TextAlignment = TextAlignment.CenterLeft,
                };
                msgView.AddChidren(btnMsgTime);
@@ -271,9 +269,9 @@
                {
                    Width = Application.GetRealWidth(114),
                    TextID = StringId.Functions,
                    SelectedTextColor = CSS.CSS_Color.MainColor,
                    TextColor = CSS.CSS_Color.PromptingColor1,
                    TextSize = CSS.CSS_FontSize.HeadlineFontSize,
                    SelectedTextColor = CSS_Color.MainColor,
                    TextColor = CSS_Color.PromptingColor1,
                    TextSize = CSS_FontSize.HeadlineFontSize,
                    TextAlignment = TextAlignment.Center,
                    IsSelected = true,
                    IsBold = true
@@ -286,7 +284,7 @@
                    Gravity = Gravity.CenterVertical,
                    Width = Application.GetRealWidth(1),
                    Height = Application.GetRealHeight(14),
                    BackgroundColor = CSS.CSS_Color.PromptingColor1,
                    BackgroundColor = CSS_Color.PromptingColor1,
                };
                changeView.AddChidren(btnLine);

@@ -295,22 +293,19 @@
                    X = btnLine.Right,
                    Width = Application.GetRealWidth(114),
                    TextID = StringId.Scenes,
                    SelectedTextColor = CSS.CSS_Color.MainColor,
                    TextColor = CSS.CSS_Color.PromptingColor1,
                    TextSize = CSS.CSS_FontSize.TextFontSize,
                    SelectedTextColor = CSS_Color.MainColor,
                    TextColor = CSS_Color.PromptingColor1,
                    TextSize = CSS_FontSize.TextFontSize,
                    TextAlignment = TextAlignment.Center,
                };
                changeView.AddChidren(btnChangeScene);
                #endregion

                //bodyView.AddChidren(new Button() { Y = changeView.Bottom, Height = Application.GetRealHeight(10), BackgroundColor = 0xAAF2F3F7 });


                #region ContextView
                contentView = new PageLayout()
                {
                    Y = changeView.Bottom ,
                    Height = Application.GetRealHeight(310 + 30), //20为超出部分
                    Height = Application.GetRealHeight(310 + 30 + 10), //20为超出部分
                };
                bodyView.AddChidren(contentView);

@@ -325,7 +320,7 @@
                contentView.PageIndex = 0;

                #endregion
                bodyView.AddChidren(new Button() { Y = changeView.Bottom, Height = Application.GetRealHeight(7), BackgroundColor = 0xAAF2F3F7 });
                bodyView.AddChidren(new Button() { Y = changeView.Bottom, Height = Application.GetRealHeight(4), BackgroundColor = 0xAAF2F3F7 });

                LoadEvent_ChangeShowedFunctionType();
            }
@@ -389,6 +384,33 @@
                    LoadDeviceFunctionDiv(functionView, function);
                    index++;
                }

                if (index == 0)
                {
                    var view = new FrameLayout();
                    deviceFunctionView.AddChidren(view);

                    var btnNoCollectionBg = new Button()
                    {
                        Y = Application.GetRealHeight(20),
                        Gravity = Gravity.CenterHorizontal,
                        Width = Application.GetRealWidth(180),
                        Height = Application.GetRealWidth(180),
                        UnSelectedImagePath = "Collection/NoCollectionBg.png",
                    };
                    view.AddChidren(btnNoCollectionBg);

                    var btnNoCollectionTip = new Button()
                    {
                        Height = Application.GetRealHeight(42),
                        Y = btnNoCollectionBg.Bottom,
                        TextAlignment = TextAlignment.Center,
                        TextColor = CSS_Color.PromptingColor1,
                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                        TextID = StringId.TipNoCollcetion,
                    };
                    view.AddChidren(btnNoCollectionTip);
                }
            }
            catch (Exception ex)
            {
@@ -442,6 +464,7 @@
                    LoadSceneFunctionDiv( functionView, function);
                    index++;
                }

            }
            catch (Exception ex)
            {
@@ -475,8 +498,8 @@
                    Y = Application.GetRealWidth(10) + btnIcon.Bottom,
                    Text = function.name,
                    IsBold = true,
                    TextColor = CSS.CSS_Color.FirstLevelTitleColor,
                    TextSize = CSS.CSS_FontSize.TextFontSize,
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextSize = CSS_FontSize.TextFontSize,
                    Height = Application.GetRealWidth(24),
                    Width = Application.GetRealWidth(140),
                    TextAlignment = TextAlignment.CenterLeft,
@@ -490,10 +513,10 @@
                    Y = btnName.Bottom,
                    Height = Application.GetRealWidth(18),
                    Width = Application.GetRealWidth(113),
                    TextColor = CSS.CSS_Color.PromptingColor1,
                    TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
                    TextColor = CSS_Color.PromptingColor1,
                    TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
                    TextAlignment = TextAlignment.CenterLeft,
                    SelectedTextColor = CSS.CSS_Color.MainBackgroundColor,
                    SelectedTextColor = CSS_Color.MainBackgroundColor,
                    Text = function.GetRoomListName()
                };
                view.AddChidren(btnZone);
@@ -505,9 +528,9 @@
                    Y = btnZone.Bottom,
                    Height = Application.GetRealWidth(18),
                    Width = Application.GetRealWidth(113),
                    SelectedTextColor = CSS.CSS_Color.MainBackgroundColor,
                    SelectedTextColor = CSS_Color.MainBackgroundColor,
                    TextColor = 0x00000000,
                    TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
                    TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
                    TextAlignment = TextAlignment.CenterLeft,
                    Tag = "state",
                    Text = function.lastState
@@ -678,10 +701,10 @@
                    Y = btnName.Bottom,
                    Height = Application.GetRealWidth(18),
                    Width = Application.GetRealWidth(113),
                    TextColor = CSS.CSS_Color.MainBackgroundColor,
                    TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
                    TextColor = CSS_Color.MainBackgroundColor,
                    TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
                    TextAlignment = TextAlignment.CenterLeft,
                    SelectedTextColor = CSS.CSS_Color.MainBackgroundColor,
                    SelectedTextColor = CSS_Color.MainBackgroundColor,
                    Text = function.GetRoomListName(),
                };
                view.AddChidren(btnZone);