数据结构优化修改

wei

2021-03-08 37c315988c2dc11e4f477233f7a9f87d57bb61aa

 HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs

@@ -10,34 +10,34 @@
        /// <summary>

        /// 更新功能状态

        /// </summary>

        public static void UpdataStates(Light uFunction)

        public static void UpdataStatus(Function updataTemp)

        {

            Application.RunOnMainThread((Action)(() =>

            Application.RunOnMainThread(() =>

            {

                try

                {

                    if (bodyView == null)

                        return;

                    if (uFunction.spk == bodyView.light.spk && uFunction.sid == bodyView.light.sid)

                    if (updataTemp.spk == bodyView.function.spk && updataTemp.sid == bodyView.function.sid)

                    {

                        if (uFunction.trait_on_off.curValue.ToString() == "on")

                        if (updataTemp.trait_on_off.curValue.ToString() == "on")

                        {

                            bodyView.dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);

                            if (!bodyView.onDimmerBar)

                            {

                                bodyView.dimmerBar.Progress = uFunction.brightness;

                                bodyView.dimmerBar.Progress = Convert.ToInt32( updataTemp.GetAttrState(FunctionAttributeKey.Brightness));

                            }
                            bodyView.btnBrightnessText.Text = uFunction.brightness + "%";
                            bodyView.btnBrightnessText.Y = ((100 - uFunction.brightness) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);

                            bodyView.btnBrightnessText.Text = updataTemp.GetAttrState(FunctionAttributeKey.Brightness) + "%";
                            bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);

                        }

                        else

                        {

                            bodyView.dimmerBar.SetProgressBarColors(CSS_Color.DividingLineColor, CSS_Color.DividingLineColor);

                        }

                        bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.curValue.ToString() == "on";

                        bodyView.barColorTemplatrue.Enable = uFunction.trait_on_off.curValue.ToString() == "on";

                        bodyView.btnSwitch.IsSelected = updataTemp.trait_on_off.curValue.ToString() == "on";

                        bodyView.barColorTemplatrue.Enable = updataTemp.trait_on_off.curValue.ToString() == "on";

                        var cct = 27;

                        int.TryParse(uFunction.Attr_CCT.curValue.ToString(), out cct);

                        int.TryParse(updataTemp.GetAttrState(FunctionAttributeKey.CCT), out cct);

                        bodyView.barColorTemplatrue.Progress = cct / 100;
                        //设置初始值
                        bodyView.barColorTemplatrue.SetCustomText(bodyView.barColorTemplatrue.Progress * 100 + "K");

@@ -48,7 +48,7 @@
                {

                    MainPage.Log($"{bodyView.GetType().Name } UpdataStates error : {ex.Message}");

                }

            }));

            });

        }



        void LoadEventList()

@@ -60,9 +60,9 @@
            LoadEvet_ChangeColorTemplatrue();

            //回退刷新信息事件

            actionRefresh = () => {

                btnFunctionName.Text = btnFunctionName_Out.Text = light.name;

                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = light.GetRoomListName();

                //light.SaveFunctionData(true);

                btnFunctionName.Text = btnFunctionName_Out.Text = function.name;

                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = function.GetRoomListName();

                //function.SaveFunctionData(true);

            };

        }

        /// <summary>

@@ -72,8 +72,8 @@
        {

            //barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>

            //{

            //    light.fadeTime = e;

            //    light.SaveFunctionData(true);

            //    function.fadeTime = e;

            //    function.SaveFunctionData(true);

            //};

        }



@@ -90,10 +90,10 @@
                    {
                        //设置自定义的文本
                        barColorTemplatrue.SetCustomText(value * 100 + "K");
                        light.Attr_CCT.curValue = value * 100;
                        function.SetAttrState(FunctionAttributeKey.CCT, value * 100);
                        //System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                        //d.Add(FunctionAttributeKey.CCT, light.Attr_CCT.curValue.ToString());
                        //Control.Ins.SendWriteCommand(light, d);
                        //d.Add(FunctionAttributeKey.CCT, function.Attr_CCT.curValue.ToString());
                        //Control.Ins.SendWriteCommand(function, d);
                    });

                    //System.Threading.Thread.Sleep(200);

                }).Start();

