From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs | 350 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 199 insertions(+), 151 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
index 0987e21..071fe66 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
@@ -6,7 +6,7 @@
namespace Shared.Phone.UserCenter.DoorLock
{
- public class TemporaryPassword : DoorLockCommonLayout, ZigBee.Common.IStatus
+ public class TemporaryPassword : DoorLockCommonLayout
{
/// <summary>
/// 鏋勯�犲嚱鏁�
@@ -16,17 +16,40 @@
{
this.doorLock = doorLock;
BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor;
- ZigBee.Device.ZbGateway.StatusList.Add(this);
}
- #region 鈼� 鍙橀噺鐢虫槑__________________________
+ #region 鍙橀噺鐢虫槑
+ /// <summary>
+ /// 褰撳墠闂ㄩ攣
+ /// </summary>
ZigBee.Device.DoorLock doorLock;
- public System.Collections.Generic.List<Button> pawButtonList = new System.Collections.Generic.List<Button> { };//涓存椂瀵嗙爜涓殑6浣嶆暟瀛�
- Button passwordText; //涓存椂瀵嗙爜
+ /// <summary>
+ /// 涓存椂瀵嗙爜涓殑6浣嶆暟瀛�
+ /// </summary>
+ public System.Collections.Generic.List<Button> pawButtonList = new System.Collections.Generic.List<Button> { };
+ /// <summary>
+ /// 涓存椂瀵嗙爜
+ /// </summary>
+ Button passwordText;
+ /// <summary>
+ /// 涓儴甯冪殑椤堕儴甯冨眬
+ /// </summary>
FrameLayout MidTopFrameLayout;
- Action<string, string> action;//鎺ユ敹閫氱煡
+ /// <summary>
+ /// 鎺ユ敹閫氱煡
+ /// </summary>
+ Action<string, string> action;
+ /// <summary>
+ /// 淇濆瓨瀹屾垚鎸夐挳
+ /// </summary>
Button btnFinifh;
+ /// <summary>
+ /// 褰撳墠鏈夋晥鏃ユ湡鏃堕棿
+ /// </summary>
DateTime cunVDateTime;
+ /// <summary>
+ /// 褰撳墠澶辨晥鏃ユ湡鏃堕棿
+ /// </summary>
DateTime cunIVDateTime;
#endregion
@@ -68,78 +91,7 @@
EventHandler<MouseEventArgs> eHandler = (sender, e) =>
{
- var dialog = new Dialog { };
- dialog.Show();
-
- var flMain = new FrameLayout { BackgroundColor = 0x00000000 };
- dialog.AddChidren(flMain);
- flMain.MouseUpEventHandler += (sender11, e11) =>
- {
- dialog.Close();
- };
-
- var delBackgroundFrameLayout = new FrameLayout
- {
- X = Application.GetRealWidth(596),
- Y = Application.GetRealHeight(164),
- Height = Application.GetRealHeight(173),
- Width = Application.GetRealWidth(449),
- BackgroundImagePath = "DoorLock/DelBackground.png",
- };
- flMain.AddChidren(delBackgroundFrameLayout);
-
- var btnDelIcon2 = new Button
- {
- Height = Application.GetRealHeight(81),
- Width = Application.GetRealWidth(81),
- X = Application.GetRealWidth(81),
- Y = Application.GetRealHeight(55),
- UnSelectedImagePath = "DoorLock/DelIcon.png",
- };
- delBackgroundFrameLayout.AddChidren(btnDelIcon2);
-
- var btnDelText = new Button
- {
- Height = Application.GetRealHeight(58),
- Width = Application.GetRealWidth(311),
- X = Application.GetRealWidth(173),
- Y = Application.GetRealHeight(69),
- TextAlignment = TextAlignment.CenterLeft,
- Text = Language.StringByID(R.MyInternationalizationString.ClearTempPassword),
- TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
- TextSize = 12,
- };
- delBackgroundFrameLayout.AddChidren(btnDelText);
-
- EventHandler<MouseEventArgs> eHandler2 = (sender2, e2) =>
- {
- var dialog1 = new Dialog { };
- var doorDialog = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog1, Language.StringByID(R.MyInternationalizationString.Tip));
- doorDialog.Show();
- doorDialog.dialogMidFraFrameLayout.Width = Application.GetRealWidth(415);
- doorDialog.dialogMidFraFrameLayout.Height = Application.GetRealHeight(58);
- doorDialog.dialogMidFraFrameLayout.X = Application.GetRealWidth(190);
- doorDialog.dialogMidFraFrameLayout.Y = Application.GetRealHeight(202);
- doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
- doorDialog.dialogMidText.Text = Language.StringByID(R.MyInternationalizationString.SureToDeleteTempPassword);
- doorDialog.dialogMidText.TextSize = 14;
- doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
- doorDialog.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.Confrim);
- doorDialog.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>
- {
- dialog.Close();
- dialog1.Close();
- };
- doorDialog.dialogBtnConfirm.MouseUpEventHandler += (sender1, e1) =>
- {
- dialog.Close();
- dialog1.Close();
- ClearEventHandler(btnDelText, dialog1);
- };
- };
- delBackgroundFrameLayout.MouseDownEventHandler += eHandler2;
- btnDelIcon2.MouseDownEventHandler += eHandler2;
- btnDelText.MouseDownEventHandler += eHandler2;
+ ClearDialog();
};
btnDelFrameLayout.MouseDownEventHandler += eHandler;
btnDelIcon.MouseDownEventHandler += eHandler;
@@ -156,6 +108,9 @@
MidFrameLayoutContent();
}
+ /// <summary>
+ /// 涓儴甯冨眬
+ /// </summary>
public void MidFrameLayoutContent()
{
MidTopFrameLayout.RemoveAll();
@@ -181,7 +136,7 @@
Y = Application.GetRealHeight(48),
TextAlignment = TextAlignment.Center,
Text = Language.StringByID(R.MyInternationalizationString.ClickGenerate),
- TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
+ TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
TextSize = 12,
Visible = true,
Enable = true,
@@ -218,6 +173,7 @@
TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
TextAlignment = TextAlignment.CenterRight,
TextSize = 16,
+ Text = "--:--",
};
MidTopFrameLayout.AddChidren(validTime);
@@ -226,7 +182,7 @@
Height = Application.GetRealHeight(49),
Width = Application.GetRealWidth(84 + 135),
Y = Application.GetRealHeight(441),
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
+ TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
TextSize = 12,
TextAlignment = TextAlignment.CenterRight,
};
@@ -241,6 +197,7 @@
TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
TextAlignment = TextAlignment.CenterLeft,
TextSize = 16,
+ Text = "--:--",
};
MidTopFrameLayout.AddChidren(inValidTime);
@@ -250,7 +207,7 @@
Width = Application.GetRealWidth(717 - 508),
X = Application.GetRealWidth(508),
Y = Application.GetRealHeight(444),
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
+ TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
TextAlignment = TextAlignment.CenterLeft,
TextSize = 12,
};
@@ -331,7 +288,9 @@
};
#endregion
}
- //搴曢儴鐣岄潰鍜屾暟鎹鐞�
+ /// <summary>
+ /// 搴曢儴甯冨眬澶勭悊
+ /// </summary>
public void BottomFrameLayoutContent()
{
var bottomFrameLayout = new FrameLayout()
@@ -341,6 +300,7 @@
BackgroundColor = ZigbeeColor.Current.XMWhite,
};
this.midFrameLayout.AddChidren(bottomFrameLayout);
+ bottomFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
var informationEdit = new Button()
{
@@ -393,7 +353,7 @@
{
Width = Application.GetRealWidth(58),
Height = Application.GetRealHeight(58),
- UnSelectedImagePath = "Item/Next.png",
+ UnSelectedImagePath = "Item/RightNext.png",
SelectedImagePath = "Item/Down.png",
};
btnNextFrameLayout.AddChidren(btnNext);
@@ -401,7 +361,7 @@
var btnLine = new FrameLayout()
{
Width = Application.GetRealWidth(965),
- Height = Application.GetRealHeight(5),
+ Height = 1,
X = Application.GetRealWidth(58),
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
};
@@ -433,7 +393,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;
}
@@ -453,7 +415,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;
}
@@ -508,6 +471,7 @@
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect,
TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
TextSize = 16,
+ IsBold = true,
Enable = false,
};
bottomFrameLayout.AddChidren(btnFinifh);
@@ -518,7 +482,10 @@
};
}
- //纭畾浜嬩欢澶勭悊
+ /// <summary>
+ /// 纭畾浜嬩欢澶勭悊
+ /// </summary>
+ /// <param name="btnFinifh"></param>
void FinifhEventHandler(Button btnFinifh)
{
System.Threading.Tasks.Task.Run(async () =>
@@ -531,7 +498,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;
}
@@ -544,7 +512,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;
}
@@ -606,7 +575,10 @@
addDoorLockTempPasswordData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
addDoorLockTempPasswordData.IsOtherAccountCtrl = true;
}
- addDoorLockTempPasswordData.TempPwd = doorLock.tempPasswordObject.TempPassword;
+ //瀵瑰瘑鐮佽繘琛屽姞瀵嗗鐞�
+ string hdlKey = "hD1(La3o";
+ var enPsw = UserCenterLogic.EncryptPassword(hdlKey, doorLock.tempPasswordObject.TempPassword);
+ addDoorLockTempPasswordData.TempPwd = enPsw;
if (doorLock.DeviceAddr != null)
{
addDoorLockTempPasswordData.LocalDoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
@@ -620,7 +592,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;
}
@@ -628,7 +601,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;
}
@@ -640,7 +614,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;
}
@@ -649,7 +624,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;
}
@@ -658,7 +634,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;
}
@@ -678,8 +655,77 @@
});
}
- //娓呴櫎浜嬩欢澶勭悊
- async void ClearEventHandler(Button btnDelText = null, Dialog dialog = null)
+ /// <summary>
+ /// 娓呴櫎UI
+ /// </summary>
+ void ClearDialog()
+ {
+ var dialog = new Dialog { };
+ dialog.Show();
+
+ var flMain = new FrameLayout { BackgroundColor = 0x00000000 };
+ dialog.AddChidren(flMain);
+ flMain.MouseUpEventHandler += (sender11, e11) =>
+ {
+ dialog.Close();
+ };
+
+ var delBackgroundFrameLayout = new FrameLayout
+ {
+ X = Application.GetRealWidth(596),
+ Y = Application.GetRealHeight(164),
+ Height = Application.GetRealHeight(173),
+ Width = Application.GetRealWidth(449),
+ BackgroundImagePath = "DoorLock/DelBackground.png",
+ };
+ flMain.AddChidren(delBackgroundFrameLayout);
+
+ var btnDelIcon2 = new Button
+ {
+ Height = Application.GetRealHeight(81),
+ Width = Application.GetRealWidth(81),
+ X = Application.GetRealWidth(81),
+ Y = Application.GetRealHeight(55),
+ UnSelectedImagePath = "DoorLock/DelIcon.png",
+ };
+ delBackgroundFrameLayout.AddChidren(btnDelIcon2);
+
+ var btnDelText = new Button
+ {
+ Height = Application.GetRealHeight(58),
+ Width = Application.GetRealWidth(311),
+ X = Application.GetRealWidth(173),
+ Y = Application.GetRealHeight(69),
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = Language.StringByID(R.MyInternationalizationString.ClearTempPassword),
+ TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
+ TextSize = 14,
+ IsBold = true,
+ };
+ delBackgroundFrameLayout.AddChidren(btnDelText);
+
+ EventHandler<MouseEventArgs> eHandler2 = (sender2, e2) =>
+ {
+ dialog.Close();
+ string msg = Language.StringByID(R.MyInternationalizationString.SureToDeleteTempPassword);
+ var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
+ alert.Show();
+ //浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
+ alert.ConfirmClickEvent += () =>
+ {
+ ClearEventHandler(btnDelText);
+ };
+ };
+ delBackgroundFrameLayout.MouseDownEventHandler += eHandler2;
+ btnDelIcon2.MouseDownEventHandler += eHandler2;
+ btnDelText.MouseDownEventHandler += eHandler2;
+ }
+
+ /// <summary>
+ /// 娓呴櫎浜嬩欢澶勭悊
+ /// </summary>
+ /// <param name="btnDelText"></param>
+ async void ClearEventHandler(Button btnDelText = null)
{
if (btnDelText == null)
{
@@ -694,7 +740,7 @@
var resultData = await doorLock.DefaultControlAsync(passData);
if (resultData != null && resultData.defaultControlResponseData != null)
{
- if (resultData.defaultControlResponseData.status == 0)
+ if (resultData.defaultControlResponseData.status == 0 || resultData.defaultControlResponseData.status == 2)
{
var delDoorLockTempPasswordData = new ZigBee.Device.DoorLock.DelDoorLockTempPasswordData();
if (UserCenterResourse.UserInfo.AuthorityNo != 1)
@@ -721,7 +767,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);
});
}
}
@@ -729,7 +776,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);
});
}
}
@@ -737,14 +785,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);
}
}
}
@@ -753,17 +802,16 @@
{
Application.RunOnMainThread(() =>
{
- if (dialog != null)
- {
- dialog.Close();
- }
+
MidFrameLayoutContent();
CommonPage.Loading.Hide();
});
}
}
- //璇诲彇浜戠瀛樺偍鏁版嵁
+ /// <summary>
+ /// 璇诲彇浜戠瀛樺偍鏁版嵁
+ /// </summary>
void ReadTempPasswordData()
{
System.Threading.Tasks.Task.Run(async () =>
@@ -792,7 +840,10 @@
tpObj.UserId = int.Parse(curDoorLockTempPaw.TempPwdId);
tpObj.ValidTime = curDoorLockTempPaw.ValidBeginTime;
tpObj.InValidTime = curDoorLockTempPaw.ValidEndTime;
- doorLock.LocalTempPassword = tpObj.TempPassword = curDoorLockTempPaw.TempPwd;
+ //瑙ｅ瘑瀵嗙爜
+ string hdlKey = "hD1(La3o";
+ var desPsw = UserCenterLogic.DecryptPassword(hdlKey, curDoorLockTempPaw.TempPwd);
+ doorLock.LocalTempPassword = tpObj.TempPassword = desPsw;
doorLock.tempPasswordObject = tpObj;
TimeDateData(doorLock.tempPasswordObject.ValidTime, doorLock.tempPasswordObject.InValidTime);
}
@@ -808,7 +859,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 { }
@@ -823,7 +875,12 @@
});
}
- //鏈湴鏃堕棿鏁版嵁澶勭悊
+ /// <summary>
+ /// 鏈湴鏃堕棿鏁版嵁澶勭悊
+ /// </summary>
+ /// <param name="validTimeDateTime"></param>
+ /// <param name="inValidTime"></param>
+ /// <param name="isClearLocalTime"></param>
void TimeDateData(DateTime validTimeDateTime, DateTime inValidTime, bool isClearLocalTime = false)
{
if (doorLock.tempPasswordObject != null)
@@ -858,7 +915,14 @@
}
}
- //鏃堕棿鏄剧ず鏁版嵁澶勭悊
+ /// <summary>
+ /// 鏃堕棿鏄剧ず鏁版嵁澶勭悊
+ /// </summary>
+ /// <param name="validTime"></param>
+ /// <param name="validTimeDate"></param>
+ /// <param name="inValidTime"></param>
+ /// <param name="inValidTimeDate"></param>
+ /// <param name="isDefaultTime"></param>
void TimeDisplay(Button validTime, Button validTimeDate, Button inValidTime, Button inValidTimeDate, bool isDefaultTime)
{
string hour = "";
@@ -872,12 +936,14 @@
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 = cur.Year;
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateYear = InValidTime.Year;
Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateMonth = cur.Month;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMonth = cur.Month;
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMonth = InValidTime.Month;
Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateDay = cur.Day;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateDay = cur.Day + 1;
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateDay = InValidTime.Day;
//doorLock.ReSave();
}
if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateHour < 10)
@@ -899,7 +965,7 @@
//鏈夋晥鏃堕棿
if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateHour == 100)
{
- validTime.Text = "00:00";
+ validTime.Text = "--:--";
}
else
{
@@ -925,48 +991,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);
- }
- #region 鈼� 鎺ュ彛瀹炵幇__________________________
- /// <summary>
- /// 澶勭悊鍙樺寲浜嬩欢 --灏嗗純鐢� 鏀圭敤DeviceInfoChange()
- /// </summary>
- /// <returns>The changed.</returns>
- /// <param name="common">Common.</param>
- public void Changed(CommonDevice common)
- {
+ 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);
+ }
}
- /// <summary>
- /// 澶勭悊鍙樺寲浜嬩欢
- /// </summary>
- /// <param name="common"></param>
- /// <param name="typeTag"></param>
- public void DeviceInfoChange(CommonDevice common, string typeTag)
- {
- }
- /// <summary>
- /// Changeds the IL ogic status.
- /// </summary>
- /// <param name="logic">Logic.</param>
- public void ChangedILogicStatus(ZigBee.Device.Logic logic)
- {
- }
- /// <summary>
- /// Changeds the IS cene status.
- /// </summary>
- /// <param name="scene">Scene.</param>
- public void ChangedISceneStatus(Scene scene)
- {
- }
- #endregion
}
}
--
Gitblit v1.8.0