From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs | 315 ++++++++++++++++++++++++----------------------------
1 files changed, 144 insertions(+), 171 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
old mode 100755
new mode 100644
index 0cbb7ae..3fa6ec0
--- a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
@@ -2,6 +2,7 @@
using Shared.Common;
using Shared.Phone.Device.Category;
using Shared.Phone.Device.CommonForm;
+using Shared.Phone.UserView;
namespace Shared.Phone.Device.Room
{
@@ -16,8 +17,30 @@
private FrameLayout bodyFrameLayout;
private Button floorBtn;
+ /// <summary>
+ /// 褰撳墠妤煎眰id
+ /// </summary>
+ private string curFloorId;
- private FrameLayout itemView;
+ public FrameLayout itemView;
+
+ static RoomManagement roomManagement;
+ public static RoomManagement Instance
+ {
+ get
+ {
+ if (roomManagement == null)
+ {
+ roomManagement = new RoomManagement { };
+ }
+ return roomManagement;
+ }
+ }
+
+ /// <summary>
+ /// 鏄惁鍙互瑙﹀彂鐐瑰嚮浜嬩欢--鏄惁鍙互璺宠浆涓婚〉鎴块棿
+ /// </summary>
+ public bool CanClick = true;
#endregion
@@ -25,9 +48,9 @@
public Action action;
+
public override void RemoveFromParent()
{
- //鏇存柊鐣岄潰
//action?.Invoke();
base.RemoveFromParent();
}
@@ -36,9 +59,11 @@
/// </summary>
public void Show()
{
+ RemoveAll();
+
AddTop();
- AddBodyView();
+ AddBodyView(Config.Instance.Home.CurrentFloorId);
}
#region Add____________________________________
@@ -54,17 +79,19 @@
top.SetTopTitle(R.MyInternationalizationString.RoomList);
top.backButton.MouseUpEventHandler += (sender, e) =>
{
- RemoveFromParent();
+ CommonPage.Instance.CloseLeftMenu();
};
floorBtn = new Button()
{
- X = Application.GetRealWidth(750),
- Width = Application.GetRealWidth(200),
+ X = Application.GetRealWidth(650),
+ Width = Application.GetRealWidth(300),
Height = Application.GetRealHeight(60),
Gravity = Gravity.CenterVertical,
TextAlignment = TextAlignment.CenterRight,
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
+ TextSize = 14,
+ IsBold = true
};
var selectFloorBtn = new Button()
@@ -76,9 +103,13 @@
UnSelectedImagePath = "Item/Drop_Down.png"
};
- floorBtn.Text = Config.Instance.Home.GetCurrentFloorName();
- top.topView.AddChidren(floorBtn);
- top.topView.AddChidren(selectFloorBtn);
+ floorBtn.Text = Config.Instance.Home.GetCurrentFloorName;
+ if(Config.Instance.Home.FloorDics.Count>0)
+ {
+ curFloorId = Config.Instance.Home.CurrentFloorId;
+ top.topView.AddChidren(floorBtn);
+ top.topView.AddChidren(selectFloorBtn);
+ }
selectFloorBtn.MouseUpEventHandler += SelectedFloor_MouseUpEventHandler;
floorBtn.MouseUpEventHandler += SelectedFloor_MouseUpEventHandler;
}
@@ -92,16 +123,21 @@
{
var floors = new SelectFloor();
AddChidren(floors);
- floors.Init(599, 161);
- floors.FloorAction += (floorName) =>
+ floors.changeFloor = false;
+ floors.CurFloorId = curFloorId;
+ floors.Init(599, 161,Direction.Right);
+ floors.FloorAction += (floorId) =>
{
- floorBtn.Text = floorName;
+ curFloorId = floorId;
+ floorBtn.Text = Config.Instance.Home.GetFloorNameById(floorId);
+ AddBodyView(floorId);
};
}
+
/// <summary>
/// AddBodyView
/// </summary>
- public void AddBodyView()
+ public void AddBodyView(string floorId)
{
bodyFrameLayout = new FrameLayout()
{
@@ -111,44 +147,96 @@
};
AddChidren(bodyFrameLayout);
- var roomScrolView = new VerticalScrolViewLayout { };
- bodyFrameLayout.AddChidren(roomScrolView);
- for (int i = 0; i < Shared.Common.Room.Lists.Count; i++)
+ try
{
- var room = Shared.Common.Room.Lists[i];
- int xx = 43 + i % 2 * (20 + 487);
- int yy = 0;
-
- if (i == 0 || i == 1)
+ if (Common.Room.Lists.Count <= 1)
{
- if (i % 2 == 0)
- {
- itemView = new FrameLayout()
- {
- Height = Application.GetRealHeight(354 + 58),
- Tag = room
- };
- roomScrolView.AddChidren(itemView);
- }
- yy = 58;
+ return;
}
- else if (i % 2 == 0)
+ var roomScrolView = new VerticalScrolViewLayout { };
+ bodyFrameLayout.AddChidren(roomScrolView);
+ var roomList = Common.Room.CurrentRoom.GetRoomsByFloorId(floorId);
+ if (roomList == null || roomList.Count == 0)
{
itemView = new FrameLayout()
{
- Height = Application.GetRealHeight(354),
- Tag = room
+ Height = Application.GetRealHeight(354 + 58)
};
roomScrolView.AddChidren(itemView);
+
+ var roomView = new RoomNoNameMainView(34, 58);
+ itemView.AddChidren(roomView);
+ roomView.Init();
+
+ roomView.Icon.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
+ roomView.RoomNameButton.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
+ roomView.iconFL.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
}
+ else
+ {
+ for (int i = 0; i < roomList.Count + 1; i++)
+ {
+ int xx = 43 + i % 2 * (20 + 487);
+ int yy = 0;
+ if (i == 0 || i == 1)
+ {
+ if (i % 2 == 0)
+ {
+ itemView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(354 + 58)
+ };
+ roomScrolView.AddChidren(itemView);
+ }
+ yy = 58;
+ }
+ else if (i % 2 == 0)
+ {
+ itemView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(354)
+ };
+ roomScrolView.AddChidren(itemView);
+ }
- var roomView = new RoomMainView(xx, yy);
- itemView.AddChidren(roomView);
- roomView.Init();
- roomView.SetRoomName(room.Name);
- roomView.SetRoomIcon(room.BackgroundImage);
+ if (i < roomList.Count)
+ {
+ var room = roomList[i];
+ var roomView = new RoomMainView(xx, yy);
+ itemView.AddChidren(roomView);
+ roomView.Init(this, room);
+ roomView.SetRoomName(room.Name);
+ roomView.SetRoomIcon(room.BackgroundImageType == 0 ? room.BackgroundImage : System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage));
+ roomView.ClickBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ if (CanClick == false)
+ {
+ return;
+ }
+ CommonPage.Instance.CloseLeftMenu();
+ Common.Room.CurrentRoom = room;
+ Config.Instance.Home.CurrentFloorId = room.FloorId;
+ UserPage.Instance.Fresh();
+ };
+ }
+ else
+ {
+ var roomView = new RoomNoNameMainView(xx, yy);
+ itemView.AddChidren(roomView);
+ roomView.Init();
+
+ roomView.Icon.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
+ roomView.RoomNameButton.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
+ roomView.iconFL.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
+ }
+ }
+ }
+
}
-
+ catch (Exception ex)
+ {
+ string tt=ex.Message;
+ }
}
#endregion
@@ -156,141 +244,26 @@
/// <summary>
/// 鎴块棿绠＄悊鐣岄潰
/// </summary>
- void RoomPage()
+ public RoomManagement()
{
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
+ roomManagement = this;
+ }
- return;
-
-
-
- var RoomBodyView = new VerticalScrolViewLayout()
+ /// <summary>
+ /// ShowUnallocatedRoom_MouseUpEvent
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="mouseEventArgs"></param>
+ private void ShowUnallocatedRoom_MouseUpEvent(object sender,MouseEventArgs mouseEventArgs)
+ {
+ if(CanClick==false)
{
- Height = Application.GetRealHeight(CommonPage.AppRealHeight - CommonPage.Navigation_Height),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
- };
-
-
-
- foreach (var roomFilePath in Config.Instance.Home.RoomFilePathList)
- {
- var room = Shared.Common.Room.GetRoomByFilePath(roomFilePath);
- if (room == null)
- {
- continue;
- }
-
- var roomFL = new FrameLayout()
- {
- Height = Application.GetRealHeight(570),
- Width = Application.GetRealWidth(CommonPage.AppRealWidth - CommonPage.XLeft * 2),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
- Gravity = Gravity.CenterHorizontal,
- Radius = CommonPage.BigFormRadius,
- };
- RoomBodyView.AddChidren(roomFL);
-
- var roomRowView = new RowLayout()
- {
- Y = Application.GetRealHeight(20),
- Height = Application.GetMinRealAverage(550),
- Width = Application.GetRealWidth(CommonPage.AppRealWidth - CommonPage.XLeft * 2),
- BackgroundColor =ZigbeeColor.Current.GXCBackgroundColor,
- LineColor= ZigbeeColor.Current.GXCBackgroundColor,
- Radius = CommonPage.BigFormRadius,
- Gravity = Gravity.CenterHorizontal
- };
- roomFL.AddChidren(roomRowView);
-
- var backGroundBtn = new Button()
- {
- UnSelectedImagePath = room.BackgroundImage,
- Radius = CommonPage.BigFormRadius,
- Height = Application.GetMinRealAverage(550),
- Width = Application.GetRealWidth(CommonPage.AppRealWidth - CommonPage.XLeft * 2),
- };
- roomRowView.AddChidren(backGroundBtn);
-
- var hardBlackBG = new FrameLayout()
- {
- Radius = CommonPage.BigFormRadius,
- BackgroundColor = ZigbeeColor.Current.GXCBlack70Color
- };
- roomRowView.AddChidren(hardBlackBG);
-
- var btnRoomName = new Button()
- {
- Width = Application.GetRealWidth(500),
- Height=Application.GetRealHeight(200),
- Text = room.Name,
- TextAlignment = TextAlignment.Center,
- TextSize=25,
- TextColor=ZigbeeColor.Current.GXCTextWhiteColor,
- Gravity=Gravity.Center
- };
- roomRowView.AddChidren(btnRoomName);
-
- var btnEditRoom = new Device.CommonForm.SelectedStatuButton()
- {
- X = roomRowView.Width- Application.GetRealWidth(100+30),
- Y=backGroundBtn.Y,
- Width = Application.GetMinRealAverage(110),
- Height=Application.GetMinRealAverage(110),
- UnSelectedImagePath = "Room/More.png",
- SelectedImagePath="Room/MoreSelected.png",
- };
- roomRowView.AddChidren(btnEditRoom);
-
- var delBtn = new Shared.Phone.Device.CommonForm.RowLayoutDeleteButton();
- //绗竴涓槸鎴块棿鍠滅埍锛屼笉鍏佽婊戝姩鍒犻櫎 鍒嗕韩杩囨潵鐨勪篃涓嶅厑璁稿垹闄�
- if (room.IsLove || room.IsSharedRoom)
- {
-
- }
- else
- {
- roomRowView.AddRightView(delBtn);
- }
-
- //鍒犻櫎浣忓畢
- delBtn.MouseUpEventHandler += (sender, e) =>
- {
- var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.ConfirmDeleteThisRoom), Language.StringByID(R.MyInternationalizationString.Cancel), Language.StringByID(R.MyInternationalizationString.Confrim));
- alert.Show();
- alert.ResultEventHandler += (send, ee) =>
- {
- if(ee)
- {
- Shared.Common.Room.CurrentRoom.Remove(roomFilePath);
- Show();
- }
- };
- };
-
- btnEditRoom.MouseUpEventHandler += (sender, e) =>
- {
- //AddOrUpdateRoom(action, roomFilePath);
- var addRoom = new AddRoom();
- Shared.Phone.UserView.HomePage.Instance.AddChidren(addRoom);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- addRoom.action = () =>
- {
- Show();
- };
- AddRoom.OldBackgroundImagePath = string.Empty;
- addRoom.Show(roomFilePath);
- };
-
- roomRowView.MouseUpEventHandler += (sender, e) =>
- {
- //var userRoom = new RoomAddDevice();
- //this.AddChidren(userRoom);
- //userRoom.Show(roomFilePath);
- };
-
+ return;
}
-
-
+ var unalloctedRoom = new UnallocatedRoom();
+ AddChidren(unalloctedRoom);
+ unalloctedRoom.Show();
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0