From cf0bffdf072bae11bdb8c780d0a355818700f713 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 18 五月 2020 15:42:45 +0800
Subject: [PATCH] 请合并代码，优化面板问题
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
old mode 100755
new mode 100644
index 7f5755c..ab7df40
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
@@ -63,7 +63,7 @@
}
this.dicScenes[tempScene.Id] = tempScene;
}
- catch(Exception ex)
+ catch (Exception ex)
{
HdlLogLogic.Current.WriteLog(ex);
try
@@ -589,13 +589,14 @@
/// <returns></returns>
public string GetZoneById(int sceneId)
{
- var room =HdlRoomLogic.Current.GetRoomBySceneId(sceneId);
+ var room = HdlRoomLogic.Current.GetRoomBySceneId(sceneId);
if (room == null)
{
return null;
}
var floorName = Shared.Common.Config.Instance.Home.GetFloorNameById(room.FloorId);
- if (floorName == null)
+ //鏇存敼浠ｇ爜锛氬鏋渇loorName=鈥溾�濅篃瑕佸垽鏂紝鍚﹀垯鏈夆�滐紝鈥�
+ if (string.IsNullOrEmpty(floorName))
{
return room.Name;
}
@@ -659,8 +660,8 @@
sceneUIs.Add(this.dicScenes[sceneId]);
}
}
- }
-
+ }
+
return sceneUIs;
}
--
Gitblit v1.8.0