From ed2f4a97aa48cdb4a013d2a389877f52eb3eccdf Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:15:59 +0800
Subject: [PATCH] Merge branch 'DEV_GXC' of http://172.16.1.23:6688/r/~xm/HomeApp into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/Logic/SetDeviceState.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SetDeviceState.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SetDeviceState.cs
index 7673c10..bd9932d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SetDeviceState.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SetDeviceState.cs
@@ -32,6 +32,8 @@
//TextID = MyInternationalizationString.adddevice,
TextSize = 17,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ X = Application.GetRealWidth(150),
};
topFrameLayout.AddChidren (titleName);
@@ -107,7 +109,7 @@
actionsInfo.Add("TaskList", taskListInfo);
switch (common.Type)
{
- case DeviceType.ColorDimmableLight:
+ case DeviceType.DimmableLight:
{
#region ----鍒濆鍖栬澶囧姛鑳芥暟鎹�----
//Dictionary<string, string> switchdictionary = new Dictionary<string, string>();
@@ -314,7 +316,7 @@
}
var intvalue = int.Parse(value["Data1"]);
brightnessdictionary.Add("Data1", intvalue.ToString());
- var lightbrightnessvalue = (intvalue * 100) / 254 + 1;
+ var lightbrightnessvalue = (intvalue * 100) / 254;
Btnvelue.Text = lightbrightnessvalue.ToString() + "%";
horizontalSeekBarVol.Progress = lightbrightnessvalue;
--
Gitblit v1.8.0