From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

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

--
Gitblit v1.8.0