From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceImageInfoLogic.cs |  149 -------------------------------------------------
 1 files changed, 0 insertions(+), 149 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceImageInfoLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceImageInfoLogic.cs
index 6dd6b98..6f42f2d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceImageInfoLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceImageInfoLogic.cs
@@ -31,55 +31,6 @@
             }
         }
 
-        /// <summary>
-        /// OTA璁惧鑾峰彇闀滃儚鍚庣殑鍥炶皟鍑芥暟
-        /// </summary>
-        private Dictionary<string, Action<CommonDevice, CommonDevice.DeviceStatusReportData>> dicOtaBackAction = new Dictionary<string, Action<CommonDevice, CommonDevice.DeviceStatusReportData>>();
-
-        #endregion
-
-        #region 鈻� 涓诲叆鍙e嚱鏁癬________________________
-
-        /// <summary>
-        /// 璁剧疆璁惧鍏ㄩ儴鐨勯暅鍍忎俊鎭�
-        /// </summary>
-        /// <param name="tADevice"></param>
-        /// <param name="backAction"></param>
-        public void SetAllImageInfoToOtaDevice(OTADevice tADevice, Action<CommonDevice, CommonDevice.DeviceStatusReportData> backAction = null)
-        {
-            if (tADevice == null)
-            {
-                return;
-            }
-            lock (dicOtaBackAction)
-            {
-                //鍏堢Щ闄�
-                this.RemoveDeviceFirmwareVersionThread(tADevice);
-
-                if (backAction != null)
-                {
-                    this.dicOtaBackAction[tADevice.DeviceAddr] = backAction;
-                }
-                //璁剧疆璁惧鐨勫浐浠剁増鏈彿(闇�瑕佺瓑寰呮帹閫佸悗鎵嶄細鏇存敼)
-                this.SetFirmwareVersionToOtaDevice(tADevice);
-            }
-        }
-
-        /// <summary>
-        /// 璁剧疆璁惧鐨勫浐浠剁増鏈彿(闇�瑕佺瓑寰呮帹閫佸悗鎵嶄細鏇存敼)
-        /// </summary>
-        /// <param name="tADevice"></param>
-        private void SetFirmwareVersionToOtaDevice(OTADevice tADevice)
-        {
-            if (HdlGatewayReceiveLogic.Current.IsEsixt("DeviceAutoGetFirmwareVersion") == false)
-            {
-                //娣诲姞浜嬩欢
-                HdlGatewayReceiveLogic.Current.AddAttributeEvent("DeviceAutoGetFirmwareVersion", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, this.SetFirmwareVersionByInterfaceResult);
-            }
-            //鍙戦�佸懡浠�
-            this.SetFirmwareVersionComand(tADevice);
-        }
-
         #endregion
 
         #region 鈻� 鍙戦�佸懡浠__________________________
@@ -115,106 +66,6 @@
             var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
             jObject.Add("Data", data);
             device.Gateway?.Send(("GetDeviceStatus"), jObject.ToString());
-        }
-
-        #endregion
-
-        #region 鈻� 璁剧疆灞炴�__________________________
-
-        /// <summary>
-        /// 璁剧疆璁惧鐨勫浐浠剁増鏈�   -1:寮傚父  0:鎺ㄩ�佺殑杩欎釜涓滆タ骞朵笉鏄浐浠朵俊鎭�  1:姝e父
-        /// </summary>
-        /// <param name="report">涓婃姤淇℃伅</param>
-        /// <param name="device">闇�瑕佷慨鏀圭殑璁惧瀵硅薄</param>
-        /// <returns></returns>
-        public int SetFirmwareVersion(CommonDevice.DeviceStatusReportData report, CommonDevice device)
-        {
-            if (report == null)
-            {
-                return -1;
-            }
-
-            //鏄惁鏄纭殑鎺ㄩ�佹暟鎹�
-            bool isRightData = false;
-            foreach (var data in report.AttriBute)
-            {
-                //闀滃儚鐗堟湰
-                if (data.AttributeId == (int)AttriButeId.ImgVersion)
-                {
-                    isRightData = true;
-                    device.ImgVersion = data.AttriButeData;
-                }
-                //纭欢鐗堟湰
-                if (data.AttributeId == (int)AttriButeId.mgHWversion)
-                {
-                    isRightData = true;
-                    device.HwVersion = data.AttriButeData;
-                }
-                //闀滃儚ID
-                if (data.AttributeId == (int)AttriButeId.ImgTypeId)
-                {
-                    isRightData = true;
-                    device.ImgTypeId = data.AttriButeData;
-                }
-            }
-            if (isRightData == false)
-            {
-                //杩欎釜涓嶆槸鍥轰欢淇℃伅鐨勬帹閫�
-                return 0;
-            }
-            return 1;
-        }
-
-        #endregion
-
-        #region 鈻� 鎺ュ彛鎺ㄩ�佸鐞哶______________________
-
-        /// <summary>
-        /// 鏍规嵁鎺ュ彛鎺ㄩ�佺殑淇℃伅锛岃缃浐浠剁増鏈彿
-        /// </summary>
-        /// <param name="device"></param>
-        private void SetFirmwareVersionByInterfaceResult(CommonDevice device)
-        {
-            var otaDevice = Common.LocalDevice.Current.GetOTADevice(device.DeviceAddr, device.DeviceEpoint);
-            if (otaDevice != null)
-            {
-                //璁剧疆鍥轰欢鐗堟湰淇℃伅
-                this.SetFirmwareVersion(device.DeviceStatusReport, otaDevice);
-                otaDevice.ReSave();
-            }
-            lock (dicOtaBackAction)
-            {
-                if (this.dicOtaBackAction.ContainsKey(device.DeviceAddr) == true)
-                {
-                    var action = this.dicOtaBackAction[device.DeviceAddr];
-                    //璋冪敤鍥炶皟鍑芥暟
-                    action?.Invoke(device, device.DeviceStatusReport);
-                    //鐒跺悗绉婚櫎
-                    this.dicOtaBackAction.Remove(device.DeviceAddr);
-                    action = null;
-                }
-            }
-        }
-        #endregion
-
-        #region 鈻� 绉婚櫎鐩戝惉绾跨▼_______________________
-
-        /// <summary>
-        /// 绉婚櫎鑾峰彇璁惧鍥轰欢淇℃伅鐨勭洃鍚嚎绋�
-        /// </summary>
-        /// <param name="device"></param>
-        public void RemoveDeviceFirmwareVersionThread(CommonDevice device)
-        {
-            lock (dicOtaBackAction)
-            {
-                if (this.dicOtaBackAction.ContainsKey(device.DeviceAddr) == true)
-                {
-                    var action = this.dicOtaBackAction[device.DeviceAddr];
-                    //鐒跺悗绉婚櫎
-                    this.dicOtaBackAction.Remove(device.DeviceAddr);
-                    action = null;
-                }
-            }
         }
 
         #endregion

--
Gitblit v1.8.0