From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs | 317 +++++++++++++++++++++++++++++-----------------------
1 files changed, 175 insertions(+), 142 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
index b6001cf..ee6f735 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
@@ -17,7 +17,6 @@
this.doorLock = doorLock;
BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor;
ZigBee.Device.ZbGateway.StatusList.Add(this);
- ReadTempPasswordData();
}
#region 鈼� 鍙橀噺鐢虫槑__________________________
@@ -36,6 +35,7 @@
/// </summary>
public void Show()
{
+ ReadTempPasswordData();
this.TopFrameLayout(this, Language.StringByID(R.MyInternationalizationString.TemporaryPassword));
EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
@@ -52,7 +52,7 @@
#region btnDelFrameLayout
var btnDelFrameLayout = new FrameLayout
{
- X = Application.GetRealWidth(953),
+ X = Application.GetRealWidth(953 - 116),
Height = Application.GetRealHeight(69),
Width = Application.GetRealWidth(1080 - 953),
};
@@ -107,35 +107,22 @@
TextAlignment = TextAlignment.CenterLeft,
Text = Language.StringByID(R.MyInternationalizationString.ClearTempPassword),
TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
- TextSize = 12,
+ TextSize = 14,
+ IsBold = true,
};
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);
- };
+ 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;
@@ -181,7 +168,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,
@@ -190,11 +177,9 @@
var randomPassword = new EditText()
{
- X = Application.GetRealWidth(233),
Y = Application.GetRealHeight(153),
Height = Application.GetRealHeight(84),
- Width = Application.GetRealWidth(251),
- TextAlignment = TextAlignment.CenterRight,
+ TextAlignment = TextAlignment.Center,
TextSize = 24,
SecureTextEntry = false,
Enable = false,
@@ -215,47 +200,46 @@
var validTime = new Button()
{
Height = Application.GetRealHeight(55),
- Width = Application.GetRealWidth(115),
- X = Application.GetRealWidth(92),
+ Width = Application.GetRealWidth(92 + 115),
Y = Application.GetRealHeight(386),
TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
- TextAlignment = TextAlignment.CenterLeft,
- TextSize = 14,
+ TextAlignment = TextAlignment.CenterRight,
+ TextSize = 16,
};
MidTopFrameLayout.AddChidren(validTime);
var validTimeDate = new Button()
{
Height = Application.GetRealHeight(49),
- Width = Application.GetRealWidth(135),
- X = Application.GetRealWidth(84),
+ Width = Application.GetRealWidth(84 + 135),
Y = Application.GetRealHeight(441),
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
- TextSize = 10,
+ TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+ TextSize = 12,
+ TextAlignment = TextAlignment.CenterRight,
};
MidTopFrameLayout.AddChidren(validTimeDate);
var inValidTime = new Button()
{
Height = Application.GetRealHeight(55),
- Width = Application.GetRealWidth(118),
+ Width = Application.GetRealWidth(717 - 507),
X = Application.GetRealWidth(507),
Y = Application.GetRealHeight(389),
TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
TextAlignment = TextAlignment.CenterLeft,
- TextSize = 14,
+ TextSize = 16,
};
MidTopFrameLayout.AddChidren(inValidTime);
var inValidTimeDate = new Button()
{
Height = Application.GetRealHeight(49),
- Width = Application.GetRealWidth(135),
+ 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 = 10,
+ TextSize = 12,
};
MidTopFrameLayout.AddChidren(inValidTimeDate);
@@ -281,7 +265,6 @@
{
randomPassword.Text = "- - - - - -";
temPasswordVisiable.Visible = false;
- randomPassword.X = Application.GetRealWidth(215);
randomPassword.TextColor = Shared.Common.ZigbeeColor.Current.XMGray4;
Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.IsModify = true;
topPic.Visible = true;
@@ -291,8 +274,6 @@
{
randomPassword.Text = doorLock.LocalTempPassword;
temPasswordVisiable.Visible = true;
- // topPic.Visible = false;
- // topPic.Enable = false;
if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InTempPasswordVisiable)
{
randomPassword.SecureTextEntry = false;
@@ -347,6 +328,7 @@
BackgroundColor = ZigbeeColor.Current.XMWhite,
};
this.midFrameLayout.AddChidren(bottomFrameLayout);
+ bottomFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
var informationEdit = new Button()
{
@@ -399,7 +381,7 @@
{
Width = Application.GetRealWidth(58),
Height = Application.GetRealHeight(58),
- UnSelectedImagePath = "Item/Next.png",
+ UnSelectedImagePath = "Item/RightNext.png",
SelectedImagePath = "Item/Down.png",
};
btnNextFrameLayout.AddChidren(btnNext);
@@ -434,6 +416,15 @@
{
if (curIndex == 0)
{
+ if (string.IsNullOrEmpty(doorLock.LocalTempPassword))
+ {
+ //璇�"鐐瑰嚮鐢熸垚"涓存椂瀵嗙爜锛�
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip1), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
+ });
+ return;
+ }
var tempPage = new Shared.Phone.UserCenter.DoorLock.TimeSettignPage(doorLock, "ValidTime");
Shared.Phone.UserView.HomePage.Instance.AddChidren(tempPage);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
@@ -445,6 +436,15 @@
}
if (curIndex == 1)
{
+ if (string.IsNullOrEmpty(doorLock.LocalTempPassword))
+ {
+ //璇�"鐐瑰嚮鐢熸垚"涓存椂瀵嗙爜锛�
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip1), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
+ });
+ return;
+ }
var tempPage = new Shared.Phone.UserCenter.DoorLock.TimeSettignPage(doorLock, "InValidTime");
Shared.Phone.UserView.HomePage.Instance.AddChidren(tempPage);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
@@ -496,6 +496,7 @@
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect,
TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
TextSize = 16,
+ IsBold = true,
Enable = false,
};
bottomFrameLayout.AddChidren(btnFinifh);
@@ -514,7 +515,7 @@
Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
try
{
- if (doorLock.LocalTempPassword == "")
+ if (string.IsNullOrEmpty(doorLock.LocalTempPassword))
{
//璇�"鐐瑰嚮鐢熸垚"涓存椂瀵嗙爜锛�
Application.RunOnMainThread(() =>
@@ -523,44 +524,23 @@
});
return;
}
- //if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateHour == 100)
- //{
- // //璇疯缃敓鏁堟椂闂达紱
- // Application.RunOnMainThread(() =>
- // {
- // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip2), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
- // });
- // return;
- //}
- //if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateMonth == 0)
- //{
- // //璇疯缃敓鏁堟棩鏈燂紱
- // Application.RunOnMainThread(() =>
- // {
- // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip3), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
- // });
- // return;
- //}
- //if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateHour == 100)
- //{
- // Application.RunOnMainThread(() =>
- // {
- // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip4), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
- // });
- // return;
- //}
- //if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMonth == 0)
- //{
- // Application.RunOnMainThread(() =>
- // {
- // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip5), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
- // });
- // return;
- //}
var dNow = DateTime.Now;
- var validDateTime = new DateTime(dNow.Year, Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateMonth, Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateDay, Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateHour, Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateMinute, dNow.Second);
+ var validDateTime = new DateTime(dNow.Year, Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateMonth, Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateDay, Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateHour, Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateMinute - 1, dNow.Second);
var inValidDateTime = new DateTime(dNow.Year, Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMonth, Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateDay, Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateHour, Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMinute, dNow.Second);
+ if (DateTime.Compare(inValidDateTime, validDateTime) < 0)
+ {
+ //鏃犳晥鐨勬椂闂磋缃�
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetTempPasswordTip), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
+ });
+ return;
+ }
+
+ var startTimeStr = Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetUnixTimeStamp(validDateTime);
+ var endTimeStr = Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetUnixTimeStamp(inValidDateTime);
+
action = (topic, data) =>
{
var gatewayID = topic.Split('/')[0];
@@ -602,40 +582,57 @@
}
//璁剧疆涓存椂瀵嗙爜鍒伴棬閿�
var addOrModifyResult = await doorLock.TempPasswordAsync(doorLock.LocalTempPassword, validDateTime, inValidDateTime);
- if (addOrModifyResult != null && addOrModifyResult.responseData != null && addOrModifyResult.responseData.status == 0)
+ if (addOrModifyResult != null && addOrModifyResult.responseData != null)
{
- System.Threading.Thread.Sleep(1000);
- if (doorLock.tempPasswordObject != null)
+ if (addOrModifyResult.responseData.status == 0)
{
- var addDoorLockTempPasswordData = new ZigBee.Device.DoorLock.AddDoorLockTempPasswordData();
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ System.Threading.Thread.Sleep(1000);
+ if (doorLock.tempPasswordObject != null)
{
- addDoorLockTempPasswordData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- addDoorLockTempPasswordData.IsOtherAccountCtrl = true;
+ var addDoorLockTempPasswordData = new ZigBee.Device.DoorLock.AddDoorLockTempPasswordData();
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ addDoorLockTempPasswordData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ addDoorLockTempPasswordData.IsOtherAccountCtrl = true;
+ }
+ addDoorLockTempPasswordData.TempPwd = doorLock.tempPasswordObject.TempPassword;
+ if (doorLock.DeviceAddr != null)
+ {
+ addDoorLockTempPasswordData.LocalDoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ }
+ addDoorLockTempPasswordData.ValidBeginTime = doorLock.tempPasswordObject.ValidTime;
+ addDoorLockTempPasswordData.ValidEndTime = doorLock.tempPasswordObject.InValidTime;
+ addDoorLockTempPasswordData.TempPwdId = doorLock.tempPasswordObject.UserId.ToString();
+ //瀛樺埌浜�
+ var result1 = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLockPwd", addDoorLockTempPasswordData);
+ if (result1 == null)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
+ });
+ return;
+ }
+ if (result1.StateCode != "Success")
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetFailedXm1), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
+ });
+ return;
+ }
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.IsModify = false;
+ doorLock.LocalTempPassword = doorLock.tempPasswordObject.TempPassword;
+ TimeDateData(doorLock.tempPasswordObject.ValidTime, doorLock.tempPasswordObject.InValidTime);
}
- addDoorLockTempPasswordData.TempPwd = doorLock.tempPasswordObject.TempPassword;
- if (doorLock.DeviceAddr != null)
- {
- addDoorLockTempPasswordData.LocalDoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- }
- addDoorLockTempPasswordData.ValidBeginTime = doorLock.tempPasswordObject.ValidTime;
- addDoorLockTempPasswordData.ValidEndTime = doorLock.tempPasswordObject.InValidTime;
- addDoorLockTempPasswordData.TempPwdId = doorLock.tempPasswordObject.UserId.ToString();
- //瀛樺埌浜�
- var result1 = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLockPwd", addDoorLockTempPasswordData);
- if (result1 != null && result1.StateCode != "Success")
+ else
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetFailedXm1), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetFailedXm), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
});
return;
}
- //btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;//XMUnSelect XMBlack
- //btnFinifh.Enable = false;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.IsModify = false;
- doorLock.LocalTempPassword = doorLock.tempPasswordObject.TempPassword;
- TimeDateData(doorLock.tempPasswordObject.ValidTime, doorLock.tempPasswordObject.InValidTime);
}
else
{
@@ -650,7 +647,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.SetFailedXm), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
});
return;
}
@@ -671,7 +668,7 @@
}
//娓呴櫎浜嬩欢澶勭悊
- async void ClearEventHandler(Button btnDelText = null, Dialog dialog = null)
+ async void ClearEventHandler(Button btnDelText = null)
{
if (btnDelText == null)
{
@@ -684,35 +681,58 @@
{
var passData = doorLock.SetUserAccessData(doorLock.tempPasswordObject.UserId, ZigBee.Device.DoorLock.AccessType.DelCurrentUser);
var resultData = await doorLock.DefaultControlAsync(passData);
- if (resultData != null && resultData.defaultControlResponseData != null && resultData.defaultControlResponseData.status == 0)
+ if (resultData != null && resultData.defaultControlResponseData != null)
{
- var delDoorLockTempPasswordData = new ZigBee.Device.DoorLock.DelDoorLockTempPasswordData();
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ if (resultData.defaultControlResponseData.status == 0)
{
- delDoorLockTempPasswordData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- delDoorLockTempPasswordData.IsOtherAccountCtrl = true;
- }
- if (doorLock.DeviceAddr != null)
- {
- delDoorLockTempPasswordData.LocalDoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- }
- var result1 = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLockPwd", delDoorLockTempPasswordData);
- if (result1 != null && result1 != null && result1.StateCode == "Success")
- {
- doorLock.tempPasswordObject = null;
- doorLock.LocalTempPassword = "";
- TimeDateData(DateTime.Now, DateTime.Now, true);
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InTempPasswordVisiable = false;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.IsModify = true;
+ var delDoorLockTempPasswordData = new ZigBee.Device.DoorLock.DelDoorLockTempPasswordData();
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ delDoorLockTempPasswordData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ delDoorLockTempPasswordData.IsOtherAccountCtrl = true;
+ }
+ if (doorLock.DeviceAddr != null)
+ {
+ delDoorLockTempPasswordData.LocalDoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ }
+ var result1 = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLockPwd", delDoorLockTempPasswordData);
+ if (result1 != null)
+ {
+ if (result1.StateCode == "Success")
+ {
+ doorLock.tempPasswordObject = null;
+ doorLock.LocalTempPassword = "";
+ TimeDateData(DateTime.Now, DateTime.Now, true);
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InTempPasswordVisiable = false;
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.IsModify = true;
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ClearFailedXm1) + ".", Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
+ });
+ }
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
+ });
+ }
}
else
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ClearFailedXm1), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ClearFailedXm1), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
+ });
}
}
else
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ClearFailedXm), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDelText);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDelText);
}
}
@@ -722,10 +742,7 @@
{
Application.RunOnMainThread(() =>
{
- if (dialog != null)
- {
- dialog.Close();
- }
+
MidFrameLayoutContent();
CommonPage.Loading.Hide();
});
@@ -751,18 +768,33 @@
getDoorLockTempPasswordData.LocalDoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
}
var result = await ZigBee.Device.DoorLock.GetDoorLockTempPasswordFromServer("DoorLock/GetDoorLockPwdPagger", getDoorLockTempPasswordData);
- if (result != null && result.PageData != null)
+ if (result != null)
{
- foreach (var curDoorLockTempPaw in result.PageData)
+ if (result.PageData.Count != 0)
{
- var tpObj = new ZigBee.Device.DoorLock.TempPasswordObject();
- tpObj.UserId = int.Parse(curDoorLockTempPaw.TempPwdId);
- tpObj.ValidTime = curDoorLockTempPaw.ValidBeginTime;
- tpObj.InValidTime = curDoorLockTempPaw.ValidEndTime;
- doorLock.LocalTempPassword = tpObj.TempPassword = curDoorLockTempPaw.TempPwd;
- doorLock.tempPasswordObject = tpObj;
- TimeDateData(doorLock.tempPasswordObject.ValidTime, doorLock.tempPasswordObject.InValidTime);
+ foreach (var curDoorLockTempPaw in result.PageData)
+ {
+ var tpObj = new ZigBee.Device.DoorLock.TempPasswordObject();
+ tpObj.UserId = int.Parse(curDoorLockTempPaw.TempPwdId);
+ tpObj.ValidTime = curDoorLockTempPaw.ValidBeginTime;
+ tpObj.InValidTime = curDoorLockTempPaw.ValidEndTime;
+ doorLock.LocalTempPassword = tpObj.TempPassword = curDoorLockTempPaw.TempPwd;
+ doorLock.tempPasswordObject = tpObj;
+ TimeDateData(doorLock.tempPasswordObject.ValidTime, doorLock.tempPasswordObject.InValidTime);
+ }
}
+ else
+ {
+ doorLock.tempPasswordObject = null;
+ doorLock.LocalTempPassword = "";
+ TimeDateData(DateTime.Now, DateTime.Now, true);
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InTempPasswordVisiable = false;
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.IsModify = true;
+ }
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
}
}
catch { }
@@ -832,6 +864,7 @@
Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMonth = cur.Month;
Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateDay = cur.Day;
Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateDay = cur.Day + 1;
+ //doorLock.ReSave();
}
if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateHour < 10)
{
--
Gitblit v1.8.0