From 301d3f15ba03ff942c029bd4c0b1ff544f7cfede Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 30 十二月 2020 11:19:48 +0800
Subject: [PATCH] 2020-12-30 1.解决RGB灯,色盘ColorPicker部分安卓手机,刷新图片时会变小问题

---
 HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
index 73c1efc..26276ea 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
@@ -20,22 +20,28 @@
                         return;
                     if (uFunction.functionType == bodyView.light.functionType && uFunction.sid == bodyView.light.sid)
                     {
-
                         if (uFunction.trait_on_off.curValue.ToString() == "on")
                         {
                             bodyView.dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
                             if (!bodyView.onDimmerBar)
                             {
                                 bodyView.dimmerBar.Progress = uFunction.brightness;
-                            }
-                            bodyView.btnBrightnessText.Text = uFunction.brightness + "%";
-                            bodyView.btnBrightnessText.Y = ((100 - uFunction.brightness) * Application.GetRealHeight(222 - 16 - 16) / 100) + Application.GetRealWidth(40);
+                            }
+                            bodyView.btnBrightnessText.Text = uFunction.brightness + "%";
+                            bodyView.btnBrightnessText.Y = ((100 - uFunction.brightness) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);
                         }
                         else
                         {
                             bodyView.dimmerBar.SetProgressBarColors(CSS_Color.DividingLineColor, CSS_Color.DividingLineColor);
                         }
                         bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.curValue.ToString() == "on";
+                        bodyView.barColorTemplatrue.Enable = uFunction.trait_on_off.curValue.ToString() == "on";
+                        var cct = 27;
+                        int.TryParse(uFunction.Attr_CCT.curValue.ToString(), out cct);
+                        bodyView.barColorTemplatrue.Progress = cct / 100;
+                        //璁剧疆鍒濆鍊�
+                        bodyView.barColorTemplatrue.SetCustomText(bodyView.barColorTemplatrue.Progress * 100 + "K");
+
                     }
                 }
                 catch (Exception ex)
@@ -122,16 +128,21 @@
             dimmerBar.OnStartTrackingTouchEvent = (sender, e) => {
                 onDimmerBar = true;
             };
-            dimmerBar.OnStopTrackingTouchEvent = (sender, e) => {
+            dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
+            {
                 onDimmerBar = false;
                 light.brightness = dimmerBar.Progress;
                 System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                 d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
                 Control.Ins.SendWriteCommand(light, d);
                 //light.fadeTime = barFadeTime.Progress;
+                btnBrightnessText.Text = dimmerBar.Progress + "%";
+
+                dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
             };
             dimmerBar.OnProgressChangedEvent = (sender, e) =>
             {
+                dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
                 //light.fadeTime = 0;
                 //if (!btnSwitch.IsSelected)
                 //{
@@ -162,8 +173,11 @@
                 //    }
                 //}
 
-                btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16 - 16) / 100) + Application.GetRealWidth(40);
-                btnBrightnessText.Text = light.brightness + "%";
+                //btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16 - 16) / 100) + Application.GetRealWidth(40);
+                //btnBrightnessText.Text = light.brightness + "%";
+
+                btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);
+                btnBrightnessText.Text = dimmerBar.Progress + "%";
             };
 
 

--
Gitblit v1.8.0