From 9a4629512ccf8359efd88671c9317c3cc7faf0c8 Mon Sep 17 00:00:00 2001 From: hxb <hxb@hdlchina.com.cn> Date: 星期一, 29 八月 2022 16:46:40 +0800 Subject: [PATCH] Merge branch 'dev' into dev-temp --- ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMemoryListDeviceForm.cs | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMemoryListDeviceForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMemoryListDeviceForm.cs index 68531ea..0a597b5 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMemoryListDeviceForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMemoryListDeviceForm.cs @@ -38,7 +38,7 @@ listView.Height = bodyFrameLayout.Height; bodyFrameLayout.AddChidren(listView); - var listDevice = HdlDeviceCommonLogic.Current.listAllDevice; + var listDevice = Common.LocalDevice.Current.listAllDevice; for (int i = 0; i < listDevice.Count; i++) { this.AddRowControl(listView, listDevice[i], i != listDevice.Count - 1); @@ -51,7 +51,7 @@ { var row1 = new RowLayoutControl(listView.rowSpace / 2); listView.AddChidren(row1); - row1.frameTable.AddTopView(HdlDeviceCommonLogic.Current.GetDeviceEpointName(device), 800); + row1.frameTable.AddTopView(Common.LocalDevice.Current.GetDeviceEpointName(device), 800); row1.frameTable.AddBottomView(device.FilePath, 800); if (addLine == true) { -- Gitblit v1.8.0