2019.12.13

gxc

2019-12-13 eb424d24e39bab4a245725f35deab3f234ea0f13

 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

@@ -426,7 +426,10 @@
                Gravity = Gravity.CenterVertical,
                UnSelectedImagePath = "Item/Floor.png"
            };
            topFrameLayout.AddChidren(floor);
            if (Config.Instance.Home.FloorDics.Count > 0)
            {
                topFrameLayout.AddChidren(floor);
            }

            floorBtn = new Button
            {
@@ -438,7 +441,10 @@
                TextColor = ZigbeeColor.Current.GXCTextColor,
                Text = Config.Instance.Home.GetCurrentFloorName
            };
            topFrameLayout.AddChidren(floorBtn);
            if (Config.Instance.Home.FloorDics.Count > 0)
            {
                topFrameLayout.AddChidren(floorBtn);
            }

            var messageBtn = new Button()
            {
@@ -460,7 +466,8 @@
                TextAlignment = TextAlignment.CenterLeft,
                Text = Config.Instance.Home.Name ?? Language.StringByID(R.MyInternationalizationString.TheResidenceNameNull),
                TextSize = 24,
                TextColor = ZigbeeColor.Current.GXCTextBlackColor
                TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                IsBold=true
            };
            if (Config.Instance.Home.IsOthreShare)
            {
@@ -476,7 +483,7 @@
                var tempHomeBtn = send as Button;
                if (Config.Instance.HomeFilePathList.Count == 0)
                {
                    var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst), Language.StringByID(R.MyInternationalizationString.Close), Language.StringByID(R.MyInternationalizationString.OK));
                    var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst), Language.StringByID(R.MyInternationalizationString.Close), Language.StringByID(R.MyInternationalizationString.Confrim));
                    alert.Show();
                    alert.ResultEventHandler += (senderHouse, eHouse) =>
                    {
@@ -503,7 +510,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 +518,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
                    };
@@ -624,7 +631,7 @@
            //消息
            messageBtn.MouseUpEventHandler += (send, e) =>
            {
               

            };

            #endregion
@@ -639,10 +646,10 @@
                    Height = Application.GetRealHeight(478),
                };
                AddChidren(roomPageView);
                //与屏幕边框的边距
                roomPageView.RowPadding = Application.GetRealWidth(181);
                //突出边距
                roomPageView.TCBJ = Application.GetRealWidth(112);
                //两个page之间的间距
                roomPageView.PagePadding = Application.GetRealWidth(69);
                roomPageView.JMBJ = Application.GetRealWidth(69);

                //当前房间
                //Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.CurrentRoom;
@@ -650,114 +657,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 +686,9 @@
                    TextColor = ZigbeeColor.Current.GXCTextGrayColor3,
                    SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
                    TextID = R.MyInternationalizationString.Scence,
                    IsSelected = false
                    IsSelected = true,
                    TextSize=16,
                    IsBold=true
                };
                functionSceneView.AddChidren(sceneBtn);

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

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

@@ -1002,7 +918,7 @@
            {
                Y = noFunction.Bottom,
                Height = Application.GetRealHeight(200),
                Text = Language.StringByID(R.MyInternationalizationString.NoFunction).Replace("{\\r\\n}", "\r\n"),
                Text = Language.StringByID(R.MyInternationalizationString.NoFunction_Tip).Replace("{\\r\\n}", "\r\n"),
                TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
                IsMoreLines = true
            };
@@ -1116,7 +1032,7 @@
                                zbGateway.ReportAction += UpdateDeviceControllStatu;
                                AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice);

                                (device.CommonDevice as Rollershade).CurtainUpDownStopControl(1);
                                (device.CommonDevice as Rollershade).CurtainUpDownStopControl(0);

                                ((sender as Button).Parent as FunctionMainView).SetStatuText(CommonFormResouce.GetSwitchStatu(true));
                                ((sender as Button).Parent as FunctionMainView).IsSelected = true;
@@ -1142,7 +1058,7 @@
                                zbGateway.ReportAction += UpdateDeviceControllStatu;
                                AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice);

                                (device.CommonDevice as Rollershade).CurtainUpDownStopControl(0);
                                (device.CommonDevice as Rollershade).CurtainUpDownStopControl(1);

                                ((sender as Button).Parent as FunctionMainView).SetStatuText(CommonFormResouce.GetSwitchStatu(false));
                                ((sender as Button).Parent as FunctionMainView).IsSelected = false;
@@ -1722,7 +1638,7 @@
            {
                Y = noScene.Bottom,
                Height = Application.GetRealHeight(200),
                Text = Language.StringByID(R.MyInternationalizationString.NoScene).Replace("{\\r\\n}", "\r\n"),
                Text = Language.StringByID(R.MyInternationalizationString.NoScene_Tip).Replace("{\\r\\n}", "\r\n"),
                TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
                IsMoreLines = true
            };
@@ -1751,7 +1667,7 @@
                for (int i = 0; i < sceneList.Count; i++)
                {
                    var scene = sceneList[i];
                    int xx = 43 + i % 2 * (20 + 487);
                    int xx = 33 + i % 2 * (40 + 487);
                    int yy = 14;
                    if (scene == null)
                    {