From aeb4af0cadfaca52c9bfbe5257df285ad0cc2f39 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 04 十二月 2019 15:34:09 +0800
Subject: [PATCH] 2019-12-04-1
---
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs | 66 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs
index 52c85fb..4a815d9 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs
@@ -1745,21 +1745,10 @@
{
#region ----鍒濆鍖栬澶囧姛鑳芥暟鎹�----
- Dictionary<string, string> switchdictionary = new Dictionary<string, string>();
Dictionary<string, string> temperaturedictionary = new Dictionary<string, string>();
Dictionary<string, string> modedictionary = new Dictionary<string, string>();
Dictionary<string, string> speeddictionary = new Dictionary<string, string>();
- taskListInfo.Add(switchdictionary);
- taskListInfo.Add(temperaturedictionary);
- taskListInfo.Add(modedictionary);
- taskListInfo.Add(speeddictionary);
- dictionary(switchdictionary, "TaskType", "1");
- dictionary(switchdictionary, "Data2", "0");
- dictionary(temperaturedictionary, "TaskType", "5");
- dictionary(modedictionary, "TaskType", "5");
- dictionary(modedictionary, "Data1", "3");
- dictionary(speeddictionary, "TaskType", "5");
- dictionary(speeddictionary, "Data1", "6");
+
#endregion
@@ -1916,25 +1905,24 @@
{
foreach (var value in TaskList)
{
- if (value["TaskType"] == "1")
+ if (TaskList.Count == 1)
{
- dictionary(switchdictionary, "Data1", value["Data1"]);
- if (value["Data1"] == "1")
- {
- openBtnSelected.Visible = true;
- closeBtnSelected.Visible = false;
- pausePickerViewfra.Height = Application.GetRealHeight(0);
- }
- else if (value["Data1"] == "0")
- {
- openBtnSelected.Visible = false;
- closeBtnSelected.Visible = true;
- pausePickerViewfra.Height = Application.GetRealHeight(600);
- break;
- }
+ //鏁扮粍鍙湁涓�涓厓绱犺鏄庡綋鍓嶇┖璋冪姸鎬佷负鍏筹紱
+ openBtnSelected.Visible = false;
+ closeBtnSelected.Visible = true;
+ pausePickerViewfra.Height = Application.GetRealHeight(600);
+ //濡傛灉绌鸿皟鐘舵�佹槸鍏筹紱鐩存帴璺冲嚭for寰潖锛�
+ break;
}
- else if (value["TaskType"] == "5")
+ else
+ {
+ openBtnSelected.Visible = true;
+ closeBtnSelected.Visible = false;
+ pausePickerViewfra.Height = Application.GetRealHeight(0);
+ }
+
+ if (value["TaskType"] == "5")
{
if (value["Data1"] == "3")
{//3---璁剧疆宸ヤ綔妯″紡(1:鑷姩;3:鍒跺喎;4:鍒剁儹;7:閫侀;8:闄ゆ箍)
@@ -2022,11 +2010,21 @@
///纭浜嬩欢
EventHandler<MouseEventArgs> openclick = (sender, e) =>
{
+ //娓呴櫎涔嬪墠鏁版嵁锛�
+ taskListInfo.Clear();
+ //鍔犺浇鏂版暟鎹紱
+ 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);
pausePickerViewfra.Height = Application.GetRealHeight(0);
SelectedDeviceStatusaction = "yes";
openBtnSelected.Visible = true;
closeBtnSelected.Visible = false;
- dictionary(switchdictionary, "Data1", "1");
var temperature = mList1[indextemperature].Split(' ')[0];
var modestring = mList2[indexmode].Split(' ')[0];
var speedstring = mList3[indexspeed].Split(' ')[0];
@@ -2045,12 +2043,18 @@
///鍙栨秷浜嬩欢
EventHandler<MouseEventArgs> closeclick = (sender, e) =>
{
- pausePickerViewfra.Height = Application.GetRealHeight(600);
+ //娓呴櫎涔嬪墠鏁版嵁锛�
+ taskListInfo.Clear();
+ dictionary(modedictionary, "TaskType", "5");
+ dictionary(modedictionary, "Data1", "3");
+ dictionary(modedictionary, "Data2", "0");
+ //鍔犺浇鏂版暟鎹紱
+ taskListInfo.Add(modedictionary);
+ pausePickerViewfra.Height = Application.GetRealHeight(600);
SelectedDeviceStatusaction = "yes";
openBtnSelected.Visible = false;
closeBtnSelected.Visible = true;
- dictionary(switchdictionary, "Data1", "0");
};
closerowlayout.MouseUpEventHandler += closeclick;
btnclose.MouseUpEventHandler += closeclick;
--
Gitblit v1.8.0