From 3291885285dfd5d4f665c20676307878dc3163bc Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 20 十二月 2019 16:28:53 +0800
Subject: [PATCH] 请合并最新代码（优化设备不支持的功能）
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
index 5759c49..a6f7ada 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -918,16 +918,27 @@
/// <summary>
/// 鍒犻櫎鎸囧畾璁惧
/// </summary>
- private async void DoDeleteDevice()
+ private void DoDeleteDevice()
{
- //鍒犻櫎璁惧
- bool result = await Common.LocalDevice.Current.DeleteDevice(listNewDevice);
- if (result == false)
+ HdlThreadLogic.Current.RunThread(async () =>
{
- return;
- }
- //鍏抽棴鐣岄潰
- this.CloseForm();
+ //鎵撳紑杩涘害鏉�
+ this.ShowProgressBar();
+
+ //鍒犻櫎璁惧
+ bool result = await Common.LocalDevice.Current.DeleteDevice(listNewDevice);
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+ if (result == false)
+ {
+ return;
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鍏抽棴鐣岄潰
+ this.CloseForm();
+ });
+ });
}
#endregion
--
Gitblit v1.8.0