From fa175644110d2c50a957b1d9b92d7fbab39f63f9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 16 十二月 2019 15:25:55 +0800
Subject: [PATCH] 2019.12.16
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 8 ++++----
ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs | 2 +-
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 81d09cc..cbea63f 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -6,11 +6,11 @@
<Files>
<File FileName="Shared/R.cs" />
<File FileName="GateWay.Droid/Assets/Language.ini" />
- <File FileName="Shared/Phone/Device/Light/DimmableLightControl.cs" Line="411" Column="15" />
- <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1354" Column="47" />
- <File FileName="Shared/Phone/Device/AC/ACControl.cs" Line="422" Column="61" />
+ <File FileName="Shared/Phone/Device/Light/DimmableLightControl.cs" Line="410" Column="1" />
+ <File FileName="Shared/Phone/Device/Category/Category.cs" Line="366" Column="68" />
+ <File FileName="Shared/Phone/Device/AC/ACControl.cs" Line="243" Column="33" />
<File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="1" Column="1" />
- <File FileName="Shared/Phone/Device/DeviceLogic/ReadDeviceAttributeLogic.cs" Line="46" Column="1" />
+ <File FileName="Shared/Phone/Device/DeviceLogic/ReadDeviceAttributeLogic.cs" Line="44" Column="78" />
<File FileName="Shared/Common/CommonPage.cs" Line="60" Column="99" />
<File FileName="Shared/Phone/UserView/UserPage.cs" Line="251" Column="30" />
</Files>
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index a9211dd..f1eaa77 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -363,7 +363,7 @@
{
continue;
}
- dimmableLight.OnOffStatus = dimmableLight.DeviceStatusReport.AttriBute[0].AttriButeData;
+ dimmableLight.Level = dimmableLight.DeviceStatusReport.AttriBute[0].AttriButeData;
var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
row.SetStatu(dimmableLight.OnOffStatus == 1);
row.SetStatuText(deviceUI.GetDeviceStatu());
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
index 472ec29..94c1dc7 100644
--- a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
@@ -394,7 +394,7 @@
};
itemView.AddChidren(levelSeekBar);
- if (dimmableLight.OnOffStatus==1)
+ if (dimmableLight.OnOffStatus == 1)
{
levelSeekBar.IsClickable = true;
levelSeekBar.WaveColor = ZigbeeColor.Current.GXCWaveSeekBarColor;
--
Gitblit v1.8.0