2019-12-10-01

WJC

2019-12-10 4e0d1c906e69af41905b5376da15773be0fca547

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

@@ -49,6 +49,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.devicestate,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);

@@ -1239,6 +1240,7 @@
                                        Width = Application.GetRealWidth(600),
                                        TextAlignment = TextAlignment.CenterLeft,
                                        TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                        TextSize = 14,
                                    };
                                    timeoutrowlayout.AddChidren(btntimeout);

@@ -1453,20 +1455,23 @@
                        };
                        devicefra.AddChidren(Btntemperaturevalue);

                        var horizontalSeekBarVol = new HorizontalSeekBar
                        var horizontalSeekBarVol = new DiyImageSeekBar
                        {
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(80),
                            Radius = (uint)Application.GetRealHeight(25),
                            Y = timetype.Bottom + Application.GetRealHeight(70 + 60 + 70),
                            X = Application.GetRealWidth(80),
                            ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
                            Max = 100,
                            SleepTime = 1000,
                            ThumbRadius = 9,
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(160),
                            IsProgressTextShow = false,//显示百分比
                            IsClickable = true,//进度条是否滑动
                            ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//选中进度条颜色
                            ThumbImagePath = "ZigeeLogic/progressbtn_2.png",//进度条按钮图标
                            ThumbImageHeight = Application.GetRealHeight(56),//进度条按钮图标的高度（默认正方形：宽和高一样）
                            ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,//进度条原颜色
                            //ProgressTextSize = 13,//显示百分比字体大小 
                            SeekBarViewHeight = Application.GetRealHeight(10),//进度条的高度
                        };
                        devicefra.AddChidren(horizontalSeekBarVol);
                        horizontalSeekBarVol.MouseUpEventHandler += (sender, e) =>
                        horizontalSeekBarVol.OnProgressChangedEvent += (sender, e) =>
                        {
                            SelectedDeviceStatuscondition = "TemperatureSensor";
                            if (temperatureSensor.SensorDiv == 1)