From 404cdc88627f942df7944af04ee05b9d527752d6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 九月 2019 13:22:40 +0800
Subject: [PATCH] 合并了徐梅的按键面板绑定
---
ZigbeeApp/Shared/Phone/UserCenter/DeviceShard/ShardDeviceMacInfoEditorForm.cs | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DeviceShard/ShardDeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/DeviceShard/ShardDeviceMacInfoEditorForm.cs
index ec4623d..701dddd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DeviceShard/ShardDeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DeviceShard/ShardDeviceMacInfoEditorForm.cs
@@ -52,7 +52,8 @@
/// </summary>
private void InitMiddleFrame()
{
- this.bodyFrameLayout.RemoveAll();
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
//璁惧鍥剧墖
var btnpictrue = new PicViewControl(510, 320);
@@ -182,7 +183,7 @@
new System.Threading.Thread(async () =>
{
//璁剧疆璁惧鍏ㄩ儴鐨勯暅鍍忎俊鎭�
- Common.LocalDevice.Current.SetAllImageInfoToOtaDevice(oTADevice, this.OtaImageInfoActionBack);
+ HdlDeviceImageInfoLogic.Current.SetAllImageInfoToOtaDevice(oTADevice, this.OtaImageInfoActionBack);
int count = 5;
while (this.receiveImageInfo == false && count > 0)
{
@@ -192,6 +193,8 @@
}
//鍙橀噺杩樺師
this.receiveImageInfo = false;
+ //绉婚櫎浜嬩欢
+ HdlDeviceImageInfoLogic.Current.RemoveDeviceFirmwareVersionThread(oTADevice);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
@@ -229,11 +232,21 @@
Application.RunOnMainThread(() =>
{
- if (ActionFormClose != null)
- {
- this.ActionFormClose(deviceName);
- }
- });
+ this.ActionFormClose?.Invoke(deviceName);
+ });
+ }
+
+ #endregion
+
+ #region 鈻� 鍏抽棴鐣岄潰___________________________
+
+ /// <summary>
+ /// 鐢婚潰鍏抽棴
+ /// </summary>
+ public override void CloseForm()
+ {
+ this.ActionFormClose = null;
+ base.CloseForm();
}
#endregion
--
Gitblit v1.8.0