From 52005ed57f3f7bc796fdd1a878e4f298a126f1e8 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 16:48:47 +0800
Subject: [PATCH] 2019.10.29-3
---
ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
old mode 100755
new mode 100644
index 8c5ef3f..ae05bf1
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -72,7 +72,7 @@
private readonly int sleepSpan = 300;
- private FrameLayout itemView;
+ private FrameLayout itemView=new FrameLayout();
#endregion
@@ -460,7 +460,7 @@
Gravity = Gravity.CenterVertical,
TextAlignment =TextAlignment.CenterLeft,
TextColor=ZigbeeColor.Current.GXCTextColor,
- Text=Config.Instance.Home.GetCurrentFloorName()
+ Text=Config.Instance.Home.GetCurrentFloorName
};
topFrameLayout.AddChidren(floorBtn);
@@ -1073,12 +1073,12 @@
{
if ((sender as Button).IsSelected)
{
- Shared.Common.Room.GetLoveRoom().DeleteDevice(device.FileName);
+ Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(device.FileName);
(sender as Button).IsSelected = false;
}
else
{
- Shared.Common.Room.GetLoveRoom().AddDevice(device.FileName);
+ Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(device.FileName);
(sender as Button).IsSelected = true;
}
if (Room.CurrentRoom.IsLove)
@@ -2379,7 +2379,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 +2439,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