Merge branch 'CJL' into wxr4

wxr

2021-05-12 9acd3887f1f8db40d59f991b1726a61aa7c7637c

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

@@ -182,6 +182,8 @@
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            contentView.AddChidren(row);


            if (sceneStatus.key != FunctionAttributeKey.OnOff)
            {
                row.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });