From 5986f63b75bd81c6cef262c670e9251c038cbf5d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 17 十二月 2019 17:21:07 +0800
Subject: [PATCH] 合并一个版本
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
index bc006ad..af7eff0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
@@ -140,7 +140,7 @@
rowUpDate.ButtonClickEvent += (sender, e) =>
{
btnNewVersion.Visible = false;
- var form = new GatewayUpdate.GatewayFirmwareInfoForm();
+ var form = new GatewayUpdate.GatewayFirmwareUpdateForm();
form.AddForm(zbGateway);
};
@@ -366,7 +366,7 @@
this.CloseForm();
//鍏抽棴鎸囧畾鐣岄潰(缃戝叧鎼滅储)
- this.CloseFormByFormName("WiredGatewayListForm");
+ this.CloseFormByFormName("GatewaySearchListForm");
this.CloseFormByFormName("NewGateWayMenuSelectForm");
//鍏抽棴鎸囧畾鐣岄潰(缃戝叧缂栬緫)
@@ -395,21 +395,32 @@
/// </summary>
/// <param name="strWayId"></param>
/// <param name="row"></param>
- private async void DeleteGateway(string strWayId)
+ private void DeleteGateway(string strWayId)
{
- //鍒犻櫎浜戠缃戝叧
- bool result = await HdlGatewayLogic.Current.DeleteGateway(strWayId);
- if (result == false)
+ HdlThreadLogic.Current.RunThread(async () =>
{
- return;
- }
+ //鎵撳紑杩涘害鏉�
+ this.ShowProgressBar();
- if (strWayId == GatewayResourse.AppOldSelectGatewayId)
- {
- HdlGatewayLogic.Current.SaveGatewayIdToLocation(string.Empty);
- }
- //鍏抽棴鑷韩
- this.CloseForm();
+ //鍒犻櫎浜戠缃戝叧
+ bool result = await HdlGatewayLogic.Current.DeleteGateway(strWayId);
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+ if (result == false)
+ {
+ return;
+ }
+
+ if (strWayId == GatewayResourse.AppOldSelectGatewayId)
+ {
+ HdlGatewayLogic.Current.SaveGatewayIdToLocation(string.Empty);
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鍏抽棴鑷韩
+ this.CloseForm();
+ });
+ });
}
#endregion
--
Gitblit v1.8.0