From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

---
 ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs |  259 +++++++++++++++++++++++++++++----------------------
 1 files changed, 148 insertions(+), 111 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
index b23a780..e3d9fca 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
@@ -25,7 +25,6 @@
         Button clicktextcolcrbutton = new Button();
         public void Show()
         {
-
             UserView.HomePage.Instance.ScrollEnabled = false;
             this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
             #region  鏈�涓婇潰鐨勫竷灞�浠g爜
@@ -47,6 +46,7 @@
                 Height = Application.GetRealHeight(69),
                 Y = Application.GetRealHeight(92),
                 TextID = MyInternationalizationString.devicestate,
+                IsBold = true,
             };
             topRowLayout.AddChidren(titleName);
 
@@ -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
@@ -1052,22 +1052,24 @@
                             LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                         };
                         openframelayout.AddChidren(horizontalSeekBarRow);
-                        var horizontalSeekBarVol = new HorizontalSeekBar
+                        var horizontalSeekBarVol = new DiyImageSeekBar
                         {
+                            Y = openrowlayout.Bottom,
+                            X = Application.GetRealWidth(80),
                             Width = Application.GetRealWidth(920),
-                            Height = Application.GetRealHeight(80),
-                            Radius = (uint)Application.GetRealHeight(25),
-                            Y = Application.GetRealHeight(25),
-                            //Gravity = Gravity.CenterVertical,
-                            ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
-                            Max = 100,
-                            SleepTime = 1000,
-                            ThumbRadius = 9,
-                            IsCanMove = false
-                        };
-                        horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);
+                            Height = Application.GetRealHeight(160),
+                            IsProgressTextShow = true,//鏄剧ず鐧惧垎姣�
+                            IsClickable = false,//杩涘害鏉℃槸鍚︽粦鍔�
+                            ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉¢鑹�
+                            ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍�
+                            ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
+                            ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                            ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏� 
+                            SeekBarViewHeight = Application.GetRealHeight(10),//杩涘害鏉$殑楂樺害
 
-                        #endregion
+                        };
+                        openframelayout.AddChidren(horizontalSeekBarVol);
+                         #endregion
 
                         #region  鍏�
                         var closeframelayout = new FrameLayout
@@ -1138,30 +1140,32 @@
                         #endregion
 
                         int Progressvalue = 100;
-                        horizontalSeekBarVol.ProgressChanged += (sender, e) =>
-                        {
-                            SelectedDeviceStatusaction = "yes";
-                            Progressvalue = horizontalSeekBarVol.Progress;
-                            if (switchdictionary.ContainsKey("TaskType"))
-                            {
-                                switchdictionary.Remove("TaskType");
-                            }
-                            if (switchdictionary.ContainsKey("Data1"))
-                            {
-                                switchdictionary.Remove("Data1");
-                            }
-                            switchdictionary.Add("TaskType", "3");
+                        EventHandler<int> progressclick = (sender, e) =>
+                         {
+                             SelectedDeviceStatusaction = "yes";
+                             Progressvalue = horizontalSeekBarVol.Progress;
+                             if (switchdictionary.ContainsKey("TaskType"))
+                             {
+                                 switchdictionary.Remove("TaskType");
+                             }
+                             if (switchdictionary.ContainsKey("Data1"))
+                             {
+                                 switchdictionary.Remove("Data1");
+                             }
+                             switchdictionary.Add("TaskType", "3");
                             //鏈�澶т寒搴﹀�兼槸254闇�瑕佽浆鎹紱
                             var lightbrightnessvalue = (254 * horizontalSeekBarVol.Progress) / 100;
-                            switchdictionary.Add("Data1", lightbrightnessvalue.ToString());
+                             switchdictionary.Add("Data1", lightbrightnessvalue.ToString());
 
-                        };
+                         };
+                        horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
+                        horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;
                         ///纭浜嬩欢
                         EventHandler<MouseEventArgs> openclick = (sender, e) =>
                         {
                             SelectedDeviceStatusaction = "yes";
-                            horizontalSeekBarVol.IsCanMove = true;
-                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+                            horizontalSeekBarVol.IsClickable = true;
+                            horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
                             openBtnSelected.Visible = true;
                             closeBtnSelected.Visible = false;
                             takebackBtnSelected.Visible = false;
@@ -1188,8 +1192,8 @@
                         EventHandler<MouseEventArgs> closeclick = (sender, e) =>
                         {
                             SelectedDeviceStatusaction = "yes";
-                            horizontalSeekBarVol.IsCanMove = false;
-                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+                            horizontalSeekBarVol.IsClickable = false;
+                            horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
                             openBtnSelected.Visible = false;
                             closeBtnSelected.Visible = true;
                             takebackBtnSelected.Visible = false;
@@ -1213,8 +1217,8 @@
                         EventHandler<MouseEventArgs> takebackclick = (sender, e) =>
                         {
                             SelectedDeviceStatusaction = "yes";
-                            horizontalSeekBarVol.IsCanMove = false;
-                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+                            horizontalSeekBarVol.IsClickable = false;
+                            horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
                             openBtnSelected.Visible = false;
                             closeBtnSelected.Visible = false;
                             takebackBtnSelected.Visible = true;
@@ -1256,8 +1260,8 @@
                                         openBtnSelected.Visible = false;
                                         closeBtnSelected.Visible = true;
                                         takebackBtnSelected.Visible = false;
-                                        horizontalSeekBarVol.IsCanMove = false;
-                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+                                        horizontalSeekBarVol.IsClickable = false;
+                                        horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
                                     }
                                     else if (value["Data1"] == "2")
                                     {
@@ -1265,8 +1269,8 @@
                                         openBtnSelected.Visible = false;
                                         closeBtnSelected.Visible = false;
                                         takebackBtnSelected.Visible = true;
-                                        horizontalSeekBarVol.IsCanMove = false;
-                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+                                        horizontalSeekBarVol.IsClickable = false;
+                                        horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
                                     }
 
                                 }
@@ -1277,8 +1281,8 @@
                                     openBtnSelected.Visible = true;
                                     closeBtnSelected.Visible = false;
                                     takebackBtnSelected.Visible = false;
-                                    horizontalSeekBarVol.IsCanMove = true;
-                                    horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+                                    horizontalSeekBarVol.IsClickable = true;
+                                    horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
                                     horizontalSeekBarVol.Progress = int.Parse(value["Data1"])*100/254;
                                     Progressvalue = horizontalSeekBarVol.Progress;
 
@@ -1350,20 +1354,22 @@
                             LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                         };
                         openframelayout.AddChidren(horizontalSeekBarRow);
