From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Common/Controls/CompoundControls/SafetySensorStatuControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs
similarity index 95%
rename from ZigbeeApp/Shared/Phone/Common/Controls/CompoundControls/SafetySensorStatuControl.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs
index 9248f9f..d7e93fe 100644
--- a/ZigbeeApp/Shared/Phone/Common/Controls/CompoundControls/SafetySensorStatuControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs
@@ -3,7 +3,7 @@
using System.Text;
using ZigBee.Device;
-namespace Shared.Phone
+namespace Shared.Phone.UserCenter
{
/// <summary>
/// 瀹夐槻浼犳劅鍣ㄧ姸鎬佺殑鑷畾涔夋帶浠�
@@ -65,7 +65,7 @@
btnStatu.TextID = R.MyInternationalizationString.uStatu;
this.AddChidren(btnStatu);
//绾�
- var btnLine = new NormalViewControl(Application.GetRealWidth(876), HdlControlResourse.BottomLineHeight, false);
+ var btnLine = new NormalViewControl(Application.GetRealWidth(876), ControlCommonResourse.BottomLineHeight, false);
btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
btnLine.X = Application.GetRealWidth(46);
btnLine.Y = Application.GetRealHeight(104);
@@ -74,14 +74,14 @@
var btnDeviceName = new NormalViewControl(400, 58, true);
btnDeviceName.X = Application.GetRealWidth(46);
btnDeviceName.Y = Application.GetRealHeight(141);
- btnDeviceName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
+ btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(device);
this.AddChidren(btnDeviceName);
//鍦ㄧ嚎鐘舵��
btnOnline = new NormalViewControl(200, 58, true);
btnOnline.X = this.Width - Application.GetRealWidth(200 + 46);
btnOnline.Y = btnDeviceName.Y;
btnOnline.TextAlignment = TextAlignment.CenterRight;
- this.SetOnlineStatu(HdlDeviceCommonLogic.Current.CheckDeviceIsOnline(device));
+ this.SetOnlineStatu(Common.LocalDevice.Current.CheckDeviceIsOnline(device));
this.AddChidren(btnOnline);
}
--
Gitblit v1.8.0