？？？？？？？

黄学彪

2020-03-23 cc0d80c7d86c6d0167269b3408c4b30c24ce84e9

 ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs

@@ -37,6 +37,10 @@
        /// scene
        /// </summary>
        public SceneUI scene;
        /// <summary>
        /// CollectionAction
        /// </summary>
        public Action CollectionAction;

        /// <summary>
        /// IsSelected
@@ -149,8 +153,8 @@
                TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
                SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize=14,
                IsBold=true
                TextSize = 14,
                IsBold = true
            };
            AddChidren(SceneNameButton);
        }
@@ -163,7 +167,7 @@
            SetTimeByDelayTime(scene.SceneDelayTime);
            SetSceneNameText(scene.Name);
            SetIcon(scene.IconPath);
            SetCollect(Common.Room.CurrentRoom.GetLoveRoom().SceneUIFilePathList.Contains(scene.FileName));
            SetCollect(UserCenter.HdlRoomLogic.Current.IsCollectInRoom(scene));

            TimeButton.MouseUpEventHandler += SetTimeEvents;
            CollectButton.MouseUpEventHandler += CollectionEvent;
@@ -182,6 +186,8 @@
            TimeButton.Height = Application.GetMinRealAverage(63);
            TimeButton.UnSelectedImagePath = string.Empty;
            TimeButton.Text = name;
            TimeButton.TextSize = 14;
            TimeButton.IsBold = true;
        }

        /// <summary>
@@ -277,7 +283,7 @@
                {
                    return;
                }
                CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.ControlSceneFail);
                CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.ControlSceneFail));
            }

            scene.RemainTime = scene.SceneDelayTime;
@@ -308,16 +314,24 @@
        /// <param name="mouseEventArgs"></param>
        private void  CollectionEvent(object sender,MouseEventArgs mouseEventArgs)
        {
            (sender as Button).IsSelected = !(sender as Button).IsSelected;
            if ((sender as Button).IsSelected)
            var roomLove = UserCenter.HdlRoomLogic.Current.GetLoveRoom();
            if (UserCenter.HdlRoomLogic.Current.CurrentRoom.IsLove)
            {
                Shared.Common.Room.CurrentRoom.GetLoveRoom().AddScene(scene);
                UserCenter.HdlSceneLogic.Current.DeleteScene(roomLove, scene);
                CollectionAction?.Invoke();
            }
            else
            {
                Shared.Common.Room.CurrentRoom.GetLoveRoom().RemoveScene(scene);
                (sender as Button).IsSelected = !(sender as Button).IsSelected;
                if ((sender as Button).IsSelected)
                {

                    UserCenter.HdlSceneLogic.Current.AddScene(roomLove, scene);
                }
                else
                {

                    UserCenter.HdlSceneLogic.Current.DeleteScene(roomLove, scene);
                }
            }
            scene.Save();
        }

        /// <summary>
@@ -334,7 +348,7 @@
            }
            var timeSelect = new SelectTime();
            CommonPage.Instance.AddChidren(timeSelect);
            timeSelect.TempTime = scene.DelayTime;
            timeSelect.TempTime = scene.SceneDelayTime;
            timeSelect.Init();
            timeSelect.TimeAction = (t) =>
            {