From 9904031f5291daaf56985146bb671f25e18ebbdf Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 19:51:31 +0800
Subject: [PATCH] 最新代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs | 88 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 84 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs
index 8e98169..81832f0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs
@@ -409,7 +409,7 @@
textZone.Text = zoneData();
textZone.MouseDownEventHandler += (sender, e) =>
{
- GetSpecificZoneNowDate();
+ //GetSpecificZoneNowDate();
};
var btnLine = new FrameLayout()
@@ -697,12 +697,40 @@
{
if (setTimeType == "ValidTime")
{
+ string nowValue1 = DateTime.Now.ToString("yyyyMMdd");
+ string nowValue2 = dtNow.Year.ToString() + curMonth.ToString().PadLeft(2, '0') + curDay.ToString().PadLeft(2, '0');
+ if (nowValue1.CompareTo(nowValue2) == 1)
+ {
+ this.ShowMassage(ShowMsgType.Error, "鐢熸晥鏃ユ湡涓嶈兘澶т簬褰撳墠鏃ユ湡");
+ return;
+ }
+ //妫�鏌ユ椂闂�
+ var flage = this.CheckValidTime(dtNow.Year, curMonth, curDay,
+ DoorLockCommonInfo.ValidDateHour, DoorLockCommonInfo.ValidDateMinute, DoorLockCommonInfo.ValidDateSecond,
+ DoorLockCommonInfo.InValidDateYear, DoorLockCommonInfo.InValidDateMonth, DoorLockCommonInfo.InValidDateDay,
+ DoorLockCommonInfo.InValidDateHour, DoorLockCommonInfo.InValidDateMinute, DoorLockCommonInfo.InValidDateSecond);
+ if (flage == false)
+ {
+ this.ShowMassage(ShowMsgType.Error, "鐢熸晥鏃堕棿涓嶈兘灏忎簬澶辨晥鏃堕棿");
+ return;
+ }
DoorLockCommonInfo.ValidDateYear = dtNow.Year;
DoorLockCommonInfo.ValidDateMonth = curMonth;
DoorLockCommonInfo.ValidDateDay = curDay;
}
else
- {
+ {
+ //妫�鏌ユ椂闂�
+ var flage = this.CheckValidTime(DoorLockCommonInfo.ValidDateYear, DoorLockCommonInfo.ValidDateMonth, DoorLockCommonInfo.ValidDateDay,
+ DoorLockCommonInfo.ValidDateHour, DoorLockCommonInfo.ValidDateMinute, DoorLockCommonInfo.ValidDateSecond,
+ dtNow.Year, curMonth, curDay,
+ DoorLockCommonInfo.InValidDateHour, DoorLockCommonInfo.InValidDateMinute, DoorLockCommonInfo.InValidDateSecond);
+ if (flage == false)
+ {
+ this.ShowMassage(ShowMsgType.Error, "澶辨晥鏃堕棿涓嶈兘澶т簬鐢熸晥鏃堕棿");
+ return;
+ }
+
DoorLockCommonInfo.InValidDateYear = dtNow.Year;
DoorLockCommonInfo.InValidDateMonth = curMonth;
DoorLockCommonInfo.InValidDateDay = curDay;
@@ -875,13 +903,35 @@
btnOk.MouseUpEventHandler += (sender1, e1) =>
{
if (setTimeType == "ValidTime")
- {
+ {
+ //妫�鏌ユ椂闂�
+ var flage = this.CheckValidTime(DoorLockCommonInfo.ValidDateYear, DoorLockCommonInfo.ValidDateMonth, DoorLockCommonInfo.ValidDateDay,
+ curHour, curMin, curSec,
+ DoorLockCommonInfo.InValidDateYear, DoorLockCommonInfo.InValidDateMonth, DoorLockCommonInfo.InValidDateDay,
+ DoorLockCommonInfo.InValidDateHour, DoorLockCommonInfo.InValidDateMinute, DoorLockCommonInfo.InValidDateSecond);
+ if (flage == false)
+ {
+ this.ShowMassage(ShowMsgType.Error, "澶辨晥鏃堕棿涓嶈兘澶т簬鐢熸晥鏃堕棿");
+ return;
+ }
+
DoorLockCommonInfo.ValidDateHour = curHour;
DoorLockCommonInfo.ValidDateMinute = curMin;
DoorLockCommonInfo.ValidDateSecond = curSec;
}
else
- {
+ {
+ //妫�鏌ユ椂闂�
+ var flage = this.CheckValidTime(DoorLockCommonInfo.ValidDateYear, DoorLockCommonInfo.ValidDateMonth, DoorLockCommonInfo.ValidDateDay,
+ DoorLockCommonInfo.ValidDateHour, DoorLockCommonInfo.ValidDateMinute, DoorLockCommonInfo.ValidDateSecond,
+ DoorLockCommonInfo.InValidDateYear, DoorLockCommonInfo.InValidDateMonth, DoorLockCommonInfo.InValidDateDay,
+ curHour, curMin, curSec);
+ if (flage == false)
+ {
+ this.ShowMassage(ShowMsgType.Error, "澶辨晥鏃堕棿涓嶈兘澶т簬鐢熸晥鏃堕棿");
+ return;
+ }
+
DoorLockCommonInfo.InValidDateHour = curHour;
DoorLockCommonInfo.InValidDateMinute = curMin;
DoorLockCommonInfo.InValidDateSecond = curSec;
@@ -896,6 +946,36 @@
}
}
}
+
+ /// <summary>
+ /// 妫�鏌ユ椂闂�
+ /// </summary>
+ /// <returns></returns>
+ private bool CheckValidTime(int validYear, int validMoth, int validDay, int validHour, int validMinute, int validSecond
+ , int inValidYear, int inValidMoth, int inValidDay, int inValidHour, int inValidMinute, int inValidSecond)
+ {
+ //鐢熸晥鏃堕棿
+ string nowValue1 = validYear.ToString()
+ + validMoth.ToString().PadLeft(2, '0')
+ + validDay.ToString().PadLeft(2, '0')
+ + validHour.ToString().PadLeft(2, '0')
+ + validMinute.ToString().PadLeft(2, '0')
+ + validSecond.ToString().PadLeft(2, '0');
+ //澶辨晥鏃堕棿
+ string nowValue2 = inValidYear.ToString()
+ + inValidMoth.ToString().PadLeft(2, '0')
+ + inValidDay.ToString().PadLeft(2, '0')
+ + inValidHour.ToString().PadLeft(2, '0')
+ + inValidMinute.ToString().PadLeft(2, '0')
+ + inValidSecond.ToString().PadLeft(2, '0');
+
+ if (nowValue1.CompareTo(nowValue2) == 1)
+ {
+ return false;
+ }
+ return true;
+ }
+
#endregion
#region 绉婚櫎鏂规硶
--
Gitblit v1.8.0