From e96e11d6f8b965ea522c983e040d41e3b9ef105a Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 21:33:19 +0800
Subject: [PATCH] 2020-05-18-4
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
old mode 100644
new mode 100755
index 35f9b0f..97b170b
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -43,7 +43,7 @@
var middle = new VerticalScrolViewLayout
{
Y = view.topRowLayout.Bottom,
- Height = Application.GetRealHeight(1920 - 184-180),
+ Height = Application.GetRealHeight(Method.H - 184-180),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
@@ -101,7 +101,7 @@
addconditionview.iconBtn.Visible = true;
addconditionview.titleBtn.TextID = MyInternationalizationString.ifcondition;
middle.AddChidren(addconditionview.AddDeviceView());
-
+
///娣诲姞鏉′欢鐨勭偣鍑讳簨浠�
addconditionview.clickBtn.MouseUpEventHandler+= (sender, e) =>
{
@@ -162,7 +162,6 @@
LogicView.AddDeviceView addflview = new LogicView.AddDeviceView();
addflview.titleBtn.TextID = MyInternationalizationString.addconditions;
middle.AddChidren(addflview.AddFl());
-
addflview.clickBtn.MouseUpEventHandler += (sender, e) =>
{
if (Common.Logic.CurrentLogic.Conditions.Count == 1)
@@ -500,16 +499,18 @@
s = "鈮�";
}
break;
- }
+ }
+ ///杞崲娓╁害鍊�/100
+ string srtValue = (int.Parse(conditions["AttriButeData1"]) / 100).ToString();
if (conditions["Cluster_ID"] == "1026")
{
icon = "ZigeeLogic/temperature.png";
- state = s + conditions["AttriButeData1"] + "鈩�";
+ state = s + srtValue + "鈩�";
}
else
{
icon = "ZigeeLogic/humidity.png";
- state = s + conditions["AttriButeData1"] + "%";
+ state = s + srtValue + "%";
}
break;
@@ -682,7 +683,6 @@
addactionview.iconBtn.Visible = true;
addactionview.titleBtn.TextID = MyInternationalizationString.execute;
middle.AddChidren(addactionview.AddDeviceView());
-
addactionview.clickBtn.MouseUpEventHandler+= (sender, e) =>
{
@@ -695,8 +695,6 @@
ListActions.AddRange(Common.Logic.CurrentLogic.Actions);
ListActions.Add(new Dictionary<string, object>());
-
-
for (int i = 0; i < ListActions.Count; i++)
{
if (i == (ListActions.Count - 1))
@@ -705,8 +703,6 @@
LogicView.AddDeviceView addflview = new LogicView.AddDeviceView();
addflview.titleBtn.TextID = MyInternationalizationString.addfunction;
middle.AddChidren(addflview.AddFl());
-
-
addflview.clickBtn.MouseUpEventHandler += (sender, e) =>
{
Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
--
Gitblit v1.8.0