From bbaae33cad1dadaad27eeac712d30fff248bffa5 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 17 三月 2020 17:46:25 +0800
Subject: [PATCH] 2020-03-17-2

---
 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
old mode 100644
new mode 100755
index 30c1a07..03a8f3f
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
@@ -496,9 +496,9 @@
                             }
                             break;
                         case 2:
-                            {
-                                //鍦ㄦ湰鍦版煡鎵捐鍦烘櫙;
-                                var sceneinof = Common.Room.AllRoomSceneUIList.Find((obj) => { return obj.Id.ToString() == actions["DeviceAddr"].ToString(); });
+                            {
+                                //鍦ㄦ湰鍦版煡鎵捐鍦烘櫙;
+                                var sceneinof = UserCenter.HdlSceneLogic.Current.GetSceneUIBySceneId(Convert.ToInt32(actions["DeviceAddr"].ToString()));
                                 //鏈湴娌℃湁瀛樺湪;
                                 if (sceneinof == null)
                                 {
@@ -526,8 +526,7 @@
                                 name = sceneinof.Name;
                                 actiondevice.regionNameBtn.Visible = true;
                                 /////閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
-                                Common.Room room = new Common.Room();
-                                actiondevice.regionNameBtn.Text = room.GetRoomNameBySceneId(sceneinof.Id);
+                                actiondevice.regionNameBtn.Text = UserCenter.HdlRoomLogic.Current.GetRoomNameBySceneId(sceneinof.Id);
 
                             }
                             break;

--
Gitblit v1.8.0