Merge branch 'wjc' into Dev-Branch

wxr

2023-03-01 8e65391ab8d48285f9049f2747fb420f3ad1b852

 HDL_ON/Common/ApiUtlis.cs

@@ -171,7 +171,8 @@
                            var deviceResult = Ins.HttpRequest.GetDeviceList("30", "1");
                            if (deviceResult.Code == StateCode.SUCCESS)
                            {
                                FunctionList.List.Clear();
                                FunctionList.List.ClearDatas();
                                MainPage.Log($"============设备============开始" + FunctionList.List.Functions.Count);
                                //MainPage.Log($"读取设备信息成功");
                                //MainPage.Log($"sid列表获取====" + deviceResult.Data.ToString());
                                var deviceList = JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
@@ -333,12 +334,12 @@
                            complateDevice = true;
                            MainPage.Log($"============设备============完成" + FunctionList.List.Functions.Count);
                        }
                    })
                    { IsBackground = true }.Start();
                    //})
                    //{ IsBackground = true }.Start();

                    //===================场景==========================
                    new System.Threading.Thread(() =>
                    {
                    ////===================场景==========================
                    //new System.Threading.Thread(() =>
                    //{
                        try
                        {
                            complateScene = false;