From e5f993f52e09eb46878baced83bb8492f147d41c Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 04 十一月 2019 17:58:40 +0800
Subject: [PATCH] 2019-11-04-1
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
old mode 100644
new mode 100755
index 98eba8b..382077a
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
@@ -31,8 +31,8 @@
DateTime cunIVDateTime;
#endregion
- /// <summary>
- /// UI鏄剧ず
+ /// <summary>
+ /// UI鏄剧ず
/// </summary>
public void Show()
{
@@ -112,16 +112,38 @@
delBackgroundFrameLayout.AddChidren(btnDelText);
EventHandler<MouseEventArgs> eHandler2 = (sender2, e2) =>
- {
- ClearEventHandler(btnDelText, dialog);
- };
+ {
+ 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;
};
btnDelFrameLayout.MouseDownEventHandler += eHandler;
btnDelIcon.MouseDownEventHandler += eHandler;
- #endregion
+ #endregion
MidTopFrameLayout = new FrameLayout()
{
X = Application.GetRealWidth(181),
@@ -586,6 +608,11 @@
if (doorLock.tempPasswordObject != null)
{
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)
{
@@ -660,6 +687,11 @@
if (resultData != null && resultData.defaultControlResponseData != null && resultData.defaultControlResponseData.status == 0)
{
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;
@@ -709,6 +741,11 @@
try
{
var getDoorLockTempPasswordData = new ZigBee.Device.DoorLock.GetDoorLockTempPasswordData();
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ getDoorLockTempPasswordData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ getDoorLockTempPasswordData.IsOtherAccountCtrl = true;
+ }
if (doorLock.DeviceAddr != null)
{
getDoorLockTempPasswordData.LocalDoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
--
Gitblit v1.8.0