From 627093aca723d4bfb971b97c828e8b3a22dbda78 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 17 七月 2020 17:26:19 +0800
Subject: [PATCH] 2020-07-17-1
---
ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs | 34 +++++++++++++---------------------
1 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
index 21e844f..45f0f72 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
@@ -380,6 +380,7 @@
/// <param name="devicelist">璁惧鍒楄〃</param>
void ConditionDeviceView(List<DeviceType> deviceTypelist, List<CommonDevice> devicelist)
{
+
middle.RemoveAll();
foreach (var common in devicelist)
{
@@ -448,27 +449,18 @@
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);
-
-
- var nightlight = new Nightlight();
- UserView.HomePage.Instance.AddChidren(nightlight);
- UserView.HomePage.Instance.PageIndex += 1;
- nightlight.Show();
-
-
-
+ 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,0);
};
deviceFramelayout.MouseUpEventHandler += devicclick;
bjFramelayout.MouseUpEventHandler += devicclick;
--
Gitblit v1.8.0