From 136b9e2fc48249a5ff89874f1080ba94130e7a9e Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 19 五月 2020 11:12:29 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs b/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
index a238bb8..330f836 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
@@ -193,7 +193,7 @@
frameContr.CollectEvent += (collect) =>
{
//濡傛灉褰撳墠鏄敹钘忔埧闂�,鍒欓渶瑕佸埛鏂颁富椤�
- if (HdlRoomLogic.Current.CurrentRoom.IsLove == true)
+ if (HdlRoomLogic.Current.NowMainPageRoom.IsLove == true)
{
this.dataHadChanged = true;
}
@@ -536,7 +536,7 @@
selectZone.ZoneAction += (selectRoom) =>
{
//鍙樻洿浜嗗綋鍓嶆埧闂寸殑涓滆タ,涓婚〉闇�瑕佸埛鏂�
- if (HdlRoomLogic.Current.CurrentRoom.Id == selectRoom.Id)
+ if (HdlRoomLogic.Current.NowMainPageRoom.Id == selectRoom.Id)
{
this.dataHadChanged = true;
}
--
Gitblit v1.8.0