@@ -101,10 +101,10 @@

            barColorTemplatrue.OnStopTrackingTouchEvent = (sender, value) =>

            {
                light.Attr_CCT.curValue = value * 100;
                function.SetAttrState(FunctionAttributeKey.CCT, value * 100);
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.CCT, light.Attr_CCT.curValue.ToString());
                Control.Ins.SendWriteCommand(light, d);
                d.Add(FunctionAttributeKey.CCT, (value * 100 ).ToString());
                Control.Ins.SendWriteCommand(function, d);
            };



        }

@@ -115,8 +115,8 @@
        void LoadCollectionEvent()

        {

            btnCollection.MouseUpEventHandler += (sender, e) => {

                btnCollection.IsSelected = light.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;

                light.CollectFunction();

                btnCollection.IsSelected = function.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;

                function.CollectFunction();

            };

        }



@@ -131,11 +131,11 @@
            dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
            {

                onDimmerBar = false;

                light.brightness = dimmerBar.Progress;

                function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress);

                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();

                d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());

                Control.Ins.SendWriteCommand(light, d);

                //light.fadeTime = barFadeTime.Progress;

                d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString());

                Control.Ins.SendWriteCommand(function, d);

                //function.fadeTime = barFadeTime.Progress;

                btnBrightnessText.Text = dimmerBar.Progress + "%";

                dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
@@ -143,38 +143,38 @@
            dimmerBar.OnProgressChangedEvent = (sender, e) =>
            {

                dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
                //light.fadeTime = 0;

                //function.fadeTime = 0;

                //if (!btnSwitch.IsSelected)

                //{

                //    dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);

                //}

                //btnSwitch.IsSelected = e > 0 ? true : false;

                //light.brightness = e;

                //light.trait_on_off.curValue = e > 0 ? "on" : "off";

                //function.brightness = e;

                //function.trait_on_off.curValue = e > 0 ? "on" : "off";



                //if (e == 0 || e == 100)

                //{

                //    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();

                //    d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());

                //    Control.Ins.SendWriteCommand(light, d);

                //    d.Add(FunctionAttributeKey.Brightness, function.brightness.ToString());

                //    Control.Ins.SendWriteCommand(function, d);

                //}

                //else

                //{

                //    if (200 < (DateTime.Now - light.refreshTime).TotalMilliseconds)

                //    if (200 < (DateTime.Now - function.refreshTime).TotalMilliseconds)

                //    {

                //        light.refreshTime = DateTime.Now;

                //        function.refreshTime = DateTime.Now;

                //        new System.Threading.Thread(() =>

                //        {

                //            System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();

                //            d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());

                //            Control.Ins.SendWriteCommand(light, d);

                //            d.Add(FunctionAttributeKey.Brightness, function.brightness.ToString());

                //            Control.Ins.SendWriteCommand(function, d);

                //        })

                //        { IsBackground = true }.Start();

                //    }

                //}



                //btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16 - 16) / 100) + Application.GetRealWidth(40);

                //btnBrightnessText.Text = light.brightness + "%";

                //btnBrightnessText.Text = function.brightness + "%";



                btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);
                btnBrightnessText.Text = dimmerBar.Progress + "%";

@@ -190,7 +190,7 @@
        {

            btnSwitch.MouseUpEventHandler += (sender, e) =>

            {

                //light.fadeTime = barFadeTime.Progress;

                //function.fadeTime = barFadeTime.Progress;

                btnSwitch.IsSelected = !btnSwitch.IsSelected;

                if (btnSwitch.IsSelected)

                {

@@ -202,19 +202,19 @@
                }

                new System.Threading.Thread(() =>

                {

                    light.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";

                    function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";

                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();

                    d.Add(FunctionAttributeKey.OnOff, light.trait_on_off.curValue.ToString());

                    d.Add(FunctionAttributeKey.FadeTime, light.fadeTime.ToString());
                    d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());

                    d.Add(FunctionAttributeKey.FadeTime, function.GetAttrState(FunctionAttributeKey.FadeTime));
                    if (btnSwitch.IsSelected)

                    {

                        d.Add(FunctionAttributeKey.Brightness, light.lastBrightness.ToString());

                        d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());

                    }

                    else

                    {

                        light.lastBrightness = light.brightness;

                        function.lastBrightness = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness));

                    }

                    Control.Ins.SendWriteCommand(light, d);

                    Control.Ins.SendWriteCommand(function, d);

                })

                { IsBackground = true }.Start();

            };