From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
index 2d5b82d..a5cc9e1 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
@@ -215,7 +215,7 @@
{
var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
selecteddevice.deviceNameBtn.Visible = true;
- selecteddevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);
+ selecteddevice.deviceNameBtn.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(deviceinof);
selecteddevice.regionNameBtn.Visible = true;
Method.RoomNmae(selecteddevice.regionNameBtn, deviceinof);
selecteddevice.iconBtn.UnSelectedImagePath ="ZigeeLogic/sensor13.png";
@@ -270,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 ShowMsgControl(ShowMsgType.Confirm,
Language.StringByID(MyInternationalizationString.doyouwanttodelete),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -359,7 +360,7 @@
{
var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
actiondevice.deviceNameBtn.Visible = true;
- actiondevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);
+ actiondevice.deviceNameBtn.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(deviceinof);
actiondevice.regionNameBtn.Visible = true;
Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);
switch (deviceinof.Type)
@@ -403,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 ShowMsgControl(ShowMsgType.Confirm,
Language.StringByID(MyInternationalizationString.doyouwanttodelete),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
--
Gitblit v1.8.0