Merge branch 'ez-test' into temp-wxr

hxb

2021-02-26 cbe3c22d13b30208eccfa75ecd36f88adaa72930

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

@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI.Music;
@@ -106,7 +107,7 @@
                btnSwitch.IsSelected = !btnSwitch.IsSelected;
                new System.Threading.Thread(() =>
                {
                    if (function.functionCategory == FunctionCategory.Light)
                    if (function.Spk_Prefix == FunctionCategory.Light)
                    {
                        var light = function as Light;
                        light.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
@@ -125,7 +126,7 @@
        /// </summary>
        void LoadEvent_LightDimming(DiyImageSeekBar dimmerControlBar)
        {
            if(function.functionType == FunctionType.Dimmer || function.functionType == FunctionType.RGB)
            if(function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
            {
                var light = function as Light;
                dimmerControlBar.OnStartTrackingTouchEvent = (sender, e) => {
@@ -196,12 +197,6 @@
                Control.Ins.SendWriteCommand(curtain, d);
            };

            //btnStop.MouseDownEventHandler = (sender, e) =>
            //{
            //    btnStop.IsSelected = true;
            //    btnClose.IsSelected = false;
            //    btnOpen.IsSelected = false;
            //};
            btnStop.MouseUpEventHandler = (sender, e) =>
            {
                btnStop.IsSelected = true;
@@ -227,6 +222,40 @@
        }
        #endregion


        /// <summary>
        /// 加载晾衣架控制事件
        /// </summary>
        void LoadEvent_ControlClothesHanger(Function function, Button btnUp, Button btnDown)
        {
            btnUp.MouseDownEventHandler = (sender, e) =>
            {
                btnUp.IsSelected = true;
            };
            btnUp.MouseUpEventHandler = (sender, e) =>
            {
                btnUp.IsSelected = false;
                function.SetAttrState(FunctionAttributeKey.Position, "up");
                Dictionary<string, string> d = new Dictionary<string, string>();
                d.Add(FunctionAttributeKey.Position, "up");
                Control.Ins.SendWriteCommand(function, d);
            };

            btnDown.MouseDownEventHandler = (sender, e) =>
            {
                btnDown.IsSelected = true;
            };
            btnDown.MouseUpEventHandler = (sender, e) =>
            {
                btnDown.IsSelected = false;
                function.SetAttrState(FunctionAttributeKey.Position, "down");
                Dictionary<string, string> d = new Dictionary<string, string>();
                d.Add(FunctionAttributeKey.Position, "down");
                Control.Ins.SendWriteCommand(function, d);
            };
        }


        #region 空调事件
        #endregion