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/SharedContent/LookSharedContentForm.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
index 17a9b30..374d5fb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
@@ -255,7 +255,7 @@
else
{
var frameBack = new FrameLayout();
- frameBack.X = HdlControlResourse.XXLeft;
+ frameBack.X = ControlCommonResourse.XXLeft;
frameBack.Y = Application.GetRealHeight(178);
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.Width = bodyFrameLayout.Width;
@@ -315,15 +315,15 @@
foreach (var device in listDevice)
{
var frameRow = new FrameRowControl(listView.rowSpace / 2);
- frameRow.LeftOffset = Application.GetRealWidth(46) - HdlControlResourse.XXLeft;
- frameRow.RightOffset = -HdlControlResourse.XXLeft;
+ frameRow.LeftOffset = Application.GetRealWidth(46) - ControlCommonResourse.XXLeft;
+ frameRow.RightOffset = -ControlCommonResourse.XXLeft;
listView.AddChidren(frameRow);
//鍥炬爣
var btnIcon = frameRow.AddLeftIcon(81);
- HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnIcon, device);
+ Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, device);
//鍚嶇О
var btnView = frameRow.AddLeftCaption(string.Empty, 600);
- btnView.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
+ btnView.Text = Common.LocalDevice.Current.GetDeviceEpointName(device);
btnView.TextSize = 15;
//搴曠嚎
frameRow.AddBottomLine();
@@ -332,7 +332,7 @@
btnSelect.UnSelectedImagePath = "Item/ItemUnSelected.png";
btnSelect.SelectedImagePath = "Item/ItemSelected.png";
- string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
+ string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
if (dicSelectDevice.ContainsKey(mainKeys) == true)
{
btnSelect.IsSelected = true;
@@ -378,7 +378,7 @@
var dic = new Dictionary<string, List<CommonDevice>>();
foreach (var device in listDevice)
{
- var typeInfo = HdlDeviceCommonLogic.Current.GetDeviceBelongEnumInfo(device);
+ var typeInfo = Common.LocalDevice.Current.GetDeviceBelongEnumInfo(device);
if (dic.ContainsKey(typeInfo.BeloneText) == false)
{
dic[typeInfo.BeloneText] = new List<CommonDevice>();
--
Gitblit v1.8.0