Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Projec...

wei

2021-01-11 41f9c8837b0551c68f8fd798c06951fa716b7ab8

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

@@ -22,7 +22,11 @@

                        if (uFunction.trait_on_off.curValue.ToString() == "on")
                        {
                            bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheel.png";
                            //解决部分安卓手机，刷新图片时会变小问题
                            if (bodyView.colorPicker.ColorImagePath != "FunctionIcon/Light/ColorWheel.png")
                            {
                                bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheel.png";
                            }
                            bodyView.dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
                            bodyView.btnSwitch.IsSelected = true;
                            if (!bodyView.onDimmerBar)
@@ -33,7 +37,12 @@
                        //状态一样时,不再刷新视图
                        else if (uFunction.trait_on_off.curValue.ToString() == "off" && bodyView.btnSwitch.IsSelected == true)
                        {
                            bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
                            //解决部分安卓手机，刷新图片时会变小问题
                            if (bodyView.colorPicker.ColorImagePath != "FunctionIcon/Light/ColorWheelGray.png")
                            {
                                bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
                            }
                            //bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
                            bodyView.dimmerBar.ProgressBarColor = CSS.CSS_Color.PromptingColor2;
                            bodyView.btnSwitch.IsSelected = false;
                            //色盘的圆点隐藏