From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs | 78 ++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 41 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs
index 8a34d39..227faea 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs
@@ -15,7 +15,7 @@
/// <summary>
/// totalSecond
/// </summary>
- private int totalSecond;
+ public int totalSecond;
/// <summary>
/// selectedTimeAction
/// </summary>
@@ -23,52 +23,38 @@
#endregion
+ /// <summary>
+ /// SelectDelayTime
+ /// </summary>
public SelectDelayTime()
{
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
- Tag = "categoryAddScene";
+ //Tag = "categoryAddScene";
}
+ /// <summary>
+ /// RemoveFromParent
+ /// </summary>
public override void RemoveFromParent()
{
base.RemoveFromParent();
}
-
+ /// <summary>
+ /// sceneTargetDevice
+ /// </summary>
public SceneTargetDeviceUI sceneTargetDevice;
-
+ /// <summary>
+ /// Show
+ /// </summary>
public void Show()
{
if (sceneTargetDevice == null)
{
- sceneTargetDevice = new SceneTargetDeviceUI { Type = 1 };
+ sceneTargetDevice = new SceneTargetDeviceUI { Type = 2 };
}
AddTop();
AddBodyView();
-
-
-
- void selectTimeMouseUpEvent(object sender, MouseEventArgs e)
- {
- //if (!string.IsNullOrEmpty(targetDeviceID))
- //{
- //var targetDeviceUI = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.SceneTargetDeviceUIID == targetDeviceID);
- // if (targetDeviceUI != null)
- // {
- // targetDeviceUI.DelayTime= SceneTargetDevice.DelayTime;
- // targetDeviceUI.Type = SceneTargetDevice.Type;
- // }
- //}
- //UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene");
- //var categoryAddScene = new CategoryAddScene();
- //UserView.HomePage.Instance.AddChidren(categoryAddScene);
- //UserView.HomePage.Instance.PageIndex += 1;
- //categoryAddScene.Show();
- }
-
-
-
-
}
@@ -81,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();
@@ -104,20 +90,20 @@
var bg1 = new FrameLayout
{
Y = Application.GetRealHeight(118),
- Height = Application.GetRealHeight(207),
- Width = Application.GetRealWidth(207),
+ Height = Application.GetMinRealAverage(207),
+ Width = Application.GetMinRealAverage(207),
Gravity = Gravity.CenterHorizontal,
- Radius = (uint)Application.GetRealHeight(207 / 2),
+ Radius = (uint)Application.GetMinRealAverage(207 / 2),
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
};
bodyFrameLayout.AddChidren(bg1);
var bg2 = new FrameLayout
{
- Height = Application.GetRealHeight(184),
- Width = Application.GetRealWidth(184),
+ Height = Application.GetMinRealAverage(184),
+ Width = Application.GetMinRealAverage(184),
Gravity = Gravity.Center,
- Radius = (uint)Application.GetRealHeight(184 / 2),
+ Radius = (uint)Application.GetMinRealAverage(184 / 2),
BackgroundColor = ZigbeeColor.Current.GXCSelectedBackgroundColor,
};
bg1.AddChidren(bg2);
@@ -127,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);
@@ -140,6 +126,7 @@
Gravity = Gravity.CenterHorizontal,
TextID = R.MyInternationalizationString.SelectTimeForAction,
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
+ TextSize=15,
IsMoreLines = true
};
bodyFrameLayout.AddChidren(tip);
@@ -149,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);
@@ -181,6 +168,8 @@
pickView.setNPicker(minuStrList, secStrList, null);
+ pickView.setCurrentItems(totalSecond / 60, totalSecond % 60, 0);
+
pickView.OnSelectChangeEvent += (l1, l2, l3) =>
{
totalSecond = minuList[l1] * 60 + secList[l2];
@@ -191,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