Merge remote-tracking branch 'origin/dev-cqy（1.5.9）' into dev--wxr

wxr

2023-03-16 f703a411c0ebdf7ada490fda75b52fd839dae079

 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());
@@ -229,7 +230,7 @@
                                {
                                    newFunction.AssembleStatus();
                                    newFunction.SaveFunctionFile();
                                    FunctionList.List.IniFunctionList(newFunction.savePath);
                                    FunctionList.List.IniFunctionList(newFunction.savePath,true);
                                    MainPage.Log($"============设备============{iiii++}");
                                }

@@ -314,8 +315,8 @@
                                if (isInterphoneType_FREEVIEW)
                                {
#if __IOS__
                        //登录全视通
                        Shared.IOS.HDLFVSDK.Video.Init("", DB_ResidenceData.Instance.CurrentRegion.id);
                                    //登录全视通
                                    Shared.IOS.HDLFVSDK.Video.Init("", DB_ResidenceData.Instance.CurrentRegion.id);
#endif
                                }

@@ -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;