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/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs |   50 ++++++++++++++++----------------------------------
 1 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
index 9ab7f3f..f67c9ad 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
@@ -186,24 +186,18 @@
             frameBack.AddChidren(btnProgress1);
 
             //杩涘害鏉�
-            var seekBar1 = new HorizontalSeekBar();
+            var seekBar1 = new SeekBarControl();
             seekBar1.Y = Application.GetRealHeight(253);
-            seekBar1.Gravity = Gravity.CenterHorizontal;
-            seekBar1.Width = Application.GetRealWidth(962);
-            seekBar1.Height = Application.GetRealHeight(81);
-            seekBar1.Max = 100;
-            seekBar1.BackgroundColor = 0xfff5f5f5;
-            seekBar1.ThumbColor = Common.ZigbeeColor.Current.GXCButtonBlueColor;
-            seekBar1.ProgressColor = 0xff3e99f4;
-            seekBar1.Progress = energyModeInfo.level;
+            seekBar1.ProgressBarColor = 0xff3e99f4;
             frameBack.AddChidren(seekBar1);
-            seekBar1.ProgressChanged += (sender, value) =>
+            seekBar1.ProgressChangedEvent += (div, value) =>
             {
                 btnProgress1.Text = value + "%";
                 //鏁版嵁鍙樻洿
                 energyModeInfo.level = value;
                 valueChanged = true;
             };
+            seekBar1.Progress = energyModeInfo.level;
 
             var btnTemp1 = new NormalViewControl(200, 49, true);
             btnTemp1.X = ControlCommonResourse.XXLeft;
@@ -254,28 +248,22 @@
             btnProgress1.Y = Application.GetRealHeight(29);
             btnProgress1.TextSize = 12;
             btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
-            btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";
+            btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";
             frameLinght.AddChidren(btnProgress1);
 
             //杩涘害鏉�
-            var seekBar1 = new HorizontalSeekBar();
+            var seekBar1 = new SeekBarControl();
             seekBar1.Y = Application.GetRealHeight(124);
-            seekBar1.Gravity = Gravity.CenterHorizontal;
-            seekBar1.Width = Application.GetRealWidth(962);
-            seekBar1.Height = Application.GetRealHeight(81);
-            seekBar1.Max = 100;
-            seekBar1.BackgroundColor = 0xfff5f5f5;
-            seekBar1.ThumbColor = Common.ZigbeeColor.Current.GXCButtonBlueColor;
-            seekBar1.ProgressColor = 0xfffdb500;
-            seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;
+            seekBar1.ProgressBarColor = 0xfffdb500;
             frameLinght.AddChidren(seekBar1);
-            seekBar1.ProgressChanged += (sender, value) =>
+            seekBar1.ProgressChangedEvent += (div, value) =>
             {
                 btnProgress1.Text = value + "%";
                 //鏁版嵁鍙樻洿
-                linghtLevelInfo.panelDirectionsLevel = value;
+                linghtLevelInfo.panelBacklightLevel = value;
                 valueChanged = true;
             };
+            seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;
 
             var btnTemp1 = new NormalViewControl(200, 49, true);
             btnTemp1.X = ControlCommonResourse.XXLeft;
@@ -324,28 +312,22 @@
             btnProgress1.Y = Application.GetRealHeight(369);
             btnProgress1.TextSize = 12;
             btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
-            btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";
+            btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";
             frameLinght.AddChidren(btnProgress1);
 
             //杩涘害鏉�
-            var seekBar1 = new HorizontalSeekBar();
+            var seekBar1 = new SeekBarControl();
             seekBar1.Y = Application.GetRealHeight(464);
-            seekBar1.Gravity = Gravity.CenterHorizontal;
-            seekBar1.Width = Application.GetRealWidth(962);
-            seekBar1.Height = Application.GetRealHeight(81);
-            seekBar1.Max = 100;
-            seekBar1.BackgroundColor = 0xfff5f5f5;
-            seekBar1.ThumbColor = Common.ZigbeeColor.Current.GXCButtonBlueColor;
-            seekBar1.ProgressColor = 0xfffdb500;
-            seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;
+            seekBar1.ProgressBarColor = 0xfffdb500;
             frameLinght.AddChidren(seekBar1);
-            seekBar1.ProgressChanged += (sender, value) =>
+            seekBar1.ProgressChangedEvent += (div, value) =>
             {
                 btnProgress1.Text = value + "%";
                 //鏁版嵁鍙樻洿
-                linghtLevelInfo.panelBacklightLevel = value;
+                linghtLevelInfo.panelDirectionsLevel = value;
                 valueChanged = true;
             };
+            seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;
 
             var btnTemp1 = new NormalViewControl(200, 49, true);
             btnTemp1.X = ControlCommonResourse.XXLeft;

--
Gitblit v1.8.0