From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayReplaceForm.cs | 27 ++++-----------------------
1 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayReplaceListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayReplaceForm.cs
similarity index 83%
rename from ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayReplaceListForm.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayReplaceForm.cs
index dc85bb3..6219ad7 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayReplaceListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayReplaceForm.cs
@@ -3,7 +3,7 @@
using System.Text;
using ZigBee.Device;
-namespace Shared.Phone.UserCenter.GatewayManage
+namespace Shared.Phone.UserCenter.Gateway
{
/// <summary>
/// 缃戝叧鏇挎崲鐣岄潰
@@ -158,13 +158,12 @@
//搴曠嚎
frameRow.AddBottomLine();
}
- frameRow.ButtonClickEvent += (sender, e) =>
+ btnSelect.ButtonClickEvent += (sender, e) =>
{
- if (this.btnSelectIcon != null) { this.btnSelectIcon.Visible = false; }
+ if (this.btnSelectIcon != null) { this.btnSelectIcon.IsSelected = false; }
- btnSelect.Visible = true;
+ btnSelect.IsSelected = true;
this.btnSelectIcon = btnSelect;
- this.btnSelectIcon.MainKey = localWay.GwId;
this.btnConfirm.CanClick = true;
};
}
@@ -178,24 +177,6 @@
/// </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