From f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f Mon Sep 17 00:00:00 2001 From: WJC <wjc@hdlchina.com.cn> Date: 星期一, 30 十二月 2019 13:32:33 +0800 Subject: [PATCH] 2019-12-30-1 --- ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs index fa588ac..229002d 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs @@ -30,7 +30,7 @@ var titleName = new Button { - TextSize = 16, + TextSize = 17, TextColor = ZigbeeColor.Current.LogicTextBlackColor, TextAlignment = TextAlignment.CenterLeft, X = Application.GetRealWidth(176), @@ -38,6 +38,7 @@ Height = Application.GetRealHeight(69), Y = Application.GetRealHeight(92), Text = name, + IsBold = true, }; topRowLayout.AddChidren(titleName); @@ -115,6 +116,7 @@ TextAlignment = TextAlignment.CenterLeft, TextColor = ZigbeeColor.Current.LogicTextBlackColor, Tag = intvalue, + TextSize = 14, }; timeRow.AddChidren(timeBtn); @@ -159,8 +161,18 @@ } } - int selectIndex1 = timevalue / 60; - int selectIndex2 = timevalue % 60; + int selectIndex1 = 0; + int selectIndex2 = 0; + if (timevalue > 3600) + { + selectIndex1 = 60; + selectIndex2 = timevalue - 3600; + } + else + { + selectIndex1 = timevalue / 60; + selectIndex2 = timevalue % 60; + } PickerView.ShowNormal(minuteList, secondList, new List<string>(), (Index1, Index2, Index3) => { selectetimedvalue = int.Parse(minuteList[Index1].Split(' ')[0]) * 60 + int.Parse(secondList[Index2].Split(' ')[0]); @@ -196,6 +208,7 @@ BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor, TextID = MyInternationalizationString.Save, TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor, + TextSize = 16, }; saveFrameLayout.AddChidren(btnsave); btnsave.MouseUpEventHandler += (sender, e) => @@ -235,8 +248,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; } -- Gitblit v1.8.0