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/UserCenter/Device/DeviceMacInfoEditorForm.cs |  163 ++++++++++++++++++++++++++---------------------------
 1 files changed, 80 insertions(+), 83 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
index 0dee854..22b08b0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -72,11 +72,11 @@
         /// <param name="deviceMac">璁惧mac鍦板潃</param>
         public void ShowForm(string deviceMac)
         {
-            this.listNewDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
+            this.listNewDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(deviceMac);
             if (listNewDevice.Count == 0)
             {
                 //閽堝鍗曠函鍙湁涓�涓�200绔偣鐨勮澶�
-                listNewDevice.Add(Common.LocalDevice.Current.GetOTADevice(deviceMac));
+                listNewDevice.Add(HdlDeviceCommonLogic.Current.GetOTADevice(deviceMac));
             }
             this.listDeviceType.Clear();
             deviceMacTemp = deviceMac;
@@ -86,33 +86,49 @@
                 this.listDeviceType.Add(device.Type);
             }
             //鑾峰彇杩欎竴鍫嗚澶囨椂灞炰簬浠�涔堢被鍨嬬殑
-            this.deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listNewDevice);
+            this.deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(listNewDevice);
 
             //璁剧疆鏍囬淇℃伅
             base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uDeviceSettion));
 
-            //鍒濆鍖栧彸涓婅鑿滃崟
-            this.InitTopRightMenu();
+            //閲嶆柊鑾峰彇纭欢淇℃伅(false:涓嶉渶瑕佽幏鍙�,true:闇�瑕佽幏鍙�)
+            var result = this.RefreshHardFirmwareInfo();
 
-            //鍒濆鍖栦腑閮ㄦ帶浠�
-            this.InitMiddleFrame();
-
-            //閲嶆柊鑾峰彇纭欢淇℃伅
-            this.RefreshHardFirmwareInfo();
-
-            //绠�绾﹀鍔熻兘闈㈡澘鑾峰彇缁戝畾鐩爣鐨勬樉绀�
-            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+            HdlThreadLogic.Current.RunThread(() =>
             {
-                //绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧淇℃伅
-                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);
-                if (dev != null)
+                if (result == true)
                 {
-                    var key = new ZigBee.Device.Panel();
-                    key.DeviceAddr = deviceMac;
-                    key.CurrentGateWayId = dev.CurrentGateWayId;
-                    InitBindInfo(key); 
+                    //濡傛灉闇�瑕侀噸鏂板幓璇诲彇璁惧鐨勪俊鎭墠鑳芥樉绀虹晫闈㈢殑璇�,绛夊緟涓�娈垫椂闂�
+                    this.ShowProgressBar();
+                    System.Threading.Thread.Sleep(1500);
                 }
-            }
+                HdlThreadLogic.Current.RunMain(() =>
+                {
+                    //鍒濆鍖栧彸涓婅鑿滃崟
+                    this.InitTopRightMenu();
+
+                    //鍒濆鍖栦腑閮ㄦ帶浠�
+                    this.InitMiddleFrame();
+
+                    //绠�绾﹀鍔熻兘闈㈡澘鑾峰彇缁戝畾鐩爣鐨勬樉绀�
+                    if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+                    {
+                        //绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧淇℃伅
+                        var dev = HdlDeviceCommonLogic.Current.GetDevice(deviceMac, 62);
+                        if (dev != null)
+                        {
+                            var key = new ZigBee.Device.Panel();
+                            key.DeviceAddr = deviceMac;
+                            key.CurrentGateWayId = dev.CurrentGateWayId;
+                            InitBindInfo(key);
+                        }
+                    }
+                    if (result == true)
+                    {
+                        this.CloseProgressBar();
+                    }
+                });
+            });
         }
 
         /// <summary>
@@ -140,7 +156,7 @@
 
             //璁惧澶囨敞
             string caption = Language.StringByID(R.MyInternationalizationString.uDeviceNote);
-            string deviceName = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
+            string deviceName = HdlDeviceCommonLogic.Current.GetDeviceMacName(listNewDevice[0]);
             var btnNote = new FrameCaptionInputControl(caption, deviceName, listview.rowSpace / 2);
             btnNote.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
             listview.AddChidren(btnNote);
