202009101

wxr

2020-09-10 af1cb3ecd0f4b0589e00b28f7f9edccf39e6e12b

 HDL_ON/UI/UI2/3-Intelligence/SetSceneFunctionInfoPage.cs

@@ -63,8 +63,8 @@
                    //无操作
                    break;
                case FunctionType.Dimmer:
                case FunctionType.RGB:
                    LoadFunctionRow(function.function.Find((obj) => obj.name == "brightness"));

                    break;
            }

@@ -98,7 +98,7 @@

            btnConfrim.MouseUpEventHandler = (sender, e) =>
            {
                var temp = scene.sceneFunctionList.Find((obj) => obj.sid == function.sid) ;
                var temp = scene.sceneFunctionList.Find((obj) => obj.sid == function.sid);
                if (temp!=null)
                {
                    temp = function;
@@ -109,7 +109,6 @@
                }
                refreshAction();
                this.RemoveFromParent();

            };
        }

@@ -128,8 +127,10 @@
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            contentView.AddChidren(row);
            row.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });

            if (trait.name != "on_off")
            {
                row.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
            }
            Button btnBrightnessRight = new Button()
            {
                X = Application.GetRealWidth(339),
@@ -596,7 +597,8 @@
                ProgressTextColor = CSS_Color.FirstLevelTitleColor,
                ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                MaxValue = 100,
                Progress = trait.value.ToString().Replace("{}", "") == "" ? 0 : (int)trait.value,
                Progress = trait.value.ToString().Replace("{}", "") == "" ? 0 : Convert.ToInt32( trait.value),
                SeekBarPadding = Application.GetRealWidth(20),
            };
            optionBaseView.AddChidren(controlBar);