From 304dca51c28183a9dfc192c6b93ea1c00bdd5d97 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 01 七月 2020 15:00:40 +0800
Subject: [PATCH] 添加了写入功能类型
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
index a4417a0..3683150 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
@@ -333,11 +333,28 @@
var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
if (isShow == true)
{
+ //澶囨敞锛氶潰鏉夸腑鍙樉绀虹湡瀹炵殑璁惧锛屽叾浠栧睘浜庣粦瀹氱殑鍥炶矾涓嶆樉绀�
//鑾峰彇杩欎竴鍫嗚澶囨椂灞炰簬浠�涔堢被鍨嬬殑
var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
{
var listTemp = Common.LocalDevice.Current.GetMutilfunctionPanelByMac(listDevice);
+ //灞曞紑妯″紡鏃讹紝鎵╁ぇ渚濇嵁涓�:瀹冩湁鍑犱釜瀛愭帶浠�
+ heightValue = (listTemp.Count + 1) * (ControlCommonResourse.ListViewRowHeight + rowInfo.frameTable.rowSpace);
+ //鏍囬鑷繁灏辨槸涓�涓瓙鎺т欢
+ if (rowInfo.frameTable.ChildrenCount == 1)
+ {
+ foreach (CommonDevice info in listTemp)
+ {
+ //鍔犺浇瀹冪殑鍒楄〃
+ this.AddDeviceDetailRow(rowInfo.frameTable, info, deviceEnumInfo);
+ }
+ }
+ }
+ else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
+ {
+ var listTemp = Common.LocalDevice.Current.GetPanelMatchEpointByMac(listDevice);
//灞曞紑妯″紡鏃讹紝鎵╁ぇ渚濇嵁涓�:瀹冩湁鍑犱釜瀛愭帶浠�
heightValue = (listTemp.Count + 1) * (ControlCommonResourse.ListViewRowHeight + rowInfo.frameTable.rowSpace);
//鏍囬鑷繁灏辨槸涓�涓瓙鎺т欢
@@ -497,6 +514,27 @@
var form = new DeviceFunctionSettionForm();
form.AddForm(device, true);
}
+ }
+ //绠�绾︾幆澧冮潰鏉跨殑鎸夐敭閰嶇疆
+ else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
+ {
+
+ if (device.Type == DeviceType.FreshAir || device.Type == DeviceType.Thermostat)
+ {
+ var form = new DevicePanel.PanelSimpleEnvironmentButtonSettionForm();
+ form.AddForm(device);
+ }
+ else
+ {
+ var form = new DeviceFunctionSettionForm();
+ form.AddForm(device, true);
+ }
+ }
+ //绠�绾︾幆澧冮潰鏉跨殑鎸夐敭閰嶇疆
+ else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ {
+ var form = new DeviceFunctionSettionForm();
+ form.AddForm(device, true);
}
//鏂规偊闈㈡澘
else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
@@ -1019,6 +1057,20 @@
{
continue;
}
+
+ //鑾峰彇璁惧绫诲瀷鐨�
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleEnvironment)
+ {
+ foreach (var outClu in device.OutClusterList)
+ {
+ //鍘绘帀绠�绾︾幆澧冮潰鏉跨被鐨勫悇绉嶆湇鍔＄璁惧锛屽鍐呮満涓嶆樉绀�
+ if (outClu.OutCluster == 513)
+ {
+ continue;
+ }
+ }
+ }
if (dic.ContainsKey(device.DeviceAddr) == false)
{
dic[device.DeviceAddr] = new List<CommonDevice>();
@@ -1281,7 +1333,7 @@
}
#endregion
- #region 鈻� 鑷畾涔夋櫤鑳介煶绠辨帶浠禵____________________
+ #region 鈻� 鑷畾涔夋櫤鑳介煶绠辨帶浠禵________________
/// <summary>
/// 鑷畾涔夌綉鍏虫帶浠�
--
Gitblit v1.8.0