2019.11.18

gxc

2019-11-18 1e76fa5a69bc478b3eb5738546aeb51b8fd6f7c9

 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

@@ -445,7 +445,7 @@
            };
            if(Config.Instance.Home.IsOthreShare)
            {
                residecneName.Text = $"({Language.StringByID(R.MyInternationalizationString.Shared)}){Config.Instance.Home.Name}";
                residecneName.Text = $"{Config.Instance.Home.Name}";
            }
            AddChidren(residecneName);

@@ -554,7 +554,7 @@
                        };
                        if(home.IsOthreShare)
                        {
                            nameBtn.Text = $"({Language.StringByID(R.MyInternationalizationString.Shared)}){home.Name}";
                            nameBtn.Text = $"{home.Name}";
                        }
                        rowView.AddChidren(nameBtn);

@@ -572,7 +572,7 @@
                            residecneName.Text = home.Name;
                            if(home.IsOthreShare)
                            {
                                nameBtn.Text = $"({Language.StringByID(R.MyInternationalizationString.Shared)}){home.Name}";
                                nameBtn.Text = $"{home.Name}";
                            }
                            clickCheckBtn = pointBtn;
                            clickNameBtn = nameBtn;
@@ -591,7 +591,7 @@
                            residecneName.Text = home.Name;
                            if (home.IsOthreShare)
                            {
                                residecneName.Text = nameBtn.Text = $"({Language.StringByID(R.MyInternationalizationString.Shared)}){home.Name}";
                                residecneName.Text = nameBtn.Text = $"{home.Name}";
                            }
                        }
                        else
@@ -627,11 +627,10 @@
                AddChidren(roomPageView);

                //当前房间
                if (Shared.Common.Room.CanInitAllRoom == true)
                {
                    //Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.CurrentRoom;
                    Room.CurrentRoom = Room.Lists[0];
                    foreach (var room in Room.CurrentRoom.GetRoomsByCurrentFloorIdAppendLoveRoom())
                var rList = Room.CurrentRoom.GetRoomsByCurrentFloorIdAppendLoveRoom();
                Room.CurrentRoom = rList[0];
                foreach (var room in rList)
                    {
                        var roomBackView = new FrameLayout()
                        {
@@ -640,8 +639,8 @@
                        roomPageView.AddChidren(roomBackView);
                        var roomBG = new Button()
                        {
                            //UnSelectedImagePath = "Room/HomeBG.png",
                            UnSelectedImagePath = room.BackgroundImage
                        UnSelectedImagePath = "Room/HomeBG.png",
                        //UnSelectedImagePath = room.BackgroundImage
                        };
                        roomBackView.AddChidren(roomBG);
                        var roomName = new Button()
@@ -678,42 +677,8 @@
                            };
                        };
                    }
                }
                else
                {
                    Room.CurrentRoom = Room.Lists[0];
                    var roomBackView = new FrameLayout()
                    {
                        BackgroundImagePath = "Room/r0.png"
                    };
                    roomPageView.AddChidren(roomBackView);
                    var roomBG = new Button()
                    {
                        UnSelectedImagePath = "Room/HomeBG.png",
                    };
                    roomBackView.AddChidren(roomBG);
                    var roomName = new Button()
                    {
                        X = Application.GetRealWidth(20),
                        Y = Application.GetRealHeight(20),
                        Width = Application.GetRealWidth(500),
                        Height = Application.GetRealHeight(80),
                        Text = Language.StringByID(R.MyInternationalizationString.Favorite),
                        TextAlignment = TextAlignment.CenterLeft,
                        TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
                        TextSize = 18
                    };
                    roomBackView.AddChidren(roomName);
                    var roomListBtn = new Button()
                    {
                        X = roomPageView.Width - Application.GetRealWidth(100 + 20),
                        Y = Application.GetRealHeight(20),
                        Width = Application.GetMinRealAverage(100),
                        Height = Application.GetMinRealAverage(100),
                        UnSelectedImagePath = "Item/List.png"
                    };
                    roomBackView.AddChidren(roomListBtn);
                }



                var functionSceneView = new FrameLayout()
                {
@@ -783,7 +748,7 @@
                roomPageView.PageChange += (sender, e) =>
                {
                    //切换当前房间
                    Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.Lists[roomPageView.PageIndex];
                    Room.CurrentRoom = rList[roomPageView.PageIndex];
                    RefreshBodyView();
                };
            }
@@ -802,10 +767,6 @@
        /// </summary>
        public void RefreshBodyView()
        {
            if (Room.CanInitAllRoom == false)
            {
                return;
            }
            functionSceneBodyView.RemoveAll();
            if (functionBtn.IsSelected)
            {
@@ -1781,7 +1742,7 @@
                    }
                    else
                    {
                        sceneView.SetTimeText(scene.SceneDelayTime.ToString());
                        sceneView.SetTimeText(CommonFormResouce.GetTimeString(scene.SceneDelayTime));
                    }

                    sceneView.TimeButton.MouseUpEventHandler += (sender, e) =>