From d78515ac4ac8cf4a1785d9df18058d6724f12b79 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 14 一月 2021 19:34:59 +0800
Subject: [PATCH] 合并xm2021-01-13 wjc2021-02-06
---
ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs b/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
index fc9b3c8..90df1c8 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
@@ -206,7 +206,7 @@
{
deviceinof = new CommonDevice();
}
- actiondevice.deviceNameBtn.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(deviceinof);
+ actiondevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);
actiondevice.deviceNameBtn.Visible = true;
actiondevice.regionNameBtn.Visible = true;
Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);
@@ -342,7 +342,7 @@
this.AddChidren(flMain);
CompleteView completeView = new CompleteView();
flMain.AddChidren(completeView.Show(1));
- // completeView.Btntitle.Text =HdlDeviceCommonLogic.Current.GetDeviceEpointName(common);
+ // completeView.Btntitle.Text =LocalDevice.Current.GetDeviceEpointName(common);
completeView.Btntitle.TextID = MyInternationalizationString.openmode;
EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
{
--
Gitblit v1.8.0