From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 101 ++++++++++++++++++++++++++++++--------------------
1 files changed, 61 insertions(+), 40 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
index 2fc9508..0dee854 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -72,11 +72,11 @@
/// <param name="deviceMac">璁惧mac鍦板潃</param>
public void ShowForm(string deviceMac)
{
- this.listNewDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(deviceMac);
+ this.listNewDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
if (listNewDevice.Count == 0)
{
//閽堝鍗曠函鍙湁涓�涓�200绔偣鐨勮澶�
- listNewDevice.Add(HdlDeviceCommonLogic.Current.GetOTADevice(deviceMac));
+ listNewDevice.Add(Common.LocalDevice.Current.GetOTADevice(deviceMac));
}
this.listDeviceType.Clear();
deviceMacTemp = deviceMac;
@@ -86,7 +86,7 @@
this.listDeviceType.Add(device.Type);
}
//鑾峰彇杩欎竴鍫嗚澶囨椂灞炰簬浠�涔堢被鍨嬬殑
- this.deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(listNewDevice);
+ this.deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listNewDevice);
//璁剧疆鏍囬淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uDeviceSettion));
@@ -104,7 +104,7 @@
if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
{
//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧淇℃伅
- var dev = HdlDeviceCommonLogic.Current.GetDevice(deviceMac, 62);
+ var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);
if (dev != null)
{
var key = new ZigBee.Device.Panel();
@@ -140,7 +140,7 @@
//璁惧澶囨敞
string caption = Language.StringByID(R.MyInternationalizationString.uDeviceNote);
- string deviceName = HdlDeviceCommonLogic.Current.GetDeviceMacName(listNewDevice[0]);
+ string deviceName = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
var btnNote = new FrameCaptionInputControl(caption, deviceName, listview.rowSpace / 2);
btnNote.txtInput.MaxByte = 48;//闄愬埗鍙兘杈撳叆48涓瓧鑺�
listview.AddChidren(btnNote);
@@ -149,7 +149,7 @@
btnNote.AddBottomLine();
btnNote.txtInput.FinishInputEvent += () =>
{
- string oldName = HdlDeviceCommonLogic.Current.GetDeviceMacName(listNewDevice[0]);
+ string oldName = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
if (btnNote.Text == string.Empty)
{
btnNote.Text = oldName;
@@ -168,7 +168,7 @@
//璁惧绫诲瀷
caption = Language.StringByID(R.MyInternationalizationString.uDeviceType);
- deviceName = HdlDeviceCommonLogic.Current.GetDeviceObjectText(listNewDevice);
+ deviceName = Common.LocalDevice.Current.GetDeviceObjectText(listNewDevice);
var btnType = new FrameCaptionViewControl(caption, deviceName, listview.rowSpace / 2);
btnType.UseClickStatu = false;
listview.AddChidren(btnType);
@@ -207,7 +207,7 @@
continue;
}
var room = HdlRoomLogic.Current.GetRoomByDevice(device);
- string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
+ string mainKeys = LocalDevice.Current.GetDeviceMainKeys(device);
if (room == null)
{
//杩欓噷鏈夌偣鐗规畩,濡傛灉鍥炶矾娌℃湁璁剧疆鏈夊尯鍩熺殑鏃跺��,鎵嶈缃�
@@ -243,7 +243,7 @@
bodyFrameLayout.AddChidren(btnFinish);
btnFinish.ButtonClickEvent += (sender, e) =>
{
- string oldName = HdlDeviceCommonLogic.Current.GetDeviceMacName(listNewDevice[0]);
+ string oldName = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
if (btnNote.Text.Trim() == string.Empty)
{
btnNote.Text = oldName;
@@ -390,7 +390,7 @@
var doorLock = this.listNewDevice[0] as ZigBee.Device.DoorLock;
btnRow.ButtonClickEvent += async (sender, e) =>
{
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1)
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1)
{
Action action = null;
Action actionNone = null;
@@ -475,7 +475,7 @@
btnswitch.ButtonClickEvent += async (sender, e) =>
{
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1)
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1)
{
if (btnswitch.IsSelected == true)
{
@@ -543,7 +543,7 @@
var doorLock = this.listNewDevice[0] as ZigBee.Device.DoorLock;
btnRow.ButtonClickEvent += async (sender, e) =>
{
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1)
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1)
{
var tempPage = new Shared.Phone.UserCenter.DoorLock.TimeSettignPage(doorLock, "DoorLockTime");
Shared.Phone.UserView.HomePage.Instance.AddChidren(tempPage);
@@ -782,10 +782,31 @@
private void AddFunctionSettionRow()
{
//鍙湁鍥炶矾鏁板ぇ浜�1鎵嶈兘鏈夎繖涓彍鍗�
- if (HdlDeviceCommonLogic.Current.GetDevicesCountByMac(listNewDevice[0].DeviceAddr) == 1)
+ if (Common.LocalDevice.Current.GetDevicesCountByMac(listNewDevice[0].DeviceAddr) == 1)
{
//鏂伴灏忔ā鍧楀彧鏈変竴涓洖璺紝浣嗚姹傛柊椋庡皬妯″潡鐨勬柊椋庢湁鍔熻兘璁剧疆
- if (deviceEnumInfo.ConcreteType != DeviceConcreteType.Relay_FangyueFreshAirModul)
+ //鏅捐。鏋堕粯璁ゅ彧瀛樺偍绗竴鍥炶矾锛屽叾浠栧洖璺杩囨护浜�
+ bool isSpecial = false;
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Relay_FangyueFreshAirModul)
+ {
+ isSpecial = true;
+ }
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Airer)
+ {
+ isSpecial = true;
+ var dev = listNewDevice[0];
+ //鏅捐。鏋堕粯璁ゅ彧瀛樺偍绗竴鍥炶矾锛屽叾浠栧洖璺湪鍔熻兘鐣岄潰闇�瑕佽鍙栨椂闂达紝鎵�浠ユ彁鍓嶄竴涓晫闈㈣幏鍙�
+ //绗竴鐗堟椂闂村姛鑳界敱浜庤澶囦笉鏀寔锛屾殏鏃跺幓鎺夛紝鍚庢湡鎵嶅姞涓�
+ //for (int i = 3; i < 6; i++)
+ //{
+ // //娉ㄦ剰锛岃。鏋朵腑鐨勭姸鎬佺敱涓嶅悓绔偣鑾峰彇
+ // //鍥炶矾3:璇诲彇椋庡共寮�鍏崇姸鎬佸拰鏃堕棿鍊�
+ // //鍥炶矾4:璇诲彇鐑樺共寮�鍏崇姸鎬佸拰鏃堕棿鍊�
+ // //鍥炶矾5:璇诲彇娑堟瘨寮�鍏崇姸鎬佸拰鏃堕棿鍊�
+ // HdlDeviceAttributeLogic.Current.SendAirerComand(dev, i);
+ //}
+ }
+ if (!isSpecial)
{
return;
}
@@ -979,10 +1000,10 @@
}
//娣诲姞灞炴�т笂鎶ョ洃鍚�
- string mainkeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(this.listNewDevice[0]);
+ string mainkeys = LocalDevice.Current.GetDeviceMainKeys(this.listNewDevice[0]);
HdlGatewayReceiveLogic.Current.AddAttributeEvent("HandPullControl", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (device) =>
{
- string checkKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
+ string checkKey = LocalDevice.Current.GetDeviceMainKeys(device);
if (mainkeys != checkKey || device.DeviceStatusReport.CluterID != 258)
{
return;
@@ -1054,7 +1075,7 @@
btnBindTargets.AddBottomLine();
btnBindTargets.ButtonClickEvent += (sender, e) =>
{
- var dev = HdlDeviceCommonLogic.Current.GetDevice(deviceMac, 32);//绠�绾﹂潰鏉块殢渚夸竴涓寜閿潵鑾峰彇璁惧
+ var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 32);//绠�绾﹂潰鏉块殢渚夸竴涓寜閿潵鑾峰彇璁惧
if (dev != null)
{
var curControlDev = dev as Panel;
@@ -1091,7 +1112,7 @@
proximitySensorsInfo.enable = btnSwitch.IsSelected;
//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧淇℃伅
- var dev = HdlDeviceCommonLogic.Current.GetDevice(deviceMac, 62);
+ var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);
if (dev != null)
{
var key = new ZigBee.Device.Panel();
@@ -1123,7 +1144,7 @@
rowLight.AddRightArrow();
rowLight.ButtonClickEvent += (sender, e) =>
{
- var dev = HdlDeviceCommonLogic.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
+ var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
var device = new CommonDevice();
if (dev != null)
{
@@ -1159,7 +1180,7 @@
rowHumidity.ButtonClickEvent += (sender, e) =>
{
- var dev = HdlDeviceCommonLogic.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
+ var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
var device = new CommonDevice();
if (dev != null)
{
@@ -1210,7 +1231,7 @@
var btnTemperatureStatu = rowTemPerature.AddMostRightView(msg, 700);
rowTemPerature.ButtonClickEvent += (sender, e) =>
{
- var dev = HdlDeviceCommonLogic.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
+ var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
var device = new CommonDevice();
if (dev != null)
{
@@ -1308,7 +1329,7 @@
bindList = panelBindListRes.getAllBindResponseData.BindList;
foreach (var bDev in bindList)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
+ var device = Common.LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
if (device == null)
{
continue;
@@ -1318,18 +1339,18 @@
var bD = device as TemperatureSensor;
if (bD.SensorDiv == 1 && bDev.BindCluster == 1026)
{
- bindTemperatureName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
+ bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindTemperatureDev = device;
}
if (bD.SensorDiv == 2 && bDev.BindCluster == 1029)
{
- bindHumidityName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindHumidityDev = device;
}
}
if (device.Type == DeviceType.FreshAirHumiditySensor)
{
- bindHumidityName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindHumidityDev = device;
}
}
@@ -1474,7 +1495,7 @@
private void AddFirmwareUpdateRow()
{
//鎷ユ湁200绔彛杩欎釜涓滆タ鐨勬椂鍊欙紝鎵嶄細鏄剧ず杩欎竴琛�
- var oTADevice = HdlDeviceCommonLogic.Current.GetOTADevice(listNewDevice[0].DeviceAddr);
+ var oTADevice = Common.LocalDevice.Current.GetOTADevice(listNewDevice[0].DeviceAddr);
if (oTADevice == null)
{
return;
@@ -1535,12 +1556,12 @@
{
bool receiveImageInfo = false;
//璁剧疆璁惧鍏ㄩ儴鐨勯暅鍍忎俊鎭�
- string checkKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(oTADevice.DeviceAddr, oTADevice.DeviceEpoint);
+ string checkKey = LocalDevice.Current.GetDeviceMainKeys(oTADevice.DeviceAddr, oTADevice.DeviceEpoint);
HdlGatewayReceiveLogic.Current.AddAttributeEvent("SetDeviceVersionInfo", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
{
if (report.DeviceStatusReport.CluterID == (int)Cluster_ID.Ota)
{
- string mainKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report.DeviceAddr, report.DeviceEpoint);
+ string mainKey = LocalDevice.Current.GetDeviceMainKeys(report.DeviceAddr, report.DeviceEpoint);
if (checkKey == mainKey)
{
//宸茬粡鎺ユ敹寰楀埌
@@ -1549,7 +1570,7 @@
}
});
//鍙戦�佸懡浠�
- HdlDeviceAttributeLogic.Current.ReadDeviceFirmwareVersion(oTADevice);
+ HdlDeviceImageInfoLogic.Current.SetFirmwareVersionComand(oTADevice);
int count = 5;
while (receiveImageInfo == false && count > 0)
@@ -1561,12 +1582,12 @@
//绉婚櫎浜嬩欢
HdlGatewayReceiveLogic.Current.RemoveEvent("SetDeviceVersionInfo");
- oTADevice = HdlDeviceCommonLogic.Current.GetOTADevice(listNewDevice[0].DeviceAddr);
+ oTADevice = Common.LocalDevice.Current.GetOTADevice(listNewDevice[0].DeviceAddr);
//娣诲姞鍗囩骇鍥轰欢淇℃伅(鎴愪笉鎴愬姛閮芥棤鎵�璋�)
- var result = HdlFirmwareUpdateLogic.Current.AddFirmwareVersionInfo(FirmwareLevelType.A璁惧, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString());
+ var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.A璁惧, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString());
//鑾峰彇璁惧鏈�鏂扮増鏈�
- var deviceFirmware = HdlFirmwareUpdateLogic.Current.GetFirmwareMostVersionInfo(FirmwareLevelType.A璁惧,
+ var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.A璁惧,
oTADevice.HwVersion.ToString(),
oTADevice.ImgTypeId.ToString(),
oTADevice.ImgVersion);
@@ -1596,7 +1617,7 @@
{
//淇敼MAC鍚�
string deviceName = i_deviceName.Trim();
- var result = HdlDeviceCommonLogic.Current.ReMacName(this.listNewDevice, deviceName);
+ var result = Common.LocalDevice.Current.ReMacName(this.listNewDevice, deviceName);
if (result == false)
{
return;
@@ -1645,7 +1666,7 @@
private void ShowTopRightMenu()
{
//妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘(鎷跨鐐规渶灏忕殑閭ｄ釜鍥炶矾鍘诲畾浣�)
- bool canTest = HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(listNewDevice[0]);
+ bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]);
TopRightMenuControl frame = null;
@@ -1666,7 +1687,7 @@
frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>
{
//鍙戦�佸畾浣嶅姛鑳�
- HdlDeviceCommonLogic.Current.SetFixedPositionCommand(listNewDevice[0], true);
+ Common.LocalDevice.Current.SetFixedPositionCommand(listNewDevice[0], true);
});
}
@@ -1690,7 +1711,7 @@
//鍚屾
deviceMenu = Language.StringByID(R.MyInternationalizationString.Synchronization);
- if (HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(listNewDevice[0]))
+ if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]))
{
frame.AddRowMenu(deviceMenu, "", "Item/SynchronizationSelected.png", () =>
{
@@ -1718,7 +1739,7 @@
this.ShowProgressBar();
//鍒犻櫎璁惧
- bool result = await HdlDeviceCommonLogic.Current.DeleteDevice(listNewDevice);
+ bool result = await Common.LocalDevice.Current.DeleteDevice(listNewDevice);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
if (result == false)
@@ -1744,7 +1765,7 @@
this.ShowProgressBar();
//鍚屾璁惧
- bool result = await HdlDeviceCommonLogic.Current.SynchronizationDevice(listNewDevice);
+ bool result = await Common.LocalDevice.Current.SynchronizationDevice(listNewDevice);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
if (result == false)
@@ -1766,7 +1787,7 @@
HdlGatewayReceiveLogic.Current.RemoveEvent("SetDeviceVersionInfo");
//璁惧鏂板叆缃�
- if (HdlFormLogic.Current.IsFormOpen("AddDeviceTypeListForm") == true)
+ if (UserCenterResourse.DicActionForm.ContainsKey("AddDeviceTypeListForm") == true)
{
this.LoadFormMethodByName("DeviceListMainForm", "RefreshDeviceRow", new object[] { listNewDevice[0].DeviceAddr });
}
@@ -1789,7 +1810,7 @@
return;
}
//閲嶆柊鑾峰彇纭欢淇℃伅
- HdlDeviceAttributeLogic.Current.ReadDeviceAllHardFirmwareInfo(listNewDevice[0]);
+ HdlDeviceHardInfoLogic.Current.SetAllHardFirmwareInfoToDevice(listNewDevice[0]);
}
#endregion
--
Gitblit v1.8.0