From b3e96fce4cc01113128ddf8e0a18fc19594a9e56 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 05 十二月 2019 18:38:30 +0800
Subject: [PATCH] 一个新的版本

---
 ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs |   82 +++++++++++++++++++++--------------------
 1 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
index b23a780..fffe741 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
@@ -133,7 +133,7 @@
 
             };
             this.AddChidren(devicetypehorizontalScrol);
-            devicetypehorizontalScrol.SetCornerWithSameRadius(20, HDLUtils.RectCornerBottomLeft);
+            devicetypehorizontalScrol.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
 
             middle = new VerticalScrolViewLayout();
             middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
@@ -142,7 +142,7 @@
             middle.X = Application.GetRealWidth(58);
             //middle.Radius = (uint)Application.GetRealHeight(50);
             this.AddChidren(middle);
-            middle.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft);
+            middle.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
 
             ///鐩墠鏀寔鐨勮澶�
             List<DeviceType> deviceTypeList = new List<DeviceType> {
@@ -691,7 +691,7 @@
                 //Radius = (uint)Application.GetRealHeight(60),
             };
             flMain.AddChidren(devicefra);
-            devicefra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+            devicefra.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
 
             #region  -------鍙栨秷   瀹屾垚
             var timetype = new RowLayout
@@ -1742,22 +1742,9 @@
                     {
 
                         #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");
-
+                       var temperaturedictionary = new Dictionary<string, string>();
+                       var modedictionary = new Dictionary<string, string>();
+                        var speeddictionary = new Dictionary<string, string>();
                         #endregion
 
                         #region  绌鸿皟View
@@ -1906,33 +1893,32 @@
                             }
                         };
 
-                        #endregion
+                        #endregion 
                         //榛樿26,鑷姩,涓
                         int indextemperature = 10, indexmode = 2, indexspeed = 1;
                         if (edit && TaskList != null)
                         {
                             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);
-                                        //濡傛灉绌鸿皟鐘舵�佹槸鍏筹紱鐩存帴璺冲嚭for寰潖锛�
-                                        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:闄ゆ箍)
@@ -2020,11 +2006,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];
@@ -2043,12 +2039,18 @@
                         ///鍙栨秷浜嬩欢
                         EventHandler<MouseEventArgs> closeclick = (sender, e) =>
                         {
+                            //娓呴櫎涔嬪墠鏁版嵁锛�
+                            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