2020.2.28

gxc

2020-02-28 66a9965c44ecc32a6696abca876ab9d1cd091584

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

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

        /// <summary>
        /// IsSelected
@@ -120,9 +124,9 @@

            TimeButton = new Button()
            {
                X = Application.GetMinRealAverage(40),
                Y = Application.GetMinRealAverage(17),
                Width = Application.GetMinRealAverage(320),
                X = Application.GetMinRealAverage(30),
                Y = Application.GetMinRealAverage(20),
                Width = Application.GetMinRealAverage(63),
                Height = Application.GetMinRealAverage(63),
                TextColor = ZigbeeColor.Current.GXCTextSelectedColor3,
                TextAlignment = TextAlignment.CenterLeft,
@@ -131,8 +135,8 @@

            CollectButton = new Button
            {
                X = Application.GetMinRealAverage(366),
                Y = Application.GetMinRealAverage(14),
                X = Application.GetMinRealAverage(350),
                Y = Application.GetMinRealAverage(1),
                Width = Application.GetMinRealAverage(107),
                Height = Application.GetMinRealAverage(107),
                UnSelectedImagePath = "Item/Collection1.png",
@@ -149,6 +153,8 @@
                TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
                SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
                IsBold = true
            };
            AddChidren(SceneNameButton);
        }
@@ -167,6 +173,7 @@
            CollectButton.MouseUpEventHandler += CollectionEvent;
            SceneIcon.MouseUpEventHandler += SceneUpHandler;
            SceneNameButton.MouseUpEventHandler += SceneUpHandler;
            sceneBG.MouseUpEventHandler += SceneUpHandler;
        }

        /// <summary>
@@ -175,10 +182,12 @@
        /// <param name="name"></param>
        public void SetTimeText(string name)
        {
            TimeButton.Width = Application.GetMinRealAverage(320);
            TimeButton.Width = Application.GetMinRealAverage(280);
            TimeButton.Height = Application.GetMinRealAverage(63);
            TimeButton.UnSelectedImagePath = string.Empty;
            TimeButton.Text = name;
            TimeButton.TextSize = 14;
            TimeButton.IsBold = true;
        }

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

            scene.RemainTime = scene.SceneDelayTime;
            scene.SceneDelayTime = 0;
            Common.Room.CurrentRoom.ModifySceneDelayTime(scene);
            new System.Threading.Thread(() =>
            {
                while (scene.RemainTime > 0)
@@ -305,16 +315,23 @@
        /// <param name="mouseEventArgs"></param>
        private void  CollectionEvent(object sender,MouseEventArgs mouseEventArgs)
        {
            (sender as Button).IsSelected = !(sender as Button).IsSelected;
            if ((sender as Button).IsSelected)
            if (Common.Room.CurrentRoom.IsLove)
            {
                Shared.Common.Room.CurrentRoom.GetLoveRoom().AddScene(scene);
                Common.Room.CurrentRoom.GetLoveRoom().DeleteScene(scene);
                CollectionAction?.Invoke();
            }
            else
            {
                Shared.Common.Room.CurrentRoom.GetLoveRoom().RemoveScene(scene);
                (sender as Button).IsSelected = !(sender as Button).IsSelected;
                if ((sender as Button).IsSelected)
                {
                    Common.Room.CurrentRoom.GetLoveRoom().AddScene(scene);
                }
                else
                {
                    Common.Room.CurrentRoom.GetLoveRoom().DeleteScene(scene);
                }
            }
            scene.Save();
        }

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

                Common.Room.CurrentRoom.ModifySceneDelayTime(scene);
            };
        }