From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs | 56 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
index c4005af..68c6c1c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
@@ -926,26 +926,44 @@
void TimeDisplay(Button validTime, Button validTimeDate, Button inValidTime, Button inValidTimeDate, bool isDefaultTime)
{
string hour = "";
- string minute = "";
+ string minute = "";
if (isDefaultTime)
- {
- var cur = DateTime.Now;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateHour = cur.Hour;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateHour = cur.Hour;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateMinute = cur.Minute;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMinute = cur.Minute;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateSecond = cur.Second;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateSecond = cur.Second;
-
- var InValidTime = cur.AddDays(1);
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateYear = cur.Year;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateYear = InValidTime.Year;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateMonth = cur.Month;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMonth = InValidTime.Month;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateDay = cur.Day;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateDay = InValidTime.Day;
-
- //doorLock.ReSave();
+ {
+ var cur = DateTime.Now;
+ DoorLockCommonInfo.ValidDateHour = cur.Hour;
+ DoorLockCommonInfo.ValidDateMinute = cur.Minute;
+ DoorLockCommonInfo.ValidDateSecond = cur.Second;
+ DoorLockCommonInfo.InValidDateHour = cur.Hour;
+ DoorLockCommonInfo.InValidDateMinute = cur.Minute;
+ DoorLockCommonInfo.InValidDateSecond = cur.Second;
+ DoorLockCommonInfo.ValidDateYear = cur.Year;
+ DoorLockCommonInfo.ValidDateMonth = cur.Month;
+ DoorLockCommonInfo.ValidDateDay = cur.Day;
+
+ var curD = DoorLockCommonInfo.LastDayOfMonth(cur);
+ if (DoorLockCommonInfo.ValidDateDay == curD.Day)
+ {
+ if (DoorLockCommonInfo.ValidDateMonth == 12)
+ {
+ DoorLockCommonInfo.InValidDateYear = cur.Year + 1;
+ DoorLockCommonInfo.InValidDateMonth = 1;
+ DoorLockCommonInfo.InValidDateDay = 1;
+ }
+ else
+ {
+ DoorLockCommonInfo.InValidDateYear = cur.Year;
+ DoorLockCommonInfo.InValidDateMonth = cur.Month + 1;
+ DoorLockCommonInfo.InValidDateDay = 1;
+ }
+ }
+ else
+ {
+ DoorLockCommonInfo.InValidDateYear = cur.Year;
+ DoorLockCommonInfo.InValidDateMonth = cur.Month;
+ DoorLockCommonInfo.InValidDateDay = cur.Day + 1;
+ }
+
+ //doorLock.ReSave();
}
if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateHour < 10)
{
--
Gitblit v1.8.0