@@ -149,7 +165,7 @@
             btnNote.AddBottomLine();
             btnNote.txtInput.FinishInputEvent += () =>
             {
-                string oldName = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
+                string oldName = HdlDeviceCommonLogic.Current.GetDeviceMacName(listNewDevice[0]);
                 if (btnNote.Text == string.Empty)
                 {
                     btnNote.Text = oldName;
@@ -168,7 +184,7 @@
 
             //璁惧绫诲瀷
             caption = Language.StringByID(R.MyInternationalizationString.uDeviceType);
-            deviceName = Common.LocalDevice.Current.GetDeviceObjectText(listNewDevice);
+            deviceName = HdlDeviceCommonLogic.Current.GetDeviceObjectText(listNewDevice);
             var btnType = new FrameCaptionViewControl(caption, deviceName, listview.rowSpace / 2);
             btnType.UseClickStatu = false;
             listview.AddChidren(btnType);
@@ -207,7 +223,7 @@
                         continue;
                     }
                     var room = HdlRoomLogic.Current.GetRoomByDevice(device);
-                    string mainKeys = LocalDevice.Current.GetDeviceMainKeys(device);
+                    string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
                     if (room == null)
                     {
                         //杩欓噷鏈夌偣鐗规畩,濡傛灉鍥炶矾娌℃湁璁剧疆鏈夊尯鍩熺殑鏃跺��,鎵嶈缃�
@@ -243,7 +259,7 @@
             bodyFrameLayout.AddChidren(btnFinish);
             btnFinish.ButtonClickEvent += (sender, e) =>
             {
-                string oldName = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
+                string oldName = HdlDeviceCommonLogic.Current.GetDeviceMacName(listNewDevice[0]);
                 if (btnNote.Text.Trim() == string.Empty)
                 {
                     btnNote.Text = oldName;
@@ -390,7 +406,7 @@
                 var doorLock = this.listNewDevice[0] as ZigBee.Device.DoorLock;
                 btnRow.ButtonClickEvent += async (sender, e) =>
                  {
-                     if (UserCenterResourse.UserInfo.AuthorityNo == 1)
+                     if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1)
                      {
                          Action action = null;
                          Action actionNone = null;
@@ -475,7 +491,7 @@
 
                 btnswitch.ButtonClickEvent += async (sender, e) =>
                  {
-                     if (UserCenterResourse.UserInfo.AuthorityNo == 1)
+                     if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1)
                      {
                          if (btnswitch.IsSelected == true)
                          {
@@ -543,7 +559,7 @@
                 var doorLock = this.listNewDevice[0] as ZigBee.Device.DoorLock;
                 btnRow.ButtonClickEvent += async (sender, e) =>
                  {
-                     if (UserCenterResourse.UserInfo.AuthorityNo == 1)
+                     if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1)
                      {
                          var tempPage = new Shared.Phone.UserCenter.DoorLock.TimeSettignPage(doorLock, "DoorLockTime");
                          Shared.Phone.UserView.HomePage.Instance.AddChidren(tempPage);
@@ -782,31 +798,10 @@
         private void AddFunctionSettionRow()
         {
             //鍙湁鍥炶矾鏁板ぇ浜�1鎵嶈兘鏈夎繖涓彍鍗�
-            if (Common.LocalDevice.Current.GetDevicesCountByMac(listNewDevice[0].DeviceAddr) == 1)
+            if (HdlDeviceCommonLogic.Current.GetDevicesCountByMac(listNewDevice[0].DeviceAddr) == 1)
             {
                 //鏂伴灏忔ā鍧楀彧鏈変竴涓洖璺紝浣嗚姹傛柊椋庡皬妯″潡鐨勬柊椋庢湁鍔熻兘璁剧疆
-                //鏅捐。鏋堕粯璁ゅ彧瀛樺偍绗竴鍥炶矾锛屽叾浠栧洖璺杩囨护浜�
-                bool isSpecial = false;
-                if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Relay_FangyueFreshAirModul)
-                {
-                    isSpecial = true;
-                }
-                if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Airer)
-                {
-                    isSpecial = true;
-                    var dev = listNewDevice[0];
-                    //鏅捐。鏋堕粯璁ゅ彧瀛樺偍绗竴鍥炶矾锛屽叾浠栧洖璺湪鍔熻兘鐣岄潰闇�瑕佽鍙栨椂闂达紝鎵�浠ユ彁鍓嶄竴涓晫闈㈣幏鍙�
-                    //绗竴鐗堟椂闂村姛鑳界敱浜庤澶囦笉鏀寔锛屾殏鏃跺幓鎺夛紝鍚庢湡鎵嶅姞涓�
-                    //for (int i = 3; i < 6; i++)
-                    //{
-                    //  //娉ㄦ剰锛岃。鏋朵腑鐨勭姸鎬佺敱涓嶅悓绔偣鑾峰彇
-                    //  //鍥炶矾3:璇诲彇椋庡共寮�鍏崇姸鎬佸拰鏃堕棿鍊� 
-                    //  //鍥炶矾4:璇诲彇鐑樺共寮�鍏崇姸鎬佸拰鏃堕棿鍊�
-                    //  //鍥炶矾5:璇诲彇娑堟瘨寮�鍏崇姸鎬佸拰鏃堕棿鍊�
-                    //  HdlDeviceAttributeLogic.Current.SendAirerComand(dev, i);
-                    //}
-                }
-                if (!isSpecial)
+                if (deviceEnumInfo.ConcreteType != DeviceConcreteType.Relay_FangyueFreshAirModul)
                 {
                     return;
                 }
@@ -989,21 +984,21 @@
             if (Common.Config.Instance.Home.IsShowTemplate == true)
             {
                 btnSwitch.CanClick = false;
-                btnSwitch.IsSelected = TemplateData.TemplateDeviceDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
+                btnSwitch.IsSelected = HdlTemplateDeviceDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
                 return;
             }
             //濡傛灉鏄櫄鎷熶綇瀹�
             if (Common.Config.Instance.Home.IsVirtually == true)
             {
-                btnSwitch.IsSelected = TemplateData.TemplateDeviceDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
+                btnSwitch.IsSelected = HdlTemplateDeviceDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
                 return;
             }
 
             //娣诲姞灞炴�т笂鎶ョ洃鍚�
-            string mainkeys = LocalDevice.Current.GetDeviceMainKeys(this.listNewDevice[0]);
+            string mainkeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(this.listNewDevice[0]);
             HdlGatewayReceiveLogic.Current.AddAttributeEvent("HandPullControl", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (device) =>
             {
-                string checkKey = LocalDevice.Current.GetDeviceMainKeys(device);
+                string checkKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
                 if (mainkeys != checkKey || device.DeviceStatusReport.CluterID != 258)
                 {
                     return;
@@ -1075,7 +1070,7 @@
             btnBindTargets.AddBottomLine();
             btnBindTargets.ButtonClickEvent += (sender, e) =>
             {
-                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 32);//绠�绾﹂潰鏉块殢渚夸竴涓寜閿潵鑾峰彇璁惧
+                var dev = HdlDeviceCommonLogic.Current.GetDevice(deviceMac, 32);//绠�绾﹂潰鏉块殢渚夸竴涓寜閿潵鑾峰彇璁惧
                 if (dev != null)
                 {
                     var curControlDev = dev as Panel;
@@ -1112,7 +1107,7 @@
                 proximitySensorsInfo.enable = btnSwitch.IsSelected;
 
                 //绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧淇℃伅
-                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);
+                var dev = HdlDeviceCommonLogic.Current.GetDevice(deviceMac, 62);
                 if (dev != null)
                 {
                     var key = new ZigBee.Device.Panel();
@@ -1144,7 +1139,7 @@
             rowLight.AddRightArrow();
             rowLight.ButtonClickEvent += (sender, e) =>
             {
-                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
+                var dev = HdlDeviceCommonLogic.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
                 var device = new CommonDevice();
                 if (dev != null)
                 {
@@ -1180,7 +1175,7 @@
             rowHumidity.ButtonClickEvent += (sender, e) =>
             {
 
-                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
+                var dev = HdlDeviceCommonLogic.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
                 var device = new CommonDevice();
                 if (dev != null)
                 {
@@ -1231,7 +1226,7 @@
             var btnTemperatureStatu = rowTemPerature.AddMostRightView(msg, 700);
             rowTemPerature.ButtonClickEvent += (sender, e) =>
             {
-                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
+                var dev = HdlDeviceCommonLogic.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
                 var device = new CommonDevice();
                 if (dev != null)
                 {
@@ -1329,7 +1324,7 @@
                 bindList = panelBindListRes.getAllBindResponseData.BindList;
                 foreach (var bDev in bindList)
                 {
-                    var device = Common.LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
+                    var device = HdlDeviceCommonLogic.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
                     if (device == null)
                     {
                         continue;
@@ -1339,18 +1334,18 @@
                         var bD = device as TemperatureSensor;
                         if (bD.SensorDiv == 1 && bDev.BindCluster == 1026)
                         {
-                            bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+                            bindTemperatureName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
                             bindTemperatureDev = device;
                         }
                         if (bD.SensorDiv == 2 && bDev.BindCluster == 1029)
                         {
-                            bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+                            bindHumidityName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
                             bindHumidityDev = device;
                         }
                     }
                     if (device.Type == DeviceType.FreshAirHumiditySensor)
                     {
-                        bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+                        bindHumidityName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
                         bindHumidityDev = device;
                     }
                 }
@@ -1495,7 +1490,7 @@
         private void AddFirmwareUpdateRow()
         {
             //鎷ユ湁200绔彛杩欎釜涓滆タ鐨勬椂鍊欙紝鎵嶄細鏄剧ず杩欎竴琛�
-            var oTADevice = Common.LocalDevice.Current.GetOTADevice(listNewDevice[0].DeviceAddr);
+            var oTADevice = HdlDeviceCommonLogic.Current.GetOTADevice(listNewDevice[0].DeviceAddr);
             if (oTADevice == null)
             {
                 return;
@@ -1556,12 +1551,12 @@
             {
                 bool receiveImageInfo = false;
                 //璁剧疆璁惧鍏ㄩ儴鐨勯暅鍍忎俊鎭�
-                string checkKey = LocalDevice.Current.GetDeviceMainKeys(oTADevice.DeviceAddr, oTADevice.DeviceEpoint);
+                string checkKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(oTADevice.DeviceAddr, oTADevice.DeviceEpoint);
                 HdlGatewayReceiveLogic.Current.AddAttributeEvent("SetDeviceVersionInfo", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
                 {
                     if (report.DeviceStatusReport.CluterID == (int)Cluster_ID.Ota)
                     {
-                        string mainKey = LocalDevice.Current.GetDeviceMainKeys(report.DeviceAddr, report.DeviceEpoint);
+                        string mainKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report.DeviceAddr, report.DeviceEpoint);
                         if (checkKey == mainKey)
                         {
                             //宸茬粡鎺ユ敹寰楀埌
@@ -1570,7 +1565,7 @@
                     }
                 });
                 //鍙戦�佸懡浠�
-                HdlDeviceImageInfoLogic.Current.SetFirmwareVersionComand(oTADevice);
+                HdlDeviceAttributeLogic.Current.ReadDeviceFirmwareVersion(oTADevice);
 
                 int count = 5;
                 while (receiveImageInfo == false && count > 0)
@@ -1582,12 +1577,12 @@
                 //绉婚櫎浜嬩欢
                 HdlGatewayReceiveLogic.Current.RemoveEvent("SetDeviceVersionInfo");
 
-                oTADevice = Common.LocalDevice.Current.GetOTADevice(listNewDevice[0].DeviceAddr);
+                oTADevice = HdlDeviceCommonLogic.Current.GetOTADevice(listNewDevice[0].DeviceAddr);
                 //娣诲姞鍗囩骇鍥轰欢淇℃伅(鎴愪笉鎴愬姛閮芥棤鎵�璋�)
-                var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.A璁惧, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString());
+                var result = HdlFirmwareUpdateLogic.Current.AddFirmwareVersionInfo(FirmwareLevelType.A璁惧, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString());
 
                 //鑾峰彇璁惧鏈�鏂扮増鏈�
-                var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.A璁惧,
+                var deviceFirmware = HdlFirmwareUpdateLogic.Current.GetFirmwareMostVersionInfo(FirmwareLevelType.A璁惧,
                     oTADevice.HwVersion.ToString(),
                     oTADevice.ImgTypeId.ToString(),
                     oTADevice.ImgVersion);
@@ -1617,7 +1612,7 @@
         {
             //淇敼MAC鍚�
             string deviceName = i_deviceName.Trim();
-            var result = Common.LocalDevice.Current.ReMacName(this.listNewDevice, deviceName);
+            var result = HdlDeviceCommonLogic.Current.ReMacName(this.listNewDevice, deviceName);
             if (result == false)
             {
                 return;
@@ -1666,7 +1661,7 @@
         private void ShowTopRightMenu()
         {
             //妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘(鎷跨鐐规渶灏忕殑閭d釜鍥炶矾鍘诲畾浣�)
-            bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]);
+            bool canTest = HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(listNewDevice[0]);
 
             TopRightMenuControl frame = null;
 
@@ -1687,7 +1682,7 @@
                 frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>
                 {
                     //鍙戦�佸畾浣嶅姛鑳�
-                    Common.LocalDevice.Current.SetFixedPositionCommand(listNewDevice[0], true);
+                    HdlDeviceCommonLogic.Current.SetFixedPositionCommand(listNewDevice[0], true);
                 });
             }
 
@@ -1711,7 +1706,7 @@
 
             //鍚屾
             deviceMenu = Language.StringByID(R.MyInternationalizationString.Synchronization);
-            if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]))
+            if (HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(listNewDevice[0]))
             {
                 frame.AddRowMenu(deviceMenu, "", "Item/SynchronizationSelected.png", () =>
                 {
@@ -1739,7 +1734,7 @@
                 this.ShowProgressBar();
 
                 //鍒犻櫎璁惧
-                bool result = await Common.LocalDevice.Current.DeleteDevice(listNewDevice);
+                bool result = await HdlDeviceCommonLogic.Current.DeleteDevice(listNewDevice);
                 //鍏抽棴杩涘害鏉�
                 this.CloseProgressBar();
                 if (result == false)
@@ -1765,7 +1760,7 @@
                 this.ShowProgressBar();
 
                 //鍚屾璁惧
-                bool result = await Common.LocalDevice.Current.SynchronizationDevice(listNewDevice);
+                bool result = await HdlDeviceCommonLogic.Current.SynchronizationDevice(listNewDevice);
                 //鍏抽棴杩涘害鏉�
                 this.CloseProgressBar();
                 if (result == false)
@@ -1787,7 +1782,7 @@
             HdlGatewayReceiveLogic.Current.RemoveEvent("SetDeviceVersionInfo");
 
             //璁惧鏂板叆缃�
-            if (UserCenterResourse.DicActionForm.ContainsKey("AddDeviceTypeListForm") == true)
+            if (HdlFormLogic.Current.IsFormOpen("AddDeviceTypeListForm") == true)
             {
                 this.LoadFormMethodByName("DeviceListMainForm", "RefreshDeviceRow", new object[] { listNewDevice[0].DeviceAddr });
             }
@@ -1800,17 +1795,19 @@
         #region 鈻� 纭欢淇℃伅___________________________
 
         /// <summary>
-        /// 閲嶆柊鑾峰彇纭欢淇℃伅
+        /// 閲嶆柊鑾峰彇纭欢淇℃伅(false:涓嶉渶瑕佽幏鍙�,true:闇�瑕佽幏鍙�)
         /// </summary>
-        private void RefreshHardFirmwareInfo()
+        private bool RefreshHardFirmwareInfo()
         {
             if (listNewDevice[0].DriveCode > 0 || Common.Config.Instance.Home.IsShowTemplate == true)
             {
                 //铏氭嫙璁惧娌℃湁杩欑鎿嶄綔
-                return;
+                return false;
             }
             //閲嶆柊鑾峰彇纭欢淇℃伅
-            HdlDeviceHardInfoLogic.Current.SetAllHardFirmwareInfoToDevice(listNewDevice[0]);
+            HdlDeviceAttributeLogic.Current.ReadDeviceAllHardFirmwareInfo(listNewDevice[0]);
+            //鑾峰彇璁惧鐨勫浐瀹氬睘鎬�
+            return HdlDeviceAttributeLogic.Current.ReadDeviceAllFixedAttribute(listNewDevice[0]);
         }
 
         #endregion

--
Gitblit v1.8.0