Merge branch 'wxr-2.1' into wxr-2.0

wxr

2023-09-06 c2348ebb81ca12b72eee6fbe9eee47925c1a5b07

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

@@ -8,40 +8,87 @@
    public partial class DimmerPage
    {
        /// <summary>
        /// 通知更新界面的时间
        /// </summary>
        DateTime notiyUpdateTime = DateTime.MinValue;
        System.Threading.Thread updateUiThread;
        object lockObj = new object();
        
        /// <summary>
        /// 更新功能状态
        /// </summary>
        public static void UpdataStates(Function updataTemp)
        {
            Application.RunOnMainThread((() =>
            if (bodyView == null)
            {
                try
                return;
            }
            lock (bodyView.lockObj)
            {
                MainPage.Log($"收到更新" + DateTime.Now.Ticks);
                bodyView.notiyUpdateTime = DateTime.Now;
                if (bodyView.updateUiThread == null)
                {
                    if (bodyView == null)
                        return;
                    if (updataTemp.spk == bodyView.function.spk && updataTemp.sid == bodyView.function.sid)
                    bodyView.updateUiThread = new System.Threading.Thread(() =>
                    {
                        bodyView.btnBrightnessText.Text = updataTemp.GetAttrState(FunctionAttributeKey.Brightness) + "%";
                        if (updataTemp.trait_on_off.curValue.ToString() == "on")
                        while (true)
                        {
                            bodyView.dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
                            if (!bodyView.onDimmerBar)
                            System.Threading.Thread.Sleep(1500);
                            if (bodyView == null)
                            {
                                bodyView.dimmerBar.Progress = Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness));
                                bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
                                return;
                            }
                            if (DateTime.Now.AddMilliseconds(-1500) > bodyView.notiyUpdateTime)
                            {
                                MainPage.Log("没有新数据，更新UI");
                                break;
                            }
                            else
                            {
                                MainPage.Log("有新数据，继续等待");
                            }
                        }
                        else
                        {
                            bodyView.dimmerBar.SetProgressBarColors(CSS_Color.DividingLineColor, CSS_Color.DividingLineColor);
                        }
                        bodyView.btnSwitch.IsSelected = updataTemp.trait_on_off.curValue.ToString() == "on";
                    }

                        Application.RunOnMainThread(() =>{
                            try
                            {
                                if (bodyView == null)
                                    return;
                                if (updataTemp.spk == bodyView.function.spk && updataTemp.sid == bodyView.function.sid)
                                {
                                    bodyView.btnBrightnessText.Text = updataTemp.GetAttrState(FunctionAttributeKey.Brightness) + "%";
                                    if (updataTemp.trait_on_off.curValue.ToString() == "on")
                                    {
                                        bodyView.dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
                                        if (!bodyView.onDimmerBar)
                                        {
                                            bodyView.dimmerBar.Progress = Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness));
                                            bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
                                        }
                                    }
                                    else
                                    {
                                        bodyView.dimmerBar.SetProgressBarColors(CSS_Color.DividingLineColor, CSS_Color.DividingLineColor);
                                    }
                                    bodyView.btnSwitch.IsSelected = updataTemp.trait_on_off.curValue.ToString() == "on";
                                }
                            }
                            catch (Exception ex)
                            {
                                MainPage.Log($"{bodyView.GetType().Name} UpdataStates error : {ex.Message}");
                            }
                            finally
                            {
                                bodyView.updateUiThread = null;
                            }
                        });


                        bodyView.updateUiThread.IsBackground = true;
                        bodyView.updateUiThread.Start();
                    });
                }
                catch (Exception ex)
                {
                    MainPage.Log($"{bodyView.GetType().Name } UpdataStates error : {ex.Message}");
                }
            }));
            }
        }

        void LoadEventList()
@@ -117,7 +164,6 @@
                //20201223 删除滑动发送命令，防止控件跳动
                dimmerBar.OnProgressChangedEvent = (sender, e) =>
                {
                   
                    if (!btnSwitch.IsSelected)
                    {
                        dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
@@ -132,20 +178,20 @@
                        d.Add(FunctionAttributeKey.Brightness, e.ToString());
                        Control.Ins.SendWriteCommand(function, d);
                    }
                    else
                    {
                        if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
                        {
                            function.refreshTime = DateTime.Now;
                            new System.Threading.Thread(() =>
                            {
                                System.Collections.Generic.Dictionary<string, string> dic = new System.Collections.Generic.Dictionary<string, string>();
                                dic.Add(FunctionAttributeKey.Brightness, e.ToString());
                                Control.Ins.SendWriteCommand(function, dic);
                            })
                            { IsBackground = true }.Start();
                        }
                    }
                    //else
                    //{
                    //    if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
                    //    {
                    //        function.refreshTime = DateTime.Now;
                    //        new System.Threading.Thread(() =>
                    //        {
                    //            System.Collections.Generic.Dictionary<string, string> dic = new System.Collections.Generic.Dictionary<string, string>();
                    //            dic.Add(FunctionAttributeKey.Brightness, e.ToString());
                    //            Control.Ins.SendWriteCommand(function, dic);
                    //        })
                    //        { IsBackground = true }.Start();
                    //    }
                    //}
                    btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
                    btnBrightnessText.Text = dimmerBar.Progress + "%";
                };