From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayReplaceListForm.cs | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayReplaceForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayReplaceListForm.cs
similarity index 83%
rename from ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayReplaceForm.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayReplaceListForm.cs
index 6219ad7..dc85bb3 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayReplaceForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayReplaceListForm.cs
@@ -3,7 +3,7 @@
using System.Text;
using ZigBee.Device;
-namespace Shared.Phone.UserCenter.Gateway
+namespace Shared.Phone.UserCenter.GatewayManage
{
/// <summary>
/// 缃戝叧鏇挎崲鐣岄潰
@@ -158,12 +158,13 @@
//搴曠嚎
frameRow.AddBottomLine();
}
- btnSelect.ButtonClickEvent += (sender, e) =>
+ frameRow.ButtonClickEvent += (sender, e) =>
{
- if (this.btnSelectIcon != null) { this.btnSelectIcon.IsSelected = false; }
+ if (this.btnSelectIcon != null) { this.btnSelectIcon.Visible = false; }
- btnSelect.IsSelected = true;
+ btnSelect.Visible = true;
this.btnSelectIcon = btnSelect;
+ this.btnSelectIcon.MainKey = localWay.GwId;
this.btnConfirm.CanClick = true;
};
}
@@ -177,6 +178,24 @@
/// </summary>
private void DoReplaceGateway()
{
+ if (this.btnSelectIcon == null) { return; }
+
+ ZbGateway realGateway = null;
+ if (HdlGatewayLogic.Current.GetRealGateway(ref realGateway, this.nowZbGateway.GwId) == false)
+ {
+ //閿欒:缃戝叧瀵硅薄涓㈠け
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uErrorGatewayLostMsg));
+ return;
+ }
+
+ var targetGw = HdlGatewayLogic.Current.GetLocalGateway(this.btnSelectIcon.MainKey);
+ //纭鏇挎崲鎺夌綉鍏�:{0}?
+ string msg = Language.StringByID(R.MyInternationalizationString.uReplaceGatewayConfirmMsg).Replace("{0}", HdlGatewayLogic.Current.GetGatewayName(targetGw));
+ this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+ {
+ var form = new GatewayReplaceBackUpListForm();
+ form.AddForm(realGateway, this.btnSelectIcon.MainKey);
+ });
}
#endregion
--
Gitblit v1.8.0