From 045590bbb1efb46590b0dce0a5482cae284b33f3 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 07 十一月 2019 13:50:32 +0800
Subject: [PATCH] 2019.11.7-1
---
ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs | 18 +++++++++---------
1 files changed, 9 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 e248dfa..aeb5b99
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -170,8 +170,8 @@
return;
}
airSwitch.OnOffStatus = airSwitch.DeviceStatusReport.AttriBute[0].AttriButeData;
- (rowFL.GetChildren(0) as FunctionMainView).IsSelected = airSwitch.OnOffStatus == 1;
- (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu();
+ (rowFL.GetChildren(0) as FunctionMainView).IsSelected = airSwitch.OnOffStatus == 1;
+ (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu();
//璁板綍鍥炲鏃堕棿
airSwitch.LastDateTime = DateTime.Now;
}
@@ -208,7 +208,7 @@
case DeviceType.Thermostat:
//AC鍔熻兘
- if (common.DeviceStatusReport.CluterID == 513)
+ if ((common as ZigBee.Device.AC).DeviceStatusReport.CluterID == 513)
{
var ac = deviceUI.CommonDevice as ZigBee.Device.AC;
ac.DeviceStatusReport = common.DeviceStatusReport;
@@ -253,7 +253,7 @@
(rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu();
}
//褰揅luterID=3,灏辫瘉鏄庤璁惧鍦ㄧ嚎锛岀洿鎺ユ爣璁�
- if (common.DeviceStatusReport.CluterID == 3)
+ if ((common as ZigBee.Device.AC).DeviceStatusReport.CluterID == 3)
{
var ac = deviceUI.CommonDevice as AC;
ac.IsOnline = 1;
@@ -311,7 +311,7 @@
}
});
}
-
+
}
/// <summary>
/// Changeds the IL ogic status.
@@ -778,7 +778,7 @@
{
ShowNoGatewayTip();
}
-
+
}
#endregion
@@ -920,7 +920,7 @@
private void GoToAddGateWay(object sender, MouseEventArgs mouseEventArgs)
{
var selectNewGateWayForm = new UserCenter.GatewayAdd.NewGateWayMenuSelectForm { };
- selectNewGateWayForm.AddForm();
+ selectNewGateWayForm.AddForm(selectNewGateWayForm);
}
#endregion
@@ -972,7 +972,7 @@
else
{
deviceVerticalScrolViewLayout = new VerticalScrolViewLayout { };
-
+
functionSceneBodyView.AddChidren(deviceVerticalScrolViewLayout);
for(int i=0;i<deviceList.Count;i++)
{
@@ -996,7 +996,7 @@
deviceVerticalScrolViewLayout.AddChidren(itemView);
}
-
+
//鍒犻櫎璁惧
EventHandler<MouseEventArgs> delEvent = (sender, e) =>
{
--
Gitblit v1.8.0