合并一个版本

黄学彪

2019-12-17 5986f63b75bd81c6cef262c670e9251c038cbf5d

 ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs

@@ -1040,7 +1040,7 @@
                        };
                        openrowlayout.AddChidren(btnopen);

                        var openBtnSelected = new SelectedButton(); 
                        var openBtnSelected = new SelectedButton();
                        openrowlayout.AddChidren(openBtnSelected);

                        var horizontalSeekBarRow = new RowLayout
@@ -1049,7 +1049,7 @@
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(160),
                            X = Application.GetRealWidth(80),
                           LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                        };
                        openframelayout.AddChidren(horizontalSeekBarRow);
                        var horizontalSeekBarVol = new DiyImageSeekBar
@@ -1142,7 +1142,6 @@
                        int Progressvalue = 100;
                        EventHandler<int> progressclick = (sender, e) =>
                         {
                             Console.WriteLine("12345");
                             SelectedDeviceStatusaction = "yes";
                             Progressvalue = horizontalSeekBarVol.Progress;
                             if (switchdictionary.ContainsKey("TaskType"))
@@ -1357,8 +1356,8 @@
                        openframelayout.AddChidren(horizontalSeekBarRow);
                        var horizontalSeekBarVol = new DiyImageSeekBar
                        {
                            X = Application.GetRealWidth(80),
                            Y = openrowlayout.Bottom,
                            X = Application.GetRealWidth(80),
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(160),
                            IsProgressTextShow = true,//显示百分比
@@ -1366,9 +1365,9 @@
                            ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//选中进度条颜色
                            ThumbImagePath = "ZigeeLogic/progressbtn2.png",//进度条按钮图标
                            ThumbImageHeight = Application.GetRealHeight(56),//进度条按钮图标的高度（默认正方形：宽和高一样）
                            ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                            ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,//进度条原颜色
                            ProgressTextSize = 14,//显示百分比字体大小 
                            SeekBarViewHeight = Application.GetRealHeight(10),//进度条的高度
                            SeekBarViewHeight = Application.GetRealHeight(10),
                        };
                        openframelayout.AddChidren(horizontalSeekBarVol);

@@ -1747,7 +1746,7 @@
                        }
                    }
                    break;
                    
                ///空调
                case DeviceType.Thermostat:
                    {

@@ -1882,8 +1881,7 @@
                        var closeBtnSelected = new SelectedButton();
                        closerowlayout.AddChidren(closeBtnSelected);
                        #endregion
                      
                   


                        mUIPickerView.OnSelectChangeEvent += (s1, s2, s3) =>
                        {
@@ -1902,12 +1900,13 @@

                            }
                        };

                        #endregion 
                        
                        #endregion
                        //默认26,自动,中风
                        int indextemperature = 10, indexmode = 2, indexspeed = 1;
                        if (edit && TaskList != null)
                        {
                       
                            foreach (var value in TaskList)
                            {
                                if (TaskList.Count == 1)
@@ -2049,6 +2048,7 @@
                        ///取消事件
                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
                        {
              
                            //清除之前数据；
                            taskListInfo.Clear();
                            dictionary(modedictionary, "TaskType", "5");