2019-11-04-1

WJC

2019-11-04 e5f993f52e09eb46878baced83bb8492f147d41c

 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

@@ -72,7 +72,7 @@
        private readonly int sleepSpan = 300;


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

        #endregion

@@ -380,7 +380,7 @@
                    }

                });

            }

           

        }
        /// <summary>
        /// Changeds the IL ogic status.
@@ -853,7 +853,7 @@
            {
                ShowNoGatewayTip();
            }



        }

        #endregion
@@ -975,8 +975,8 @@
        /// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
        private void GoToAddGateWay(object sender, MouseEventArgs mouseEventArgs)
        {
            var selectNewGateWayForm = new UserCenter.GatewayAdd.NewGateWaySelectForm { };
            selectNewGateWayForm.AddForm(selectNewGateWayForm);
            var selectNewGateWayForm = new UserCenter.GatewayAdd.NewGateWayMenuSelectForm { };
            selectNewGateWayForm.AddForm();
        }

        #endregion
@@ -1028,7 +1028,7 @@
            else
            {
                deviceVerticalScrolViewLayout = new VerticalScrolViewLayout { };
                

                functionSceneBodyView.AddChidren(deviceVerticalScrolViewLayout);
               for(int i=0;i<deviceList.Count;i++)
                {
@@ -1052,7 +1052,7 @@
                        deviceVerticalScrolViewLayout.AddChidren(itemView);
                    }

                   

                    //删除设备
                    EventHandler<MouseEventArgs> delEvent = (sender, e) =>
                    {
@@ -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();