From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/Common/Logic/HdlGatewayUpdateLogic.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs b/ZigbeeApp/Shared/Phone/Common/Logic/HdlGatewayUpdateLogic.cs
similarity index 97%
rename from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
rename to ZigbeeApp/Shared/Phone/Common/Logic/HdlGatewayUpdateLogic.cs
index eb94ed6..c55a7f7 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Logic/HdlGatewayUpdateLogic.cs
@@ -4,12 +4,12 @@
using System.Threading.Tasks;
using ZigBee.Device;
-namespace Shared.Phone.UserCenter
+namespace Shared.Phone
{
/// <summary>
/// 缃戝叧鐨勫崌绾ч�昏緫
/// </summary>
- public class HdlGatewayUpdateLogic : HdlDeviceUpdateCommonLogic
+ public class HdlGatewayUpdateLogic : DeviceUpdateCommon
{
#region 鈻� 鍙橀噺澹版槑___________________________
@@ -83,9 +83,9 @@
{
//濡傛灉鏄瓑寰呮ā寮忥紝鍐嶆鐐瑰嚮鏃讹紝绉婚櫎鍒楄〃
string gwId = this.upDatezbGateway.GwId;
- if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(gwId) == true)
+ if (HdlFirmwareUpdateResourse.dicUpdateList.ContainsKey(gwId) == true)
{
- FirmwareUpdateResourse.dicUpdateList.Remove(gwId);
+ HdlFirmwareUpdateResourse.dicUpdateList.Remove(gwId);
}
this.UpdateStatu = UpdateStatuMode.None;
//鍙栨秷
@@ -102,12 +102,12 @@
//杩涘叆绛夊緟妯″紡
this.UpdateStatu = UpdateStatuMode.Wait;
string gwId2 = this.upDatezbGateway.GwId;
- FirmwareUpdateResourse.dicUpdateList[gwId2] = this;
+ HdlFirmwareUpdateResourse.dicUpdateList[gwId2] = this;
//绛夊緟涓��
this.UpdateStatuChangedEvent?.Invoke(0, Language.StringByID(R.MyInternationalizationString.uWaitting));
//鎵ц涓嬩竴涓彲鏇存柊鐨勫浐浠剁殑鏇存柊鎿嶄綔
- HdlFirmwareUpdateLogic.DoUpdateNextFirmware();
+ HdlFirmwareUpdateLogic.Current.DoUpdateNextFirmware();
}
/// <summary>
@@ -748,7 +748,7 @@
this.UpdateStatu = UpdateStatuMode.UpdateSuccess;
//鎵ц涓嬩竴涓崌绾�
- HdlFirmwareUpdateLogic.DoUpdateNextFirmware();
+ HdlFirmwareUpdateLogic.Current.DoUpdateNextFirmware();
//缃戝叧鍗囩骇鎴愬姛!
this.SetProgressValue(100, 100);
System.Threading.Thread.Sleep(1500);
@@ -772,7 +772,7 @@
HdlGatewayLogic.Current.SetHadGatewayUpdateFlage(false);
//鎵ц涓嬩竴涓崌绾�
- HdlFirmwareUpdateLogic.DoUpdateNextFirmware();
+ HdlFirmwareUpdateLogic.Current.DoUpdateNextFirmware();
}
/// <summary>
@@ -786,7 +786,7 @@
HdlGatewayLogic.Current.SetHadGatewayUpdateFlage(false);
//鎵ц涓嬩竴涓崌绾�
- HdlFirmwareUpdateLogic.DoUpdateNextFirmware();
+ HdlFirmwareUpdateLogic.Current.DoUpdateNextFirmware();
}
#endregion
@@ -996,7 +996,7 @@
while (this.IsFinishUpdate == false)
{
//鑾峰彇鐗堟湰
- var result = HdlGatewayLogic.Current.GetGatewayInfo(this.upDatezbGateway, false, ShowErrorMode.NO);
+ var result = HdlGatewayLogic.Current.RefreshGatewayInfo(this.upDatezbGateway, false, ShowErrorMode.NO);
if (result != null)
{
break;
--
Gitblit v1.8.0