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, 16 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
old mode 100755
new mode 100644
index 68d4804..4bb15b0
--- 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 鈼� 鎺ュ彛____________________________
@@ -158,7 +160,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,7 +188,7 @@
case 28:
ac.currentSystemMode = attriButeList[0].AttriButeData;
ac.LastDateTime = DateTime.Now;
- break;
+ break;
case 4099:
var value = Convert.ToString(attriButeList[0].AttriButeData, 2).PadLeft(16, '0');
var modeStr = value.Substring(value.Length - 5, 5);
@@ -198,9 +200,9 @@
case 4097:
ac.CleanStatu = attriButeList[0].AttriButeData == 42;
- break;
- }
- }
+ break;
+ }
+ }
if (common.DeviceStatusReport.CluterID == 514)
{
@@ -209,10 +211,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;
@@ -223,7 +225,7 @@
break;
}
}
-
+
//褰揅luterID=3,灏辫瘉鏄庤璁惧鍦ㄧ嚎锛岀洿鎺ユ爣璁�
if (common.DeviceStatusReport.CluterID == 3)
{
@@ -328,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>
@@ -495,7 +501,7 @@
var home = new UserHomeView { };
Instance.BodyView.AddChidren(home);
home.Show();
-
+
}
else if (sender == Instance.categoryIMG || sender==Instance.categoryName)
{
--
Gitblit v1.8.0