From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 377 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 309 insertions(+), 68 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
old mode 100755
new mode 100644
index c4a9f56..a91f411
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -2,6 +2,8 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Shared.Common;
+using Shared.Phone.UserCenter.Device.Bind;
+using Shared.Phone.UserCenter.DeviceBind;
using ZigBee.Device;
namespace Shared.Phone.UserCenter.Device
@@ -33,7 +35,30 @@
/// 涓ぎ绌鸿皟鐨勭増鏈帶浠�
/// </summary>
private NormalViewControl btnAirConditionerVersion = null;
-
+ /// <summary>
+ /// 绠�绾﹂潰鏉跨粦瀹氱殑娓╁害鐩爣鍚嶅瓧
+ /// </summary>
+ private string bindTemperatureName = string.Empty;
+ /// <summary>
+ /// 绠�绾﹂潰鏉跨粦瀹氱殑婀垮害鐩爣鍚嶅瓧
+ /// </summary>
+ private string bindHumidityName = string.Empty;
+ /// <summary>
+ /// 绠�绾﹂潰鏉跨粦瀹氳缁戠洰鏍囨槸娓╁害
+ /// </summary>
+ private CommonDevice bindTemperatureDev;
+ /// <summary>
+ /// 绠�绾﹂潰鏉跨粦瀹氳缁戠洰鏍囨槸婀垮害
+ /// </summary>
+ private CommonDevice bindHumidityDev;
+ /// <summary>
+ /// 绠�绾﹂潰鏉垮綋鍓峂ac
+ /// </summary>
+ private string deviceMacTemp = string.Empty;
+ // <summary>
+ /// 绠�绾﹂潰鏉夸腑琚粦瀹氱殑娓╂箍搴︾洰鏍囧垪琛�
+ /// </summary>
+ private List<BindObj.BindListResponseObj> bindList = new List<BindObj.BindListResponseObj>();
#endregion
#region 鈻� 鍒濆鍖朹____________________________
@@ -50,8 +75,8 @@
//閽堝鍗曠函鍙湁涓�涓�200绔偣鐨勮澶�
listNewDevice.Add(Common.LocalDevice.Current.GetOTADevice(deviceMac));
}
-
this.listDeviceType.Clear();
+ deviceMacTemp = deviceMac;
foreach (var device in listNewDevice)
{
//鏀堕泦璁惧绫诲瀷
@@ -71,6 +96,20 @@
//閲嶆柊鑾峰彇纭欢淇℃伅
this.RefreshHardFirmwareInfo();
+
+ //绠�绾﹀鍔熻兘闈㈡澘鑾峰彇缁戝畾鐩爣鐨勬樉绀�
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ {
+ //绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧淇℃伅
+ var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);
+ if (dev != null)
+ {
+ var key = new ZigBee.Device.Panel();
+ key.DeviceAddr = deviceMac;
+ key.CurrentGateWayId = dev.CurrentGateWayId;
+ InitBindInfo(key);
+ }
+ }
}
/// <summary>
@@ -251,11 +290,10 @@
else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
{
//绠�绾﹀鍔熻兘闈㈡澘
- this.AddIBindRow();
+ this.AddIBindRow(deviceMacTemp);
this.AddFunctionSettionRow();
- this.AddHumiditySourceRow();
- this.AddTemperatureSensorRow();
-
+ this.AddHumiditySourceRow(deviceMacTemp);
+ this.AddTemperatureSensorRow(deviceMacTemp);
}
else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
{
@@ -563,13 +601,14 @@
btnFunction.AddBottomLine();
btnFunction.ButtonClickEvent += (sender, e) =>
{
- var form = new DeviceBind.PanelSimpleEnvironmentTargetsForm();
-
+ //绠�绾︾幆澧冮潰鏉跨殑鎸夐敭閰嶇疆
+ var form = new DevicePanel.PanelSimpleEnvironmentButtonSettionForm();
+ form.AddForm(listNewDevice[0]);
};
}
#endregion
-
+
#endregion
#region 鈻� 鎸夐敭璁剧疆(鏂规偊)_____________________
@@ -610,10 +649,15 @@
var form = new DevicePanel.PanelFangyueEnvironmentButtonSettionForm();
form.AddForm(listNewDevice[0]);
}
- else
+ else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
{
//鏂规偊鏂伴闈㈡澘鐨勬寜閿厤缃�
var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm();
+ form.AddForm(listNewDevice[0]);
+ }
+ else
+ {
+ var form = new DevicePanel.PanelFangyueButtonSettionForm();
form.AddForm(listNewDevice[0]);
}
};
@@ -669,7 +713,8 @@
private void AddPirSensorWorkModeRow()
{
if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir
- || deviceEnumInfo.IsHdlDevice == false)
+ || deviceEnumInfo.IsHdlDevice == false
+ || this.listNewDevice.Count != 2)
{
return;
}
@@ -698,7 +743,8 @@
/// </summary>
private void AddPirSensorBindRow()
{
- if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir)
+ if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir
+ || this.listNewDevice.Count != 2)
{
return;
}
@@ -776,6 +822,15 @@
{
var form = new DevicePanel.PanelFangyueFunctionSettionForm();
form.AddForm(listNewDevice[0], deviceEnumInfo);
+ }
+ //绠�绾︾幆澧冮潰鏉跨殑鎸夐敭閰嶇疆
+ else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ {
+ var form = new DeviceFunctionSettionForm();
+ if (listNewDevice.Count > 62)
+ {
+ form.AddForm(listNewDevice[62], true);
+ }
}
//娌充笢鐨勯潰鏉胯澶�
else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘 && deviceEnumInfo.IsHdlDevice == true)
@@ -965,9 +1020,9 @@
#region 鈻� 绠�绾﹀鍔熻兘闈㈡澘鐢╛__________________
/// <summary>
- /// 娣诲姞銆愮粦瀹氱洰鏍囥�戣
+ /// 娣诲姞銆愮粦瀹氱洰鏍囥�戣
/// </summary>
- private void AddIBindRow()
+ private void AddIBindRow(string deviceMac)
{
string bindTargets = Language.StringByID(R.MyInternationalizationString.uBindTargets);
var btnBindTargets = new FrameRowControl(listview.rowSpace / 2);
@@ -979,14 +1034,17 @@
btnBindTargets.AddBottomLine();
btnBindTargets.ButtonClickEvent += (sender, e) =>
{
- var form = new DeviceBind.PanelSimpleMutilfunctionTargetsForm();
+ var simpleMutilfunctionTargetsPage = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionTargetsForm(deviceMac);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(simpleMutilfunctionTargetsPage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ simpleMutilfunctionTargetsPage.Show();
};
}
/// <summary>
/// 婀垮害鏉ユ簮琛�
/// </summary>
- private void AddHumiditySourceRow()
+ private void AddHumiditySourceRow(string deviceMac)
{
//婀垮害
var rowHumidity = new FrameRowControl(listview.rowSpace / 2);
@@ -997,40 +1055,48 @@
//鍙崇澶�
rowHumidity.AddRightArrow();
var msg = Language.StringByID(R.MyInternationalizationString.nothing);
- //if (!string.IsNullOrEmpty(bindHumidityName))
- //{
- // msg = bindHumidityName;
- //}
+ if (!string.IsNullOrEmpty(bindHumidityName))
+ {
+ msg = bindHumidityName;
+ }
var btnHumidityStatu = rowHumidity.AddMostRightView(msg, 700);
rowHumidity.ButtonClickEvent += (sender, e) =>
{
- //var key = new Panel();
- //var bindHumiditySensorPage = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionBindSensorForm(key, bindHumidityDev, 3);
- //Shared.Phone.UserView.HomePage.Instance.AddChidren(bindHumiditySensorPage);
- //Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- //bindHumiditySensorPage.Show();
- //bindHumiditySensorPage.actionHumidityTarget += (bindName) =>
- //{
- // Application.RunOnMainThread(() =>
- // {
- // if (string.IsNullOrEmpty(bindName))
- // {
- // btnHumidityStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
- // }
- // else
- // {
- // btnHumidityStatu.Text = bindName;
- // }
- // });
- //};
+ var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
+ var device = new CommonDevice();
+ if (dev != null)
+ {
+ device.CurrentGateWayId = dev.CurrentGateWayId;
+ }
+ device.Type = DeviceType.OnOffSwitch;
+ device.DeviceAddr = deviceMac;
+ device.DeviceEpoint = 65;//鑳界粦瀹氭箍搴︾殑鍥炶矾
+ var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindHumidityDev, BindInfo.BindType.Humidity);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ paneTargetsBaseFormp.Show();
+ paneTargetsBaseFormp.actionHumidityTarget += (bindName) =>
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (string.IsNullOrEmpty(bindName))
+ {
+ btnHumidityStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
+ }
+ else
+ {
+ btnHumidityStatu.Text = bindName;
+ }
+ });
+ };
};
}
/// <summary>
/// 娓╁害鏉ユ簮琛�
/// </summary>
- private void AddTemperatureSensorRow()
+ private void AddTemperatureSensorRow(string deviceMac)
{
//娓╁害鏉ユ簮
var rowTemPerature = new FrameRowControl(listview.rowSpace / 2);
@@ -1041,34 +1107,161 @@
//鍙崇澶�
rowTemPerature.AddRightArrow();
var msg = Language.StringByID(R.MyInternationalizationString.nothing);
- //if (!string.IsNullOrEmpty(bindTemperatureName))
- //{
- // msg = bindTemperatureName;
- //}
+ if (!string.IsNullOrEmpty(bindTemperatureName))
+ {
+ msg = bindTemperatureName;
+ }
var btnTemperatureStatu = rowTemPerature.AddMostRightView(msg, 700);
rowTemPerature.ButtonClickEvent += (sender, e) =>
{
- //var key = new Panel();
- //var bindTemperatureSensorPage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(key, bindTemperatureDev, 2);
- //Shared.Phone.UserView.HomePage.Instance.AddChidren(bindTemperatureSensorPage);
- //Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- //bindTemperatureSensorPage.Show();
-
- //bindTemperatureSensorPage.actionTemperatureTarget += (bindName) =>
- //{
- // Application.RunOnMainThread(() =>
- // {
- // if (string.IsNullOrEmpty(bindName))
- // {
- // btnTemperatureStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
- // }
- // else
- // {
- // btnTemperatureStatu.Text = bindName;
- // }
- // });
- //};
+ var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
+ var device = new CommonDevice();
+ if (dev != null)
+ {
+ device.CurrentGateWayId = dev.CurrentGateWayId;
+ }
+ device.Type = DeviceType.OnOffSwitch;
+ device.DeviceAddr = deviceMac;
+ device.DeviceEpoint = 64;//鑳界粦瀹氭俯搴︾殑鍥炶矾
+ var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindTemperatureDev, BindInfo.BindType.Temperature);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ paneTargetsBaseFormp.Show();
+ paneTargetsBaseFormp.actionTemperatureTarget += (bindName) =>
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (string.IsNullOrEmpty(bindName))
+ {
+ btnTemperatureStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
+ }
+ else
+ {
+ btnTemperatureStatu.Text = bindName;
+ }
+ });
+ };
};
+ }
+
+ /// <summary>
+ ///璇绘俯婀垮害鏁版嵁
+ /// </summary>
+ void InitBindInfo(CommonDevice curControlDev)
+ {
+ System.Threading.Tasks.Task.Run(async () =>
+ {
+ try
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Start("");
+ });
+ //1銆佽幏鍘荤粦瀹氱殑娓╁害浼犳劅鍣�
+ curControlDev.DeviceEpoint = 64;
+ var result = await GetBindName(curControlDev);
+ if (!result)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_2" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ });
+ return;
+ }
+
+ //2銆佽幏鍘荤粦瀹氱殑婀垮害搴︿紶鎰熷櫒
+ curControlDev.DeviceEpoint = 65;
+ var result2 = await GetBindName(curControlDev);
+ if (!result2)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_3" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ });
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ var mess = ex.Message;
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitMiddleFrame();
+ CommonPage.Loading.Hide();
+ });
+ }
+ });
+ }
+
+ /// <summary>
+ /// 鑾峰彇缁戝畾鐨勬俯婀垮害鐩爣
+ /// </summary>
+ /// <param name="curControlDev"></param>
+ /// <returns></returns>
+ private async System.Threading.Tasks.Task<bool> GetBindName(CommonDevice curControlDev)
+ {
+ bool result = false;
+ var panelBindListRes = HdlDeviceBindLogic.Current.GetDeviceBindAsync(curControlDev);
+ if (panelBindListRes != null && panelBindListRes.getAllBindResponseData != null)
+ {
+ bindList = panelBindListRes.getAllBindResponseData.BindList;
+ foreach (var bDev in bindList)
+ {
+ var device = Common.LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
+ if (device == null)
+ {
+ continue;
+ }
+ if (device.Type == DeviceType.TemperatureSensor)
+ {
+ var bD = device as TemperatureSensor;
+ if (bD.SensorDiv == 1 && bDev.BindCluster == 1026)
+ {
+ if (string.IsNullOrEmpty(bDev.ESName))
+ {
+ bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+ }
+ else
+ {
+ bindTemperatureName = bDev.ESName;
+ }
+ bindTemperatureDev = device;
+ }
+ if (bD.SensorDiv == 2 && bDev.BindCluster == 1029)
+ {
+ if (string.IsNullOrEmpty(bDev.ESName))
+ {
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+ }
+ else
+ {
+ bindHumidityName = bDev.ESName;
+ }
+
+ bindHumidityDev = device;
+ }
+ }
+ if (device.Type == DeviceType.FreshAirHumiditySensor)
+ {
+ if (string.IsNullOrEmpty(bDev.ESName))
+ {
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+ }
+ else
+ {
+ bindHumidityName = bDev.ESName;
+ }
+
+ bindHumidityDev = device;
+ }
+ }
+ result = true;
+ }
+ return result;
}
#endregion
@@ -1216,7 +1409,7 @@
/// <param name="oTADevice">ota璁惧</param>
private void SetDeviceVersionInfo(PicViewControl btnNewVersion, OTADevice oTADevice)
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
bool receiveImageInfo = false;
//璁剧疆璁惧鍏ㄩ儴鐨勯暅鍍忎俊鎭�
@@ -1228,7 +1421,7 @@
while (receiveImageInfo == false && count > 0)
{
//绛夊緟璁惧闀滃儚鐨勫弽棣�
- await Task.Delay(300);
+ System.Threading.Thread.Sleep(300);
count--;
}
//绉婚櫎浜嬩欢
@@ -1236,7 +1429,7 @@
oTADevice = Common.LocalDevice.Current.GetOTADevice(listNewDevice[0].DeviceAddr);
//娣诲姞鍗囩骇鍥轰欢淇℃伅(鎴愪笉鎴愬姛閮芥棤鎵�璋�)
- var result = await HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.ZigbeeDevice, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString());
+ var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.ZigbeeDevice, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString());
//鑾峰彇璁惧鏈�鏂扮増鏈�
var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.ZigbeeDevice,
@@ -1315,7 +1508,17 @@
//妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘(鎷跨鐐规渶灏忕殑閭ｄ釜鍥炶矾鍘诲畾浣�)
bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]);
- var frame = new TopRightMenuControl(canTest == true ? 2 : 1, 1);
+ TopRightMenuControl frame = null;
+
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ {
+ frame = new TopRightMenuControl(3, 1);
+ }
+ else
+ {
+ frame = new TopRightMenuControl(canTest == true ? 2 : 1, 1);
+ }
+
string deviceMenu = string.Empty;
if (canTest == true)
{
@@ -1346,6 +1549,23 @@
});
});
+ //鍚屾
+ deviceMenu = Language.StringByID(R.MyInternationalizationString.Synchronization);
+ if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]))
+ {
+ frame.AddRowMenu(deviceMenu, "", "Item/SynchronizationSelected.png", () =>
+ {
+ //濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�,姝ゅ姛鑳芥棤鏁�
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ return;
+ }
+
+ //鍚屾鎸囧畾璁惧
+ this.SynchronizationDevice();
+ });
+ }
+
}
/// <summary>
@@ -1373,6 +1593,27 @@
});
});
}
+
+ /// <summary>
+ /// 鍚屾鎸囧畾璁惧
+ /// </summary>
+ private void SynchronizationDevice()
+ {
+ HdlThreadLogic.Current.RunThread(async () =>
+ {
+ //鎵撳紑杩涘害鏉�
+ this.ShowProgressBar();
+
+ //鍚屾璁惧
+ bool result = await Common.LocalDevice.Current.SynchronizationDevice(listNewDevice);
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+ if (result == false)
+ {
+ return;
+ }
+ });
+ }
#endregion
#region 鈻� 鍏抽棴鐣岄潰___________________________
--
Gitblit v1.8.0