From 3aa397ab145382935492b11c1f18c9634e69910b Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 10 十二月 2020 16:45:00 +0800
Subject: [PATCH] 请合并，门锁和晾衣架第一版代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
old mode 100644
new mode 100755
index 42a6e85..68c6c1c
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
@@ -926,10 +926,10 @@
void TimeDisplay(Button validTime, Button validTimeDate, Button inValidTime, Button inValidTimeDate, bool isDefaultTime)
{
string hour = "";
- string minute = "";
+ string minute = "";
if (isDefaultTime)
- {
- var cur = DateTime.Now;
+ {
+ var cur = DateTime.Now;
DoorLockCommonInfo.ValidDateHour = cur.Hour;
DoorLockCommonInfo.ValidDateMinute = cur.Minute;
DoorLockCommonInfo.ValidDateSecond = cur.Second;
@@ -938,8 +938,8 @@
DoorLockCommonInfo.InValidDateSecond = cur.Second;
DoorLockCommonInfo.ValidDateYear = cur.Year;
DoorLockCommonInfo.ValidDateMonth = cur.Month;
- DoorLockCommonInfo.ValidDateDay = cur.Day;
-
+ DoorLockCommonInfo.ValidDateDay = cur.Day;
+
var curD = DoorLockCommonInfo.LastDayOfMonth(cur);
if (DoorLockCommonInfo.ValidDateDay == curD.Day)
{
@@ -961,8 +961,9 @@
DoorLockCommonInfo.InValidDateYear = cur.Year;
DoorLockCommonInfo.InValidDateMonth = cur.Month;
DoorLockCommonInfo.InValidDateDay = cur.Day + 1;
- }
- //doorLock.ReSave();
+ }
+
+ //doorLock.ReSave();
}
if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateHour < 10)
{
--
Gitblit v1.8.0