Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

 HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs

@@ -408,7 +408,7 @@
                                        state = function.trait_on_off.curValue.ToString() == "on";
                                    }
                                }
                                else if (function.spk == SPK.SenesorMegahealth)
                                else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
                                {

                                    var tempStatus = function.attributes.Find((sta) => sta.key == FunctionAttributeKey.TargetStatus);
@@ -604,14 +604,14 @@
                        d.Add(FunctionAttributeKey.FadeTime, function.GetAttrState(FunctionAttributeKey.FadeTime));
                        Control.Ins.SendWriteCommand(function, d);
                    }
                    else if (function.spk == SPK.PanelSocket)
                    {
                        if (function.attributes.Find((obj) => obj.key == "on_off_usb") != null)
                        {
                            d.Add("on_off_usb", function.trait_on_off.curValue.ToString());
                        }
                        Control.Ins.SendWriteCommand(function, d);
                    }
                    //else if (function.spk == SPK.PanelSocket)//去掉，统一处理总控
                    //{
                    //    if (function.attributes.Find((obj) => obj.key == "on_off_usb") != null)
                    //    {
                    //        d.Add("on_off_usb", function.trait_on_off.curValue.ToString());
                    //    }
                    //    Control.Ins.SendWriteCommand(function, d);
                    //}
                    else
                    {
                        d.Add("on_off", function.trait_on_off.curValue.ToString());
@@ -818,6 +818,10 @@
        /// </summary>
        void GetUnreadPushMessages()
        {
            if (MainPage.NoLoginMode)
            {
                return;
            }
            System.Threading.Tasks.Task.Run(() =>
            {
                try
@@ -922,6 +926,10 @@
        /// </summary>
        void RegisterGetPushMessageAction()
        {
            if (MainPage.NoLoginMode)
            {
                return;
            }
            Action RegisterGetPushMessageAction = () => {
                if (bodyView != null)
                {