From dc0309e64f02227d8e1468b7326c07955f804612 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期三, 22 六月 2022 11:22:18 +0800
Subject: [PATCH] 修改引用路径
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs | 197 +++++++++++++++++++++++++++++++------------------
1 files changed, 125 insertions(+), 72 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
index 1ad9beb..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,22 +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 = "--:--",
};
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);
@@ -192,10 +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 = "--:--",
};
MidTopFrameLayout.AddChidren(inValidTime);
@@ -204,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);
@@ -215,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 = "- - - - - -";
@@ -256,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();
@@ -391,7 +395,9 @@
//璇�"鐐瑰嚮鐢熸垚"涓存椂瀵嗙爜锛�
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip1), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
+ var mess = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip1);
+ ShowMassage(ShowMsgType.Tip, mess);
+
});
return;
}
@@ -411,7 +417,8 @@
//璇�"鐐瑰嚮鐢熸垚"涓存椂瀵嗙爜锛�
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip1), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
+ var mess = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip1);
+ this.ShowMassage(ShowMsgType.Tip, mess);
});
return;
}
@@ -493,7 +500,8 @@
//璇�"鐐瑰嚮鐢熸垚"涓存椂瀵嗙爜锛�
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip1), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
+ var mess = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip1);
+ this.ShowMassage(ShowMsgType.Tip, mess);
});
return;
}
@@ -506,7 +514,8 @@
//鏃犳晥鐨勬椂闂磋缃�
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
+ var mess = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip);
+ this.ShowMassage(ShowMsgType.Tip, mess);
});
return;
}
@@ -570,7 +579,7 @@
}
//瀵瑰瘑鐮佽繘琛屽姞瀵嗗鐞�
string hdlKey = "hD1(La3o";
- var enPsw = UserCenterLogic.EncryptPassword(hdlKey, doorLock.tempPasswordObject.TempPassword);
+ var enPsw = UserCenterLogic.EncryptPassword(hdlKey, doorLock.tempPasswordObject.TempPassword);
addDoorLockTempPasswordData.TempPwd = enPsw;
if (doorLock.DeviceAddr != null)
{
@@ -585,7 +594,8 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
+ var mess = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime);
+ this.ShowMassage(ShowMsgType.Tip, mess);
});
return;
}
@@ -593,7 +603,8 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetFailedXm1), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
+ var mess = Language.StringByID(R.MyInternationalizationString.SetFailedXm1);
+ this.ShowMassage(ShowMsgType.Tip, mess);
});
return;
}
@@ -605,7 +616,8 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetFailedXm), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
+ var mess = Language.StringByID(R.MyInternationalizationString.SetFailedXm);
+ this.ShowMassage(ShowMsgType.Tip, mess);
});
return;
}
@@ -614,7 +626,8 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetFailedXm), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
+ var mess = Language.StringByID(R.MyInternationalizationString.SetFailedXm);
+ this.ShowMassage(ShowMsgType.Tip, mess);
});
return;
}
@@ -623,7 +636,8 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
+ var mess = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
+ this.ShowMassage(ShowMsgType.Tip, mess);
});
return;
}
@@ -755,7 +769,8 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ClearFailedXm1) + ".", Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
+ var mess = Language.StringByID(R.MyInternationalizationString.ClearFailedXm1);
+ this.ShowMassage(ShowMsgType.Tip, mess);
});
}
}
@@ -763,7 +778,8 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
+ var mess = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime);
+ this.ShowMassage(ShowMsgType.Tip, mess);
});
}
}
@@ -771,14 +787,15 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ClearFailedXm1), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
+ var mess = Language.StringByID(R.MyInternationalizationString.ClearFailedXm1);
+ this.ShowMassage(ShowMsgType.Tip, mess);
});
}
}
else
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDelText);
-
+ var mess = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
+ this.ShowMassage(ShowMsgType.Tip, mess);
}
}
}
@@ -827,7 +844,7 @@
tpObj.InValidTime = curDoorLockTempPaw.ValidEndTime;
//瑙ｅ瘑瀵嗙爜
string hdlKey = "hD1(La3o";
- var desPsw= UserCenterLogic.DecryptPassword(hdlKey, curDoorLockTempPaw.TempPwd);
+ var desPsw = UserCenterLogic.DecryptPassword(hdlKey, curDoorLockTempPaw.TempPwd);
doorLock.LocalTempPassword = tpObj.TempPassword = desPsw;
doorLock.tempPasswordObject = tpObj;
TimeDateData(doorLock.tempPasswordObject.ValidTime, doorLock.tempPasswordObject.InValidTime);
@@ -844,7 +861,8 @@
}
else
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ var mess = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime);
+ this.ShowMassage(ShowMsgType.Tip, mess);
}
}
catch { }
@@ -914,20 +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)
@@ -949,7 +986,7 @@
//鏈夋晥鏃堕棿
if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateHour == 100)
{
- validTime.Text = "00:00";
+ validTime.Text = "--:--";
}
else
{
@@ -975,14 +1012,30 @@
if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateHour == 100)
{
- inValidTime.Text = "00:00";
+ inValidTime.Text = "--:--";
}
else
{
inValidTime.Text = hour + ":" + minute;
}
- validTimeDate.Text = Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateMonth + Language.StringByID(R.MyInternationalizationString.Month) + Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateDay + Language.StringByID(R.MyInternationalizationString.Day);
- inValidTimeDate.Text = Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMonth + Language.StringByID(R.MyInternationalizationString.Month) + Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateDay + Language.StringByID(R.MyInternationalizationString.Day);
+
+ if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateMonth == 0)
+ {
+ validTimeDate.Text = "-" + Language.StringByID(R.MyInternationalizationString.Month) + "-" + Language.StringByID(R.MyInternationalizationString.Day);
+ }
+ else
+ {
+ validTimeDate.Text = Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateMonth + Language.StringByID(R.MyInternationalizationString.Month) + Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateDay + Language.StringByID(R.MyInternationalizationString.Day);
+ }
+
+ if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMonth == 0)
+ {
+ inValidTimeDate.Text = "-" + Language.StringByID(R.MyInternationalizationString.Month) + "-" + Language.StringByID(R.MyInternationalizationString.Day);
+ }
+ else
+ {
+ inValidTimeDate.Text = Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMonth + Language.StringByID(R.MyInternationalizationString.Month) + Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateDay + Language.StringByID(R.MyInternationalizationString.Day);
+ }
}
}
}
--
Gitblit v1.8.0