From cb7fd6a89ad9fcd9cf575025ab43873f17bf17c8 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 16:46:59 +0800
Subject: [PATCH] 2020-12-31-1
---
ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
old mode 100755
new mode 100644
index 9c244a8..7b4b789
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
@@ -61,7 +61,7 @@
var iconBtn = new Button
{
Width = Application.GetRealWidth(936),
- Height = Application.GetRealHeight(436),
+ Height = Application.GetRealWidth(436),
X = Application.GetRealWidth(72),
Y = Application.GetRealHeight(30),
UnSelectedImagePath = $"ZigeeLogic/logicbj{s}.png",
@@ -229,11 +229,8 @@
{
case 13:
{
- if (intvalue == "1")
- {
- selecteddevice.selecetddevicestateBtn.TextID = MyInternationalizationString.someone;
- }
- else
+
+ if (conditions.ContainsKey("IgnoreTime"))
{
int minute = int.Parse(conditions["IgnoreTime"]) / 60;
int second = int.Parse(conditions["IgnoreTime"]) % 60;
@@ -257,6 +254,11 @@
}
}
+ else
+ {
+ selecteddevice.selecetddevicestateBtn.TextID = MyInternationalizationString.someone;
+ }
+
}
break;
}
@@ -268,21 +270,22 @@
}
break;
}
-
+
///缂栬緫
+ selecteddevice.edit.Tag = i.ToString();
selecteddevice.edit.MouseUpEventHandler += (sender, e) =>
{
var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
- CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "condition_mould");
+ CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "condition_mould", int.Parse(selecteddevice.edit.Tag.ToString()));
};
///鍒犻櫎鎺т欢
selecteddevice.del.MouseUpEventHandler += (sender, e) =>
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
Language.StringByID(MyInternationalizationString.doyouwanttodelete),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -401,18 +404,20 @@
break;
}
///缂栬緫
+
+ actiondevice.edit.Tag = i;
actiondevice.edit.MouseUpEventHandler += (sender, e) => {
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
- CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_mould");
+ CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_mould",int.Parse(actiondevice.edit.Tag.ToString()));
};
///鍒犻櫎鎺т欢
actiondevice.del.MouseUpEventHandler += (sender, e) =>
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
Language.StringByID(MyInternationalizationString.doyouwanttodelete),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
--
Gitblit v1.8.0