2019.12.30

gxc

2019-12-30 b129359c5a0df75f63d9131e5e41d3060ac38cc3

 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

@@ -482,7 +482,7 @@
            if(UserCenterResourse.Option.SafetyShortcut)
            {
                var safetyBtn = new SafetyShortcutControl();
                safetyBtn.X = Application.GetRealWidth(855);
                safetyBtn.X = Application.GetRealWidth(860);
                safetyBtn.Gravity = Gravity.CenterVertical;
                topFrameLayout.AddChidren(safetyBtn);
            }
@@ -503,7 +503,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                Text = Config.Instance.Home.Name ?? Language.StringByID(R.MyInternationalizationString.TheResidenceNameNull),
                TextSize = 24,
                TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                TextColor = ZigbeeColor.Current.GXCTextDeepBlackColor,
                IsBold=true
            };
            if (Config.Instance.Home.IsOthreShare)
@@ -696,6 +696,7 @@
                    var roomView = new Device.CommonForm.RoomView(0, 0);
                    roomPageView.AddChidren(roomView);
                    roomView.Init(room);
                    roomView.HideName(true);
                    roomView.action += () =>
                    {
                        Show();
@@ -703,6 +704,11 @@
                }
                var curIndex = rList.FindIndex((obj) => obj.Id == Room.CurrentRoom.Id);
                roomPageView.PageIndex = curIndex;
                if (roomPageView.GetChildren(roomPageView.PageIndex) != null)
                {
                    (roomPageView.GetChildren(roomPageView.PageIndex) as RoomView).HideName(false);
                    
                }

                var functionSceneView = new FrameLayout()
                {
@@ -782,9 +788,22 @@

                roomPageView.PageChange += (sender, e) =>
                {
                    if(roomPageView.GetChildren(roomPageView.PageIndex - 1) !=null)
                    {
                        (roomPageView.GetChildren(roomPageView.PageIndex - 1) as RoomView).HideName(true);
                    }
                    if (roomPageView.GetChildren(roomPageView.PageIndex + 1) != null)
                    {
                        (roomPageView.GetChildren(roomPageView.PageIndex + 1) as RoomView).HideName(true);
                    }
                    if (roomPageView.GetChildren(roomPageView.PageIndex) != null)
                    {
                        (roomPageView.GetChildren(roomPageView.PageIndex) as RoomView).HideName(false);
                    }
                    //切换当前房间
                    Room.CurrentRoom = rList[roomPageView.PageIndex];
                    RefreshBodyView();
                    
                };
            }
            else