From b94f318b1cb5c3618dd53b5240c1d999c8427b71 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 29 十一月 2019 13:09:25 +0800
Subject: [PATCH] 2019.11.29
---
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 63 +++++++++++--------------------
1 files changed, 23 insertions(+), 40 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index 178c8f5..b0abfc8 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -7,6 +7,7 @@
using Shared.Phone.Device.CommonForm;
using Shared.Phone.Device.AC;
using Shared.Phone.UserCenter.DoorLock;
+using Shared.Phone.Device.DeviceLogic;
namespace Shared.Phone.Device.Category
{
@@ -910,8 +911,7 @@
{
UserHomeView.ReadStatus(light, () =>
{
- light.ReadOnOffStatus();
- light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
});
}
else
@@ -919,8 +919,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇鐘舵��
if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - light.LastDateTime).TotalSeconds)
{
- light.ReadOnOffStatus();
- light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
}
}
@@ -1029,16 +1028,14 @@
{
UserHomeView.ReadStatus(airSwitch, () =>
{
- airSwitch.ReadOnOffStatus();
- airSwitch.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
});
}
else
{
if ((DateTime.Now - airSwitch.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- airSwitch.ReadOnOffStatus();
- airSwitch.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
}
}
@@ -1129,18 +1126,14 @@
{
UserHomeView.ReadStatus(dimmableLight, () =>
{
- dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- dimmableLight.ReadOnOffStatus();
- dimmableLight.ReadLevel();
+ ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(deviceUI.CommonDevice);
});
}
else
{
if ((DateTime.Now - dimmableLight.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- dimmableLight.ReadOnOffStatus();
- dimmableLight.ReadLevel();
+ ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(deviceUI.CommonDevice);
}
}
@@ -1233,16 +1226,7 @@
//鍙戦�佽鍙栫姸鎬佸懡浠�
UserView.UserHomeView.ReadStatus(ac, () =>
{
- ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- ac.ReadLocalTemperature();
- ac.ReadCoolingSetpoint();
- ac.ReadHeatingSetpoint();
- ac.ReadAutoSetpoint();
- ac.ReadFanMode();
- ac.ReadSystemMode();
- ac.ReadSystemFansSwingMode();
- ac.ReadModeSupport();
- ac.ReadCleanStatu();
+ ReadDeviceAttributeLogic.Instance.SendACStatuComand(deviceUI.CommonDevice);
});
}
else
@@ -1250,16 +1234,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇璁惧鐘舵��
if ((DateTime.Now - ac.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- ac.ReadLocalTemperature();
- ac.ReadCoolingSetpoint();
- ac.ReadHeatingSetpoint();
- ac.ReadAutoSetpoint();
- ac.ReadFanMode();
- ac.ReadSystemMode();
- ac.ReadSystemFansSwingMode();
- ac.ReadModeSupport();
- ac.ReadCleanStatu();
+ ReadDeviceAttributeLogic.Instance.SendACStatuComand(deviceUI.CommonDevice);
}
}
@@ -1350,8 +1325,7 @@
{
UserHomeView.ReadStatus(rollerShade, () =>
{
- rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- rollerShade.ReadWcdCurrentPositionLiftPercentage();
+ ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(deviceUI.CommonDevice);
});
}
else
@@ -1359,8 +1333,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇
if ((DateTime.Now - rollerShade.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- rollerShade.ReadWcdCurrentPositionLiftPercentage();
+ ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(deviceUI.CommonDevice);
}
}
@@ -1647,7 +1620,6 @@
var sceneView = new SceneCategoryView(0, 0);
sceneScrolView.AddChidren(sceneView);
sceneView.Init(scene, room);
- sceneView.SetViewShadow(true);
GetDelayScene(sceneScrolView);
}
}
@@ -1740,8 +1712,19 @@
{ IsBackground = true }.Start();
}
- #endregion
+ /// <summary>
+ /// GetExecScene
+ /// </summary>
+ /// <param name="scrolViewLayout"></param>
+ private void GetExecScene(VerticalScrolViewLayout scrolViewLayout)
+ {
+ new System.Threading.Thread(() =>
+ {
+ })
+ { IsBackground = true }.Start();
+ }
+ #endregion
#region 鈼� 鑷姩鍖朹_________________________
--
Gitblit v1.8.0