-                        var horizontalSeekBarVol = new HorizontalSeekBar
+                        var horizontalSeekBarVol = new DiyImageSeekBar
                         {
+                            Y = openrowlayout.Bottom,
+                            X = Application.GetRealWidth(80),
                             Width = Application.GetRealWidth(920),
-                            Height = Application.GetRealHeight(80),
-                            Radius = (uint)Application.GetRealHeight(25),
-                            Y = Application.GetRealHeight(25),
-                            //Gravity = Gravity.CenterVertical,
-                            ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
-                            Max = 100,
-                            SleepTime = 1000,
-                            ThumbRadius = 9,
-                            IsCanMove = false
+                            Height = Application.GetRealHeight(160),
+                            IsProgressTextShow = true,//鏄剧ず鐧惧垎姣�
+                            IsClickable = false,//杩涘害鏉℃槸鍚︽粦鍔�
+                            ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉¢鑹�
+                            ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍�
+                            ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
+                            ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,//杩涘害鏉″師棰滆壊
+                            ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏� 
+                            SeekBarViewHeight = Application.GetRealHeight(10),
                         };
-                        horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);
+                        openframelayout.AddChidren(horizontalSeekBarVol);
 
                         #endregion
 
@@ -1403,7 +1409,8 @@
 
                         #endregion
                         int Progressvalue = 100;
-                        horizontalSeekBarVol.ProgressChanged += (sender, e) =>
+
+                        EventHandler<int> progressclick = (sender, e) =>
                         {
                             SelectedDeviceStatusaction = "yes";
                             Progressvalue = horizontalSeekBarVol.Progress;
@@ -1419,12 +1426,14 @@
                             switchdictionary.Add("Data2", horizontalSeekBarVol.Progress.ToString());
 
                         };
+                        horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
+                        horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;
                         ///纭浜嬩欢
-                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
+                        EventHandler <MouseEventArgs> openclick = (sender, e) =>
                         {
                             SelectedDeviceStatusaction = "yes";
-                            horizontalSeekBarVol.IsCanMove = true;
-                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+                            horizontalSeekBarVol.IsClickable = true;
+                            horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
                             openBtnSelected.Visible = true;
                             closeBtnSelected.Visible = false;
                             horizontalSeekBarVol.Progress = Progressvalue;
@@ -1448,8 +1457,8 @@
                         EventHandler<MouseEventArgs> closeclick = (sender, e) =>
                         {
                             SelectedDeviceStatusaction = "yes";
-                            horizontalSeekBarVol.IsCanMove = false;
-                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+                            horizontalSeekBarVol.IsClickable = false;
+                            horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
                             openBtnSelected.Visible = false;
                             closeBtnSelected.Visible = true;
 
@@ -1490,8 +1499,8 @@
                                         }
                                         switchdictionary.Add("Data1", "5");
                                         switchdictionary.Add("Data2", value["Data2"]);
-                                        horizontalSeekBarVol.IsCanMove = true;
-                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+                                        horizontalSeekBarVol.IsClickable = true;
+                                        horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
                                         openBtnSelected.Visible = true;
                                         closeBtnSelected.Visible = false;
                                         horizontalSeekBarVol.Progress = int.Parse(value["Data2"]);
@@ -1506,8 +1515,8 @@
                                         switchdictionary.Add("Data1", "1");
                                         openBtnSelected.Visible = false;
                                         closeBtnSelected.Visible = true;
-                                        horizontalSeekBarVol.IsCanMove = false;
-                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+                                        horizontalSeekBarVol.IsClickable = false;
+                                        horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
                                     }
 
                                 }
