From b7b3e92bed9c4553e30e2901a1877f088a5f8823 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 04 十一月 2019 17:20:52 +0800
Subject: [PATCH] 2019.11.4
---
ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs | 74 +++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index 816b1d1..ca472eb 100644
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -72,8 +72,11 @@
private readonly int sleepSpan = 300;
- private FrameLayout itemView;
-
+ private FrameLayout itemView=new FrameLayout();
+ /// <summary>
+ /// floorBtn
+ /// </summary>
+ private Button floorBtn;
#endregion
#region 鈼� 鎺ュ彛____________________________
@@ -452,7 +455,7 @@
};
topFrameLayout.AddChidren(floor);
- var floorBtn = new Button
+ floorBtn = new Button
{
X=floor.Right,
Width=Application.GetRealWidth(500),
@@ -492,18 +495,8 @@
}
AddChidren(residecneName);
- EventHandler<MouseEventArgs> selectFloor = (send, e) =>
- {
- var floorFL = new Phone.Device.Category.SelectFloor();
- AddChidren(floorFL);
- floorFL.Init(35,153);
- floorFL.FloorAction = (floorName) =>
- {
- floorBtn.Text = floorName;
- };
- };
- floor.MouseUpEventHandler += selectFloor;
- floorBtn.MouseUpEventHandler += selectFloor;
+ floor.MouseUpEventHandler += SelectFloor;
+ floorBtn.MouseUpEventHandler += SelectFloor;
//鍒囨崲浣忓畢
residecneName.MouseLongEventHandler += (send, e) =>
{
@@ -684,7 +677,7 @@
{
//Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.CurrentRoom;
Room.CurrentRoom = Room.Lists[0];
- foreach (var room in Room.Lists)
+ foreach (var room in Room.CurrentRoom.GetRoomsByCurrentFloorIdAppendLoveRoom())
{
var roomBackView = new FrameLayout()
{
@@ -729,7 +722,10 @@
//{
// Show();
//};
-
+ if(room.IsLove)
+ {
+ return;
+ }
var editRoom = new Device.Room.EditRoom();
HomePage.Instance.AddChidren(editRoom);
HomePage.Instance.PageIndex += 1;
@@ -859,7 +855,9 @@
#endregion
#region 鈼� 鍒锋柊____________________________
-
+ /// <summary>
+ /// RefreshBodyView
+ /// </summary>
public void RefreshBodyView()
{
if (Room.CanInitAllRoom == false)
@@ -875,6 +873,23 @@
{
ShowScene();
}
+ }
+
+ /// <summary>
+ /// SelectFloor
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="mouseEventArgs"></param>
+ public void SelectFloor(object sender,MouseEventArgs mouseEventArgs)
+ {
+ var floorFL = new Phone.Device.Category.SelectFloor();
+ AddChidren(floorFL);
+ floorFL.Init(35, 153);
+ floorFL.FloorAction = (floorName) =>
+ {
+ floorBtn.Text = floorName;
+ Show();
+ };
}
#endregion
@@ -2379,7 +2394,7 @@
sceneView.Init();
sceneView.SetSceneNameText(scene.Name);
sceneView.SetIcon($"SceneIcon/{i}.png");
- sceneView.SetCollect(scene.IsCollected);
+ sceneView.SetCollect(Common.Room.CurrentRoom.GetLoveRoom().SceneUIFilePathList.Contains(scene.FileName));
if (scene.SceneDelayTime == 0)
{
@@ -2439,17 +2454,30 @@
//鏀惰棌
EventHandler<MouseEventArgs> collectionEvent = (sender, e) =>
{
+ (sender as Button).IsSelected = !(sender as Button).IsSelected;
if ((sender as Button).IsSelected)
{
- scene.Collect(false);
- (sender as Button).IsSelected = false;
+ //scene.IsCollected = true;
+ Room.CurrentRoom.GetLoveRoom().AddScene(scene);
}
else
{
- scene.Collect(true);
- (sender as Button).IsSelected = true;
+ //scene.IsCollected = false;
+ Room.CurrentRoom.GetLoveRoom().RemoveScene(scene);
}
scene.Save();
+
+ //if ((sender as Button).IsSelected)
+ //{
+ // scene.Collect(false);
+ // (sender as Button).IsSelected = false;
+ //}
+ //else
+ //{
+ // scene.Collect(true);
+ // (sender as Button).IsSelected = true;
+ //}
+ //scene.Save();
//if (Room.CurrentRoom.IsLove)
//{
// RefreshBodyView();
--
Gitblit v1.8.0