From eb424d24e39bab4a245725f35deab3f234ea0f13 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 13 十二月 2019 10:48:50 +0800
Subject: [PATCH] 2019.12.13
---
ZigbeeApp/Shared/Phone/UserView/UserPage.cs | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
index 2a79f61..4bb15b0 100644
--- a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
@@ -3,6 +3,8 @@
using Shared.Common;
using ZigBee.Device;
using Shared.Phone.Device.AC;
+using System.Text;
+using Shared.Phone.Device.Account;
namespace Shared.Phone.UserView
{
@@ -39,7 +41,7 @@
/// <summary>
/// 搴曢儴鎸夐挳鏂囧瓧鐨刌鍊�
/// </summary>
- private static readonly int tabBarEnumName_Y = 104;
+ private static readonly int tabBarEnumName_Y = 98;
#endregion
#region 鈼� 鎺ュ彛____________________________
@@ -186,6 +188,18 @@
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;
}
}
@@ -316,6 +330,10 @@
{
BackgroundColor = Shared.Common.ZigbeeColor.Current.MainColor;
ZbGateway.StatusList.Add(this);
+ Shared.Application.LocationAction += (lat, lon) =>
+ {
+ AccountLogic.Instance.ReceiveAppLatAndLon(lat.ToString(), lon.ToString());
+ };
}
/// <summary>
@@ -477,15 +495,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 +515,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