Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into De...

Davin

2023-07-26 489d3bd60ad7dc2fecb398b09cf4c52df16f0fc2

 HDL_ON/Common/ApiUtlis.cs

@@ -104,6 +104,11 @@
                code = Ins.HttpRequest.RefreshToken();
                if (code != StateCode.SUCCESS)
                {
                    if (waitPage != null)
                    {
                        waitPage.RemoveFromParent();
                        waitPage = null;
                    }
                    MainPage.Log($"刷新token失败");
                    return;
                }
@@ -112,6 +117,11 @@
                code = Ins.HttpRequest.GetHomePager();
                if (code != StateCode.SUCCESS)
                {
                    if (waitPage != null)
                    {
                        waitPage.RemoveFromParent();
                        waitPage = null;
                    }
                    MainPage.Log($"刷新住宅信息失败");
                    return;
                }
@@ -120,6 +130,11 @@
                code = Ins.HttpRequest.GetUserInfo();
                if (code != StateCode.SUCCESS)
                {
                    if (waitPage != null)
                    {
                        waitPage.RemoveFromParent();
                        waitPage = null;
                    }
                    MainPage.Log($"刷新个人信息失败");
                    return;
                }
@@ -178,7 +193,7 @@
                                FunctionList.List.ClearDatas();
                                //MainPage.Log($"============设备============开始" + FunctionList.List.Functions.Count);
                                //MainPage.Log($"读取设备信息成功");
                                //MainPage.Log($"sid列表获取====" + deviceResult.Data.ToString());
                                MainPage.Log($"sid列表获取====" + deviceResult.Data.ToString());
                                var deviceList = JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
                                if (deviceList == null)
                                {