Merge branch 'Dev-Branch' into dev--wxr

wxr

2022-09-27 0ee75b88cfe03e46289de0de96e8ed4580c797d3

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

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using HDL_ON.UI.Music;
using Shared;

@@ -9,54 +10,60 @@
{
    public partial class FunctionControlZone
    {
        /// <summary>
        /// 更新开关状态
        /// </summary>
        /// <param name="upfunc"></param>
        public static void UpdataOnOffState(Function upfunc)
        {
            if(bodyDiv!= null)
            {
                Application.RunOnMainThread(() => {
                    if(bodyDiv.Tag.ToString() == upfunc.sid)
                    {
                        for (var o = 0; o < bodyDiv.ChildrenCount; o++)
                        {
                            if (bodyDiv.GetChildren(o).GetType() == typeof(Button))
                            {
                                var btn = bodyDiv.GetChildren(o) as Button;
                                if (btn.Tag != null)
                                {
                                    if (btn.Tag.ToString() == upfunc.sid + "_Switch")// + "_DimmerBar")
                                    {
                                        btn.IsSelected = upfunc.trait_on_off.curValue.ToString() == "on";
                                    }
                                }
                            }
                            else if (bodyDiv.GetChildren(o).GetType() == typeof(DiyImageSeekBar))
                            {
                                var btn = bodyDiv.GetChildren(o) as DiyImageSeekBar;
                                if (btn.Tag != null)
                                {
                                    if (btn.Tag.ToString() == upfunc.sid + "_DimmerBar")
                                    {
                                        btn.Progress = Convert.ToInt32(upfunc.GetAttrState(FunctionAttributeKey.Brightness));
                                    }
                                }
                            }
                        }
        //    /// <summary>
        //    /// 更新开关状态
        //    /// </summary>
        //    /// <param name="upfunc"></param>
        //    public static void UpdataOnOffState(Function upfunc)
        //    {
        //        if(bodyDiv!= null)
        //        {
        //            Application.RunOnMainThread(() => {
        //                if(bodyDiv.Tag.ToString() == upfunc.sid)
        //                {
        //                    for (var o = 0; o < bodyDiv.ChildrenCount; o++)
        //                    {
        //                        if (bodyDiv.GetChildren(o).GetType() == typeof(Button))
        //                        {
        //                            var btn = bodyDiv.GetChildren(o) as Button;
        //                            if (btn.Tag != null)
        //                            {
        //                                if (btn.Tag.ToString() == upfunc.sid + "_Switch")// + "_DimmerBar")
        //                                {
        //                                    btn.IsSelected = upfunc.trait_on_off.curValue.ToString() == "on";
        //                                }
        //                            }
        //                        }
        //                        else if (bodyDiv.GetChildren(o).GetType() == typeof(DiyImageSeekBar))
        //                        {
        //                            var btn = bodyDiv.GetChildren(o) as DiyImageSeekBar;
        //                            if (btn.Tag != null)
        //                            {
        //                                if (btn.Tag.ToString() == upfunc.sid + "_DimmerBar")
        //                                {
        //                                    btn.Progress = Convert.ToInt32(upfunc.GetAttrState(FunctionAttributeKey.Brightness));
        //                                }
        //                            }
        //                        }
        //                    }

                    }
        //                }
        //            });
        //        }
        //    }
        /// <summary>
        /// 更新在线状态
        /// </summary>
        public void UpdataOnline(bool online)
        {
            if (bodyDiv != null)
            {
                Application.RunOnMainThread(() =>
                {
                    bodyDiv.BackgroundColor = online ? CSS_Color.MainBackgroundColor : CSS_Color.PromptingColor2;
                    bodyDiv.btnOffline.Visible = !online;
                });
            }
        }
        /// <summary>
        /// 更新亮度状态
        /// </summary>
        /// <param name="upfunc"></param>
        static void UpdataBrightnessState(Function upfunc)
        {

        }

        /// <summary>
@@ -152,32 +159,32 @@
                };
                dimmerControlBar.OnProgressChangedEvent = (sender, e) => {
                    dimmerControlBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
                    //light.brightness = e;
                    //light.trait_on_off.curValue = e > 0 ? "on" : "off";
                    function.SetAttrState(FunctionAttributeKey.Brightness, e);
                    function.trait_on_off.curValue = e > 0 ? "on" : "off";

                    //if (e == 0 || e == 100)
                    //{
                    //    //Control.Send(CommandType_A.write, light);
                    //    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);
                    //}
                    //else
                    //{
                    //    var tm = (DateTime.Now - light.refreshTime).TotalMilliseconds;
                    //    Console.WriteLine("skip time "+tm);
                    //    if (300 < tm)
                    //    {
                    //        light.refreshTime = DateTime.Now;
                    //        new System.Threading.Thread(() =>
                    //        {
                    //            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);
                    //        })
                    //        { IsBackground = true }.Start();
                    //    }
                    //}
                    if (e == 0 || e == 100)
                    {
                        //Control.Send(CommandType_A.write, light);
                        System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                        d.Add("brightness", e.ToString());
                        Control.Ins.SendWriteCommand(function, d);
                    }
                    else
                    {
                        var tm = (DateTime.Now - function.refreshTime).TotalMilliseconds;
                        Console.WriteLine("skip time " + tm);
                        if (500 < tm)
                        {
                            function.refreshTime = DateTime.Now;
                            new System.Threading.Thread(() =>
                            {
                                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                                d.Add("brightness", e.ToString());
                                Control.Ins.SendWriteCommand(function, d);
                            })
                            { IsBackground = true }.Start();
                        }
                    }
                };
            }

@@ -352,7 +359,7 @@
                a31player.SetAttrState("song_step", "up");
                Dictionary<string, string> dic = new Dictionary<string, string>();
                dic.Add("song_step", "up");
                SendMethod.mMethod.SendControlCommand(a31player, dic);
                SendMethod.Current.SendControlCommand(a31player, dic);
            };
            btnPrev.MouseUpEventHandler = (sender, e) =>
            {
@@ -375,7 +382,7 @@
                a31player.SetAttrState("on_off", status);
                Dictionary<string, string> dic = new Dictionary<string, string>();
                dic.Add("on_off", status);
                SendMethod.mMethod.SendControlCommand(a31player, dic);
                SendMethod.Current.SendControlCommand(a31player, dic);
            };
            ///下一曲点击事件
            btnNext.MouseDownEventHandler = (sender, e) =>
@@ -384,7 +391,7 @@
                a31player.SetAttrState("song_step", "down");
                Dictionary<string, string> dic = new Dictionary<string, string>();
                dic.Add("song_step", "down");
                SendMethod.mMethod.SendControlCommand(a31player, dic);
                SendMethod.Current.SendControlCommand(a31player, dic);
            };
            btnNext.MouseUpEventHandler = (sender, e) =>
            {