From 882155f064c6cfa8ccd092ec083c4264eb7b3020 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 10 十二月 2019 17:55:55 +0800
Subject: [PATCH] 2019-12-10-02

---
 ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
index 3091840..ccfe1f5 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
+++ b/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,21 +1455,26 @@
                         };
                         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) =>
+
+                        EventHandler<int> progressclick = (sender, e) =>
                         {
+
                             SelectedDeviceStatuscondition = "TemperatureSensor";
                             if (temperatureSensor.SensorDiv == 1)
                             {
@@ -1481,8 +1488,10 @@
                                 Btntemperaturevalue.Text = current + "<" + horizontalSeekBarVol.Progress.ToString() + "%";
                                 dictionary(deviceConditionsInfo, "AttriButeData1", horizontalSeekBarVol.Progress.ToString());//娓╁害鍊�
                             }
-                        };
 
+                        };
+                        horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
+                        horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;
 
 
                         if (temperatureSensor.SensorDiv == 1)

--
Gitblit v1.8.0