From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index 53e5ead..c9ef969 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -231,7 +231,7 @@
ClickHandle();
- if (Common.LocalDevice.Current.CheckDeviceIsOnline(doorLock) == true)
+ if (HdlDeviceCommonLogic.Current.CheckDeviceIsOnline(doorLock) == true)
{
ReadDoorLockUserInfo();
}
@@ -264,7 +264,7 @@
btnDoorLockTitle.Y = Application.GetRealHeight(46);
btnDoorLockTitle.TextSize = 15;
btnDoorLockTitle.IsBold = true;
- btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);
+ btnDoorLockTitle.Text = HdlDeviceCommonLogic.Current.GetDeviceMacName(doorLock);
btnDoorLockTitle.Width = btnDoorLockTitle.GetRealWidthByText();
btnDoorLockTitle.TextAlignment = TextAlignment.Center;
btnDoorLockTitle.Gravity = Gravity.CenterHorizontal;
@@ -611,7 +611,7 @@
if (tempDoor.doorLockOperatingEventNotificationCommand != null)
{
//闈炰富浜轰笉寮硅繖涓獥鍙�
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
{
return;
}
@@ -732,8 +732,8 @@
{
var listDevice = new List<CommonDevice> { };
listDevice.Add(doorLock);
- var devTemp = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
- if (devTemp.ConcreteType != DeviceConcreteType.IntelligentLocks_H06C)
+ var devTemp = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(listDevice);
+ if (devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
{
Application.RunOnMainThread(() =>
{
@@ -789,7 +789,7 @@
public void ClickHandle()
{
//闂ㄩ攣鏍囬
- btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);
+ btnDoorLockTitle.Text = HdlDeviceCommonLogic.Current.GetDeviceMacName(doorLock);
//杩斿洖
EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
@@ -1054,13 +1054,13 @@
/// </summary>
private async void NomallyOpenDialog()
{
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
{
this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
return;
}
- if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
+ if (!HdlUserCenterResourse.AccountOption.DoorUnLockByRemote)
{
SystemSecondAuthentication();
return;
@@ -1080,7 +1080,7 @@
Common.Logic.LogicDviceList.Clear();
if (Common.Logic.LogicDviceList.Count == 0)
{
- Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
+ Common.Logic.LogicDviceList.AddRange(HdlDeviceCommonLogic.Current.listAllDevice.ToArray());
}
var addLogicPage = new Shared.Phone.Device.Logic.SoneLogicList();
UserView.HomePage.Instance.AddChidren(addLogicPage);
@@ -1149,7 +1149,7 @@
{
openFrameLayout.Enable = false;
btnDoorOpenPic.Enable = false;
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
{
var result = await DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, Shared.Common.Config.Instance.Guid);
if (result == false)
--
Gitblit v1.8.0