From 15c5215e0a16207baace58b81f406acfd84b4de5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 28 八月 2020 16:00:26 +0800
Subject: [PATCH] V2.508281-beta 2020-08-28 1.搜索设备时，如果红外空调备注为空时，默认”AC“+回路号命名。 2.添加场景时，卷帘和开合帘提交改为百分比进度参数。 3.增加房间页面，长按设备名字，弹出修改备注。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs
index 798a7d9..e4a9e60 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/GenericDialog.cs
@@ -54,6 +54,7 @@
Radius = 1,
BorderWidth = 1,
BorderColor = SkinStyle.Current.BorderColor,
+
};
dialogView.AddChidren (etDeviceName);
etDeviceName.TextChangeEventHandler += (sender, e) => {
@@ -168,7 +169,7 @@
try {
foreach (var room in Room.Lists) {
foreach (var common in room.DeviceList) {
- if (common.SubnetID != commonDevice.SubnetID || common.DeviceID != commonDevice.DeviceID || common.LoopID != commonDevice.LoopCount) {
+ if (common.CommonLoopID != commonDevice.CommonLoopID || common.Type != commonDevice.Type) {
continue;
}
common.Name = commonDevice.Name;
--
Gitblit v1.8.0