From a2b0218c104808fc686a40f258b48dc70bdd7170 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 20 十二月 2019 15:57:31 +0800
Subject: [PATCH] 2019.12.20

---
 ZigbeeApp/Shared/Common/Device.cs |   83 +++++++++++++++++++++++------------------
 1 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
old mode 100755
new mode 100644
index 3ef2309..afae20f
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -454,6 +454,11 @@
                 }
                 //澶囦唤鏁版嵁
                 await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(device, GatewayBackupEnum.AMac鍚嶇О, newMacName);
+                //濡傛灉瀹冨彧鏈変竴涓洖璺�,鍒欐洿鏀圭鐐瑰悕瀛�
+                if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == true && this.dicDeviceEpoint[device.DeviceAddr].Count == 1)
+                {
+                    return await this.ReName(device, newMacName);
+                }
             }
             return true;
         }
@@ -739,6 +744,20 @@
                 return -1;
             });
             return list;
+        }
+
+        /// <summary>
+        /// 鏍规嵁MAC鍦板潃,鑾峰彇鍏ㄩ儴鍥炶矾鐨勬暟閲�
+        /// </summary>
+        /// <param name="DeviceAddr">Mac鍦板潃</param>
+        /// <returns></returns>
+        public int GetDevicesCountByMac(string DeviceAddr)
+        {
+            if (dicDeviceEpoint.ContainsKey(DeviceAddr) == false)
+            {
+                return 0;
+            }
+            return dicDeviceEpoint[DeviceAddr].Count;
         }
 
         /// <summary>
@@ -1378,7 +1397,7 @@
                             temperatrue = true;
                         }
                         //婀垮害浼犳劅鍣�
-                        else if(((TemperatureSensor)device).SensorDiv == 2)
+                        else if (((TemperatureSensor)device).SensorDiv == 2)
                         {
                             humidity = true;
                         }
@@ -1505,18 +1524,25 @@
         /// </summary>
         /// <param name="listDevice">闇�瑕佷繚瀛樼殑璁惧瀵硅薄</param>
         /// <param name="roomId">闇�瑕佷繚瀛樼殑鍝釜璁惧鐨勬埧闂碔D</param>
-        public void SaveRealDeviceRoomId(List<CommonDevice> listDevice, string roomId)
+        /// <param name="saveRoadDevice">濡傛灉鍙湁涓�涓洖璺�,鏄惁鎶婂洖璺殑鎴块棿涓�璧蜂慨鏀�</param>
+        public void SaveRealDeviceRoomId(List<CommonDevice> listDevice, string roomId, bool saveRoadDevice = true)
         {
-            this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;
+            if (listDevice != null)
+            {
+                this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;
+            }
 
             //淇濆瓨璁板綍
             string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
             UserCenterLogic.SaveFileContent(fullName, this.dicDeviceRoomId);
 
+            //娣诲姞鑷姩澶囦唤
+            HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);
+
             //濡傛灉璁惧鍙湁涓�涓洖璺紝濡傛灉鏀瑰彉浜嗙湡瀹炶澶囧尯鍩燂紝鍒欏畠鐨勫洖璺殑鍖哄煙涔熶竴璧锋敼浜�
-            if (listDevice.Count == 1)
+            if (saveRoadDevice == true && listDevice != null && listDevice.Count == 1)
             {
-                Common.Room.CurrentRoom.ChangedRoom(listDevice[0], roomId);
+                Common.Room.CurrentRoom.ChangedRoom(listDevice[0], roomId, false);
             }
         }
 
@@ -1917,7 +1943,7 @@
                 }
             }
             //濡傛灉鏄皟鍏夊櫒
-            else if (mainDevice.Type == DeviceType.DimmableLight )
+            else if (mainDevice.Type == DeviceType.DimmableLight)
             {
                 mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
                 if (mainDevice.IsCustomizeImage == false)
@@ -1926,7 +1952,7 @@
                 }
             }
             //濡傛灉鏄僵鐏殑璇�
-            else if ( mainDevice.Type == DeviceType.ColorDimmableLight)
+            else if (mainDevice.Type == DeviceType.ColorDimmableLight)
             {
                 mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
                 if (mainDevice.IsCustomizeImage == false)
@@ -2288,35 +2314,20 @@
         /// <summary>
         /// 绌鸿皟(3600-3899)
         /// </summary>
-        A绌鸿皟 = 3600,
-        /// <summary>
-        /// 涓户鍣�(3900-3999)
-        /// </summary>
-        A涓户鍣� = 3900,
-        /// <summary>
-        /// 绌烘皵寮�鍏�(4100-4199)
-        /// </summary>
-        A绌烘皵寮�鍏� = 4100,
-        /// <summary>
-        /// 杞崲鍣�(4200-4699)
-        /// </summary>
-        A杞崲鍣� = 4200,
-        /// <summary>
-        /// 褰╃伅
-        /// </summary>
-        A褰╃伅 = 9,
-        /// <summary>
-        /// 娓╂箍搴︿紶鎰熷櫒
-        /// </summary>
-        A娓╂箍搴︿紶鎰熷櫒 = 10,
-        /// <summary>
-        /// 娓╁害浼犳劅鍣�
-        /// </summary>
-        A娓╁害浼犳劅鍣� = 11,
-        /// <summary>
-        /// 婀垮害浼犳劅鍣�
-        /// </summary>
-        A婀垮害浼犳劅鍣� = 12
+        A绌鸿皟 = 3600,
+        /// <summary>
        /// 涓户鍣�(3900-3999)
        /// </summary>
        A涓户鍣� = 3900,
+        /// <summary>
        /// 鏅鸿兘绌哄紑(4100-4199)
        /// </summary>
        A鏅鸿兘绌哄紑 = 4100,
+        /// <summary>
        /// 杞崲鍣�(4200-4699)
        /// </summary>
        A杞崲鍣� = 4200,
+        /// <summary>
        /// 褰╃伅
        /// </summary>
        A褰╃伅 = 9,
+        /// <summary>
        /// 娓╂箍搴︿紶鎰熷櫒
        /// </summary>
        A娓╂箍搴︿紶鎰熷櫒 = 10,
+        /// <summary>
        /// 娓╁害浼犳劅鍣�
        /// </summary>
        A娓╁害浼犳劅鍣� = 11,
+        /// <summary>
        /// 婀垮害浼犳劅鍣�
        /// </summary>
        A婀垮害浼犳劅鍣� = 12,
+        /// <summary>
        /// 寮�鍏�
        /// </summary>
        A寮�鍏� = 13,
+        /// <summary>
        /// 鎻掑骇
        /// </summary>
        A鎻掑骇 = 14,
+        /// <summary>
        /// 鐏厜
        /// </summary>
        A鐏厜 = 15,
+        /// <summary>
        /// 骞叉帴鐐�
        /// </summary>
        A骞叉帴鐐� = 16,
+        A绌烘皵寮�鍏�
+
     }
 
     #endregion

--
Gitblit v1.8.0