From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs | 128 ++++++++++++++++++++++++------------------
1 files changed, 74 insertions(+), 54 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
index c4005af..b261f23 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
@@ -95,11 +95,11 @@
};
btnDelFrameLayout.MouseDownEventHandler += eHandler;
btnDelIcon.MouseDownEventHandler += eHandler;
- #endregion
+ #endregion
MidTopFrameLayout = new FrameLayout()
{
- X = Application.GetRealWidth(181),
- Y = Application.GetRealHeight(92),
+ X = Application.GetMinRealAverage(181),
+ Y = Application.GetMinRealAverage(92),
Width = Application.GetRealWidth(717),
Height = Application.GetRealHeight(570),
BackgroundImagePath = "DoorLock/TempPasswordBackground.png",
@@ -118,7 +118,7 @@
{
Height = Application.GetRealHeight(43),
Width = Application.GetRealWidth(259),
- X = Application.GetRealWidth(230),
+ X = Application.GetRealWidth(227),
Y = Application.GetRealHeight(418),
UnSelectedImagePath = "DoorLock/TempPasswordBackground1.png",
};
@@ -168,23 +168,23 @@
var validTime = new Button()
{
Height = Application.GetRealHeight(55),
- Width = Application.GetRealWidth(92 + 115),
+ Width = Application.GetRealWidth(207),
Y = Application.GetRealHeight(386),
TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
TextAlignment = TextAlignment.CenterRight,
TextSize = 16,
- Text = "--:--",
+ Text = "--:--",
};
MidTopFrameLayout.AddChidren(validTime);
var validTimeDate = new Button()
{
Height = Application.GetRealHeight(49),
- Width = Application.GetRealWidth(84 + 135),
+ Width = Application.GetRealWidth(208),
Y = Application.GetRealHeight(441),
TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
TextSize = 12,
- TextAlignment = TextAlignment.CenterRight,
+ TextAlignment = TextAlignment.CenterRight,
};
MidTopFrameLayout.AddChidren(validTimeDate);
@@ -193,11 +193,11 @@
Height = Application.GetRealHeight(55),
Width = Application.GetRealWidth(717 - 507),
X = Application.GetRealWidth(507),
- Y = Application.GetRealHeight(389),
+ Y = Application.GetRealHeight(386),
TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
TextAlignment = TextAlignment.CenterLeft,
TextSize = 16,
- Text = "--:--",
+ Text = "--:--",
};
MidTopFrameLayout.AddChidren(inValidTime);
@@ -206,10 +206,10 @@
Height = Application.GetRealHeight(49),
Width = Application.GetRealWidth(717 - 508),
X = Application.GetRealWidth(508),
- Y = Application.GetRealHeight(444),
+ Y = Application.GetRealHeight(441),
TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
TextAlignment = TextAlignment.CenterLeft,
- TextSize = 12,
+ TextSize = 12,
};
MidTopFrameLayout.AddChidren(inValidTimeDate);
@@ -217,20 +217,7 @@
#region 鏁版嵁澶勭悊
TimeDisplay(validTime, validTimeDate, inValidTime, inValidTimeDate, false);
- if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.IsModify)
- {
- btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
- btnFinifh.Enable = true;
- topPic.Visible = true;
- topPic.Enable = true;
- }
- else
- {
- btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
- btnFinifh.Enable = false;
- topPic.Visible = false;
- topPic.Enable = false;
- }
+
if (string.IsNullOrEmpty(doorLock.LocalTempPassword))
{
randomPassword.Text = "- - - - - -";
@@ -258,21 +245,36 @@
}
}
- temPasswordVisiable.MouseUpEventHandler += (sender, e) =>
+ if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.IsModify)
{
- temPasswordVisiable.IsSelected = !temPasswordVisiable.IsSelected;
- if (!temPasswordVisiable.IsSelected)
- {
- randomPassword.TextColor = Shared.Common.ZigbeeColor.Current.XMGray4;
- randomPassword.SecureTextEntry = true;
- }
- else
- {
- randomPassword.TextColor = Shared.Common.ZigbeeColor.Current.XMOrange;
- randomPassword.SecureTextEntry = false;
- }
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InTempPasswordVisiable = !randomPassword.SecureTextEntry;
- };
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ btnFinifh.Enable = true;
+ topPic.Visible = true;
+ topPic.Enable = true;
+ }
+ else
+ {
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+ btnFinifh.Enable = false;
+ topPic.Visible = false;
+ topPic.Enable = false;
+ }
+
+ temPasswordVisiable.MouseUpEventHandler += (sender, e) =>
+ {
+ temPasswordVisiable.IsSelected = !temPasswordVisiable.IsSelected;
+ if (!temPasswordVisiable.IsSelected)
+ {
+ randomPassword.TextColor = Shared.Common.ZigbeeColor.Current.XMGray4;
+ randomPassword.SecureTextEntry = true;
+ }
+ else
+ {
+ randomPassword.TextColor = Shared.Common.ZigbeeColor.Current.XMOrange;
+ randomPassword.SecureTextEntry = false;
+ }
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InTempPasswordVisiable = !randomPassword.SecureTextEntry;
+ };
topPic.MouseUpEventHandler += (sender, e) =>
{
randomPassword.Text = Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetTempPassword();
@@ -930,21 +932,39 @@
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;
+ 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 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;
-
+ 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