From ce1feeeb0aaa2e53bca4e8d64953edaba2b41106 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 19 六月 2020 17:27:49 +0800
Subject: [PATCH] 请合并最新版代码
---
Home0618/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Home0618/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs b/Home0618/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
old mode 100755
new mode 100644
index 1a244e1..00efa20
--- a/Home0618/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
+++ b/Home0618/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
@@ -384,7 +384,7 @@
var rowLayout = new RowLayoutControl(midVerticalScrolViewLayout.rowSpace / 2);
rowLayout.BackgroundColor = ZigbeeColor.Current.XMWhite;
- midVerticalScrolViewLayout.AddChidrenRow(rowLayout);
+ midVerticalScrolViewLayout.AddChidren(rowLayout);
rowLayout.frameTable.UseClickStatu = false;
var devicePic = rowLayout.frameTable.AddLeftIcon();
devicePic.Y = Application.GetRealHeight(25);//49
@@ -485,7 +485,7 @@
//鑾峰彇鎴块棿鐨勫悕瀛�
var tempDevRoomName = tempDevRoom.Name;
//鑾峰彇妤煎眰鐨勫悕瀛�
- var tempDevFloorName = Common.Config.Instance.Home.GetFloorNameById(tempDevFloorId);
+ var tempDevFloorName = HdlResidenceLogic .Current.GetFloorNameById(tempDevFloorId);
if (string.IsNullOrEmpty(tempDevFloorName))
{
if (string.IsNullOrEmpty(tempDevRoomName))
--
Gitblit v1.8.0