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/Residence/ResidenceListForm.cs | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
index c384d1e..50c2d74 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
@@ -124,7 +124,7 @@
{
//鑾峰彇浣忓畢淇℃伅
var Pra = new GetResidenceInfoPra();
- string resultData = UserCenterLogic.GetResponseDataByRequestHttps("App/GetHomePager", false, Pra, new List<string> { "NotCheck" });
+ string resultData = UserCenterLogic.GetResponseDataByRequestHttps("App/GetHomePager", false, Pra, new List<string> { "NotCheck" }, false);
if (string.IsNullOrEmpty(resultData) == true)
{
return false;
@@ -220,13 +220,16 @@
//妫�娴嬫湰鍦版湁娌℃湁杩欎釜浣忓畢
this.CheckIsExsitResidence(info);
- HdlResidenceLogic.Current.SwitchResidence(info.Id);
+ var result = HdlResidenceLogic.Current.SwitchResidence(info.Id);
HdlThreadLogic.Current.RunMain(() =>
{
- //閲嶆柊鍒锋柊鍒楄〃
- this.listView.RemoveAll();
- this.SetResidenceInfo(2);
+ if (result == true)
+ {
+ //閲嶆柊鍒锋柊鍒楄〃
+ this.listView.RemoveAll();
+ this.SetResidenceInfo(2);
+ }
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
});
@@ -247,6 +250,14 @@
//鍒嗕韩鐨�,涓嶈兘鏇存敼
return;
}
+ //杩囨埛
+ var btnTransfer = rowLayout.AddDeleteControl();
+ btnTransfer.TextID = R.MyInternationalizationString.uTransfer;
+ btnTransfer.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new TransferResidenceMainForm();
+ form.AddForm();
+ };
//鏇存敼
var btnChanged = rowLayout.AddEditorControl();
btnChanged.TextID = R.MyInternationalizationString.uChanged1;
@@ -344,13 +355,16 @@
{
HdlThreadLogic.Current.RunThread(() =>
{
- HdlResidenceLogic.Current.SwitchResidence(i_home.Id);
+ var result = HdlResidenceLogic.Current.SwitchResidence(i_home.Id);
HdlThreadLogic.Current.RunMain(() =>
{
- //閲嶆柊鍒锋柊鍒楄〃
- this.listView.RemoveAll();
- this.SetResidenceInfo(3);
+ if (result == true)
+ {
+ //閲嶆柊鍒锋柊鍒楄〃
+ this.listView.RemoveAll();
+ this.SetResidenceInfo(3);
+ }
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
});
--
Gitblit v1.8.0