From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 11 九月 2020 09:16:59 +0800
Subject: [PATCH] 优化多功能面板：绑定温湿度传感器目标，和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
index 6187c50..69f5c4a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
@@ -96,7 +96,7 @@
/// </summary>
/// <param name="residenceId"></param>
/// <returns></returns>
- public void SwitchResidence(string residenceId)
+ public bool SwitchResidence(string residenceId)
{
//鎵撳紑杩涘害鏉�
ProgressBar.Show();
@@ -106,10 +106,12 @@
Config.Instance.Home = this.GetHouseByHouseId(residenceId);
Config.Instance.Save();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- UserCenterLogic.InitUserCenterMenmoryAndThread(false);
+ bool result = UserCenterLogic.InitUserCenterMenmoryAndThread(false);
//鍏抽棴杩涘害鏉�
ProgressBar.Close();
+
+ return result;
}
#endregion
@@ -206,9 +208,11 @@
/// <summary>
/// 鑾峰彇浜戠浣忓畢鍒楄〃
/// </summary>
- public List<string> GetHomeListsFromDb()
+ /// <param name="checkNetwork">鏄惁妫�娴嬬綉缁�,濡傛灉璁剧疆妫�娴嬬殑璇�,褰撲笉鑳借仈缃戞椂,鐩存帴杩斿洖鏈湴浣忓畢</param>
+ /// <returns></returns>
+ public List<string> GetHomeListsFromDb(bool checkNetwork)
{
- if (HdlWifiLogic.Current.CanAccessHttp == false)
+ if (checkNetwork == true && HdlWifiLogic.Current.CanAccessHttp == false)
{
//褰撳墠鏃犳硶鑱旂綉
return Config.Instance.HomeFilePathList;
@@ -225,7 +229,7 @@
try
{
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- var revertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("App/GetHomePager", System.Text.Encoding.UTF8.GetBytes(requestJson));
+ var revertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("App/GetHomePager", System.Text.Encoding.UTF8.GetBytes(requestJson), 5);
if (revertObj == null)
{
return null;
--
Gitblit v1.8.0