From 737c036a39176fd2085ce82b7c60391da8cb508c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 31 十二月 2019 19:17:47 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs | 419 +++++++++++++++++++----------------------------------------
1 files changed, 134 insertions(+), 285 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
index 3c14341..0f80521 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
@@ -46,7 +46,7 @@
#region 鈼� 鍙橀噺鐢虫槑__________________________
ZigBee.Device.DoorLock doorLock;//褰撳墠闂ㄩ攣
- VerticalListRefreshControl bodyView;//鍒锋柊View
+ VerticalListRefreshControl bodyView;//鍒锋柊View
Button currentMethod;// 褰撳墠閫夋嫨鐨勬柟寮�
Shared.Phone.UserCenter.MemberInfoRes curAccountObj;//褰撳墠璐︽埛
Button entryStatusPic;
@@ -178,7 +178,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
TextSize = 12,
- IsBold =true,
+ IsBold = true,
};
midTopFrameLayout.AddChidren(btnAllMethod);
// 绫诲瀷鍖哄垎
@@ -230,7 +230,7 @@
bodyView = new VerticalListRefreshControl(29)
{
Y = btnLine.Bottom,
- Height = Application.GetRealHeight(1921 - 184 - 116),
+ Height = Application.GetRealHeight(1921 - 184 - 116),
};
this.midFrameLayout.AddChidren(bodyView);
bodyView.BeginHeaderRefreshingAction += () =>
@@ -238,7 +238,7 @@
bodyView.BeginHeaderRefreshing();
ReadDoorLockUserInfo();
};
- BlankPicUI();
+ BlankPicUI();
}
/// <summary>
@@ -276,13 +276,13 @@
btnPicTip1 = new Button
{
- X = Application.GetRealWidth(397),
- Y = Application.GetRealHeight(844+49),
+ X = Application.GetRealWidth(397),
+ Y = Application.GetRealHeight(844 + 49),
Text = Language.StringByID(R.MyInternationalizationString.NoPasswordInformation1),
TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
Gravity = Gravity.CenterHorizontal,
- Visible = true,
- TextSize =12,
+ Visible = true,
+ TextSize = 12,
};
blankFrameLayout.AddChidren(btnPicTip1);
}
@@ -334,7 +334,7 @@
entryStatusPic.Width = Application.GetRealHeight(0);
btnPicTip.Height = Application.GetRealHeight(0);
btnPicTip1.Height = Application.GetRealHeight(0);
- blankFrameLayout.Height = Application.GetRealHeight(0);
+ blankFrameLayout.Height = Application.GetRealHeight(0);
int i = 0;
foreach (var curUserId in curAccountDoorLockUserList.Keys)
@@ -372,8 +372,7 @@
rowFrameLayout.frameTable.UseClickStatu = false;
var btnicon = rowFrameLayout.frameTable.AddLeftIcon();
btnicon.UnSelectedImagePath = "DoorLock/DoorLockUserPic.png";
- //涓婇潰闂ㄩ攣鐢ㄦ埛鍚嶇О涓�琛�
- //rowFrameLayout.frameTable.AddTopView("", 800);
+ //涓婇潰闂ㄩ攣鐢ㄦ埛鍚嶇О涓�琛�
var memberText = "";
if (curAccountObj.UserName == "" || curAccountObj.UserName == null)
{
@@ -401,141 +400,130 @@
var btndelete = rowFrameLayout.AddDeleteControl();
btndelete.ButtonClickEvent += (sender, e) =>
{
- var dialog = new Dialog { };
- var doorDialog = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog, Language.StringByID(R.MyInternationalizationString.Tip));
- doorDialog.Show();
- doorDialog.dialogMidFraFrameLayout.Height = Application.GetRealHeight(58);
- doorDialog.dialogMidFraFrameLayout.X = Application.GetRealWidth(0);
- doorDialog.dialogMidFraFrameLayout.Y = Application.GetRealHeight(202);
- doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
- doorDialog.dialogMidText.Text = Language.StringByID(R.MyInternationalizationString.SureToDelUnlockMethod);
- doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
- doorDialog.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.DoorlockConfirm);
- doorDialog.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>
- {
- dialog.Close();
- };
- doorDialog.dialogBtnConfirm.MouseUpEventHandler += async (sender1, e1) =>
- {
- try
- {
- CommonPage.Loading.Start("");
- var passData = doorLock.SetUserAccessData(curDoorLockUser.UserID, ZigBee.Device.DoorLock.AccessType.DelCurrentUser);
- var resultData = await doorLock.DefaultControlAsync(passData);
- if (resultData != null && resultData.defaultControlResponseData != null)
- {
- if (resultData.defaultControlResponseData.status == 0 || resultData.defaultControlResponseData.status == 2)
- {
- var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- {
- deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- deleteDoorLockData.IsOtherAccountCtrl = true;
- }
- if (doorLock.DeviceAddr != null)
- {
- deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- }
- deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
- deleteDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
- deleteDoorLockData.DelDoorLockDelType = 2;
- var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
- if (result != null)
- {
- if (result.StateCode == "Success")
- {
- isSecondDel = false;
- if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
- {
- doorLock.localDoorLockAccountList.Remove(curDoorLockUser.ConnectedAccount);
- var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
- localDoorLockObj.UserID = curDoorLockUser.UserID;
- doorLock.localDoorLockUserList.Remove(curUserId);
- doorLock.ReSave();
- TypeRefresh();
- }
- }
- else
- {
+ string msg = Language.StringByID(R.MyInternationalizationString.SureToDelUnlockMethod);
+ var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
+ alert.Show();
+ //浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
+ alert.ConfirmClickEvent += async () =>
+ {
+ try
+ {
+ CommonPage.Loading.Start("");
+ var passData = doorLock.SetUserAccessData(curDoorLockUser.UserID, ZigBee.Device.DoorLock.AccessType.DelCurrentUser);
+ var resultData = await doorLock.DefaultControlAsync(passData);
+ if (resultData != null && resultData.defaultControlResponseData != null)
+ {
+ if (resultData.defaultControlResponseData.status == 0 || resultData.defaultControlResponseData.status == 2)
+ {
+ var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ deleteDoorLockData.IsOtherAccountCtrl = true;
+ }
+ if (doorLock.DeviceAddr != null)
+ {
+ deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ }
+ deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
+ deleteDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
+ deleteDoorLockData.DelDoorLockDelType = 2;
+ var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
+ if (result != null)
+ {
+ if (result.StateCode == "Success")
+ {
+ isSecondDel = false;
+ if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
+ {
+ doorLock.localDoorLockAccountList.Remove(curDoorLockUser.ConnectedAccount);
+ var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
+ localDoorLockObj.UserID = curDoorLockUser.UserID;
+ doorLock.localDoorLockUserList.Remove(curUserId);
+ doorLock.ReSave();
+ TypeRefresh();
+ }
+ }
+ else
+ {
//寮�鍏冲浘鏍�
new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
- }
- }
- else
- {
- isSecondDel = true;
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
- }
- }
- else
- {
- if (isSecondDel)
- {
- var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- {
- deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- deleteDoorLockData.IsOtherAccountCtrl = true;
- }
- if (doorLock.DeviceAddr != null)
- {
- deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- }
- deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
- deleteDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
- deleteDoorLockData.DelDoorLockDelType = 2;
- var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
- if (result != null)
- {
- if (result.StateCode == "Success")
- {
- isSecondDel = false;
- if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
- {
- doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
- var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
- localDoorLockObj.UserID = curDoorLockUser.UserID;
- doorLock.localDoorLockUserList.Remove(curUserId);
- TypeRefresh();
- }
- }
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
- }
- }
- else
- {
- isSecondDel = true;
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
- }
- }
- else
- {
- if (curDoorLockUser.UserID < 10)
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.OnlyBeDeletedOnTheDevice), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
- }
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
- }
- }
- }
- }
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(CommonPage.Instance);
- }
- dialog.Close();
- }
- catch { }
- finally
- {
- CommonPage.Loading.Hide();
- }
- };
- };
+ }
+ }
+ else
+ {
+ isSecondDel = true;
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
+ }
+ }
+ else
+ {
+ if (isSecondDel)
+ {
+ var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ deleteDoorLockData.IsOtherAccountCtrl = true;
+ }
+ if (doorLock.DeviceAddr != null)
+ {
+ deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ }
+ deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
+ deleteDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
+ deleteDoorLockData.DelDoorLockDelType = 2;
+ var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
+ if (result != null)
+ {
+ if (result.StateCode == "Success")
+ {
+ isSecondDel = false;
+ if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
+ {
+ doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
+ var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
+ localDoorLockObj.UserID = curDoorLockUser.UserID;
+ doorLock.localDoorLockUserList.Remove(curUserId);
+ TypeRefresh();
+ }
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
+ }
+ }
+ else
+ {
+ isSecondDel = true;
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
+ }
+ }
+ else
+ {
+ if (curDoorLockUser.UserID < 10)
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.OnlyBeDeletedOnTheDevice), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
+ }
+ }
+ }
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(CommonPage.Instance);
+ }
+ }
+ catch { }
+ finally
+ {
+ CommonPage.Loading.Hide();
+ }
+ };
+ };
#endregion
#region 鏁版嵁澶勭悊
@@ -624,149 +612,10 @@
new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
}
};
- btnDoorlockUser.EditorEnterAction += action;
-
- //btnDel.MouseUpEventHandler += (sender, e) =>
- //{
- //var dialog = new Dialog { };
- //var doorDialog = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog, Language.StringByID(R.MyInternationalizationString.Tip));
- //doorDialog.Show();
- //doorDialog.dialogMidFraFrameLayout.Height = Application.GetRealHeight(58);
- //doorDialog.dialogMidFraFrameLayout.X = Application.GetRealWidth(0);
- //doorDialog.dialogMidFraFrameLayout.Y = Application.GetRealHeight(202);
- //doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
- //doorDialog.dialogMidText.Text = Language.StringByID(R.MyInternationalizationString.SureToDelUnlockMethod);
- //doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
- //doorDialog.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.DoorlockConfirm);
- //doorDialog.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>
- //{
- // dialog.Close();
- //};
- //doorDialog.dialogBtnConfirm.MouseUpEventHandler += async (sender1, e1) =>
- //{
- // try
- // {
- // CommonPage.Loading.Start("");
- // var passData = doorLock.SetUserAccessData(curDoorLockUser.UserID, ZigBee.Device.DoorLock.AccessType.DelCurrentUser);
- // var resultData = await doorLock.DefaultControlAsync(passData);
- // if (resultData != null && resultData.defaultControlResponseData != null)
- // {
- // if (resultData.defaultControlResponseData.status == 0 || resultData.defaultControlResponseData.status == 2)
- // {
- // var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
- // if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- // {
- // deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- // deleteDoorLockData.IsOtherAccountCtrl = true;
- // }
- // if (doorLock.DeviceAddr != null)
- // {
- // deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- // }
- // deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
- // deleteDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
- // deleteDoorLockData.DelDoorLockDelType = 2;
- // var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
- // if (result != null)
- // {
- // if (result.StateCode == "Success")
- // {
- // isSecondDel = false;
- // if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
- // {
- // doorLock.localDoorLockAccountList.Remove(curDoorLockUser.ConnectedAccount);
- // var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
- // localDoorLockObj.UserID = curDoorLockUser.UserID;
- // doorLock.localDoorLockUserList.Remove(curUserId);
- // doorLock.ReSave();
- // TypeRefresh();
- // }
- // }
- // else
- // {
- // //寮�鍏冲浘鏍�
- // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
- // }
- // }
- // else
- // {
- // isSecondDel = true;
- // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
- // }
- // }
- // else
- // {
- // if (isSecondDel)
- // {
- // var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
- // if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- // {
- // deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- // deleteDoorLockData.IsOtherAccountCtrl = true;
- // }
- // if (doorLock.DeviceAddr != null)
- // {
- // deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- // }
- // deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
- // deleteDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
- // deleteDoorLockData.DelDoorLockDelType = 2;
- // var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
- // if (result != null)
- // {
- // if (result.StateCode == "Success")
- // {
- // isSecondDel = false;
- // if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
- // {
- // doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
- // var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
- // localDoorLockObj.UserID = curDoorLockUser.UserID;
- // doorLock.localDoorLockUserList.Remove(curUserId);
- // TypeRefresh();
- // }
- // }
- // else
- // {
- // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
- // }
- // }
- // else
- // {
- // isSecondDel = true;
- // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
- // }
- // }
- // else
- // {
- // if (curDoorLockUser.UserID < 10)
- // {
- // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.OnlyBeDeletedOnTheDevice), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
- // }
- // else
- // {
- // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
- // }
- // }
- // }
- // }
- // else
- // {
- // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
- // }
- // dialog.Close();
- // }
- // catch { }
- // finally
- // {
- // CommonPage.Loading.Hide();
- // }
- //};
- //};
+ btnDoorlockUser.EditorEnterAction += action;
#endregion
i++;
- }
- //bodyView.AdjustRealHeight(Application.GetRealHeight(23));
+ }
}
}
--
Gitblit v1.8.0