From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
index 68c6c1c..4639e66 100755
--- 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,9 +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