From adb12dcdbb2ddaeac687c3aa9e57bb7ed459ab7e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 24 六月 2020 15:26:46 +0800
Subject: [PATCH] 2020.06.24.01
---
ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
old mode 100755
new mode 100644
index a6cf276..21e844f
--- a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
@@ -448,18 +448,26 @@
deviceFramelayout.AddChidren(lineBtn);
EventHandler<MouseEventArgs> devicclick = (sen, e) =>
{
- clickbutton.IsSelected = false;
- clickbutton = deviceIconBtn;
- deviceIconBtn.IsSelected = true;
- clickframeLayout.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
- clickframeLayout = bjFramelayout;
- bjFramelayout.BackgroundColor = ZigbeeColor.Current.LogicIconBackgroundColor;
- clicktextcolcrbutton.IsSelected = false;
- clicktextcolcrbutton = devicename;
- devicename.IsSelected = true;
- var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
- this.AddChidren(flMain);
- CurrentDeviceState.CurrentDeviceView(flMain, common, false, IfType);
+ //clickbutton.IsSelected = false;
+ //clickbutton = deviceIconBtn;
+ //deviceIconBtn.IsSelected = true;
+ //clickframeLayout.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+ //clickframeLayout = bjFramelayout;
+ //bjFramelayout.BackgroundColor = ZigbeeColor.Current.LogicIconBackgroundColor;
+ //clicktextcolcrbutton.IsSelected = false;
+ //clicktextcolcrbutton = devicename;
+ //devicename.IsSelected = true;
+ //var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+ //this.AddChidren(flMain);
+ //CurrentDeviceState.CurrentDeviceView(flMain, common, false, IfType);
+
+
+ var nightlight = new Nightlight();
+ UserView.HomePage.Instance.AddChidren(nightlight);
+ UserView.HomePage.Instance.PageIndex += 1;
+ nightlight.Show();
+
+
};
deviceFramelayout.MouseUpEventHandler += devicclick;
--
Gitblit v1.8.0