From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs
index ddae780..9e23323 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs
@@ -452,7 +452,7 @@
return;
}
//鍒锋柊鍐呭瓨鐨勪綇瀹呭悕
- HdlResidenceLogic.Current.EditorHouseByHouseId(i_house.Id, textValue);
+ HdlResidenceLogic.Current.EditorHouseByHouseId(i_house.Id, textValue, null, null);
//鏇存敼鏄剧ず鐨勫悕瀛�
btnHome.Text = textValue;
}
@@ -476,7 +476,7 @@
//寮�鍚繘搴︽潯
this.ShowProgressBar();
- var result = HdlResidenceLogic.Current.EditorResidenceName(info.Id, ResidenceName);
+ var result = HdlResidenceLogic.Current.EditorResidenceName(info.Id, ResidenceName, null, null);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
@@ -486,7 +486,7 @@
HdlThreadLogic.Current.RunMain(() =>
{
//鍒锋柊鍐呭瓨鐨勪綇瀹呭悕
- HdlResidenceLogic.Current.EditorHouseByHouseId(info.Id, ResidenceName);
+ HdlResidenceLogic.Current.EditorHouseByHouseId(info.Id, ResidenceName, null, null);
//鏇存敼鏄剧ず鐨勫悕瀛�
btnHome.Text = ResidenceName;
info.HomeName = ResidenceName;
@@ -546,7 +546,7 @@
this.ShowProgressBar();
//鍒涘缓浣忓畢
- var newId = HdlResidenceLogic.Current.CreatNewResidence(ResidenceName);
+ var newId = HdlResidenceLogic.Current.CreatNewResidence(ResidenceName, null, null);
this.CloseProgressBar();
if (newId != null)
@@ -572,6 +572,15 @@
this.ShowProgressBar();
HdlThreadLogic.Current.RunThread(() =>
{
+ //缁戝畾杩樻病鏈夋垚鍔熺殑缃戝叧
+ var result2 = HdlGatewayLogic.Current.ResetComandToBindBackupGateway();
+ if (result2 == false)
+ {
+ //缁戝畾缃戝叧澶辫触,璇烽噸鏂版搷浣�
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uBindGatewayFailPleaseDoAgain));
+ this.CloseProgressBar();
+ return;
+ }
//妫�娴嬪畠鏈夋病鏈夊浠�
var listBack = HdlBackupLogic.Current.GetBackupListNameFromDB(BackUpMode.A鎵嬪姩澶囦唤);
this.CloseProgressBar();
--
Gitblit v1.8.0