From 2be70a32d2a8c517bd9868fb60913fcc843e66fe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 13 五月 2020 11:21:32 +0800
Subject: [PATCH] 上传代码

---
 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
index 1d62a62..1111293 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
@@ -103,6 +103,10 @@
         /// PM缁戝畾鐩爣鍥炶皟
         /// </summary>
         public Action<string> actionPMTarget = null;
+        /// <summary>
+        /// 鏄惁鑳界偣鍑讳繚瀛樻寜閽�
+        /// </summary>
+        private bool canSave = true;
         #endregion
 
         #region UI璁捐 
@@ -358,7 +362,6 @@
                         curentOldRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
                     }
                     curRoom = room;
-                    curControlDev.RoomId = room.Id;
 
                     //鏂伴闈㈡澘淇濆瓨浣胯兘
                     btnFinifh.Enable = true;
@@ -865,6 +868,7 @@
         /// <param name="curControlDev"></param>
         void SaveTarget()
         {
+            btnFinifh.Enable = false;
             if (targetList.Count == 0)
             {
                 //绌虹洰鏍�
@@ -979,6 +983,11 @@
                     catch (Exception ex)
                     {
                         var mess = ex.Message;
+                        Application.RunOnMainThread(() =>
+                        {
+                            CommonPage.Loading.Hide();
+                        });
+                        btnFinifh.Enable = true;
                     }
                 });
             }
@@ -1181,6 +1190,11 @@
                     }
                     catch (Exception ex)
                     {
+                        Application.RunOnMainThread(() =>
+                        {
+                            CommonPage.Loading.Hide();
+                        });
+                        btnFinifh.Enable = true;
                         var mess = ex.Message;
                     }
                 });
@@ -1369,6 +1383,11 @@
             foreach (var de in room.ListDevice)
             {
                 var device = LocalDevice.Current.GetDevice(de);
+                //鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
+                if (device.ZigbeeType != 1)
+                {
+                    continue;
+                }
                 if (device != null)
                 {
                     if (device.Type == DeviceType.TemperatureSensor)
@@ -1394,6 +1413,11 @@
             foreach (var de in room.ListDevice)
             {
                 var device = LocalDevice.Current.GetDevice(de);
+                //鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
+                if (device.ZigbeeType != 1)
+                {
+                    continue;
+                }
                 if (device != null)
                 {
                     if (device.Type == DeviceType.TemperatureSensor)

--
Gitblit v1.8.0