From 05ce435c3b58e53eeab04c672affdeeab75f3036 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 15 十一月 2019 14:41:39 +0800
Subject: [PATCH] 2019.11.15-1
---
ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs | 66 +++++++++++----------------------
1 files changed, 22 insertions(+), 44 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs b/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs
index 0a8ec50..394f0c2 100644
--- a/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs
@@ -213,7 +213,7 @@
currentModeBtn.Text = ACControlBase.GetModeNameByModeId(ac.currentSystemMode);
mArcScaleSeekBar.Progress = ACControlBase.GetCurrentModeTemperature(ac);
-
+
fanModeBtn.IsSelected = false;
FanSwingModeBtn.IsSelected = false;
}
@@ -252,7 +252,7 @@
fanModeBtn.UnSelectedImagePath = ACControlBase.GetFanModeUnSelectedImagePathByFanModeId(ac.currentFanMode);
break;
case 4096:
- //椋庢墖褰撳墠鐨勬壂椋庢ā寮�
+ //椋庢墖褰撳墠鐨勬壂椋庢ā寮�
ac.currentFanSwingMode = attriButeList[0].AttriButeData;
ac.LastDateTime = DateTime.Now;
FanSwingModeBtn.IsSelected = true;
@@ -333,6 +333,7 @@
{
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
ZigBee.Device.ZbGateway.StatusList.Add(this);
+ HomePage.Instance.ScrollEnabled = false;
}
#endregion
@@ -348,6 +349,7 @@
//action();
//action = null;
RemoveUpdateControlDeviceStatuAction();
+ HomePage.Instance.ScrollEnabled = true;
base.RemoveFromParent();
}
@@ -379,26 +381,14 @@
//鍙戦�佽鍙栫姸鎬佸懡浠�
UserView.UserHomeView.ReadStatus(ac, () =>
{
- new System.Threading.Thread(() =>
- {
- System.Threading.Thread.Sleep(100);
- ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- System.Threading.Thread.Sleep(100);
- ac.ReadLocalTemperature();
- System.Threading.Thread.Sleep(100);
- ac.ReadCoolingSetpoint();
- System.Threading.Thread.Sleep(100);
- ac.ReadHeatingSetpoint();
- System.Threading.Thread.Sleep(100);
- ac.ReadAutoSetpoint();
- System.Threading.Thread.Sleep(100);
- ac.ReadFanMode();
- System.Threading.Thread.Sleep(100);
- ac.ReadSystemMode();
- System.Threading.Thread.Sleep(100);
- ac.ReadSystemFansSwingMode();
- })
- { IsBackground = true }.Start();
+ ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ac.ReadLocalTemperature();
+ ac.ReadCoolingSetpoint();
+ ac.ReadHeatingSetpoint();
+ ac.ReadAutoSetpoint();
+ ac.ReadFanMode();
+ ac.ReadSystemMode();
+ ac.ReadSystemFansSwingMode();
});
}
else
@@ -406,26 +396,14 @@
//闃叉鐭椂闂村唴澶氭璇诲彇璁惧鐘舵��
if ((DateTime.Now - ac.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- new System.Threading.Thread(() =>
- {
- System.Threading.Thread.Sleep(100);
- ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- System.Threading.Thread.Sleep(100);
- ac.ReadLocalTemperature();
- System.Threading.Thread.Sleep(100);
- ac.ReadCoolingSetpoint();
- System.Threading.Thread.Sleep(100);
- ac.ReadHeatingSetpoint();
- System.Threading.Thread.Sleep(100);
- ac.ReadAutoSetpoint();
- System.Threading.Thread.Sleep(100);
- ac.ReadFanMode();
- System.Threading.Thread.Sleep(100);
- ac.ReadSystemMode();
- System.Threading.Thread.Sleep(100);
- ac.ReadSystemFansSwingMode();
- })
- { IsBackground = true }.Start();
+ ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ac.ReadLocalTemperature();
+ ac.ReadCoolingSetpoint();
+ ac.ReadHeatingSetpoint();
+ ac.ReadAutoSetpoint();
+ ac.ReadFanMode();
+ ac.ReadSystemMode();
+ ac.ReadSystemFansSwingMode();
}
}
@@ -611,7 +589,7 @@
IsSelected = ACControlBase.IsOpen(ac)
};
itemView.AddChidren(FanSwingModeBtn);
-
+
//妯″紡
modeBtn = new Button()
{
@@ -1431,7 +1409,7 @@
#endregion
-
+
#region 鈼� 鎺у埗鍙嶉_________________________
--
Gitblit v1.8.0