2019-12-04-1

WJC

2019-12-04 aeb4af0cadfaca52c9bfbe5257df285ad0cc2f39

 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 = false;
                                    closeBtnSelected.Visible = true;
                                    pausePickerViewfra.Height = Application.GetRealHeight(600);
                                    //如果空调状态是关；直接跳出for循坏；
                                    break;

                                }
                                else
                                    {
                                        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;
                                    }

                                }
                                else if (value["TaskType"] == "5")
                                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;