From 99253403b560f761d5f9af8b4f5140496996433a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十一月 2020 16:49:50 +0800
Subject: [PATCH] 新云端的代码Ver1.0
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
index 655759b..8ecfd72 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
@@ -63,8 +63,8 @@
#endregion
#region UI鏄剧ず
- /// <summary>
- /// UI鏄剧ず
+ /// <summary>
+ /// UI鏄剧ず
/// </summary>
public void Show()
{
@@ -100,7 +100,7 @@
Gravity = Gravity.CenterHorizontal,
TextColor = ZigbeeColor.Current.XMBlack,
TextSize = 15,
- Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock),
+ Text = HdlDeviceCommonLogic.Current.GetDeviceMacName(doorLock),
};
this.midFrameLayout.AddChidren(btnDeviceText);
@@ -151,8 +151,8 @@
listview.RemoveAll();
//璁惧澶囨敞
string caption = Language.StringByID(R.MyInternationalizationString.DeviceRemarkXm);
- string deviceName = Common.LocalDevice.Current.GetDeviceMacName(doorLock);
- var btnNote = new FrameCaptionInputControl(caption, deviceName, listview.rowSpace / 2);
+ string deviceName = HdlDeviceCommonLogic.Current.GetDeviceMacName(doorLock);
+ var btnNote = new FrameCaptionInputControl(caption, deviceName, listview.rowSpace / 2);
btnNote.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
listview.AddChidren(btnNote);
btnNote.InitControl();
@@ -160,7 +160,7 @@
btnNote.AddBottomLine();
btnNote.txtInput.FinishInputEvent += () =>
{
- string oldName = Common.LocalDevice.Current.GetDeviceMacName(doorLock);
+ string oldName = HdlDeviceCommonLogic.Current.GetDeviceMacName(doorLock);
if (btnNote.Text == string.Empty)
{
btnNote.Text = oldName;
@@ -182,18 +182,18 @@
var listCheck = new List<string>();
rowBeloneArea.SelectRoomEvent += (roomKeys) =>
{
- //閫夋嫨鏈垎閰嶆椂,娓呯┖
+ //閫夋嫨鏈垎閰嶆椂,娓呯┖
if (roomKeys == string.Empty) { listCheck = new List<string>(); }
foreach (var device in this.listNewDevice)
- {
- if (roomKeys == string.Empty)
- {
- //濡傛灉閫夋嫨鐨勬槸鏈垎閰嶏紝鍒欏畠鐨勫叏閮ㄥ洖璺棤鏉′欢鍏ㄩ儴娓呯┖鎴块棿
- HdlRoomLogic.Current.ChangedRoom(device, roomKeys);
- continue;
+ {
+ if (roomKeys == string.Empty)
+ {
+ //濡傛灉閫夋嫨鐨勬槸鏈垎閰嶏紝鍒欏畠鐨勫叏閮ㄥ洖璺棤鏉′欢鍏ㄩ儴娓呯┖鎴块棿
+ HdlRoomLogic.Current.ChangedRoom(device, roomKeys);
+ continue;
}
var room = HdlRoomLogic.Current.GetRoomByDevice(device);
- string mainKeys = LocalDevice.Current.GetDeviceMainKeys(device);
+ string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
if (room == null)
{
//杩欓噷鏈夌偣鐗规畩,濡傛灉鍥炶矾娌℃湁璁剧疆鏈夊尯鍩熺殑鏃跺��,鎵嶈缃�
@@ -212,7 +212,7 @@
//璁惧妯″潡
caption = Language.StringByID(R.MyInternationalizationString.BelongDevice);
- deviceName = Common.LocalDevice.Current.GetDeviceObjectText(listNewDevice);
+ deviceName = HdlDeviceCommonLogic.Current.GetDeviceObjectText(listNewDevice);
var btnType = new FrameCaptionViewControl(caption, deviceName, listview.rowSpace / 2);
btnType.UseClickStatu = false;
listview.AddChidren(btnType);
@@ -230,7 +230,7 @@
bottomFrameLayout.AddChidren(btnFinish);
btnFinish.ButtonClickEvent += (sender, e) =>
{
- string oldName = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
+ string oldName = HdlDeviceCommonLogic.Current.GetDeviceMacName(listNewDevice[0]);
if (btnNote.Text.Trim() == string.Empty)
{
btnNote.Text = oldName;
@@ -255,7 +255,7 @@
/// </summary>
private void AddAllMenuRow()
{
- if (UserCenterResourse.UserInfo.AuthorityNo == 1)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1)
{
//娣诲姞銆愪复鏃跺瘑鐮併�戣
this.AddTempPasswordRow();
@@ -331,7 +331,7 @@
btnswitch.ButtonClickEvent += async (sender, e) =>
{
- if (UserCenterResourse.UserInfo.AuthorityNo == 1)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1)
{
if (btnswitch.IsSelected == true)
{
@@ -395,7 +395,7 @@
var doorLock = this.listNewDevice[0] as ZigBee.Device.DoorLock;
btnRow.ButtonClickEvent += async (sender, e) =>
{
- if (UserCenterResourse.UserInfo.AuthorityNo == 1)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1)
{
var tempPage = new Shared.Phone.UserCenter.DoorLock.TimeSettignPage(doorLock, "DoorLockTime");
Shared.Phone.UserView.HomePage.Instance.AddChidren(tempPage);
@@ -434,7 +434,7 @@
//淇敼MAC鍚�
string deviceName = i_deviceName.Trim();
- var result = Common.LocalDevice.Current.ReMacName(listNewDevice, deviceName);
+ var result = HdlDeviceCommonLogic.Current.ReMacName(listNewDevice, deviceName);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
--
Gitblit v1.8.0