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 | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index 26587b7..178c8f5 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -828,6 +828,7 @@
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
};
functionSceneBodyView.AddChidren(functionTypeScrowView);
+ //functionSceneBodyView.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerBottomLeft);
deviceListScrolView = new VerticalScrolViewLayout
{
@@ -838,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) =>
@@ -1573,6 +1576,8 @@
BorderWidth = 1
};
row.AddChidren(roomBtn);
+ roomBtn.SetViewShadow(true,5);
+
if (room.IsLove)
{
roomBtn.IsSelected = true;
@@ -1642,6 +1647,7 @@
var sceneView = new SceneCategoryView(0, 0);
sceneScrolView.AddChidren(sceneView);
sceneView.Init(scene, room);
+ sceneView.SetViewShadow(true);
GetDelayScene(sceneScrolView);
}
}
@@ -1706,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