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/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs
index 4d17c9a..f856377 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs
@@ -126,7 +126,7 @@
btnDeviceName.Y = Application.GetRealHeight(46);
btnDeviceName.TextSize = 15;
btnDeviceName.IsBold = true;
- btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);
+ btnDeviceName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(i_device);
btnDeviceName.Width = btnDeviceName.GetRealWidthByText();
btnDeviceName.TextAlignment = TextAlignment.Center;
btnDeviceName.Gravity = Gravity.CenterHorizontal;
@@ -159,7 +159,7 @@
//鎴块棿鍥炬爣
var btnRoomIcon = new IconViewControl(81);
- btnRoomIcon.X = ControlCommonResourse.XXLeft;
+ btnRoomIcon.X = HdlControlResourse.XXLeft;
btnRoomIcon.UnSelectedImagePath = "Item/Room.png";
btnRoomIcon.Gravity = Gravity.CenterVertical;
frameRoomBlack.AddChidren(btnRoomIcon);
@@ -295,11 +295,11 @@
/// </summary>
private void AddDeviceReportEvent()
{
- string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(this.device);
+ string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(this.device);
//灞炴�т笂鎶�
HdlGatewayReceiveLogic.Current.AddAttributeEvent("DeviceDetailCardAttribute" + mainKeys, ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
{
- string mainKey2 = Common.LocalDevice.Current.GetDeviceMainKeys(report);
+ string mainKey2 = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report);
if (mainKeys != mainKey2)
{
//涓嶆槸鍚屼竴涓笢瑗�
@@ -337,7 +337,7 @@
else
{
//鍒锋柊鍚嶅瓧
- this.btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(this.device);
+ this.btnDeviceName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(this.device);
btnDeviceName.Width = btnDeviceName.GetRealWidthByText();
btnDeviceName.Gravity = Gravity.CenterHorizontal;
if (this.nowSelectRoom == null)
@@ -363,7 +363,7 @@
/// </summary>
public override void CloseFormBefore()
{
- string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(this.device);
+ string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(this.device);
HdlGatewayReceiveLogic.Current.RemoveEvent("DeviceDetailCardAttribute" + mainKeys);
//鍥炶皟鍑芥暟
--
Gitblit v1.8.0