20201222-1

wei

2020-12-22 d07d62be7111d78b2aaa44c9cdee23a7d22b4dda

 HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs

@@ -65,29 +65,15 @@
        {
            btnCollectionIcon.MouseUpEventHandler += (sender, e) =>
            {
                btnCollectionIcon.IsSelected = function.collection = !btnCollectionIcon.IsSelected;
                function.SaveFunctionData();
                btnCollectionIcon.IsSelected = function.collect = !btnCollectionIcon.IsSelected;
                function.SaveFunctionData(true);
            };
        }
        /// <summary>
        /// 加载场景控制事件
        /// </summary>
        void LoadEvent_ControlScene()
        {
            EventHandler<MouseEventArgs> upEvent = (sender, e) => {
                Control.Ins.ControlScene(function as Scene);
                string msg = function.name + Language.StringByID(StringId.AlreadyOpened);
                new PublicAssmebly().TipMsgAutoClose(msg, false);
            };
            btnName.MouseUpEventHandler = upEvent;
            btnFromFloor.MouseUpEventHandler = upEvent;
            bodyDiv.MouseUpEventHandler = upEvent;
        }

        /// <summary>
        /// 开关事件
        /// </summary>
        void LoadEvent_SwitchFunction(Button btnSwitch)
        void LoadEvent_SwitchFunction(Button btnSwitch,FunctionAttributes fadeTime = null)
        {
            btnSwitch.MouseUpEventHandler = (sender, e) =>
            {
@@ -95,9 +81,12 @@
                new System.Threading.Thread(() =>
                {
                    function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                    //Control.Send(CommandType_A.write, function);
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add("on_off", function.trait_on_off.curValue.ToString());
                    d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                    if(fadeTime!= null)
                    {
                        d.Add(FunctionAttributeKey.FadeTime, fadeTime.curValue.ToString());
                    }
                    Control.Ins.SendWriteCommand(function, d);
                })
                { IsBackground = true }.Start();
@@ -204,19 +193,18 @@
                Control.Ins.SendWriteCommand(curtain, d);
            };

            btnStop.MouseDownEventHandler = (sender, e) =>
            //btnStop.MouseDownEventHandler = (sender, e) =>
            //{
            //    btnStop.IsSelected = true;
            //    btnClose.IsSelected = false;
            //    btnOpen.IsSelected = false;
            //};
            btnStop.MouseUpEventHandler = (sender, e) =>
            {
                btnStop.IsSelected = true;
                btnClose.IsSelected = false;
                btnOpen.IsSelected = false;
            };
            btnStop.MouseUpEventHandler = (sender, e) =>
            {
                btnOpen.IsSelected = true;
                btnClose.IsSelected = false;
                btnStop.IsSelected = false;
                curtain.trait_on_off.curValue = "stop";
                //curtain.percent = 0;
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add("on_off", curtain.trait_on_off.curValue.ToString());
                Control.Ins.SendWriteCommand(curtain, d);