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/HdlDeviceUpdateLogic.cs | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs b/ZigbeeApp/Shared/Phone/Common/Logic/HdlDeviceUpdateLogic.cs similarity index 95% rename from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs rename to ZigbeeApp/Shared/Phone/Common/Logic/HdlDeviceUpdateLogic.cs index 566d567..e9e7d22 100644 --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs +++ b/ZigbeeApp/Shared/Phone/Common/Logic/HdlDeviceUpdateLogic.cs @@ -3,12 +3,12 @@ using System.Text; using ZigBee.Device; -namespace Shared.Phone.UserCenter +namespace Shared.Phone { /// <summary> /// HDL璁惧鍗囩骇鐨勯�昏緫 /// </summary> - public class HdlDeviceUpdateLogic : HdlDeviceUpdateCommonLogic + public class HdlDeviceUpdateLogic : DeviceUpdateCommon { #region 鈻� 鍙橀噺澹版槑___________________________ @@ -83,9 +83,9 @@ if (this.UpdateStatu == UpdateStatuMode.Wait) { //濡傛灉鏄瓑寰呮ā寮忥紝鍐嶆鐐瑰嚮鏃讹紝绉婚櫎鍒楄〃 - if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(otaDevice.DeviceAddr) == true) + if (HdlFirmwareUpdateResourse.dicUpdateList.ContainsKey(otaDevice.DeviceAddr) == true) { - FirmwareUpdateResourse.dicUpdateList.Remove(otaDevice.DeviceAddr); + HdlFirmwareUpdateResourse.dicUpdateList.Remove(otaDevice.DeviceAddr); } //鍙栨秷 this.UpdateStatu = UpdateStatuMode.None; @@ -101,13 +101,13 @@ //杩涘叆绛夊緟妯″紡 this.UpdateStatu = UpdateStatuMode.Wait; - FirmwareUpdateResourse.dicUpdateList[otaDevice.DeviceAddr] = this; + HdlFirmwareUpdateResourse.dicUpdateList[otaDevice.DeviceAddr] = this; //绛夊緟涓�� this.UpdateStatuChangedEvent?.Invoke(0, Language.StringByID(R.MyInternationalizationString.uWaitting)); //鎵ц涓嬩竴涓彲鏇存柊鐨勫浐浠剁殑鏇存柊鎿嶄綔 - HdlFirmwareUpdateLogic.DoUpdateNextFirmware(); + HdlFirmwareUpdateLogic.Current.DoUpdateNextFirmware(); } /// <summary> @@ -499,7 +499,7 @@ this.UpdateStatuChangedEvent?.Invoke(0, Language.StringByID(R.MyInternationalizationString.uDeviceUpdating)); this.SetProgressValue(0); - FirmwareUpdateResourse.dicUpdateList[otaDevice.DeviceAddr] = this; + HdlFirmwareUpdateResourse.dicUpdateList[otaDevice.DeviceAddr] = this; //鍚屾杩涘害 this.zbGateway.ReportAction += UpdateDeviceProgress; } @@ -534,7 +534,7 @@ this.UpdateStatu = UpdateStatuMode.None; //鎵ц涓嬩竴涓彲鏇存柊鐨勫浐浠剁殑鏇存柊鎿嶄綔 - HdlFirmwareUpdateLogic.DoUpdateNextFirmware(); + HdlFirmwareUpdateLogic.Current.DoUpdateNextFirmware(); this.UpdateStatuChangedEvent?.Invoke(2, ""); }; contr.Show(); @@ -556,12 +556,12 @@ { System.Threading.Thread.Sleep(3000); - string checkKey = Common.LocalDevice.Current.GetDeviceMainKeys(otaDevice.DeviceAddr, otaDevice.DeviceEpoint); + string checkKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(otaDevice.DeviceAddr, otaDevice.DeviceEpoint); HdlGatewayReceiveLogic.Current.AddAttributeEvent("HdlDeviceUpdate" + otaDevice.DeviceAddr, ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) => { if (report.DeviceStatusReport.CluterID == (int)Cluster_ID.Ota) { - string mainKey = Common.LocalDevice.Current.GetDeviceMainKeys(report.DeviceAddr, report.DeviceEpoint); + string mainKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report.DeviceAddr, report.DeviceEpoint); if (checkKey == mainKey) { //宸茬粡鎺ユ敹寰楀埌 @@ -571,13 +571,13 @@ }); //鍙戦�佸懡浠� - HdlDeviceImageInfoLogic.Current.SetFirmwareVersionComand(otaDevice); + HdlDeviceAttributeLogic.Current.ReadDeviceFirmwareVersion(otaDevice); System.Threading.Thread.Sleep(1500); int count = 12; while (this.IsFinishUpdate == false && count > 0) { - HdlDeviceImageInfoLogic.Current.SetFirmwareVersionComand(otaDevice); + HdlDeviceAttributeLogic.Current.ReadDeviceFirmwareVersion(otaDevice); //绛夊緟涓�涓嬭澶囦俊鎭殑鍙嶉 System.Threading.Thread.Sleep(2000); count--; @@ -592,7 +592,7 @@ //鍗囩骇瀹屾垚 this.UpdateStatu = UpdateStatuMode.UpdateFinish; - HdlFirmwareUpdateLogic.DoUpdateNextFirmware(); + HdlFirmwareUpdateLogic.Current.DoUpdateNextFirmware(); //璁惧鍗囩骇鎴愬姛! this.UpdateStatuChangedEvent?.Invoke(1, Language.StringByID(R.MyInternationalizationString.uDeviceUpdateSuccess)); @@ -611,7 +611,7 @@ //鐘舵�佸彉鏇� this.IsFinishUpdate = true; //鎵ц涓嬩竴涓崌绾� - HdlFirmwareUpdateLogic.DoUpdateNextFirmware(); + HdlFirmwareUpdateLogic.Current.DoUpdateNextFirmware(); } /// <summary> @@ -622,7 +622,7 @@ //鐘舵�佸彉鏇� this.IsFinishUpdate = true; //鎵ц涓嬩竴涓崌绾� - HdlFirmwareUpdateLogic.DoUpdateNextFirmware(); + HdlFirmwareUpdateLogic.Current.DoUpdateNextFirmware(); } #endregion -- Gitblit v1.8.0