合并完成代码

黄学彪

2019-10-28 8b4d79ca03495e522a1953e04ca17527f33c853a

 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

@@ -853,7 +853,7 @@
            {
                ShowNoGatewayTip();
            }



        }

        #endregion
@@ -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();