From 9c607e921ca7c379799e4dd88b140265a1d5d5c5 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 22 十一月 2019 16:35:30 +0800
Subject: [PATCH] 需要合并
---
ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
old mode 100755
new mode 100644
index 5dd0ba7..5d57d60
--- a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
@@ -120,10 +120,10 @@
}
if (deviceUI.CommonDevice.Type == DeviceType.DimmableLight)
{
- if (common.DeviceStatusReport.CluterID == 6)
+ if ((common as DimmableLight).DeviceStatusReport.CluterID == 6)
{
dimmableLight = deviceUI.CommonDevice as DimmableLight;
- dimmableLight.DeviceStatusReport = common.DeviceStatusReport;
+ dimmableLight.DeviceStatusReport = (common as DimmableLight).DeviceStatusReport;
//璁板綍銆佹洿鏂扮姸鎬�
if (dimmableLight.DeviceStatusReport.AttriBute == null || dimmableLight.DeviceStatusReport.AttriBute.Count == 0)
{
@@ -146,10 +146,10 @@
dimmableLight.LastDateTime = DateTime.Now;
}
//浜害
- if (common.DeviceStatusReport.CluterID == 8)
+ if ((common as ZigBee.Device.DimmableLight).DeviceStatusReport.CluterID == 8)
{
dimmableLight = deviceUI.CommonDevice as ZigBee.Device.DimmableLight;
- dimmableLight.DeviceStatusReport = common.DeviceStatusReport;
+ dimmableLight.DeviceStatusReport = (common as ZigBee.Device.DimmableLight).DeviceStatusReport;
var attriButeList = dimmableLight.DeviceStatusReport.AttriBute;
if (attriButeList == null || attriButeList.Count == 0)
{
@@ -191,8 +191,8 @@
{
ZbGateway.StatusList.Remove(this);
UserView.HomePage.Instance.ScrollEnabled = true;
- action();
- action = null;
+ //action();
+ //action = null;
base.RemoveFromParent();
}
@@ -204,6 +204,7 @@
/// </summary>
public DimmableLightControl()
{
+ UserView.HomePage.Instance.ScrollEnabled = false;
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
ZbGateway.StatusList.Add(this);
}
@@ -269,16 +270,6 @@
{
RemoveFromParent();
};
-
- var sharedBtn = new Button
- {
- X = Application.GetRealWidth(850),
- Width = Application.GetMinReal(69),
- Height = Application.GetMinReal(69),
- Gravity = Gravity.CenterVertical,
- UnSelectedImagePath = "Item/Shared.png"
- };
- top.topView.AddChidren(sharedBtn);
var moreBtn = new Button
{
--
Gitblit v1.8.0