From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs | 67 ++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 19 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
index aba9c27..8ecfd72 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
using Shared.Common;
+using Shared.Phone.UserView;
using ZigBee.Device;
namespace Shared.Phone.UserCenter.DoorLock
@@ -12,10 +13,11 @@
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="doorLock"></param>
- public FunctionSetting(ZigBee.Device.DoorLock doorLock)
+ public FunctionSetting(Room room, CommonDevice doorLock)
{
- //闂��
- this.doorLock = doorLock;
+ this.doorLock = doorLock as ZigBee.Device.DoorLock;
+ currentRoom = room;
+ deviceUI = doorLock;
listNewDevice.Add(doorLock);
BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor;
}
@@ -23,6 +25,14 @@
#region 鍙橀噺鐢虫槑
public ZigBee.Device.DoorLock doorLock = null;
+ /// <summary>
+ /// 褰撳墠鎴块棿
+ /// </summary>
+ Room currentRoom;
+ /// <summary>
+ /// 璁惧UI瀵硅薄
+ /// </summary>
+ CommonDevice deviceUI;
/// <summary>
/// 璁惧闇�瑕佷繚瀛樼殑璁惧鍚嶅瓧
/// </summary>
@@ -53,8 +63,8 @@
#endregion
#region UI鏄剧ず
- /// <summary>
- /// UI鏄剧ず
+ /// <summary>
+ /// UI鏄剧ず
/// </summary>
public void Show()
{
@@ -90,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);
@@ -141,15 +151,16 @@
listview.RemoveAll();
//璁惧澶囨敞
string caption = Language.StringByID(R.MyInternationalizationString.DeviceRemarkXm);
- string deviceName = Common.LocalDevice.Current.GetDeviceMacName(doorLock);
+ 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();
//鍒掔嚎
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;
@@ -171,10 +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;
+ }
var room = HdlRoomLogic.Current.GetRoomByDevice(device);
- string mainKeys = LocalDevice.Current.GetDeviceMainKeys(device);
+ string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
if (room == null)
{
//杩欓噷鏈夌偣鐗规畩,濡傛灉鍥炶矾娌℃湁璁剧疆鏈夊尯鍩熺殑鏃跺��,鎵嶈缃�
@@ -188,12 +207,12 @@
}
}
//淇濆瓨璁惧鎴块棿绱㈠紩
- Common.LocalDevice.Current.SaveRealDeviceRoomId(this.listNewDevice, roomKeys);
+ HdlRoomLogic.Current.SaveRealDeviceRoomId(this.listNewDevice, roomKeys);
};
//璁惧妯″潡
- caption = Language.StringByID(R.MyInternationalizationString.BelongModel);
- deviceName = Common.LocalDevice.Current.GetDeviceObjectText(listNewDevice);
+ caption = Language.StringByID(R.MyInternationalizationString.BelongDevice);
+ deviceName = HdlDeviceCommonLogic.Current.GetDeviceObjectText(listNewDevice);
var btnType = new FrameCaptionViewControl(caption, deviceName, listview.rowSpace / 2);
btnType.UseClickStatu = false;
listview.AddChidren(btnType);
@@ -211,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;
@@ -236,7 +255,7 @@
/// </summary>
private void AddAllMenuRow()
{
- if (UserCenterResourse.UserInfo.AuthorityNo == 1)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1)
{
//娣诲姞銆愪复鏃跺瘑鐮併�戣
this.AddTempPasswordRow();
@@ -279,7 +298,7 @@
};
actionNone = async () =>
{
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonLayout.SecurityRequest(doorLock, action);
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonLayout.SecurityRequest(doorLock);
};
HdlCheckLogic.Current.CheckSecondarySecurity(action, actionNone);
};
@@ -312,7 +331,7 @@
btnswitch.ButtonClickEvent += async (sender, e) =>
{
- if (UserCenterResourse.UserInfo.AuthorityNo == 1)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1)
{
if (btnswitch.IsSelected == true)
{
@@ -376,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);
@@ -408,14 +427,14 @@
/// 璁惧閲嶅懡鍚�
/// </summary>
/// <param name="i_deviceName">deviceName.</param>
- private async void DeviceReName(string i_deviceName, bool closeForm)
+ private void DeviceReName(string i_deviceName, bool closeForm)
{
//寮�鍚繘搴︽潯
this.ShowProgressBar();
//淇敼MAC鍚�
string deviceName = i_deviceName.Trim();
- var result = await Common.LocalDevice.Current.ReMacName(listNewDevice, deviceName);
+ var result = HdlDeviceCommonLogic.Current.ReMacName(listNewDevice, deviceName);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
@@ -464,6 +483,16 @@
}
}
#endregion
+
+ #region 绉婚櫎鏂规硶
+ /// <summary>
+ /// 閲嶅啓绉婚櫎鏂规硶
+ /// </summary>
+ public override void RemoveFromParent()
+ {
+ base.RemoveFromParent();
+ }
+ #endregion
}
}
--
Gitblit v1.8.0