From 133ca903ae9c4df6ff037f5223d5abcd0df926f4 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期五, 20 三月 2020 17:55:32 +0800
Subject: [PATCH] 2020-03-20-1
---
ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs | 53 +++++++++++++++++++++++------------------------------
1 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs
old mode 100755
new mode 100644
index 8e1134d..6994a1b
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs
@@ -14,13 +14,12 @@
{
Tag = "Logic";
}
-
Dictionary<string, string> timeifon = new Dictionary<string, string>();
- Button beforeClickButton = new Button();
TimeView timeview = new TimeView
{
- Height = Application.GetRealHeight(600),
- BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
+
+ Height = Application.GetRealHeight(550),
+ BackgroundColor =0x40ffffff,// ZigbeeColor.Current.LogicTopViewBackgroundColor,
Width = Application.GetRealWidth(1080),
};
/// <summary>
@@ -96,17 +95,20 @@
void SelectedTimeTypeView(FrameLayout middle, int TypeValue)
{
middle.RemoveAll();
- #region -----绔嬪嵆鎵ц 鏃跺埢
+ #region -----绫诲瀷 鏃跺埢
TypeView typeView = new TypeView();
middle.AddChidren(typeView.Show());
typeView.textBtn.TextID = MyInternationalizationString.type;
+ typeView.titleBtn.Width = Application.GetRealWidth(630 + 70);
typeView.titleBtn.TextID = MyInternationalizationString.immediateexecution;
-
- TypeView timeView = new TypeView();
- timeView.frameLayout.Y = typeView.frameLayout.Bottom;
- middle.AddChidren(timeView.Show());
- timeView.textBtn.TextID = MyInternationalizationString.moment;
- timeView.clickviewBtn.MouseUpEventHandler += (sender, e) => {
+ typeView.backBtn.Visible = false;
+
+
+ TypeView skView = new TypeView();
+ skView.frameLayout.Y = typeView.frameLayout.Bottom;
+ middle.AddChidren(skView.Show());
+ skView.textBtn.TextID = MyInternationalizationString.moment;
+ skView.clickviewBtn.MouseUpEventHandler += (sender, e) => {
TimeTypeView(middle, TypeValue);
};
@@ -117,13 +119,13 @@
{
case 0:
{
- timeView.titleBtn.Text = Language.StringByID(MyInternationalizationString.logiccustom);
+ skView.titleBtn.Text = Language.StringByID(MyInternationalizationString.logiccustom);
textvalue = timeifon["StartHour"] + ":" + timeifon["StartMin"];
}
break;
case 1:
{
- timeView.titleBtn.Text = Language.StringByID(MyInternationalizationString.sunrise);
+ skView.titleBtn.Text = Language.StringByID(MyInternationalizationString.sunrise);
if (int.Parse(timeifon["AdjustTime"]) > 0)
{
textvalue = Language.StringByID(MyInternationalizationString.delayed) + timeifon["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
@@ -140,7 +142,7 @@
break;
case 2:
{
- timeView.titleBtn.Text = Language.StringByID(MyInternationalizationString.sunset);
+ skView.titleBtn.Text = Language.StringByID(MyInternationalizationString.sunset);
if (int.Parse(timeifon["AdjustTime"]) > 0)
{
textvalue = Language.StringByID(MyInternationalizationString.delayed) + timeifon["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
@@ -157,7 +159,7 @@
break;
case 3:
{
- timeView.titleBtn.Text = Language.StringByID(MyInternationalizationString.noon);
+ skView.titleBtn.Text = Language.StringByID(MyInternationalizationString.noon);
if (int.Parse(timeifon["AdjustTime"]) > 0)
{
textvalue = Language.StringByID(MyInternationalizationString.delayed) + timeifon["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
@@ -177,24 +179,13 @@
{
#region -----鑷畾涔夋椂闂�
- typeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
- timeView.backBtn.UnSelectedImagePath = "ZigeeLogic/dropdown.png";
- var linebtn = new Button
+ skView.backBtn.UnSelectedImagePath = "ZigeeLogic/dropdown.png";
+ var rowTimeView = new FrameLayout
{
- Y = timeView.frameLayout.Bottom,
- Height = Application.GetRealHeight(5),
- BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
- X = Application.GetRealWidth(58),
- Width = Application.GetRealWidth(965),
- };
- middle.AddChidren(linebtn);
- var rowTimeView = new RowLayout
- {
- Y = linebtn.Bottom,
+ Y = skView.frameLayout.Bottom,
Height = Application.GetRealHeight(600),
};
middle.AddChidren(rowTimeView);
-
rowTimeView.AddChidren(timeview);
#endregion
}
@@ -204,10 +195,12 @@
#region -----鎻愬墠/寤舵椂
TypeView delayView = new TypeView();
- delayView.frameLayout.Y = timeView.frameLayout.Bottom;
+ delayView.frameLayout.Y = skView.frameLayout.Bottom;
+ delayView.frameLayout.Height = Application.GetRealHeight(160+20);//澧為珮鏈�鍚庝竴琛岀殑楂樺害20;
middle.AddChidren(delayView.Show());
delayView.textBtn.TextID = MyInternationalizationString.Advancedelay;
delayView.titleBtn.Text = textvalue;
+ delayView.lineBtn.BackgroundColor = BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
delayView.clickviewBtn.MouseUpEventHandler += (sender, e) => {
var mList = new List<string>();
mList.Add(Language.StringByID(MyInternationalizationString.advance));
--
Gitblit v1.8.0