From fffd8afca5b69a592e9ba8913204f83f478e2f17 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 06 五月 2020 17:28:35 +0800
Subject: [PATCH] 增加获取颜色接口（请合并代码）
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index d546c58..61f363c 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -1025,31 +1025,31 @@
private async void NomallyOpenDialog()
{
#region 鍚庣画鐗堟湰
- //if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- //{
- // this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
- // return;
- //}
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
+ return;
+ }
- //if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
- //{
- // SystemSecondAuthentication();
- // return;
- //}
+ if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
+ {
+ SystemSecondAuthentication();
+ return;
+ }
- //action = () =>
- //{
- // //绯荤粺瀵嗙爜鏀寔鎿嶄綔闂ㄩ攣鍚庯紝璋冪敤娓╁眳鍩庣殑鐣岄潰銆愬父寮�鑷姩鍖栥��
- // var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(currentRoom, doorLock);
- // Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
- // Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- // functionSetting.Show();
- // functionSetting.aaaAction = () =>
- // {
- // UpdateNomallyOpenStatus();
- // };
- //};
- //HdlCheckLogic.Current.CheckSecondarySecurity(action);
+ action = () =>
+ {
+ //绯荤粺瀵嗙爜鏀寔鎿嶄綔闂ㄩ攣鍚庯紝璋冪敤娓╁眳鍩庣殑鐣岄潰銆愬父寮�鑷姩鍖栥��
+ var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(currentRoom, doorLock);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ functionSetting.Show();
+ // functionSetting.aaaAction = () =>
+ //{
+ // UpdateNomallyOpenStatus();
+ //};
+ };
+ HdlCheckLogic.Current.CheckSecondarySecurity(action);
#endregion
#region 鏆傛椂鐗堟湰 (鏈�缁堝幓鎺夛級
--
Gitblit v1.8.0