From 23fb45dd846ed8b62304c408c6bbe64265d4ac8b Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十二月 2019 18:57:16 +0800
Subject: [PATCH] 代码合并
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs
index e9135f8..c44215c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs
@@ -8,7 +8,7 @@
/// <summary>
/// HDL璁惧鍗囩骇鐨勯�昏緫
/// </summary>
- public class HdlDeviceUpdateLogic
+ public class HdlDeviceUpdateLogic : HdlDeviceUpdateCommonLogic
{
#region 鈻� 鍙橀噺澹版槑___________________________
@@ -27,17 +27,10 @@
/// </summary>
public Action<decimal> ProgressEvent = null;
/// <summary>
- /// 褰撳墠鎵ц鐨勭姸鎬�
- /// </summary>
- public UpdateStatuMode UpdateStatu = UpdateStatuMode.None;
- /// <summary>
/// 璁惧鏂扮増鏈殑鍥轰欢淇℃伅(澶氫釜璁惧鍗囩骇鏃�,搴旇浼氶渶瑕佸叕寮�杩欎釜瀵硅薄)
/// </summary>
public FirmwareVersionInfo deviceFirmware = null;
- /// <summary>
- /// 鍗囩骇鏄惁瀹屾垚(鍑虹幇閿欒鏃�,瀹冧篃浼氬彉鎴恡rue)
- /// </summary>
- public bool IsFinishUpdate = true;
+
/// <summary>
/// 缃戝叧
/// </summary>
@@ -65,6 +58,7 @@
/// <param name="i_deviceFirmware">璁惧鐨勫浐浠朵俊鎭�</param>
public HdlDeviceUpdateLogic(OTADevice i_otaDevice, FirmwareVersionInfo i_deviceFirmware)
{
+ this.ClassDiv = 2;
this.otaDevice = i_otaDevice;
this.deviceFirmware = i_deviceFirmware;
this.zbGateway = i_otaDevice.Gateway;
@@ -89,9 +83,9 @@
if (this.UpdateStatu == UpdateStatuMode.Wait)
{
//濡傛灉鏄瓑寰呮ā寮忥紝鍐嶆鐐瑰嚮鏃讹紝绉婚櫎鍒楄〃
- if (FirmwareUpdateResourse.dicDeviceUpdateList.ContainsKey(otaDevice.DeviceAddr) == true)
+ if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(otaDevice.DeviceAddr) == true)
{
- FirmwareUpdateResourse.dicDeviceUpdateList.Remove(otaDevice.DeviceAddr);
+ FirmwareUpdateResourse.dicUpdateList.Remove(otaDevice.DeviceAddr);
}
//鍙栨秷
this.UpdateStatu = UpdateStatuMode.None;
@@ -107,7 +101,7 @@
//杩涘叆绛夊緟妯″紡
this.UpdateStatu = UpdateStatuMode.Wait;
- FirmwareUpdateResourse.dicDeviceUpdateList[otaDevice.DeviceAddr] = this;
+ FirmwareUpdateResourse.dicUpdateList[otaDevice.DeviceAddr] = this;
//绛夊緟涓��
this.UpdateStatuChangedEvent?.Invoke(0, Language.StringByID(R.MyInternationalizationString.uWaitting));
@@ -117,9 +111,9 @@
}
/// <summary>
- /// 寮�濮嬫墽琛屾洿鏂版搷浣�
+ /// 寮�濮嬫墽琛屾洿鏂版搷浣�(FirmwareUpdateLogic璋冪敤)
/// </summary>
- public void DoStartUpdate()
+ public override void DoStartUpdate()
{
//鐘舵�佸彉鏇�
this.IsFinishUpdate = false;
@@ -505,7 +499,7 @@
this.UpdateStatuChangedEvent?.Invoke(0, Language.StringByID(R.MyInternationalizationString.uDeviceUpdating));
this.SetProgressValue(0);
- FirmwareUpdateResourse.dicDeviceUpdateList[otaDevice.DeviceAddr] = this;
+ FirmwareUpdateResourse.dicUpdateList[otaDevice.DeviceAddr] = this;
//鍚屾杩涘害
this.zbGateway.ReportAction += UpdateDeviceProgress;
}
@@ -734,7 +728,7 @@
/// <summary>
/// 閲婃斁缂撳瓨
/// </summary>
- public void Dispose()
+ public override void Dispose()
{
this.ProgressEvent = null;
this.UpdateStatuChangedEvent = null;
--
Gitblit v1.8.0