From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
index 3558710..ca590d6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
@@ -37,15 +37,19 @@
//涓讳汉鎴栬�呯鐞嗗憳鎵嶄細鍑虹幇杩欎釜鑿滃崟
if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
{
- var btnIcon = new MostRightIconControl(69, 69);
- btnIcon.UnSelectedImagePath = "Item/Add.png";
- topFrameLayout.AddChidren(btnIcon);
- btnIcon.InitControl();
- btnIcon.ButtonClickEvent += ((sender, e) =>
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == false)
{
- var form = new AddNewRoomForm();
- form.AddForm(i_floor);
- });
+ var btnIcon = new MostRightIconControl(69, 69);
+ btnIcon.UnSelectedImagePath = "Item/Add.png";
+ topFrameLayout.AddChidren(btnIcon);
+ btnIcon.InitControl();
+ btnIcon.ButtonClickEvent += ((sender, e) =>
+ {
+ var form = new AddNewRoomForm();
+ form.AddForm(i_floor);
+ });
+ }
}
//鍒濆鍖栦腑閮ㄤ俊鎭�
@@ -135,6 +139,12 @@
var form = new EditorRoomInforForm();
form.AddForm(room);
};
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnEditor.Text = Language.StringByID(R.MyInternationalizationString.uSearch1);
+ return;
+ }
//鍒犻櫎
var btnDelete = frameRow.AddDeleteControl();
@@ -147,6 +157,12 @@
//璋冩暣楂樺害
frameRow.RemoveFromParent();
listView.AdjustRealHeight(Application.GetRealHeight(23));
+
+ if (room.ListDevice.Count > 0)
+ {
+ //涓婁紶绌洪棿鍖哄煙淇℃伅
+ HdlRoomLogic.Current.SetRoomInfoToGateway();
+ }
});
};
}
--
Gitblit v1.8.0