Merge remote-tracking branch 'origin/NewFilePath' into WJC

陈嘉乐

2021-01-11 1026814d931de92f0da5f15a58870565a94100e0

 HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs

@@ -12,37 +12,43 @@
        /// </summary>

        public static void UpdataStates(Light uFunction)

        {

            Application.RunOnMainThread(() =>

            Application.RunOnMainThread((Action)(() =>

            {

                try

                {

                    if (bodyView == null)

                        return;

                    if (uFunction.functionType == bodyView.light.functionType && uFunction.sid == bodyView.light.sid)

                    if (uFunction.spk == bodyView.light.spk && 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)

                {

                    MainPage.Log($"{bodyView.GetType().Name } UpdataStates error : {ex.Message}");

                }

            });

            }));

        }



        void LoadEventList()

@@ -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 + "%";

            };