Merge branch 'wxr-2.1' into wxr-2.0

wxr

2023-09-06 c2348ebb81ca12b72eee6fbe9eee47925c1a5b07

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -732,8 +732,18 @@
                }
                else
                {
                    var pm = new DAL.Server.HttpServerRequest();
                    var pack = pm.RefreshDeviceStatus(new List<string>() { function.deviceId });
                    var pm = new HttpServerRequest();
                    try
                    {
                        pm.RefreshDeviceStatus(new List<string>() { function.deviceId });
                    }catch(Exception ex)
                    {
                        MainPage.Log($"远程读取设备状态异常:{ex.Message}");
                    }
                    finally
                    {
                        pm = null;
                    }
                }
            }
        }
@@ -1312,16 +1322,6 @@
                        }
                        MainPage.Log(localFunction.name);

                        if (Ins.GatewayOnline_Local && isCloudData)//本地链接，除了涂鸦设备数据之外的云端数据不处理
                        {
                            if (!SPK.Get3tySpk(SPK.BrandType.All3tyBrand).Contains(localFunction.spk) && !SPK.MusicSpkList().Contains(localFunction.spk))
                            {
                                //MainPage.Log($"A协议更新状态:本地链接，除了涂鸦设备数据之外的云端数据不处理........");

                                return;
                            }
                        }

                        //if (SPK.MusicSpkList().Contains(localFunction.spk))
                        //{
                        //    if (updateTemp.status.Count < 3)
@@ -1342,6 +1342,11 @@
                        {
                            localFunction.online = updateTemp.online;
                        }
                        if (SPK.LightSpkList().Contains(localFunction.spk))
                        {
                            localFunction.updateTime = DateTime.Now;
                        }
                       

                        //更新界面状态
                        switch (localFunction.spk)
@@ -1606,6 +1611,7 @@
                                break;
                        }

                        
                        HomePage.UpdataFunctionStates(localFunction);
                        RoomPage.UpdataStates(localFunction);
                        FunctionPage.UpdataStates(localFunction);