From 404cdc88627f942df7944af04ee05b9d527752d6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 九月 2019 13:22:40 +0800
Subject: [PATCH] 合并了徐梅的按键面板绑定
---
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
old mode 100644
new mode 100755
index 0ce62bb..c41f1d2
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -455,13 +455,13 @@
}
}
break;
- case DeviceType.WindowCoveringDevice:
+ case DeviceType.WindowCoveringDevice:
var rollerShape = deviceUI.CommonDevice as Rollershade;
//璁板綍鍥炲鏃堕棿
rollerShape.LastDateTime = DateTime.Now;
rollerShape.IsOnline = (common as Rollershade).IsOnline;
for (int j = 0; j < rowLayout.ChildrenCount; j++)
- {
+ {
var tempView = rowLayout.GetChildren(j);
if (tempView.Tag == null)
{
@@ -963,11 +963,11 @@
if (deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.OnOffOutput)
{
//鐏�
- var light = deviceUI.CommonDevice as ZigBee.Device.ToggleLight;
- //琛ヤ笂闈炶繙绋�
- if (light.Gateway == null)
- {
- continue;
+ var light = deviceUI.CommonDevice as ZigBee.Device.ToggleLight;
+ //琛ヤ笂闈炶繙绋�
+ if (light.Gateway == null)
+ {
+ continue;
}
if (light.Gateway.IsVirtual)
{
@@ -1858,7 +1858,7 @@
tList.Add($"{i} {Language.StringByID(R.MyInternationalizationString.Second)}");
}
//int beforeIndex = (int)(sender as CommonForm.RowLayoutEditButton).Tag;
- PickerView.Show(tList, (obj) =>
+ PickerView.Show(tList, (obj) =>
{
var tempRoom = Shared.Common.Room.GetRoomByFilePath(sceneRoomUI.room.FileName);
if (tempRoom == null)
@@ -1869,13 +1869,13 @@
{
if (ss.Id == sceneRoomUI.sceneUI.Id)
{
- ss.SceneDelayTime = int.Parse(obj.Split(' ')[0]);
+ ss.SceneDelayTime = int.Parse(tList[obj].Split(' ')[0]);
sceneRoomUI.room.Save();
RefreshBodyView();
return;
}
}
- }, Language.StringByID(R.MyInternationalizationString.Confrim), tList[(int)(sender as CommonForm.RowLayoutEditButton).Tag]);
+ },0,"", Language.StringByID(R.MyInternationalizationString.Confrim), tList[(int)(sender as CommonForm.RowLayoutEditButton).Tag]);
};
}
}
--
Gitblit v1.8.0