From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlACZbGatewayUpdateLogic.cs |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlACZbGatewayUpdateLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlACZbGatewayUpdateLogic.cs
index 96f45ff..4db67ff 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlACZbGatewayUpdateLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlACZbGatewayUpdateLogic.cs
@@ -41,7 +41,7 @@
         /// <summary>
         /// 璁惧瀵硅薄
         /// </summary>
-        private AC deviceAc = null;
+        private CommonDevice deviceAc = null;
         /// <summary>
         /// 鍓嶄竴娆＄殑鏈�缁堢姸鎬�
         /// </summary>
@@ -63,7 +63,7 @@
         /// </summary>
         /// <param name="i_deviceAc">璁惧</param>
         /// <param name="i_deviceFirmware">璁惧鐨勫浐浠朵俊鎭�</param>
-        public HdlACZbGatewayUpdateLogic(AC i_deviceAc, FirmwareVersionInfo i_deviceFirmware)
+        public HdlACZbGatewayUpdateLogic(CommonDevice i_deviceAc, FirmwareVersionInfo i_deviceFirmware)
         {
             this.ClassDiv = 2;
             this.deviceAc = i_deviceAc;
@@ -212,7 +212,7 @@
             this.zbGateway.ReportAction += receiveAction;
 
             //璇诲彇绌鸿皟妯″潡鐗堟湰
-            var result = await deviceAc.ReadACFirewareVersionAsync();
+            var result = await HdlDeviceAirConditionerLogic.Current.ReadACFirewareVersionAsync(deviceAc);
             if (result == null || result.readACFirewareVersionResponData == null || result.readACFirewareVersionResponData.Status != 0)
             {
                 //鑾峰彇绌鸿皟妯″潡鐗堟湰澶辫触
@@ -222,11 +222,11 @@
                 this.UpdateStatu = UpdateStatuMode.DeviceUpdateFail;
                 this.zbGateway.ReportAction -= receiveAction;
                 //鍙戦�佸け璐ョ粰璁惧
-                deviceAc.SendFinishAsync(1);
+                HdlDeviceAirConditionerLogic.Current.SendFinishAsync(deviceAc, 1);
                 return;
             }
             //鍙戦�佸崌绾ч�氱煡
-            var result2 = await deviceAc.UpggradeACNotificationAsync(result.readACFirewareVersionResponData.FirewareVersion, this.deviceFirmwareByte.Length);
+            var result2 = await HdlDeviceAirConditionerLogic.Current.UpggradeACNotificationAsync(deviceAc, result.readACFirewareVersionResponData.FirewareVersion, this.deviceFirmwareByte.Length);
             if (result2.responseData == null)
             {
                 //鍙戦�佸崌绾у懡浠ゅけ璐�
@@ -236,7 +236,7 @@
                 this.UpdateStatu = UpdateStatuMode.DeviceUpdateFail;
                 this.zbGateway.ReportAction -= receiveAction;
                 //鍙戦�佸け璐ョ粰璁惧
-                deviceAc.SendFinishAsync(1);
+                HdlDeviceAirConditionerLogic.Current.SendFinishAsync(deviceAc, 1);
                 return;
             }
             else if (result2.responseData.status == 1)
@@ -248,7 +248,7 @@
                 this.UpdateStatu = UpdateStatuMode.DeviceUpdateFail;
                 this.zbGateway.ReportAction -= receiveAction;
                 //鍙戦�佸け璐ョ粰璁惧
-                deviceAc.SendFinishAsync(1);
+                HdlDeviceAirConditionerLogic.Current.SendFinishAsync(deviceAc, 1);
                 return;
             }
             else if (result2.responseData.status != 0)
@@ -260,7 +260,7 @@
                 this.UpdateStatu = UpdateStatuMode.DeviceUpdateFail;
                 this.zbGateway.ReportAction -= receiveAction;
                 //鍙戦�佸け璐ョ粰璁惧
-                deviceAc.SendFinishAsync(1);
+                HdlDeviceAirConditionerLogic.Current.SendFinishAsync(deviceAc, 1);
                 return;
             }
 
@@ -278,7 +278,7 @@
                     this.UpdateStatu = UpdateStatuMode.DeviceUpdateFail;
                     this.zbGateway.ReportAction -= receiveAction;
                     //鍙戦�佸け璐ョ粰璁惧
-                    deviceAc.SendFinishAsync(1);
+                    HdlDeviceAirConditionerLogic.Current.SendFinishAsync(deviceAc, 1);
                     return;
                 }
                 await System.Threading.Tasks.Task.Delay(1000);
@@ -298,7 +298,7 @@
         /// <summary>
         /// 鎵ц璁惧鍗囩骇鎿嶄綔
         /// </summary>
-        private async void DoSetUpdateDevice(string i_offset,int i_dataLength)
+        private async void DoSetUpdateDevice(string i_offset, int i_dataLength)
         {
             this.UpdateStatu = UpdateStatuMode.DeviceUpdateReady;
             //璁惧姝ｅ湪鍗囩骇鈥�
@@ -372,7 +372,7 @@
                         this.UpdateStatu = UpdateStatuMode.DeviceUpdateFail;
                         this.zbGateway.ReportAction -= receiveAction;
                         //鍙戦�佸け璐ョ粰璁惧
-                        deviceAc.SendFinishAsync(1);
+                        HdlDeviceAirConditionerLogic.Current.SendFinishAsync(deviceAc, 1);
                         return;
                     }
                     await System.Threading.Tasks.Task.Delay(50);
@@ -398,9 +398,9 @@
                     }
                 }
                 //鍙戦�侀�忎紶鏁版嵁
-                var sendData = new AC.SendUpgradeData() { dataLength = i_dataLength, offset = i_offset };
+                var sendData = new HdlDeviceAirConditionerLogic.SendUpgradeData() { dataLength = i_dataLength, offset = i_offset };
                 sendData.databytes = listData.ToArray();
-                deviceAc.UpgradeAsync(sendData);
+                HdlDeviceAirConditionerLogic.Current.UpgradeAsync(deviceAc, sendData);
             }
             this.zbGateway.ReportAction -= receiveAction;
 
@@ -421,7 +421,7 @@
             this.UpdateStatuChangedEvent?.Invoke(0, Language.StringByID(R.MyInternationalizationString.uSendingFinishUpdateComand));
 
             //鍙戦�佹垚鍔熷懡浠ょ粰璁惧
-            deviceAc.SendFinishAsync(0);
+            HdlDeviceAirConditionerLogic.Current.SendFinishAsync(deviceAc, 0);
 
             //绛変釜涓ょ閽熷惂
             await System.Threading.Tasks.Task.Delay(2000);

--
Gitblit v1.8.0