From 427d1c7ecd04b03419eae157e32fe3367d8dffea Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 28 十一月 2019 09:53:25 +0800
Subject: [PATCH] 2019.11.28
---
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index ed78c9f..178c8f5 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -283,6 +283,20 @@
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:
+ //杩囪檻缃戞竻娲楁爣蹇�:42
+ ac.CleanStatu = attriButeList[0].AttriButeData == 42;
+ break;
}
var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
@@ -611,9 +625,10 @@
var floors = new SelectFloor ();
AddChidren(floors);
floors.Init(580,330,Direction.Right);
- floors.FloorAction += (floorName) =>
+ floors.changeFloor = true;
+ floors.FloorAction += (floorId) =>
{
- floorBtn.Text = floorName;
+ floorBtn.Text = Config.Instance.Home.GetFloorNameById(floorId);
RefreshBodyView();
};
}
@@ -813,6 +828,7 @@
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
};
functionSceneBodyView.AddChidren(functionTypeScrowView);
+ //functionSceneBodyView.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerBottomLeft);
deviceListScrolView = new VerticalScrolViewLayout
{
@@ -823,6 +839,8 @@
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
};
functionSceneBodyView.AddChidren(deviceListScrolView);
+ //deviceListScrolView.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft);
+
tempFunctionTypeBtn = new FunctionButton();
EventHandler<MouseEventArgs> ShowSameTypeFunction = (object typeSender, MouseEventArgs mouseEventArgs) =>
@@ -1223,6 +1241,8 @@
ac.ReadFanMode();
ac.ReadSystemMode();
ac.ReadSystemFansSwingMode();
+ ac.ReadModeSupport();
+ ac.ReadCleanStatu();
});
}
else
@@ -1238,12 +1258,14 @@
ac.ReadFanMode();
ac.ReadSystemMode();
ac.ReadSystemFansSwingMode();
+ ac.ReadModeSupport();
+ ac.ReadCleanStatu();
}
}
var deviceTypeRowLayout = new RowLayout()
{
- Height = Application.GetRealHeight(127 + 35),
+ Height = Application.GetRealHeight(129 + 35),
LineColor = ZigbeeColor.Current.GXCBackgroundColor,
Tag = deviceUI
};
@@ -1554,6 +1576,8 @@
BorderWidth = 1
};
row.AddChidren(roomBtn);
+ roomBtn.SetViewShadow(true,5);
+
if (room.IsLove)
{
roomBtn.IsSelected = true;
@@ -1623,6 +1647,7 @@
var sceneView = new SceneCategoryView(0, 0);
sceneScrolView.AddChidren(sceneView);
sceneView.Init(scene, room);
+ sceneView.SetViewShadow(true);
GetDelayScene(sceneScrolView);
}
}
@@ -1687,18 +1712,17 @@
{
if (delayScenesListResponseInfo.ScenesId == sceneView.scene.Id)
{
- var times = delayScenesListResponseInfo.RemainTime;
- sceneView.scene.RemainTime = times;
+ sceneView.scene.RemainTime = delayScenesListResponseInfo.RemainTime;
new System.Threading.Thread(() =>
{
- while (times > 0)
+ while (sceneView.scene.RemainTime > 0)
{
System.Threading.Thread.Sleep(1000);
Application.RunOnMainThread(() =>
{
- sceneView.SetTimeText(CommonFormResouce.GetTimeString(times));
+ sceneView.SetTimeText(CommonFormResouce.GetTimeString(sceneView.scene.RemainTime));
});
- times -= 1;
+ sceneView.scene.RemainTime -= 1;
}
Application.RunOnMainThread(() =>
{
--
Gitblit v1.8.0