Merge branch 'DEV_GXC' of http://172.16.1.23:6688/r/~xm/HomeApp into DEV_GXC

gxc

2019-10-29 ed2f4a97aa48cdb4a013d2a389877f52eb3eccdf

 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

old mode 100755
new mode 100644
@@ -72,7 +72,7 @@
        private readonly int sleepSpan = 300;


        private FrameLayout itemView;
        private FrameLayout itemView=new FrameLayout();

        #endregion

@@ -460,7 +460,7 @@
                Gravity = Gravity.CenterVertical,
                TextAlignment =TextAlignment.CenterLeft,
                TextColor=ZigbeeColor.Current.GXCTextColor,
                Text=Config.Instance.Home.GetCurrentFloorName()
                Text=Config.Instance.Home.GetCurrentFloorName
            };
            topFrameLayout.AddChidren(floorBtn);

@@ -1073,12 +1073,12 @@
                    {
                        if ((sender as Button).IsSelected)
                        {
                            Shared.Common.Room.GetLoveRoom().DeleteDevice(device.FileName);
                            Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(device.FileName);
                            (sender as Button).IsSelected = false;
                        }
                        else
                        {
                            Shared.Common.Room.GetLoveRoom().AddDevice(device.FileName);
                            Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(device.FileName);
                            (sender as Button).IsSelected = true;
                        }
                        if (Room.CurrentRoom.IsLove)
@@ -2379,7 +2379,7 @@
                    sceneView.Init();
                    sceneView.SetSceneNameText(scene.Name);
                    sceneView.SetIcon($"SceneIcon/{i}.png");
                    sceneView.SetCollect(scene.IsCollected);
                    sceneView.SetCollect(Common.Room.CurrentRoom.GetLoveRoom().SceneUIFilePathList.Contains(scene.FileName));

                    if (scene.SceneDelayTime == 0)
                    {
@@ -2439,17 +2439,30 @@
                    //收藏
                    EventHandler<MouseEventArgs> collectionEvent = (sender, e) =>
                    {
                        (sender as Button).IsSelected = !(sender as Button).IsSelected;
                        if ((sender as Button).IsSelected)
                        {
                            scene.Collect(false);
                            (sender as Button).IsSelected = false;
                            //scene.IsCollected = true;
                            Room.CurrentRoom.GetLoveRoom().AddScene(scene);
                        }
                        else
                        {
                            scene.Collect(true);
                            (sender as Button).IsSelected = true;
                            //scene.IsCollected = false;
                            Room.CurrentRoom.GetLoveRoom().RemoveScene(scene);
                        }
                        scene.Save();

                        //if ((sender as Button).IsSelected)
                        //{
                        //    scene.Collect(false);
                        //    (sender as Button).IsSelected = false;
                        //}
                        //else
                        //{
                        //    scene.Collect(true);
                        //    (sender as Button).IsSelected = true;
                        //}
                        //scene.Save();
                        //if (Room.CurrentRoom.IsLove)
                        //{
                        //    RefreshBodyView();