From 587c36e27131f2d028fcabc13b296a8de7470034 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 08 一月 2020 08:59:19 +0800
Subject: [PATCH] 2019.1.8
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs | 37 ++++++++++++++++---------------------
1 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
index 1d0ea04..d6e9dea 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
@@ -9,7 +9,7 @@
/// <summary>
/// 缃戝叧鐨勫崌绾ч�昏緫
/// </summary>
- public class HdlGatewayUpdateLogic
+ public class HdlGatewayUpdateLogic : HdlDeviceUpdateCommonLogic
{
#region 鈻� 鍙橀噺澹版槑___________________________
@@ -23,7 +23,7 @@
/// </summary>
public Action<int, string> UpdateStatuChangedEvent = null;
/// <summary>
- /// 杩涘害鍊间簨浠�
+ /// 杩涘害鍊间簨浠�(宸茬粡鏄櫨鍒嗘瘮鐨勫��)
/// </summary>
public Action<decimal> ProgressEvent = null;
/// <summary>
@@ -38,14 +38,6 @@
/// 缃戝叧鏂扮増鏈殑鍥轰欢淇℃伅
/// </summary>
public FirmwareVersionInfo gatewayFirmware = null;
- /// <summary>
- /// 褰撳墠鎵ц鐘舵��(鍑虹幇閿欒鏃�,瀹冧篃浼氬彉鎴恡rue)
- /// </summary>
- public UpdateStatuMode UpdateStatu = UpdateStatuMode.None;
- /// <summary>
- /// 鍗囩骇鏄惁瀹屾垚
- /// </summary>
- public bool IsFinishUpdate = true;
/// <summary>
/// 鍓嶄竴娆＄殑鏈�缁堢姸鎬�
@@ -71,6 +63,7 @@
public HdlGatewayUpdateLogic(ZbGateway zbGateway, FirmwareVersionInfo i_virtualFirmware,
FirmwareVersionInfo i_coordinatorFirmware, FirmwareVersionInfo i_gatewayFirmware)
{
+ this.ClassDiv = 1;
this.upDatezbGateway = zbGateway;
this.virtualFirmware = i_virtualFirmware;
this.coordinatorFirmware = i_coordinatorFirmware;
@@ -90,9 +83,9 @@
{
//濡傛灉鏄瓑寰呮ā寮忥紝鍐嶆鐐瑰嚮鏃讹紝绉婚櫎鍒楄〃
string gwId = HdlGatewayLogic.Current.GetGatewayId(this.upDatezbGateway);
- if (FirmwareUpdateResourse.dicGatewayUpdateList.ContainsKey(gwId) == true)
+ if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(gwId) == true)
{
- FirmwareUpdateResourse.dicGatewayUpdateList.Remove(gwId);
+ FirmwareUpdateResourse.dicUpdateList.Remove(gwId);
}
this.UpdateStatu = UpdateStatuMode.None;
//鍙栨秷
@@ -109,7 +102,7 @@
//杩涘叆绛夊緟妯″紡
this.UpdateStatu = UpdateStatuMode.Wait;
string gwId2 = HdlGatewayLogic.Current.GetGatewayId(this.upDatezbGateway);
- FirmwareUpdateResourse.dicGatewayUpdateList[gwId2] = this;
+ FirmwareUpdateResourse.dicUpdateList[gwId2] = this;
//绛夊緟涓��
this.UpdateStatuChangedEvent?.Invoke(0, Language.StringByID(R.MyInternationalizationString.uWaitting));
@@ -120,7 +113,7 @@
/// <summary>
/// 寮�濮嬫墽琛屾洿鏂版搷浣�(FirmwareUpdateLogic璋冪敤)
/// </summary>
- public void DoStartUpdate()
+ public override void DoStartUpdate()
{
//鐘舵�佸彉鏇�
this.IsFinishUpdate = false;
@@ -412,6 +405,7 @@
//鍗忚皟鍣ㄥ浐浠朵笅杞戒腑
this.UpdateStatuChangedEvent(0, Language.StringByID(R.MyInternationalizationString.uCoordinatorFirmwareDownLoading));
+ this.SetProgressValue(0, 100);
//涓嬭浇鍗忚皟鍣ㄦ枃浠剁殑杩涘害
this.upDatezbGateway.ReportAction += this.DownLoadCoordinatorFileProgress;
@@ -462,6 +456,7 @@
//璁剧疆杩涘害
var responData = tempZb.downloadFileProgressResponData;
+ this.SetProgressValue(responData.DownloadPercent, 100);
//鍗忚皟鍣ㄥ浐浠朵笅杞戒腑
this.UpdateStatuChangedEvent?.Invoke(0, Language.StringByID(R.MyInternationalizationString.uCoordinatorFirmwareDownLoading));
@@ -610,6 +605,7 @@
//缃戝叧鍥轰欢涓嬭浇涓�
this.UpdateStatuChangedEvent?.Invoke(0, Language.StringByID(R.MyInternationalizationString.uGatewayFirmwareDownLoading));
+ this.SetProgressValue(0, 100);
//涓嬭浇缃戝叧鏂囦欢鐨勮繘搴�
this.upDatezbGateway.ReportAction += this.DownLoadGatewayFileProgress;
@@ -754,7 +750,10 @@
//鎵ц涓嬩竴涓崌绾�
HdlFirmwareUpdateLogic.DoUpdateNextFirmware();
//缃戝叧鍗囩骇鎴愬姛!
- this.UpdateStatuChangedEvent?.Invoke(1, "");
+ this.SetProgressValue(100, 100);
+ System.Threading.Thread.Sleep(1500);
+
+ this.UpdateStatuChangedEvent?.Invoke(1, Language.StringByID(R.MyInternationalizationString.uGatewayUpdateSuccess));
});
}
@@ -807,7 +806,7 @@
return;
}
decimal result = value / maxValue;
- this.ProgressEvent?.Invoke(value);
+ this.ProgressEvent?.Invoke(result);
}
/// <summary>
@@ -980,10 +979,6 @@
{
HdlThreadLogic.Current.RunThread(async () =>
{
- //褰撳墠缃戝叧鐨勭増鏈�
- var oldVersion = HdlGatewayLogic.Current.GetGwInfoAttribute(this.upDatezbGateway, "LinuxFWVersion");
- int oldLinuxVersion = Convert.ToInt32(oldVersion);
-
//鍏堢瓑涓�120绉掑惂锛岀綉鍏冲崌绾у拰缃戝叧瀹屽叏閲嶅惎闇�瑕佸緢闀挎椂闂�
int count = 12;
for (int i = 0; i < count; i++)
@@ -1023,7 +1018,7 @@
/// <summary>
/// 閲婃斁缂撳瓨
/// </summary>
- public void Dispose()
+ public override void Dispose()
{
this.ProgressEvent = null;
this.UpdateStatuChangedEvent = null;
--
Gitblit v1.8.0