20209112

wxr

2020-09-11 9b5399d3dd4299563821af0a7131f9a52402feea

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

@@ -32,8 +32,10 @@
                        {
                            bodyView.dimmerBar.SetProgressBarColors(CSS_Color.DividingLineColor, CSS_Color.DividingLineColor);
                        }
                        //bodyView.dimmerBar.WaveColor = uFunction.on_off == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
                        bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.value.ToString() == "on";

                        bodyView.btnBrightnessText.Y = ((100 - uFunction.brightness) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
                        bodyView.btnBrightnessText.Text = uFunction.brightness + "%";
                    }
                }
                catch (Exception ex)
@@ -48,10 +50,22 @@
            LoadSwitchEvent();
            LoadCollectionEvent();
            LoadEvent_DimmerBar();
            LoadEvet_ChangeFadeTime();
            //回退刷新信息事件
            actionRefresh = () => {
                btnFunctionName.Text = btnFunctionName_Out.Text = light.name;
                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = light.GetRoomListName();
            };
        }
        /// <summary>
        /// 修改灯光渐变时间
        /// </summary>
        void LoadEvet_ChangeFadeTime()
        {
            barFadeTime.OnProgressChangedEvent = (sender, e) =>
            {
                light.fadeTime = e;
                light.SaveFunctionData();
            };
        }

@@ -83,6 +97,7 @@
                Control.SendWriteCommand(light, d);
            };
            dimmerBar.OnProgressChangedEvent = (sender, e) => {
                light.fadeTime = 0;
                if (!btnSwitch.IsSelected)
                {
                    dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
@@ -113,8 +128,6 @@
                    }
                }

                MainPage.Log( dimmerBar.NowProgressY.ToString());
                //btnBrightnessText.Y = dimmerBar.NowProgressY + Application.GetRealWidth(40);
                btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
                btnBrightnessText.Text = light.brightness + "%";
            };
@@ -127,6 +140,7 @@
        {
            btnSwitch.MouseUpEventHandler += (sender, e) =>
            {
                light.fadeTime = barFadeTime.Progress;
                btnSwitch.IsSelected = !btnSwitch.IsSelected;
                if (btnSwitch.IsSelected)
                {