Merge branch 'wxr-2.1' into wxr-2.0

wxr

2023-09-06 c2348ebb81ca12b72eee6fbe9eee47925c1a5b07

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

@@ -8,10 +8,46 @@
    public partial class ColorTureLampPage

    {

        /// <summary>

        /// 通知更新界面的时间
        /// </summary>
        DateTime notiyUpdateTime = DateTime.MinValue;
        System.Threading.Thread updateUiThread;
        object lockObj = new object();

        /// <summary>

        /// 更新功能状态

        /// </summary>

        public static void UpdataStatus(Function updataTemp)

        {

            if(bodyView == null)
            {
                return;
            }
            lock (bodyView.lockObj)
            {
                MainPage.Log($"收到更新" + DateTime.Now.Ticks);
                bodyView.notiyUpdateTime = DateTime.Now;
                if (bodyView.updateUiThread == null)
                {
                    bodyView.updateUiThread = new System.Threading.Thread(() =>
                    {
                        while (true)
                        {
                            System.Threading.Thread.Sleep(1500);
                            if (bodyView == null)
                            {
                                return;
                            }
                            if (DateTime.Now.AddMilliseconds(-1500) > bodyView.notiyUpdateTime)
                            {
                                MainPage.Log("没有新数据，更新UI");
                                break;
                            }
                            else
                            {
                                MainPage.Log("有新数据，继续等待");
                            }
                        }

            Application.RunOnMainThread(() =>

            {

                try

@@ -51,7 +87,18 @@
                {

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

                }

                            finally
                            {
                                bodyView.updateUiThread = null;
                            }

            });


                        bodyView.updateUiThread.IsBackground = true;
                        bodyView.updateUiThread.Start();
                    });
                }
            }
        }



        void LoadEventList()

@@ -196,20 +243,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> d = new System.Collections.Generic.Dictionary<string, string>();

                                d.Add(FunctionAttributeKey.Brightness, e.ToString());

                                Control.Ins.SendWriteCommand(function, d);

                            })

                            { 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> d = new System.Collections.Generic.Dictionary<string, string>();

                    //            d.Add(FunctionAttributeKey.Brightness, e.ToString());

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

                    //        })

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

                    //    }

                    //}





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