@@ -1737,29 +1746,23 @@
                         }
                     }
                     break;
-                    
+                ///绌鸿皟
                 case DeviceType.Thermostat:
                     {
 
                         #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");
+                       var temperaturedictionary = new Dictionary<string, string>();
+                       var modedictionary = new Dictionary<string, string>();
+                        var 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
 
                         devicefra.Y = Application.GetRealHeight(1920 - 600 - 210 - 160*2);
@@ -1806,11 +1809,12 @@
                         };
                         devicefra.AddChidren(PickerViewfra);
 
-
+                        //閬尅绌鸿皟婊戝姩view锛�
                         var pausePickerViewfra= new FrameLayout
                         {
                             Y = openframelayout.Bottom,
                             Height = Application.GetRealHeight(600),
+                            BackgroundColor=0x60ffffff,
                         };
                         devicefra.AddChidren(pausePickerViewfra);
 
@@ -1885,11 +1889,14 @@
                         var closeBtnSelected = new SelectedButton();
                         closerowlayout.AddChidren(closeBtnSelected);
                         #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";
@@ -1901,38 +1908,43 @@
                                 dictionary(temperaturedictionary, "Data2", a.ToString());
 
                                 SpeedState(speedstring, speeddictionary);
-
-
                             }
                         };
-
+                       mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 0);
+                        mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 1);
+                        mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 2);
                         #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;
-                                    }
+                                    mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 0);
+                                    mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 1);
+                                    mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 2);
+                                    //鏁扮粍鍙湁涓�涓厓绱犺鏄庡綋鍓嶇┖璋冪姸鎬佷负鍏筹紱
+                                    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);
+                                    mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 0);
+                                    mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 1);
+                                    mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 2);
+                                }
+
+
+                                if (value["TaskType"] == "5")
                                 {
                                     if (value["Data1"] == "3")
                                     {//3---璁剧疆宸ヤ綔妯″紡(1:鑷姩;3:鍒跺喎;4:鍒剁儹;7:閫侀;8:闄ゆ箍)
@@ -2002,7 +2014,7 @@
                                         }
                                         indexspeed = mList3.IndexOf(speedtext);
                                     }
-                                    //4---璁剧疆鍔犵儹搴︽暟;5---璁剧疆鍒跺喎銆侀櫎婀垮害鏁�;7---璁剧疆鑷姩搴︽暟
+                                    //4-璁剧疆鍔犵儹搴︽暟;5-璁剧疆鍒跺喎銆侀櫎婀垮害鏁�;7-璁剧疆鑷姩搴︽暟
                                     else if (value["Data1"] == "4" || value["Data1"] == "5" || value["Data1"] == "7")
                                     {
                                         var s = int.Parse(value["Data2"]) / 100;
@@ -2016,15 +2028,30 @@
                         }
                         ///鏇存柊鏈�鏂扮┖璋冪姸鎬侊紱
                         mUIPickerView.setCurrentItems(indextemperature, indexmode, indexspeed);
-
+                     
                         ///纭浜嬩欢
                         EventHandler<MouseEventArgs> openclick = (sender, e) =>
                         {
+                            mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 0);
+                            mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 1);
+                            mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnSelectedColor, 2);
+                            mUIPickerView.setCurrentItems(indextemperature, indexmode, indexspeed);
                             pausePickerViewfra.Height = Application.GetRealHeight(0);
                             SelectedDeviceStatusaction = "yes";
                             openBtnSelected.Visible = true;
                             closeBtnSelected.Visible = false;
-                            dictionary(switchdictionary, "Data1", "1");
+                            //娓呴櫎涔嬪墠鏁版嵁锛�
+                            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);
+                          
                             var temperature = mList1[indextemperature].Split(' ')[0];
                             var modestring = mList2[indexmode].Split(' ')[0];
                             var speedstring = mList3[indexspeed].Split(' ')[0];
@@ -2043,12 +2070,22 @@
                         ///鍙栨秷浜嬩欢
                         EventHandler<MouseEventArgs> closeclick = (sender, e) =>
                         {
+                            mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 0);
+                            mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 1);
+                            mUIPickerView.setTextColorCenter(ZigbeeColor.Current.LogicBtnCancelColor, 2);
+                            mUIPickerView.setCurrentItems(indextemperature, indexmode, indexspeed);
+                            //娓呴櫎涔嬪墠鏁版嵁锛�
+                            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;
@@ -2071,9 +2108,9 @@
                 {
                     if (!edit)
                     {
-                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
-                                               Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
-                                               Language.StringByID(MyInternationalizationString.complete));
+                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+                               Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
+                              Language.StringByID(MyInternationalizationString.confrim));
                         alert.Show();
                         return;
                     }

--
Gitblit v1.8.0