From 944b87b6bcccb095cd73f13f4410fb20faf48f74 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 25 十二月 2019 11:21:06 +0800
Subject: [PATCH] 2019.12.25
---
ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs
index dac1b70..227faea 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs
@@ -67,7 +67,7 @@
var top = new TopFrameLayout();
AddChidren(top);
top.InitTopview();
- top.SetTopTitle(R.MyInternationalizationString.AddScence);
+ top.SetTopTitle(R.MyInternationalizationString.AddDelayTime);
top.backButton.MouseUpEventHandler += (sender, e) =>
{
RemoveFromParent();
@@ -113,7 +113,7 @@
Height = Application.GetMinRealAverage(124),
Width = Application.GetMinRealAverage(124),
Gravity = Gravity.Center,
- Radius = (uint)Application.GetRealHeight(124 / 2),
+ Radius = (uint)Application.GetRealHeight(58),
UnSelectedImagePath = "Item/Timer.png"
};
bg1.AddChidren(timeImg);
@@ -126,6 +126,7 @@
Gravity = Gravity.CenterHorizontal,
TextID = R.MyInternationalizationString.SelectTimeForAction,
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
+ TextSize=15,
IsMoreLines = true
};
bodyFrameLayout.AddChidren(tip);
@@ -135,7 +136,7 @@
Y = Application.GetRealHeight(611),
Height = Application.GetRealHeight(1126),
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
- Radius = (uint)Application.GetRealHeight(17),
+ Radius = (uint)Application.GetRealHeight(58),
};
bodyFrameLayout.AddChidren(midFL);
@@ -179,9 +180,16 @@
confirmBtn.SetTitle(R.MyInternationalizationString.Save);
confirmBtn.MouseUpEventHandler += (sender, e) =>
{
- sceneTargetDevice.DelayTime = totalSecond;
- selectedTimeAction?.Invoke(sceneTargetDevice);
- RemoveFromParent();
+ if (totalSecond == 0)
+ {
+ RemoveFromParent();
+ }
+ else
+ {
+ sceneTargetDevice.DelayTime = totalSecond;
+ selectedTimeAction?.Invoke(sceneTargetDevice);
+ RemoveFromParent();
+ }
};
}
--
Gitblit v1.8.0