From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
index 4144117..cc4974c 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
@@ -17,9 +17,9 @@
Tag = "Logic";
}
- public void Show(int isInt=0, bool edit=false)
+ public void Show(int isInt = 0, bool edit = false)
{
-
+
#region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
var topRowLayout = new RowLayout
@@ -40,6 +40,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.adddelay,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -79,7 +80,6 @@
};
this.AddChidren(middle);
-
var blancolor = new FrameLayout
{
Width = Application.GetMinRealAverage(200),
@@ -111,11 +111,11 @@
color.AddChidren(btnicon);
var titleText = new Button
{
- Width = Application.GetMinRealAverage(480),
+ Width = Application.GetMinRealAverage(580),
Height = Application.GetMinRealAverage(60),
- X = Application.GetRealWidth(300),
+ X = Application.GetRealWidth(250),
Y = blancolor.Bottom + Application.GetRealHeight(50),
- TextID =MyInternationalizationString.createtimetext,
+ TextID = MyInternationalizationString.createtimetext,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextSize = 15,
@@ -129,8 +129,7 @@
BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
};
middle.AddChidren(PickerViewfra);
- PickerViewfra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
-
+ PickerViewfra.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
var mUIPickerView = new UIPickerView
{
@@ -163,12 +162,22 @@
int value = 0;
if (edit)
{
-
+
timevalue = int.Parse(Common.Logic.CurrentLogic.Actions[isInt]["DelayTime"].ToString());
- var minutevalue1 = timevalue / 60;
- var secondvalue1 = timevalue % 60;
- //鏇存柊鏈�鏂扮姸鎬�
- mUIPickerView.setCurrentItems(minutevalue1, secondvalue1, 0);
+ if (timevalue > 3600)
+ {
+ //鏇存柊鏈�鏂扮姸鎬�
+ mUIPickerView.setCurrentItems(60, timevalue - 3600, 0);
+ }
+ else
+ {
+
+ var minutevalue1 = timevalue / 60;
+ var secondvalue1 = timevalue % 60;
+ //鏇存柊鏈�鏂扮姸鎬�
+ mUIPickerView.setCurrentItems(minutevalue1, secondvalue1, 0);
+ }
+
value = timevalue;
}
string selectde = "";
@@ -181,7 +190,6 @@
};
-
var btnsave = new Button
{
Y = PickerViewfra.Height - Application.GetRealHeight(260),
@@ -192,6 +200,7 @@
BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
TextID = MyInternationalizationString.Save,
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ TextSize=16,
};
PickerViewfra.AddChidren(btnsave);
@@ -202,7 +211,7 @@
{
return;
}
- if (selectde != ""|| timevalue==5)
+ if (selectde != "" || timevalue == 5)
{
Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
actionsInfo.Add("LinkType", 7);
@@ -223,8 +232,8 @@
if (!edit)
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.delaytip),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
@@ -234,6 +243,7 @@
UserView.HomePage.Instance.PageIndex += 1;
logicCommunalPage.Show(() => { });
};
+
}
}
}
--
Gitblit v1.8.0