From 4e25d344065ffd9248a254ec9d11f0bb4bbbdb5e Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 30 三月 2020 11:34:58 +0800
Subject: [PATCH] 2020-03-30-1
---
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
index b55fb3b..713aae9 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
@@ -139,7 +139,7 @@
{
var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
selecteddevice.deviceNameBtn.Visible = true;
- selecteddevice.deviceNameBtn.Text = deviceinof.DeviceEpointName;
+ selecteddevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);
selecteddevice.regionNameBtn.Visible = true;
Method.RoomNmae(selecteddevice.regionNameBtn, deviceinof);
selecteddevice.edit.Tag = i;
@@ -245,7 +245,7 @@
{
var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
- name = deviceinof.DeviceEpointName;
+ name =LocalDevice.Current.GetDeviceEpointName(deviceinof);
actiondevice.regionNameBtn.Visible = true;
Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);
@@ -612,6 +612,7 @@
}
public void AddCondition(int value)
{
+ Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
var addCondition = new AddCondition();
addCondition.conditionsIndex = value;
UserView.HomePage.Instance.AddChidren(addCondition);
--
Gitblit v1.8.0