2021-12-01-01

xm

2021-12-01 6d73bf6e816570291865674bef8bce8972e4de3f

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

@@ -40,7 +40,7 @@
                                {
                                    if (btn.Tag.ToString() == upfunc.sid + "_DimmerBar")
                                    {
                                        //btn.Progress = (upfunc as Light).trait_brightness.value.value.ToString() == "on";
                                        btn.Progress = Convert.ToInt32(upfunc.GetAttrState(FunctionAttributeKey.Brightness));
                                    }
                                }
                            }
@@ -76,13 +76,25 @@
        /// </summary>
        void LoadEvent_SwitchFunction(Button btnSwitch,FunctionAttributes fadeTime = null)
        {

            btnSwitch.MouseUpEventHandler = (sender, e) =>
            {
                btnSwitch.IsSelected = !btnSwitch.IsSelected;

                if(SPK.NotStatusSpkList.Contains( function.spk ))
                {
                    new System.Threading.Thread(() => {
                        System.Threading.Thread.Sleep(2000);
                        Application.RunOnMainThread(() => {
                            btnSwitch.IsSelected = !btnSwitch.IsSelected;
                        });
                    }) { IsBackground = true }.Start();
                }

                new System.Threading.Thread(() =>
                {
                    function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    Dictionary<string, string> d = new Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                    if(fadeTime!= null)
                    {
@@ -107,12 +119,10 @@
                btnSwitch.IsSelected = !btnSwitch.IsSelected;
                new System.Threading.Thread(() =>
                {
                    if (function.Spk_Prefix == FunctionCategory.Light)
                    if (SPK.LightSpkList().Contains( function.spk))
                    {
                        var light = function as Light;
                        light.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>();
                        function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                        Dictionary<string, string> d = new Dictionary<string, string>();
                        d.Add("on_off", function.trait_on_off.curValue.ToString());
                        Control.Ins.SendWriteCommand(function, d);
                    }
@@ -128,7 +138,6 @@
        {
            if(function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
            {
                var light = function as Light;
                dimmerControlBar.OnStartTrackingTouchEvent = (sender, e) => {
                    onDimmerBar = true;
                    (bodyDiv.Parent as VerticalScrolViewLayout).ScrollEnabled = false;
@@ -136,10 +145,10 @@
                dimmerControlBar.OnStopTrackingTouchEvent = (sender, e) => {
                    onDimmerBar = false;
                    (bodyDiv.Parent as VerticalScrolViewLayout).ScrollEnabled = true;
                    light.brightness = dimmerControlBar.Progress;
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add("brightness", light.brightness.ToString());
                    Control.Ins.SendWriteCommand(light, d);
                    function.SetAttrState(FunctionAttributeKey.Brightness, dimmerControlBar.Progress.ToString());
                    Dictionary<string, string> d = new Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.Brightness, dimmerControlBar.Progress.ToString());
                    Control.Ins.SendWriteCommand(function, d);
                };
                dimmerControlBar.OnProgressChangedEvent = (sender, e) => {
                    dimmerControlBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
@@ -183,7 +192,7 @@
        /// <param name="btnStop"></param>
        /// <param name="btnOpen"></param>
        /// <param name="btnClose"></param>
        void LoadEvent_ControlCurtain(Button btnStop, Button btnOpen, Button btnClose, Curtain curtain)
        void LoadEvent_ControlCurtain(Button btnStop, Button btnOpen, Button btnClose, Function curtain)
        {
            btnClose.MouseUpEventHandler = (sender, e) =>
            {
@@ -191,9 +200,9 @@
                btnStop.IsSelected = false;
                btnOpen.IsSelected = false;
                curtain.trait_on_off.curValue = "off";
                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());
                curtain.SetAttrState(FunctionAttributeKey.Percent, 0);
                Dictionary<string, string> d = new Dictionary<string, string>();
                d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
                Control.Ins.SendWriteCommand(curtain, d);
            };

@@ -203,8 +212,8 @@
                btnClose.IsSelected = false;
                btnOpen.IsSelected = false;
                curtain.trait_on_off.curValue = "stop";
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add("on_off", curtain.trait_on_off.curValue.ToString());
                Dictionary<string, string> d = new Dictionary<string, string>();
                d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
                Control.Ins.SendWriteCommand(curtain, d);
            };

@@ -214,9 +223,9 @@
                btnClose.IsSelected = false;
                btnStop.IsSelected = false;
                curtain.trait_on_off.curValue = "on";
                curtain.percent = 100;
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add("on_off", curtain.trait_on_off.curValue.ToString());
                curtain.SetAttrState(FunctionAttributeKey.Percent, 100);
                Dictionary<string, string> d = new Dictionary<string, string>();
                d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
                Control.Ins.SendWriteCommand(curtain, d);
            };
        }
@@ -234,7 +243,15 @@
            };
            btnUp.MouseUpEventHandler = (sender, e) =>
            {
                btnUp.IsSelected = false;
                new System.Threading.Thread(() =>
                {
                    System.Threading.Thread.Sleep(2000);
                    Application.RunOnMainThread(() =>
                    {
                        btnUp.IsSelected = false;
                    });
                })
                { IsBackground = true }.Start();
                function.SetAttrState(FunctionAttributeKey.Position, "up");
                Dictionary<string, string> d = new Dictionary<string, string>();
                d.Add(FunctionAttributeKey.Position, "up");
@@ -247,7 +264,15 @@
            };
            btnDown.MouseUpEventHandler = (sender, e) =>
            {
                btnDown.IsSelected = false;
                new System.Threading.Thread(() =>
                {
                    System.Threading.Thread.Sleep(2000);
                    Application.RunOnMainThread(() =>
                    {
                        btnDown.IsSelected = false;
                    });
                })
                { IsBackground = true }.Start();
                function.SetAttrState(FunctionAttributeKey.Position, "down");
                Dictionary<string, string> d = new Dictionary<string, string>();
                d.Add(FunctionAttributeKey.Position, "down");
@@ -268,6 +293,8 @@
        /// <param name="curtain"></param>
        void LoadEvent_ControlMusic(Button btnPlay,Button btnNext,Button btnPrev, A31MusicModel a31player) 
        {
            if (a31player == null)
                return;
            ///上一曲点击事件
            btnPrev.MouseDownEventHandler = (sender, e) =>
            {