From 0ca3aa21580e988e340b88360cda23b501fa65f2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 11 十二月 2019 09:13:40 +0800
Subject: [PATCH] 2019.12.11
---
ZigbeeApp/Shared/Phone/UserView/UserPage.cs | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
old mode 100755
new mode 100644
index 8ffd033..97e4963
--- a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
@@ -39,7 +39,7 @@
/// <summary>
/// 搴曢儴鎸夐挳鏂囧瓧鐨刌鍊�
/// </summary>
- private static readonly int tabBarEnumName_Y = 104;
+ private static readonly int tabBarEnumName_Y = 98;
#endregion
#region 鈼� 鎺ュ彛____________________________
@@ -158,7 +158,7 @@
if (attriButeList == null || attriButeList.Count == 0)
{
return;
- }
+ }
//姝ゅ睘鎬ц〃鏄庡鍐呭綋鍓嶇殑娓╁害 * 100锛屽疄闄呮俯搴︿负鈥淟ocalTemperature / 100鈥濓紝鍗曚綅锛氣剝
var curTemp = (attriButeList[0].AttriButeData / 100 < ACControlBase.Temperature_High || attriButeList[0].AttriButeData / 100 > ACControlBase.Temperature_Low) ? attriButeList[0].AttriButeData / 100 : ACControlBase.Temperature_Default;
switch (attriButeList[0].AttributeId)
@@ -186,9 +186,21 @@
case 28:
ac.currentSystemMode = attriButeList[0].AttriButeData;
ac.LastDateTime = DateTime.Now;
+ break;
+ case 4099:
+ var value = Convert.ToString(attriButeList[0].AttriButeData, 2).PadLeft(16, '0');
+ var modeStr = value.Substring(value.Length - 5, 5);
+ for (int j = 0; j < modeStr.Length; j++)
+ {
+ ac.listSupportMode[j] = Convert.ToInt32(modeStr[j]) == 49 ? 1 : 0;
+ }
+ break;
+
+ case 4097:
+ ac.CleanStatu = attriButeList[0].AttriButeData == 42;
break;
- }
- }
+ }
+ }
if (common.DeviceStatusReport.CluterID == 514)
{
@@ -197,10 +209,10 @@
if (attriButeList == null || attriButeList.Count == 0)
{
return;
- }
+ }
ac.DeviceStatusReport = common.DeviceStatusReport;
switch (attriButeList[0].AttributeId)
- {
+ {
case 0:
ac.currentFanMode = attriButeList[0].AttriButeData;
ac.LastDateTime = DateTime.Now;
@@ -211,7 +223,7 @@
break;
}
}
-
+
//褰揅luterID=3,灏辫瘉鏄庤璁惧鍦ㄧ嚎锛岀洿鎺ユ爣璁�
if (common.DeviceStatusReport.CluterID == 3)
{
@@ -477,15 +489,18 @@
if (sender == Instance.homePageIMG || sender == Instance.homePageName)
{
//涓婚〉
+ CommonPage.Instance.IsDrawerLockMode = false;
Instance.homePageName.IsSelected = true;
Instance.homePageIMG.IsSelected = true;
var home = new UserHomeView { };
Instance.BodyView.AddChidren(home);
home.Show();
+
}
else if (sender == Instance.categoryIMG || sender==Instance.categoryName)
{
//鍒嗙被
+ CommonPage.Instance.IsDrawerLockMode = true;
Instance.categoryName.IsSelected = true;
Instance.categoryIMG.IsSelected = true;
var category = new Phone.Device.Category.Category { };
@@ -494,7 +509,8 @@
}
else if (sender == Instance.settingIMG || sender==Instance.settingName)
{
- //涓汉涓績
+ //涓汉涓績
+ CommonPage.Instance.IsDrawerLockMode = true;
Instance.settingName.IsSelected = true;
Instance.settingIMG.IsSelected = true;
var form = new UserCenter.UserMain.UserMainForm();
--
Gitblit v1.8.0