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/Device/DeviceListMainForm.cs |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
index 899ed8e..6e555b0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
@@ -261,7 +261,7 @@
                 btnPosition.ButtonClickEvent += (sender, e) =>
                 {
                     //瀹氫綅
-                    Common.LocalDevice.Current.SetFixedPositionCommand(listdevice[0]);
+                    Common.LocalDevice.Current.SetFixedPositionCommand(listdevice[0], true);
                 };
             }
 
@@ -309,7 +309,7 @@
                     return;
                 }
                 var listMacDevice = LocalDevice.Current.GetDevicesByMac(deviceMac, false);
-                if (LocalDevice.Current.IsMiniLight(listMacDevice[0]) == true)
+                if (listMacDevice.Count > 0 && LocalDevice.Current.IsMiniLight(listMacDevice[0]) == true)
                 {
                     //mini澶滅伅鐨勫姛鑳借缃晫闈�
                     var room = HdlRoomLogic.Current.GetRoomByDevice(listMacDevice[0]);
@@ -726,6 +726,11 @@
                         ProgressBar.Close();
                         if (result2 == -1)
                         {
+                            HdlThreadLogic.Current.RunMain(() =>
+                            {
+                                //闅愯棌涓嬫媺鍒锋柊鐗规晥
+                                listView.EndHeaderRefreshing();
+                            });
                             return;
                         }
                     }
@@ -974,10 +979,10 @@
                         return;
                     }
                     //娣诲姞鍗囩骇鍥轰欢淇℃伅(鎴愪笉鎴愬姛閮芥棤鎵�璋�)
-                    var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.ZigbeeDevice, ota.HwVersion.ToString(), ota.ImgTypeId.ToString());
+                    var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.A璁惧, ota.HwVersion.ToString(), ota.ImgTypeId.ToString());
 
                     //鑾峰彇璁惧鏈�鏂扮増鏈�
-                    var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.ZigbeeDevice,
+                    var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.A璁惧,
                         ota.HwVersion.ToString(),
                         ota.ImgTypeId.ToString(),
                         ota.ImgVersion);
@@ -1392,7 +1397,7 @@
                 btnName.Height = Application.GetRealHeight(60);
                 btnName.TextSize = 15;
                 btnName.Y = Application.GetRealHeight(57);
-                btnName.Text = "灏忓害灏忓害";
+                btnName.Text = "鏅鸿兘闊崇";
 
                 this.AddRightArrow();
                 this.AddMostRightView("", 300, false).Name = "smartSoundLayout";

--
Gitblit v1.8.0