From f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 13:32:33 +0800
Subject: [PATCH] 2019-12-30-1
---
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs | 54 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs
index b5bd6bb..f52900a 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs
@@ -697,6 +697,7 @@
};
flMain.AddChidren(devicefra);
devicefra.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+
#region -------鍙栨秷 瀹屾垚
var timetype = new RowLayout
{
@@ -746,7 +747,6 @@
};
timetype.AddChidren(Btncomplete);
#endregion
-
string SelectedDeviceStatusaction = "no";
actionsInfo.Add("LinkType", 0);
@@ -1057,6 +1057,8 @@
openframelayout.AddChidren(horizontalSeekBarRow);
var horizontalSeekBarVol = new DiyImageSeekBar
{
+ Y = openrowlayout.Bottom,
+ X = Application.GetRealWidth(80),
Width = Application.GetRealWidth(920),
Height = Application.GetRealHeight(160),
IsProgressTextShow = true,//鏄剧ず鐧惧垎姣�
@@ -1068,7 +1070,7 @@
ProgressTextSize = 13,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�
SeekBarViewHeight = Application.GetRealHeight(10),//杩涘害鏉＄殑楂樺害
};
- horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);
+ openframelayout.AddChidren(horizontalSeekBarVol);
#endregion
@@ -1141,7 +1143,7 @@
#endregion
int Progressvalue = 100;
- EventHandler<int> progressclick = (sender, e) =>
+ EventHandler<int> progressclick = (sender, e) =>
{
SelectedDeviceStatusaction = "yes";
Progressvalue = horizontalSeekBarVol.Progress;
@@ -1357,6 +1359,8 @@
openframelayout.AddChidren(horizontalSeekBarRow);
var horizontalSeekBarVol = new DiyImageSeekBar
{
+ Y = openrowlayout.Bottom,
+ X = Application.GetRealWidth(80),
Width = Application.GetRealWidth(920),
Height = Application.GetRealHeight(160),
IsProgressTextShow = true,//鏄剧ず鐧惧垎姣�
@@ -1368,7 +1372,7 @@
ProgressTextSize = 13,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�
SeekBarViewHeight = Application.GetRealHeight(10),//杩涘害鏉＄殑楂樺害
};
- horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);
+ openframelayout.AddChidren(horizontalSeekBarVol);
#endregion
@@ -1745,7 +1749,6 @@
}
}
break;
-
case DeviceType.Thermostat:
{
@@ -1753,8 +1756,14 @@
Dictionary<string, string> temperaturedictionary = new Dictionary<string, string>();
Dictionary<string, string> modedictionary = new Dictionary<string, string>();
Dictionary<string, string> speeddictionary = new Dictionary<string, string>();
-
-
+ dictionary(temperaturedictionary, "TaskType", "5");
+ dictionary(modedictionary, "TaskType", "5");
+ dictionary(modedictionary, "Data1", "3");
+ dictionary(speeddictionary, "TaskType", "5");
+ dictionary(speeddictionary, "Data1", "6");
+ taskListInfo.Add(temperaturedictionary);
+ taskListInfo.Add(modedictionary);
+ taskListInfo.Add(speeddictionary);
#endregion
#region 绌鸿皟View
@@ -1803,15 +1812,14 @@
};
devicefra.AddChidren(PickerViewfra);
-
+ //閬尅绌鸿皟婊戝姩view锛�
var pausePickerViewfra = new FrameLayout
{
Y = openframelayout.Bottom,
Height = Application.GetRealHeight(600),
+ BackgroundColor = 0x60ffffff,
};
devicefra.AddChidren(pausePickerViewfra);
-
-
var mUIPickerView = new UIPickerView
{
@@ -1846,6 +1854,9 @@
mList1.Add(i.ToString() + " " + "鈩�");
}
mUIPickerView.setNPicker(mList1, mList2, mList3);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 0);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 1);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 2);
///榛樿鐘舵��
@@ -1884,9 +1895,13 @@
#endregion
-
+ //榛樿26,鑷姩,涓
+ int indextemperature = 10, indexmode = 2, indexspeed = 1;
mUIPickerView.OnSelectChangeEvent += (s1, s2, s3) =>
{
+ indextemperature = s1;
+ indexmode = s2;
+ indexspeed = s3;
if (openBtnSelected.Visible)
{
SelectedDeviceStatusaction = "yes";
@@ -1904,14 +1919,16 @@
};
#endregion
- //榛樿26,鑷姩,涓
- int indextemperature = 10, indexmode = 2, indexspeed = 1;
+
if (edit && TaskList != null)
{
foreach (var value in TaskList)
{
if (TaskList.Count == 1)
{
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 0);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 1);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 2);
//鏁扮粍鍙湁涓�涓厓绱犺鏄庡綋鍓嶇┖璋冪姸鎬佷负鍏筹紱
openBtnSelected.Visible = false;
closeBtnSelected.Visible = true;
@@ -1922,6 +1939,9 @@
}
else
{
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 0);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 1);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 2);
openBtnSelected.Visible = true;
closeBtnSelected.Visible = false;
pausePickerViewfra.Height = Application.GetRealHeight(0);
@@ -2015,6 +2035,9 @@
///纭浜嬩欢
EventHandler<MouseEventArgs> openclick = (sender, e) =>
{
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 0);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 1);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 2);
//娓呴櫎涔嬪墠鏁版嵁锛�
taskListInfo.Clear();
//鍔犺浇鏂版暟鎹紱
@@ -2048,7 +2071,9 @@
///鍙栨秷浜嬩欢
EventHandler<MouseEventArgs> closeclick = (sender, e) =>
{
-
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 0);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 1);
+ mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 2);
//娓呴櫎涔嬪墠鏁版嵁锛�
taskListInfo.Clear();
dictionary(modedictionary, "TaskType", "5");
@@ -2070,7 +2095,6 @@
}
-
Btncomplete.MouseUpEventHandler += (sender, e) =>
{
--
Gitblit v1.8.0