From 8b9ce384b26c414db32f98e94e088f5334869c2d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 15:36:28 +0800
Subject: [PATCH] 全部合并了代码，安卓和 IOS 都测试通过了
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 145 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 106 insertions(+), 39 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
index b472ed0..3fb79d1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -252,13 +252,33 @@
//搴曠嚎
btnRow.AddBottomLine();
var doorLock = this.listNewDevice[0] as ZigBee.Device.DoorLock;
- btnRow.ButtonClickEvent += (sender, e) =>
- {
- var userManagement = new Shared.Phone.UserCenter.DoorLock.UserManagement(doorLock);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(userManagement);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- userManagement.Show();
- };
+ btnRow.ButtonClickEvent += async (sender, e) =>
+ {
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1)
+ {
+ var userManagement = new Shared.Phone.UserCenter.DoorLock.UserManagement(doorLock);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(userManagement);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ userManagement.Show();
+ }
+ else
+ {
+ CommonPage.Loading.Start("");
+ var result = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, Shared.Common.Config.Instance.Guid);
+ if (result == false)
+ {
+ var userManagement = new Shared.Phone.UserCenter.DoorLock.UserManagement(doorLock);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(userManagement);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ userManagement.Show();
+ }
+ else
+ {
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.AccountIsFreezed));
+ }
+ CommonPage.Loading.Hide();
+ }
+ };
}
}
@@ -284,24 +304,56 @@
var btnswitch = btnRow.AddMostRightSwitchIcon();
//搴曠嚎
btnRow.AddBottomLine();
- if (string.IsNullOrEmpty(ZigBee.Device.DoorLock.RemoteUnlockPassword) == false)
+
+ var doorLock = (ZigBee.Device.DoorLock)listNewDevice[0];
+ if (string.IsNullOrEmpty(doorLock.RemoteUnlockPassword) == false)
{
btnswitch.IsSelected = true;
}
- var doorLock= (ZigBee.Device.DoorLock)listNewDevice[0];
- btnswitch.ButtonClickEvent += (sender, e) =>
- {
- if (btnswitch.IsSelected == true)
- {
- btnswitch.IsSelected = false;
- ZigBee.Device.DoorLock.RemoteUnlockPassword = string.Empty;
- return;
- }
- var frame = new DoorLock.DoorLockCommonLayout();
- frame.RemotePasswordDialog((ZigBee.Device.DoorLock)listNewDevice[0], btnswitch.btnIcon);
- frame = null;
- };
+ btnswitch.ButtonClickEvent += async (sender, e) =>
+ {
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1)
+ {
+ if (btnswitch.IsSelected == true)
+ {
+ btnswitch.IsSelected = false;
+ doorLock.RemoteUnlockPassword = string.Empty;
+ return;
+ }
+ var frame = new DoorLock.DoorLockCommonLayout();
+ frame.RemotePasswordDialog((ZigBee.Device.DoorLock)listNewDevice[0], btnswitch.btnIcon);
+ frame = null;
+ }
+ else
+ {
+ var result = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, Shared.Common.Config.Instance.Guid);
+ if (result == false)
+ {
+ var result1 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockUnlockAccess(doorLock, Shared.Common.Config.Instance.Guid);
+ if (result1 == true)
+ {
+ if (btnswitch.IsSelected == true)
+ {
+ btnswitch.IsSelected = false;
+ doorLock.RemoteUnlockPassword = string.Empty;
+ return;
+ }
+ var frame = new DoorLock.DoorLockCommonLayout();
+ frame.RemotePasswordDialog((ZigBee.Device.DoorLock)listNewDevice[0], btnswitch.btnIcon);
+ frame = null;
+ }
+ else
+ {
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.NoAccess));
+ }
+ }
+ else
+ {
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.AccountIsFreezed));
+ }
+ }
+ };
}
}
@@ -327,13 +379,31 @@
//搴曠嚎
btnRow.AddBottomLine();
var doorLock = this.listNewDevice[0] as ZigBee.Device.DoorLock;
- btnRow.ButtonClickEvent += (sender, e) =>
- {
- var tempPage = new Shared.Phone.UserCenter.DoorLock.TimeSettignPage(doorLock, "DoorLockTime");
- Shared.Phone.UserView.HomePage.Instance.AddChidren(tempPage);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- tempPage.Show();
- };
+ btnRow.ButtonClickEvent += async (sender, e) =>
+ {
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1)
+ {
+ var tempPage = new Shared.Phone.UserCenter.DoorLock.TimeSettignPage(doorLock, "DoorLockTime");
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(tempPage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ tempPage.Show();
+ }
+ else
+ {
+ var result = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, Shared.Common.Config.Instance.Guid);
+ if (result == false)
+ {
+ var tempPage = new Shared.Phone.UserCenter.DoorLock.TimeSettignPage(doorLock, "DoorLockTime");
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(tempPage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ tempPage.Show();
+ }
+ else
+ {
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.AccountIsFreezed));
+ }
+ }
+ };
}
}
@@ -442,6 +512,12 @@
/// </summary>
private void AddFunctionSettionRow()
{
+ //鍙湁鍥炶矾鏁板ぇ浜�1鎵嶈兘鏈夎繖涓彍鍗�
+ if (Common.LocalDevice.Current.GetDevicesCountByMac(listNewDevice[0].DeviceAddr) == 1)
+ {
+ return;
+ }
+
//鍔熻兘璁剧疆
string caption = Language.StringByID(R.MyInternationalizationString.uFunctionSettingUp);
var btnFunction = new FrameRowControl(listview.rowSpace / 2);
@@ -823,23 +899,14 @@
/// </summary>
private async void DoDeleteDevice()
{
- //寮�鍚繘搴︽潯
- this.ShowProgressBar();
//鍒犻櫎璁惧
bool result = await Common.LocalDevice.Current.DeleteDevice(listNewDevice);
-
- this.CloseProgressBar();
-
if (result == false)
{
return;
}
-
- Application.RunOnMainThread(() =>
- {
- //鍏抽棴鐣岄潰
- this.CloseForm();
- });
+ //鍏抽棴鐣岄潰
+ this.CloseForm();
}
#endregion
--
Gitblit v1.8.0