From cc0d80c7d86c6d0167269b3408c4b30c24ce84e9 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 23 三月 2020 16:55:37 +0800
Subject: [PATCH] ？？？？？？？
---
ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs
index f11e9ee..94004ab 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using Shared.Common;
-
+using ZigBee.Device;
+
namespace Shared.Phone.Device.CommonForm
{
public class CategoryFunctionForWinRow:FrameLayout
@@ -74,7 +75,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;
}
@@ -82,7 +83,7 @@
/// Init
/// </summary>
/// <param name="device"></param>
- public void Init(DeviceUI device)
+ public void Init(CommonDevice device)
{
ImageBG = new Button()
{
@@ -144,7 +145,7 @@
AddChidren(OpenOrUpBtn);
OpenOrUpBtn.MouseUpEventHandler += (sender, e) =>
{
- (device.CommonDevice as ZigBee.Device.Rollershade).CurtainUpDownStopControl(0);
+ (device as ZigBee.Device.Rollershade).CurtainUpDownStopControl(0);
};
StopBtn = new Button
@@ -159,7 +160,7 @@
AddChidren(StopBtn);
StopBtn.MouseUpEventHandler += (sender, e) =>
{
- (device.CommonDevice as ZigBee.Device.Rollershade).CurtainUpDownStopControl(2);
+ (device as ZigBee.Device.Rollershade).CurtainUpDownStopControl(2);
};
CloseOrDownBtn = new Button
@@ -174,16 +175,16 @@
AddChidren(CloseOrDownBtn);
CloseOrDownBtn.MouseUpEventHandler += (sender, e) =>
{
- (device.CommonDevice as ZigBee.Device.Rollershade).CurtainUpDownStopControl(1);
+ (device as ZigBee.Device.Rollershade).CurtainUpDownStopControl(1);
};
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 +275,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