From d87400af518ebc9274f4447f06476959c3aa5102 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 14 七月 2020 16:29:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
old mode 100755
new mode 100644
index b6f5a1b..38a2eb3
--- a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
@@ -55,7 +55,7 @@
{
this.FormID = "HomeMainPageForm";
Instance = this;
-
+
//鍏堝垵濮嬪寲宸︽粦鎴块棿鍒楄〃鐣岄潰(鍦ㄥ弽灏勯噷闈㈠垵濮嬪寲)
if (LeftListRoomViewFrom.Instance == null) { }
@@ -549,8 +549,9 @@
var listDevice = new List<CommonDevice>();
foreach (var mainkeys in HdlRoomLogic.Current.NowMainPageRoom.ListDevice)
- {
+ {
var device = LocalDevice.Current.GetDevice(mainkeys);
+
//鍒ゆ柇璇ヨ澶囪兘鍚︽樉绀哄湪涓婚〉
if (LocalDevice.Current.CanShowInHomeHomeMainPage(device) == false)
{
--
Gitblit v1.8.0