From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs
index f11e9ee..5560dd9 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs
@@ -74,7 +74,7 @@
X = Application.GetRealWidth(x);
Y = Application.GetRealHeight(y);
Width = Application.GetRealWidth(1022);
- Height = Application.GetRealHeight(127);
+ Height = Application.GetRealHeight(127-2);
//BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
}
@@ -179,11 +179,11 @@
var line = new Button()
{
- X = Application.GetRealWidth(200),
- Y = Height - 2,
+ X = Application.GetRealWidth(181),
+ Y = Height - 1,
Width = Application.GetRealWidth(821),
- Height = 2,
- BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor,
+ Height = 1,
+ BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2,
Tag = Tag
};
AddChidren(line);
@@ -274,5 +274,18 @@
CloseOrDownBtn.SelectedImagePath = "RollerShade/CloseSelected.png";
}
}
+
+
+ /// <summary>
+ /// SetDeviceIcon
+ /// </summary>
+ /// <param name="imagePath"></param>
+ /// <param name="selectedImagePath"></param>
+ public void SetDeviceIcon(string imagePath, string selectedImagePath)
+ {
+ ImageBtn.UnSelectedImagePath = imagePath;
+ ImageBtn.SelectedImagePath = selectedImagePath;
+ }
+
}
}
--
Gitblit v1.8.0