Merge remote-tracking branch 'origin/release0123' into wjc

wjc

2022-03-02 a154c3ce81601e3c202d3c5f4d0a8cefc5a7e8ae

 HDL_ON/Common/ApiUtlis.cs

@@ -153,10 +153,10 @@
                        MainPage.Log($"读取房间数据失败:Code:{roomResult.Code}; msg:{roomResult.message}");
                    }
                    //===================设备=======================
                    var deviceResult = Ins.HttpRequest.GetDeviceList();
                    var deviceResult = Ins.HttpRequest.GetDeviceList("30","1");
                    if (deviceResult.Code == StateCode.SUCCESS)
                    {
                        endTime = DateTime.Now.AddSeconds(100);
                        endTime = DateTime.Now.AddSeconds(5);

                        MainPage.Log($"读取设备信息成功");
                        var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
@@ -164,6 +164,23 @@
                        {
                            deviceList = new DevcieApiPack();
                        }
                        try
                        {
                            while (deviceList.totalPage != deviceList.pageNo)
                            {
                                var deviceResult2 = Ins.HttpRequest.GetDeviceList("30", Convert.ToInt32(deviceList.pageNo) + 1 + "");
                                if (deviceResult2.Code == StateCode.SUCCESS)
                                {
                                    var deviceList2 = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
                                    deviceList.pageNo = deviceList2.pageNo;
                                    deviceList.list.AddRange(deviceList2.list);
                                }
                            }
                        }catch(Exception ex)
                        {

                        }

                        string delFile = "";
                        if (FunctionList.List.GetDeviceFunctionList().Count > 0)
                        {