2019.12.3

gxc

2019-12-03 a7a6907b3df65db9c4b2bb1237f709db5c985b52

 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

@@ -503,7 +503,7 @@
                        Y = Application.GetRealHeight(248),
                        Width = Application.GetMinRealAverage(449),
                        Height = Application.GetMinRealAverage(478),
                        UnSelectedImagePath = "Item/SelectHouse"
                        UnSelectedImagePath = "Item/SelectHouse.png"
                    };
                    closeBGview.AddChidren(bg);

@@ -511,8 +511,8 @@
                    {
                        X = Application.GetRealWidth(35),
                        Y = Application.GetRealHeight(271),
                        Height = Application.GetRealHeight(449),
                        Width = Application.GetRealWidth(440),
                        Height = Application.GetMinRealAverage(449),
                        Width = Application.GetMinRealAverage(440),
                        Radius = CommonPage.BigFormRadius,
                        BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
                    };
@@ -650,114 +650,12 @@
                Room.CurrentRoom = rList[0];
                foreach (var room in rList)
                {
                    var roomBackView = new FrameLayout()
                    var roomView = new Device.CommonForm.RoomView(0, 0);
                    roomPageView.AddChidren(roomView);
                    roomView.Init(room);
                    roomView.action += () =>
                    {
                        Width = Application.GetRealWidth(717),
                        Height=Application.GetRealHeight(478)
                    };
                    roomPageView.AddChidren(roomBackView);

                    var roomImg = new ImageView()
                    {
                        ImagePath = room.BackgroundImageType == 0 ? room.BackgroundImage : System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage),
                        Radius = (uint)Application.GetRealHeight(17)
                    };
                    roomBackView.AddChidren(roomImg);

                    var roomNameBackground = new FrameLayout
                    {
                        X = Application.GetRealWidth(29),
                        Y = Application.GetRealHeight(282),
                        Width = Application.GetRealWidth(200),
                        Height = Application.GetRealHeight(80),
                        BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor2
                    };
                    roomBackView.AddChidren(roomNameBackground);
                    roomNameBackground.SetCornerWithSameRadius(Application.GetRealHeight(40), HDLUtils.RectCornerTopRight | HDLUtils.RectCornerBottomRight);

                    var roomName = new Button()
                    {
                        X = Application.GetRealWidth(5),
                        Width = Application.GetRealWidth(190),
                        Text = room.Name,
                        TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
                    };
                    roomNameBackground.AddChidren(roomName);


                    var roomTemperatureBackground = new FrameLayout
                    {
                        X = Application.GetRealWidth(29),
                        Y = Application.GetRealHeight(374),
                        Width = Application.GetRealWidth(340),
                        Height = Application.GetRealHeight(80),
                        BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor2
                    };
                    roomBackView.AddChidren(roomTemperatureBackground);
                    roomTemperatureBackground.SetCornerWithSameRadius(Application.GetRealHeight(40), HDLUtils.RectCornerTopRight | HDLUtils.RectCornerBottomRight);

                    var temperatureIcon = new Button
                    {
                        X = Application.GetRealWidth(12),
                        Width = Application.GetMinRealAverage(58),
                        Height = Application.GetMinRealAverage(58),
                        Gravity = Gravity.CenterVertical,
                        UnSelectedImagePath = "Room/Temperature.png"
                    };
                    roomTemperatureBackground.AddChidren(temperatureIcon);

                    var temperatureText = new Button
                    {
                        X = Application.GetRealWidth(69),
                        Width = Application.GetRealWidth(86),
                        Height = Application.GetRealHeight(58),
                        Gravity = Gravity.CenterVertical,
                        Text="26℃"
                    };
                    roomTemperatureBackground.AddChidren(temperatureText);

                    var humidityIcon = new Button
                    {
                        X = Application.GetRealWidth(179),
                        Width = Application.GetMinRealAverage(58),
                        Height = Application.GetMinRealAverage(58),
                        Gravity = Gravity.CenterVertical,
                        UnSelectedImagePath = "Room/Humidity.png"
                    };
                    roomTemperatureBackground.AddChidren(humidityIcon);

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


                    var roomListBtn = new Button()
                    {
                        X = roomBackView.Width - Application.GetRealWidth(100 + 20),
                        Y = Application.GetRealHeight(20),
                        Width = Application.GetMinRealAverage(100),
                        Height = Application.GetMinRealAverage(100),
                        UnSelectedImagePath = "Room/List.png",
                    };
                    roomBackView.AddChidren(roomListBtn);

                    roomListBtn.MouseUpEventHandler += (send, e) =>
                    {
                        CommonPage.Instance.IsDrawerLockMode = true;
                        var editRoom = new Device.Room.EditRoom();
                        HomePage.Instance.AddChidren(editRoom);
                        HomePage.Instance.PageIndex += 1;
                        editRoom.Show(room);
                        editRoom.action += () =>
                        {
                            Show();
                        };
                        Show();
                    };
                }

@@ -781,7 +679,8 @@
                    TextColor = ZigbeeColor.Current.GXCTextGrayColor3,
                    SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
                    TextID = R.MyInternationalizationString.Scence,
                    IsSelected = false
                    IsSelected = true,
                    TextSize=16
                };
                functionSceneView.AddChidren(sceneBtn);

@@ -795,7 +694,8 @@
                    TextColor = ZigbeeColor.Current.GXCTextGrayColor3,
                    SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
                    TextID = R.MyInternationalizationString.Function,
                    IsSelected = false
                    IsSelected = false,
                    TextSize=14
                };
                functionSceneView.AddChidren(functionBtn);

@@ -814,6 +714,8 @@
                {
                    sceneBtn.IsSelected = false;
                    functionBtn.IsSelected = true;
                    sceneBtn.TextSize = 14;
                    functionBtn.TextSize = 16;
                    RefreshBodyView();
                };
                //选择场景分栏
@@ -821,6 +723,8 @@
                {
                    functionBtn.IsSelected = false;
                    sceneBtn.IsSelected = true;
                    sceneBtn.TextSize = 16;
                    functionBtn.TextSize = 14;
                    RefreshBodyView();
                };