From 4b378188ce972df432b23d9cb73babb6cc0679c6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 17 一月 2020 14:56:15 +0800
Subject: [PATCH] 合并代码 ver.10086
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
index cf5ecc4..7fb6fe1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
@@ -411,6 +411,37 @@
var form = new DeviceAirConditioner.IndoorUnitSettionForm();
form.AddForm((AC)device);
}
+ //鐜闈㈡澘
+ else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)
+ {
+ var form = new DeviceFunctionSettionForm();
+ form.AddForm(device, true);
+ }
+ //鏂规偊闈㈡澘
+ else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour
+ || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)
+ {
+ //骞叉帴鐐�
+ if (device.Type == DeviceType.OnOffSwitch)
+ {
+ //鏂规偊闈㈡澘鐨勬寜閿厤缃�
+ var form = new DevicePanel.PanelFangyueButtonSettionForm();
+ form.AddForm(device);
+ }
+ //缁х數鍣�
+ else if (device.Type == DeviceType.OnOffOutput)
+ {
+ //鏂规偊闈㈡澘鐨勫姛鑳介厤缃�
+ var form = new DevicePanel.PanelFangyueButtonSettionForm();
+ form.AddForm(device);
+ }
+ else
+ {
+ var form = new DeviceFunctionSettionForm();
+ form.AddForm(device, true);
+ }
+ }
//闈㈡澘璁惧
else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘)
{
@@ -443,12 +474,6 @@
var form = new DeviceFunctionSettionForm();
form.AddForm(device, true);
}
- }
- //娓╂箍搴�
- else if (device.Type == DeviceType.TemperatureSensor)
- {
- var form = new DeviceFunctionSettionForm();
- form.AddForm(device, true);
}
else
{
@@ -914,8 +939,9 @@
if (this.nowActionDeviceMac != null)
{
var rowInfo = this.dicRowInfo[nowActionDeviceMac];
- //妫�娴嬭繖涓澶囨槸鍚﹁鍒犻櫎
- if (Common.LocalDevice.Current.GetDevicesByMac(nowActionDeviceMac).Count == 0)
+ //妫�娴嬭繖涓澶囨槸鍚﹁鍒犻櫎 2020.01.13鍙樻洿:杩藉姞Ota璁惧鐨勫垽鏂�
+ if (Common.LocalDevice.Current.GetDevicesByMac(nowActionDeviceMac).Count == 0
+ && Common.LocalDevice.Current.GetOTADevice(nowActionDeviceMac) == null)
{
//绉婚櫎鎺т欢
rowInfo.dicDetailRow = null;
--
Gitblit v1.8.0