From 34e965100d635346e2d4cd6e6013bdaed66b3004 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:52:13 +0800
Subject: [PATCH] 2019.1.2-3

---
 ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs
old mode 100755
new mode 100644
index 50f3b01..7bfc751
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs
@@ -31,6 +31,10 @@
         /// </summary>
         private Button floorBtn;
         /// <summary>
+        /// 褰撳墠妤煎眰id
+        /// </summary>
+        private string curFloorId;
+        /// <summary>
         /// 閫夋嫨妤煎眰
         /// </summary>
         private Button selectFloorBtn;
@@ -148,12 +152,12 @@
             typeIdDic.Clear();
             foreach (var device in devList)
             {
-                var info = Common.LocalDevice.Current.GetDeviceBelongEnumInfo(device.CommonDevice);
+                var info = Common.LocalDevice.Current.GetNotHdlMyDeviceEnumInfo(new List<CommonDevice> { device.CommonDevice });
                 if (info.BeloneType == DeviceBeloneType.A寮�鍏� || info.BeloneType == DeviceBeloneType.A褰╃伅
                     || info.BeloneType == DeviceBeloneType.A鎻掑骇 || info.BeloneType == DeviceBeloneType.A鏅鸿兘绌哄紑
                     || info.BeloneType == DeviceBeloneType.A鐏厜 || info.BeloneType == DeviceBeloneType.A绌鸿皟
                     || info.BeloneType == DeviceBeloneType.A绐楀笜 || info.BeloneType == DeviceBeloneType.A缁х數鍣�
-                    || info.BeloneType == DeviceBeloneType.A璋冨厜鍣� 
+                    || info.BeloneType == DeviceBeloneType.A璋冨厜鍣�
                     )
                 {
                     if (typeDeviceDic.ContainsKey(info.BeloneTextId) == false)
@@ -226,9 +230,12 @@
         {
             var floors = new SelectFloor();
             AddChidren(floors);
+            floors.changeFloor = false;
+            floors.CurFloorId = curFloorId;
             floors.Init(580, 184, Direction.Right);
             floors.FloorAction += (floorId) =>
             {
+                curFloorId = floorId;
                 floorBtn.Text = Config.Instance.Home.GetFloorNameById(floorId);
                 RefreshBodyView(floorId);
             };
@@ -426,7 +433,7 @@
 
             var sameTypeList = new List<DeviceUI> { };
             sameTypeList = typeDeviceDic[int.Parse((typeSender as Button).Tag.ToString())];
-            
+
             foreach (var device in sameTypeList)
             {
                 if (beforeSceneTargetDeviceUIs.Find((obj) => obj.DeviceUI.DeviceEpoint == device.DeviceEpoint && obj.DeviceUI.DeviceAddr == device.DeviceAddr) != null)

--
Gitblit v1.8.0