From 5986f63b75bd81c6cef262c670e9251c038cbf5d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 17 十二月 2019 17:21:07 +0800
Subject: [PATCH] 合并一个版本
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
index 1db0408..27130ce 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
@@ -1040,7 +1040,7 @@
};
openrowlayout.AddChidren(btnopen);
- var openBtnSelected = new SelectedButton();
+ var openBtnSelected = new SelectedButton();
openrowlayout.AddChidren(openBtnSelected);
var horizontalSeekBarRow = new RowLayout
@@ -1049,7 +1049,7 @@
Width = Application.GetRealWidth(920),
Height = Application.GetRealHeight(160),
X = Application.GetRealWidth(80),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+ LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
};
openframelayout.AddChidren(horizontalSeekBarRow);
var horizontalSeekBarVol = new DiyImageSeekBar
@@ -1142,7 +1142,6 @@
int Progressvalue = 100;
EventHandler<int> progressclick = (sender, e) =>
{
- Console.WriteLine("12345");
SelectedDeviceStatusaction = "yes";
Progressvalue = horizontalSeekBarVol.Progress;
if (switchdictionary.ContainsKey("TaskType"))
@@ -1357,8 +1356,8 @@
openframelayout.AddChidren(horizontalSeekBarRow);
var horizontalSeekBarVol = new DiyImageSeekBar
{
- X = Application.GetRealWidth(80),
Y = openrowlayout.Bottom,
+ X = Application.GetRealWidth(80),
Width = Application.GetRealWidth(920),
Height = Application.GetRealHeight(160),
IsProgressTextShow = true,//鏄剧ず鐧惧垎姣�
@@ -1366,9 +1365,9 @@
ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉￠鑹�
ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍�
ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
- ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,//杩涘害鏉″師棰滆壊
ProgressTextSize = 14,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�
- SeekBarViewHeight = Application.GetRealHeight(10),//杩涘害鏉＄殑楂樺害
+ SeekBarViewHeight = Application.GetRealHeight(10),
};
openframelayout.AddChidren(horizontalSeekBarVol);
@@ -1747,7 +1746,7 @@
}
}
break;
-
+ ///绌鸿皟
case DeviceType.Thermostat:
{
@@ -1882,8 +1881,7 @@
var closeBtnSelected = new SelectedButton();
closerowlayout.AddChidren(closeBtnSelected);
#endregion
-
-
+
mUIPickerView.OnSelectChangeEvent += (s1, s2, s3) =>
{
@@ -1902,12 +1900,13 @@
}
};
-
- #endregion
+
+ #endregion
//榛樿26,鑷姩,涓
int indextemperature = 10, indexmode = 2, indexspeed = 1;
if (edit && TaskList != null)
{
+
foreach (var value in TaskList)
{
if (TaskList.Count == 1)
@@ -2049,6 +2048,7 @@
///鍙栨秷浜嬩欢
EventHandler<MouseEventArgs> closeclick = (sender, e) =>
{
+
//娓呴櫎涔嬪墠鏁版嵁锛�
taskListInfo.Clear();
dictionary(modedictionary, "TaskType", "5");
--
Gitblit v1.8.0