From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs | 60 +++++++++++++++++++++++++-----------------------------------
1 files changed, 25 insertions(+), 35 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
index 724b35e..8dfdc85 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
@@ -20,10 +20,6 @@
/// </summary>
private string floorKeys = string.Empty;
/// <summary>
- /// 鍏ㄩ儴鐨勯『搴�
- /// </summary>
- private Dictionary<string, List<string>> dicAllSort = new Dictionary<string, List<string>>();
- /// <summary>
/// 鎴块棿椤哄簭
/// </summary>
private List<string> listRoomSort = new List<string>();
@@ -42,15 +38,19 @@
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Common.Config.Instance.Home.FloorDics[i_floor]);
- var btnIcon = new MostRightIconControl(69, 69);
- btnIcon.UnSelectedImagePath = "Item/Add.png";
- topFrameLayout.AddChidren(btnIcon);
- btnIcon.InitControl();
- btnIcon.ButtonClickEvent += ((sender, e) =>
+ //涓讳汉鎴栬�呯鐞嗗憳鎵嶄細鍑虹幇杩欎釜鑿滃崟
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
{
- 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);
+ });
+ }
//鍒濆鍖栦腑閮ㄤ俊鎭�
this.InitMiddleFrame();
@@ -80,7 +80,7 @@
private void InitRoomListRow()
{
//鑾峰彇妤煎眰鐨勬埧闂�
- var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(this.floorKeys);
+ var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(this.floorKeys);
this.listRoomSort.Clear();
for (int i = 0; i < listRoom.Count; i++)
{
@@ -114,7 +114,7 @@
listView.AddChidren(frameRow);
//鍥炬爣
var btnIcon = frameRow.frameTable.AddLeftIcon(81);
- btnIcon.UnSelectedImagePath = "Item/RoomIcon.png";
+ btnIcon.UnSelectedImagePath = "Item/RoomIconSelected.png";
//鍚嶇О
var btnName = frameRow.frameTable.AddLeftCaption(room.Name, 600);
btnName.TextSize = 15;
@@ -127,7 +127,8 @@
}
frameRow.frameTable.ButtonClickEvent += (sender, e) =>
{
-
+ var form = new LookRoomSettionForm();
+ form.AddForm(room);
};
if (room.IsSharedRoom == true)
@@ -137,13 +138,7 @@
}
//缂栬緫
- var btnEditor = new NormalViewControl(Application.GetRealWidth(184), frameRow.Height, false);
- btnEditor.BackgroundColor = 0xff4a4a4a;
- btnEditor.TextSize = 12;
- btnEditor.TextColor = UserCenterColor.Current.White;
- btnEditor.TextAlignment = TextAlignment.Center;
- btnEditor.TextID = R.MyInternationalizationString.uEditor;
- frameRow.AddRightView(btnEditor);
+ var btnEditor = frameRow.AddEditorControl();
btnEditor.ButtonClickEvent += (sender, e) =>
{
var form = new EditorRoomInforForm();
@@ -151,24 +146,19 @@
};
//鍒犻櫎
- var btnDelete = new NormalViewControl(Application.GetRealWidth(184), frameRow.Height, false);
- btnDelete.BackgroundColor = 0xfff75858;
- btnDelete.TextSize = 12;
- btnDelete.TextColor = UserCenterColor.Current.White;
- btnDelete.TextAlignment = TextAlignment.Center;
- btnDelete.TextID = R.MyInternationalizationString.uDelete;
- frameRow.AddRightView(btnDelete);
+ var btnDelete = frameRow.AddDeleteControl();
btnDelete.ButtonClickEvent += (sender, e) =>
{
//纭鍒犻櫎鎴块棿?
this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uDeleteRoomMsg), () =>
{
- if (Common.Room.CurrentRoom.Id == room.Id)
- {
- //濡傛灉鍒犻櫎鐨勬槸褰撳墠鎴块棿鐨勮瘽
- Common.Room.CurrentRoom = Common.Room.Lists[0];
- }
- Common.Room.CurrentRoom.Remove(room.FileName);
+ HdlRoomLogic.Current.RemoveRoom(room.Id);
+ //璋冩暣楂樺害
+ frameRow.RemoveFromParent();
+ listView.AdjustRealHeight(Application.GetRealHeight(23));
+ //淇濆瓨椤哄簭
+ this.listRoomSort.Remove(room.Id);
+ HdlRoomLogic.Current.SaveRoomSort(floorKeys, this.listRoomSort);
});
};
}
--
Gitblit v1.8.0